From 290a9d470f929046f6a23cd19faa5a536ddd99c4 Mon Sep 17 00:00:00 2001
From: Pixo <robertogarciadevelopment@gmail.com>
Date: Wed, 20 Sep 2023 18:55:51 +0200
Subject: [PATCH 001/188] [PB-981]:(feature) Display banner for Desktop MacOS
 2.0.0 download

---
 src/renderer/localize/locales/en.json         |  4 +
 .../Widget/MacOSVersionAvailableBanner.tsx    | 77 +++++++++++++++++++
 src/renderer/pages/Widget/index.tsx           |  6 ++
 3 files changed, 87 insertions(+)
 create mode 100644 src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx

diff --git a/src/renderer/localize/locales/en.json b/src/renderer/localize/locales/en.json
index 0d8ce4b20..6cb6c9570 100644
--- a/src/renderer/localize/locales/en.json
+++ b/src/renderer/localize/locales/en.json
@@ -123,6 +123,10 @@
     }
   },
   "widget": {
+    "macos-available": {
+      "title": "Desktop v2.0 is already here!",
+      "message": "The native macOS app is faster and more efficient, install it today"
+    },
     "header": {
       "usage": {
         "of": "of",
diff --git a/src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx b/src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx
new file mode 100644
index 000000000..55d67b62d
--- /dev/null
+++ b/src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx
@@ -0,0 +1,77 @@
+import { ArrowRight } from '@phosphor-icons/react';
+import React, { useEffect, useState } from 'react';
+import { useTranslationContext } from '../../context/LocalContext';
+import { reportError } from '../../utils/errors';
+
+interface AssetInfo {
+  browser_download_url: string;
+}
+
+interface LatestReleaseInfo {
+  id: number;
+  name: string;
+  published_at: Date;
+  assets: AssetInfo[];
+}
+
+export async function getLatestReleaseInfo(
+  user: string,
+  repo: string
+): Promise<string | undefined> {
+  const fetchUrl = `https://api.github.com/repos/${user}/${repo}/releases/latest`;
+  const res = await fetch(fetchUrl);
+
+  if (res.status !== 200) {
+    throw Error('Release not found');
+  }
+
+  const info: LatestReleaseInfo = await res.json();
+
+  let url: string | undefined = undefined;
+  info.assets.forEach((asset) => {
+    const match = asset.browser_download_url.match(/\.(\w+)$/);
+
+    if (match && match[1]) {
+      url = asset.browser_download_url;
+    }
+  });
+
+  return url;
+}
+
+export const MacOSVersionAvailableBanner: React.FC = () => {
+  const { translate } = useTranslationContext();
+  const [downloadURL, setDownloadURL] = useState<string>();
+  useEffect(() => {
+    getLatestReleaseInfo('internxt', 'drive-desktop-macos')
+      .then(setDownloadURL)
+      .catch(reportError);
+  }, []);
+
+  const handleDownloadMacOSNative = () => {
+    try {
+      if (!downloadURL) return;
+      window.electron.openUrl(downloadURL);
+    } catch (error) {
+      reportError(error);
+    }
+  };
+  return (
+    <div
+      className="flex flex-row bg-primary px-5 py-4"
+      onClick={handleDownloadMacOSNative}
+    >
+      <div className="mr-4">
+        <h2 className="mb-1 text-sm font-semibold">
+          {translate('widget.macos-available.title')}
+        </h2>
+        <h3 className="text-sm">
+          {translate('widget.macos-available.message')}
+        </h3>
+      </div>
+      <div className="flex items-center">
+        <ArrowRight size={24} />
+      </div>
+    </div>
+  );
+};
diff --git a/src/renderer/pages/Widget/index.tsx b/src/renderer/pages/Widget/index.tsx
index eaced4505..74c16c402 100644
--- a/src/renderer/pages/Widget/index.tsx
+++ b/src/renderer/pages/Widget/index.tsx
@@ -9,10 +9,15 @@ import { SyncStatus } from '../../../main/background-processes/sync';
 import { SyncFailed } from './SyncFailed';
 import useVirtualDriveStatus from 'renderer/hooks/VirtualDriveStatus';
 import { VirtualDriveError } from './VirtualDriveError';
+import { MacOSVersionAvailableBanner } from './MacOSVersionAvailableBanner';
+import useClientPlatform from '../../hooks/ClientPlatform';
 
 export default function Widget() {
   const [syncStatus, setSyncStatus] = useState<SyncStatus>('RUNNING');
   useSyncStatus(setSyncStatus);
+
+  const platform = useClientPlatform();
+
   const { status: virtualDriveStatus } = useVirtualDriveStatus();
   const handleRetrySync = () => {
     window.electron.startRemoteSync().catch((err) => {
@@ -50,6 +55,7 @@ export default function Widget() {
   return (
     <div className="flex h-screen flex-col overflow-hidden">
       <Header />
+      {platform === 'darwin' ? <MacOSVersionAvailableBanner /> : null}
       <SyncErrorBanner />
       <BackupsFatalErrorBanner />
       {displayErrorInWidget ? renderWidgetError() : <SyncInfo />}

From 78d615e117b083c8544cea0b0bbbde48cb3e2600 Mon Sep 17 00:00:00 2001
From: Pixo <robertogarciadevelopment@gmail.com>
Date: Wed, 20 Sep 2023 18:59:35 +0200
Subject: [PATCH 002/188] [PB-981]:(feature) Add ES and FR translations

---
 src/renderer/localize/locales/es.json | 4 ++++
 src/renderer/localize/locales/fr.json | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/renderer/localize/locales/es.json b/src/renderer/localize/locales/es.json
index c3aa42ac3..d0bc0943c 100644
--- a/src/renderer/localize/locales/es.json
+++ b/src/renderer/localize/locales/es.json
@@ -123,6 +123,10 @@
     }
   },
   "widget": {
+    "macos-available": {
+      "title": "Desktop v2.0 está disponible!",
+      "message": "La versión nativa de MacOS es más rapida y eficiente, instálala hoy"
+    },
     "header": {
       "usage": {
         "of": "de",
diff --git a/src/renderer/localize/locales/fr.json b/src/renderer/localize/locales/fr.json
index 1a75f91bf..c795642aa 100644
--- a/src/renderer/localize/locales/fr.json
+++ b/src/renderer/localize/locales/fr.json
@@ -123,6 +123,10 @@
     }
   },
   "widget": {
+    "macos-available": {
+      "title": "Desktop v2.0 est disponible!",
+      "message": "L'application native de macOS est plus rapide et plus efficace, installez-la dès aujourd'hui"
+    },
     "header": {
       "usage": {
         "of": "de",

From 9d70ef5f0301cf08bff7a1cba86805c832e3ff85 Mon Sep 17 00:00:00 2001
From: Pixo <robertogarciadevelopment@gmail.com>
Date: Wed, 20 Sep 2023 19:02:22 +0200
Subject: [PATCH 003/188] [PB-981]:(feature) Fix open url await

---
 src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx b/src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx
index 55d67b62d..0f9e18e72 100644
--- a/src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx
+++ b/src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx
@@ -48,10 +48,10 @@ export const MacOSVersionAvailableBanner: React.FC = () => {
       .catch(reportError);
   }, []);
 
-  const handleDownloadMacOSNative = () => {
+  const handleDownloadMacOSNative = async () => {
     try {
       if (!downloadURL) return;
-      window.electron.openUrl(downloadURL);
+      await window.electron.openUrl(downloadURL);
     } catch (error) {
       reportError(error);
     }

From 4a9c29b0120003842eb8603c0f3da3edeb343c28 Mon Sep 17 00:00:00 2001
From: Pixo <robertogarciadevelopment@gmail.com>
Date: Thu, 21 Sep 2023 11:51:58 +0200
Subject: [PATCH 004/188] [PB-981]:(feature) Use Internxt website API to grab
 download URLs

---
 src/main/app-info/handlers.ts                 |  7 +++
 src/main/background-processes/webdav.ts       | 21 +++------
 src/main/preload.d.ts                         |  1 +
 src/main/preload.js                           |  3 ++
 .../Widget/MacOSVersionAvailableBanner.tsx    | 43 +++----------------
 5 files changed, 23 insertions(+), 52 deletions(-)

diff --git a/src/main/app-info/handlers.ts b/src/main/app-info/handlers.ts
index 38ad065e1..aeaa9e68b 100644
--- a/src/main/app-info/handlers.ts
+++ b/src/main/app-info/handlers.ts
@@ -1,9 +1,16 @@
 import { ipcMain, app } from 'electron';
 
 import { executeQuery } from './service';
+import axios from 'axios';
 
 ipcMain.handle('execute-app-query', (_, query) => executeQuery(query));
 
+ipcMain.handle('get-download-urls', async () => {
+  const response = await axios.get('https://internxt.com/api/download');
+
+  return response.data;
+});
+
 ipcMain.handle('get-path', (_, path) => {
   const result = app.getPath(path);
   return result;
diff --git a/src/main/background-processes/webdav.ts b/src/main/background-processes/webdav.ts
index dca8b9b18..05a86fcb7 100644
--- a/src/main/background-processes/webdav.ts
+++ b/src/main/background-processes/webdav.ts
@@ -3,8 +3,10 @@ import { ipcWebdav } from '../ipcs/webdav';
 import path from 'path';
 import Logger from 'electron-log';
 import eventBus from '../event-bus';
-import { ejectMacOSInstallerDisks, unmountDrive } from '../../workers/webdav/VirtualDrive';
-
+import {
+  ejectMacOSInstallerDisks,
+  unmountDrive,
+} from '../../workers/webdav/VirtualDrive';
 
 let webdavWorker: BrowserWindow | null = null;
 
@@ -47,19 +49,8 @@ function stopWebDavServer() {
   webdavWorker?.webContents.send('STOP_WEBDAV_SERVER_PROCESS');
 }
 
-function startWebDavServer() {
-  webdavWorker?.webContents.send('START_WEBDAV_SERVER_PROCESS');
-}
-
 eventBus.on('USER_LOGGED_OUT', stopWebDavServer);
 eventBus.on('USER_WAS_UNAUTHORIZED', stopWebDavServer);
-eventBus.on('USER_LOGGED_IN', () => {
-  if (webdavWorker === null) {
-    spawnWebdavServerWorker();
-  } else {
-    startWebDavServer();
-  }
-});
 
 if (process.platform === 'darwin') {
   eventBus.on('APP_IS_READY', ejectMacOSInstallerDisks);
@@ -72,6 +63,8 @@ ipcMain.handle('retry-virtual-drive-mount', () => {
 ipcMain.handle('unmount-virtual-drive-and-quit', async () => {
   try {
     await unmountDrive();
-  } catch (onMenuQuitClickError) { Logger.error({ onMenuQuitClickError }); };
+  } catch (onMenuQuitClickError) {
+    Logger.error({ onMenuQuitClickError });
+  }
   await app.quit();
 });
diff --git a/src/main/preload.d.ts b/src/main/preload.d.ts
index b06123409..9436c7261 100644
--- a/src/main/preload.d.ts
+++ b/src/main/preload.d.ts
@@ -205,6 +205,7 @@ declare interface Window {
     retryVirtualDriveMount(): void;
     unmountVirtualDriveAndQuit: () => Promise<boolean>;
     startRemoteSync: () => Promise<void>;
+    getDownloadUrls: () => Promise<{ platforms: Record<string, string> }>;
     openUrl: (url: string) => Promise<void>;
     // DEV
     resizeWindow: () => typeof import('../main/dev/service').resizeCurrentWindow;
diff --git a/src/main/preload.js b/src/main/preload.js
index 6d20cbf0b..40e40d7ed 100644
--- a/src/main/preload.js
+++ b/src/main/preload.js
@@ -287,6 +287,9 @@ contextBridge.exposeInMainWorld('electron', {
   unmountVirtualDriveAndQuit() {
     return ipcRenderer.invoke('unmount-virtual-drive-and-quit');
   },
+  getDownloadUrls() {
+    return ipcRenderer.invoke('get-download-urls');
+  },
   onVirtualDriveStatusChange(callback) {
     const eventName = 'virtual-drive-status-change';
     const callbackWrapper = (_, v) => {
diff --git a/src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx b/src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx
index 0f9e18e72..4d36b5927 100644
--- a/src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx
+++ b/src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx
@@ -3,49 +3,16 @@ import React, { useEffect, useState } from 'react';
 import { useTranslationContext } from '../../context/LocalContext';
 import { reportError } from '../../utils/errors';
 
-interface AssetInfo {
-  browser_download_url: string;
-}
-
-interface LatestReleaseInfo {
-  id: number;
-  name: string;
-  published_at: Date;
-  assets: AssetInfo[];
-}
-
-export async function getLatestReleaseInfo(
-  user: string,
-  repo: string
-): Promise<string | undefined> {
-  const fetchUrl = `https://api.github.com/repos/${user}/${repo}/releases/latest`;
-  const res = await fetch(fetchUrl);
-
-  if (res.status !== 200) {
-    throw Error('Release not found');
-  }
-
-  const info: LatestReleaseInfo = await res.json();
-
-  let url: string | undefined = undefined;
-  info.assets.forEach((asset) => {
-    const match = asset.browser_download_url.match(/\.(\w+)$/);
-
-    if (match && match[1]) {
-      url = asset.browser_download_url;
-    }
-  });
-
-  return url;
-}
+const getDownloadUrl = async () => {
+  const { platforms } = await window.electron.getDownloadUrls();
 
+  return platforms['MacOS'];
+};
 export const MacOSVersionAvailableBanner: React.FC = () => {
   const { translate } = useTranslationContext();
   const [downloadURL, setDownloadURL] = useState<string>();
   useEffect(() => {
-    getLatestReleaseInfo('internxt', 'drive-desktop-macos')
-      .then(setDownloadURL)
-      .catch(reportError);
+    getDownloadUrl().then(setDownloadURL).catch(reportError);
   }, []);
 
   const handleDownloadMacOSNative = async () => {

From 1a66c30f92041033c0b4b9fdd8199a9f8a43206f Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 21 Sep 2023 13:36:02 +0200
Subject: [PATCH 005/188] chore: change app verion

---
 package.json             | 2 +-
 release/app/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 951762cc7..fef01ee80 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.11",
+  "version": "2.0.0",
   "author": "Internxt <hello@internxt.com>",
   "description": "Internxt Drive client UI",
   "license": "AGPL-3.0",
diff --git a/release/app/package.json b/release/app/package.json
index 1eb40f149..ef47159ae 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.11",
+  "version": "2.0.0",
   "description": "Internxt Drive client UI",
   "main": "./dist/main/main.js",
   "author": "Internxt <hello@internxt.com>",

From 6abbd0eef4f19d637c06f0494c2ba2def954519c Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 18 Oct 2023 12:45:14 +0200
Subject: [PATCH 006/188] fix: skip traverse deleted or trashed folders

---
 .../items/application/AllStatusesTraverser.ts       | 13 +++++++++++--
 .../VirtualDrivePlaceholderCreator.ts               | 10 ++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/workers/sync-engine/modules/items/application/AllStatusesTraverser.ts b/src/workers/sync-engine/modules/items/application/AllStatusesTraverser.ts
index 77756c2f5..869a21f2e 100644
--- a/src/workers/sync-engine/modules/items/application/AllStatusesTraverser.ts
+++ b/src/workers/sync-engine/modules/items/application/AllStatusesTraverser.ts
@@ -1,6 +1,9 @@
 import Logger from 'electron-log';
 import { ServerFile } from '../../../../filesystems/domain/ServerFile';
-import { ServerFolder } from '../../../../filesystems/domain/ServerFolder';
+import {
+  ServerFolder,
+  ServerFolderStatus,
+} from '../../../../filesystems/domain/ServerFolder';
 import { fileNameIsValid } from '../../../../utils/name-verification';
 import { File } from '../../files/domain/File';
 import { FolderStatus } from '../../folders/domain/FolderStatus';
@@ -113,7 +116,13 @@ export class AllStatusesTraverser implements Traverser {
         status: folder.status,
       });
 
-      this.traverse(folder.id, `${name}`);
+      if (folder.status === ServerFolderStatus.EXISTS) {
+        // The folders and the files from trashed or deleted folders
+        // will have the status "EXISTS", to avoid filtering witch folders and files
+        // are in a deleted or trashed folder they not included on the collection.
+        // We cannot perform any action on them either way
+        this.traverse(folder.id, `${name}`);
+      }
     });
   }
 
diff --git a/src/workers/sync-engine/modules/placeholders/infrastructure/VirtualDrivePlaceholderCreator.ts b/src/workers/sync-engine/modules/placeholders/infrastructure/VirtualDrivePlaceholderCreator.ts
index 4f22a53bc..972d21630 100644
--- a/src/workers/sync-engine/modules/placeholders/infrastructure/VirtualDrivePlaceholderCreator.ts
+++ b/src/workers/sync-engine/modules/placeholders/infrastructure/VirtualDrivePlaceholderCreator.ts
@@ -4,11 +4,17 @@ import { Folder } from '../../folders/domain/Folder';
 import { PlaceholderCreator } from '../domain/PlaceholderCreator';
 import { createFolderPlaceholderId } from '../domain/FolderPlaceholderId';
 import { createFilePlaceholderId } from '../domain/FilePlaceholderId';
+import { FolderStatuses } from '../../folders/domain/FolderStatus';
+import { FileStatuses } from '../../files/domain/FileStatus';
 
 export class VirtualDrivePlaceholderCreator implements PlaceholderCreator {
   constructor(private readonly drive: VirtualDrive) {}
 
   folder(folder: Folder): void {
+    if (!folder.hasStatus(FolderStatuses.EXISTS)) {
+      return;
+    }
+
     const folderPath = `${folder.path.value}/`;
 
     const placeholderId = createFolderPlaceholderId(folder.uuid);
@@ -23,6 +29,10 @@ export class VirtualDrivePlaceholderCreator implements PlaceholderCreator {
   }
 
   file(file: File): void {
+    if (!file.hasStatus(FileStatuses.EXISTS)) {
+      return;
+    }
+
     const placeholderId = createFilePlaceholderId(file.contentsId);
 
     this.drive.createFileByPath(

From 7bf68a05159f031381af134d3a4cf0946362a811 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 18 Oct 2023 15:10:00 +0200
Subject: [PATCH 007/188] fix: test

---
 .../EnvironmentContentFileDownloader.test.ts  | 41 -------------------
 .../test/application/FileDeleter.test.ts      |  9 +++-
 .../test/application/FilePathUpdater.test.ts  |  4 +-
 3 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/src/workers/sync-engine/modules/contents/test/infrastructure/download/EnvironmentContentFileDownloader.test.ts b/src/workers/sync-engine/modules/contents/test/infrastructure/download/EnvironmentContentFileDownloader.test.ts
index c6a7eff96..f37263e4a 100644
--- a/src/workers/sync-engine/modules/contents/test/infrastructure/download/EnvironmentContentFileDownloader.test.ts
+++ b/src/workers/sync-engine/modules/contents/test/infrastructure/download/EnvironmentContentFileDownloader.test.ts
@@ -79,45 +79,4 @@ describe('Environment Content File Downloader', () => {
       });
     });
   });
-
-  describe('time watcher', () => {
-    it('starts the timer when the file is downloaded', async () => {
-      const strategy = createDownloadStrategy((callbacks) => {
-        callbacks.progressCallback(50);
-        callbacks.finishedCallback(null as unknown as Error, Readable.from(''));
-      });
-
-      const downloader = new EnvironmentContentFileDownloader(strategy, bucket);
-
-      downloader.on('progress', () => {
-        expect(downloader.elapsedTime()).toBeGreaterThan(-1);
-      });
-
-      expect(downloader.elapsedTime()).toBe(-1);
-
-      await downloader.download(file);
-    });
-
-    it('stops the timer when the file is not downloaded', async () => {
-      const delay = 100;
-      const strategy = createDownloadStrategy((callbacks) => {
-        callbacks.progressCallback(50);
-        setTimeout(() => {
-          callbacks.finishedCallback(
-            null as unknown as Error,
-            Readable.from('')
-          );
-        }, delay);
-      });
-
-      const downloader = new EnvironmentContentFileDownloader(strategy, bucket);
-
-      await downloader.download(file);
-
-      setTimeout(() => {
-        expect(downloader.elapsedTime()).toBeGreaterThan(delay - 10);
-        expect(downloader.elapsedTime()).toBeLessThan(delay + 10);
-      }, delay);
-    });
-  });
 });
diff --git a/src/workers/sync-engine/modules/files/test/application/FileDeleter.test.ts b/src/workers/sync-engine/modules/files/test/application/FileDeleter.test.ts
index 85227f88a..6e91d53f6 100644
--- a/src/workers/sync-engine/modules/files/test/application/FileDeleter.test.ts
+++ b/src/workers/sync-engine/modules/files/test/application/FileDeleter.test.ts
@@ -33,12 +33,17 @@ describe('File Deleter', () => {
     );
   });
 
-  it('does not trash a file if its not found', async () => {
+  it('does not nothing if the file its not found', async () => {
     const contentsId = ContentsIdMother.raw();
 
     repository.mockSearch.mockReturnValueOnce(undefined);
+    jest
+      .spyOn(allParentFoldersStatusIsExists, 'run')
+      .mockReturnValueOnce(false);
 
-    await expect(async () => await SUT.run(contentsId)).rejects.toThrow();
+    await SUT.run(contentsId);
+
+    expect(repository.mockDelete).not.toBeCalled();
   });
 
   it('does not delete a file if it has a parent already trashed', async () => {
diff --git a/src/workers/sync-engine/modules/files/test/application/FilePathUpdater.test.ts b/src/workers/sync-engine/modules/files/test/application/FilePathUpdater.test.ts
index 7fe852f40..f9ca946c9 100644
--- a/src/workers/sync-engine/modules/files/test/application/FilePathUpdater.test.ts
+++ b/src/workers/sync-engine/modules/files/test/application/FilePathUpdater.test.ts
@@ -6,8 +6,8 @@ import { FolderFinder } from '../../../folders/application/FolderFinder';
 import { FolderFinderMock } from '../../../folders/test/__mocks__/FolderFinderMock';
 import { FileFinderByContentsId } from '../../application/FileFinderByContentsId';
 import { IpcRendererSyncEngineMock } from '../../../shared/test/__mock__/IpcRendererSyncEngineMock';
-import { LocalFileIdProvider } from 'workers/sync-engine/modules/shared/application/LocalFileIdProvider';
-import { EventBusMock } from 'workers/sync-engine/modules/shared/test/__mock__/EventBusMock';
+import { LocalFileIdProvider } from '../../../shared/application/LocalFileIdProvider';
+import { EventBusMock } from '../../../shared/test/__mock__/EventBusMock';
 
 describe('File path updater', () => {
   let repository: FileRepositoryMock;

From d9b847e3d79293ce21b3f8824368773050827824 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 18 Oct 2023 15:24:25 +0200
Subject: [PATCH 008/188] fix: tsc

---
 src/main/analytics/backup-handlers.ts            | 2 +-
 src/main/preload.d.ts                            | 2 --
 src/renderer/pages/ProcessIssues/List.tsx        | 8 +-------
 src/renderer/pages/ProcessIssues/ReportModal.tsx | 7 ++++---
 src/renderer/pages/ProcessIssues/index.tsx       | 2 +-
 src/workers/backups/index.ts                     | 3 ---
 6 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/main/analytics/backup-handlers.ts b/src/main/analytics/backup-handlers.ts
index 3900c192a..d28190578 100644
--- a/src/main/analytics/backup-handlers.ts
+++ b/src/main/analytics/backup-handlers.ts
@@ -79,6 +79,6 @@ ipcMain.on('BACKUP_ISSUE', (_, issue: BackupProgressIssue) => {
   }
 
   backupProcessInfo.errors[issue.folderId].push(
-    `${issue.errorName} error when ${issue.errorDetails.action}`
+    `${issue.errorName} error when ${issue}`
   );
 });
diff --git a/src/main/preload.d.ts b/src/main/preload.d.ts
index d22164a0a..ce1be4c90 100644
--- a/src/main/preload.d.ts
+++ b/src/main/preload.d.ts
@@ -205,7 +205,5 @@ declare interface Window {
     retryVirtualDriveMount(): void;
     startRemoteSync: () => Promise<void>;
     openUrl: (url: string) => Promise<void>;
-    // DEV
-    resizeWindow: () => typeof import('../main/dev/service').resizeCurrentWindow;
   };
 }
diff --git a/src/renderer/pages/ProcessIssues/List.tsx b/src/renderer/pages/ProcessIssues/List.tsx
index e1917a562..d037a3b2b 100644
--- a/src/renderer/pages/ProcessIssues/List.tsx
+++ b/src/renderer/pages/ProcessIssues/List.tsx
@@ -18,7 +18,6 @@ import useFatalErrorActions from '../../hooks/FatalErrorActions';
 import { generalErrors } from '../../messages/general-error';
 import { shortMessages } from '../../messages/process-error';
 import { getBaseName } from '../../utils/path';
-import Button from 'renderer/components/Button';
 import { FatalError } from '../../components/Backups/FatalError';
 
 export default function ProcessIssuesList({
@@ -34,9 +33,7 @@ export default function ProcessIssuesList({
   backupFatalErrors: BackupFatalError[];
   showBackupFatalErrors: boolean;
   selectedTab: 'SYNC' | 'BACKUPS' | 'GENERAL';
-  onClickOnErrorInfo: (
-    errorClicked: Pick<ProcessIssue, 'errorName' | 'errorDetails'>
-  ) => void;
+  onClickOnErrorInfo: (errorClicked: Pick<ProcessIssue, 'errorName'>) => void;
 }) {
   const { translate } = useTranslationContext();
   const [isLoading, setIsLoading] = useState(false);
@@ -53,8 +50,6 @@ export default function ProcessIssuesList({
   function onInfoClick(errorName: ProcessErrorName) {
     onClickOnErrorInfo({
       errorName,
-      errorDetails: processIssues.find((i) => i.errorName === errorName)!
-        .errorDetails,
     });
   }
 
@@ -225,7 +220,6 @@ function Item({
   issues,
   isSelected,
   onClick,
-  onInfoClick,
 }: {
   errorName: ProcessErrorName;
   issues: ProcessIssue[];
diff --git a/src/renderer/pages/ProcessIssues/ReportModal.tsx b/src/renderer/pages/ProcessIssues/ReportModal.tsx
index e4829c459..7f539825d 100644
--- a/src/renderer/pages/ProcessIssues/ReportModal.tsx
+++ b/src/renderer/pages/ProcessIssues/ReportModal.tsx
@@ -2,7 +2,7 @@ import { Dialog, Transition } from '@headlessui/react';
 import { Fragment, useState } from 'react';
 import { useTranslationContext } from 'renderer/context/LocalContext';
 
-import { ProcessIssue } from '../../../workers/types';
+import { ErrorDetails, ProcessIssue } from '../../../workers/types';
 import { longMessages, shortMessages } from '../../messages/process-error';
 import Button from 'renderer/components/Button';
 import TextArea from 'renderer/components/TextArea';
@@ -26,7 +26,7 @@ export function ReportModal({
   data,
   onClose,
 }: {
-  data: Pick<ProcessIssue, 'errorName' | 'errorDetails'> | null;
+  data: Pick<ProcessIssue, 'errorName'> | null;
   onClose: () => void;
 }) {
   const { translate } = useTranslationContext();
@@ -68,8 +68,9 @@ export function ReportModal({
 
   async function handleSubmit() {
     setRequestState('SENDING');
+    // Send reports throw the issues windows was disabled
     const result = await window.electron.sendReport({
-      errorDetails: data!.errorDetails,
+      errorDetails: {} as ErrorDetails,
       userComment,
       includeLogs,
     });
diff --git a/src/renderer/pages/ProcessIssues/index.tsx b/src/renderer/pages/ProcessIssues/index.tsx
index 8c85bb8df..2ae3e1b57 100644
--- a/src/renderer/pages/ProcessIssues/index.tsx
+++ b/src/renderer/pages/ProcessIssues/index.tsx
@@ -19,7 +19,7 @@ export default function ProcessIssues() {
   const { backupFatalErrors } = useBackupFatalErrors();
   const [reportData, setReportData] = useState<Pick<
     ProcessIssue,
-    'errorName' | 'errorDetails'
+    'errorName'
   > | null>(null);
 
   const [activeSection, setActiveSection] = useState<Section>('SYNC');
diff --git a/src/workers/backups/index.ts b/src/workers/backups/index.ts
index 41a9b0740..5cae18f66 100644
--- a/src/workers/backups/index.ts
+++ b/src/workers/backups/index.ts
@@ -123,7 +123,6 @@ async function setUp() {
       kind,
       name,
       errorName,
-      errorDetails,
       process: 'BACKUPS',
       folderId,
     });
@@ -174,7 +173,6 @@ async function setUp() {
       kind,
       name,
       errorName,
-      errorDetails,
       process: 'BACKUPS',
       folderId,
     });
@@ -214,7 +212,6 @@ async function setUp() {
         kind,
         name,
         errorName,
-        errorDetails,
         process: 'BACKUPS',
         folderId,
       });

From 213e2ebb29c52d8f5eb8779698684c175d5b180d Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Wed, 18 Oct 2023 18:43:08 +0200
Subject: [PATCH 009/188] added placeholder trim id

---
 .../controllers/CallbackController.ts                 | 11 ++++-------
 .../modules/placeholders/domain/CommonPlaceholder.ts  |  8 ++++++++
 2 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 src/workers/sync-engine/modules/placeholders/domain/CommonPlaceholder.ts

diff --git a/src/workers/sync-engine/callbacks-controllers/controllers/CallbackController.ts b/src/workers/sync-engine/callbacks-controllers/controllers/CallbackController.ts
index 4395fec3e..ec654d257 100644
--- a/src/workers/sync-engine/callbacks-controllers/controllers/CallbackController.ts
+++ b/src/workers/sync-engine/callbacks-controllers/controllers/CallbackController.ts
@@ -1,3 +1,4 @@
+import { trimPlaceholderId } from '../../modules/placeholders/domain/CommonPlaceholder';
 import {
   FilePlaceholderId,
   isFilePlaceholderId,
@@ -9,17 +10,13 @@ import {
 
 export abstract class CallbackController {
   protected trim(id: string): string {
-    return id.replace(
-      // eslint-disable-next-line no-control-regex
-      /[\x00-\x1F\x7F-\x9F]/g,
-      ''
-    );
+    return trimPlaceholderId(id);
   }
 
   protected isFilePlaceholder(id: string): id is FilePlaceholderId {
     // make sure the id is trimmed before comparing
     // if it was already trimmed should not change its length
-    const trimmed = this.trim(id);
+    const trimmed = trimPlaceholderId(id);
 
     return isFilePlaceholderId(trimmed);
   }
@@ -27,7 +24,7 @@ export abstract class CallbackController {
   protected isFolderPlaceholder(id: string): id is FolderPlaceholderId {
     // make sure the id is trimmed before comparing
     // if it was already trimmed should not change its length
-    const trimmed = this.trim(id);
+    const trimmed = trimPlaceholderId(id);
 
     return isFolderPlaceholderId(trimmed);
   }
diff --git a/src/workers/sync-engine/modules/placeholders/domain/CommonPlaceholder.ts b/src/workers/sync-engine/modules/placeholders/domain/CommonPlaceholder.ts
new file mode 100644
index 000000000..f8039c884
--- /dev/null
+++ b/src/workers/sync-engine/modules/placeholders/domain/CommonPlaceholder.ts
@@ -0,0 +1,8 @@
+
+export function trimPlaceholderId(id: string): string {
+    return id.replace(
+        // eslint-disable-next-line no-control-regex
+        /[\x00-\x1F\x7F-\x9F]/g,
+        ''
+    ).normalize();
+}

From e0b94d50671e9db9c42aa88689028b0607a01899 Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Wed, 18 Oct 2023 18:47:30 +0200
Subject: [PATCH 010/188] added refresh placeholders on real time sync

---
 .../dependency-injection/boundaryBridge/build.ts    |  5 ++++-
 .../boundaryBridge/application/SyncPlaceholders.ts  | 13 ++++++++++---
 .../placeholders/domain/FilePlaceholderId.ts        |  9 +++++----
 .../placeholders/domain/FolderPlaceholderId.ts      |  9 +++++----
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts b/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts
index c9078afb3..1706e361f 100644
--- a/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts
+++ b/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts
@@ -11,6 +11,7 @@ import { SharedContainer } from '../shared/SharedContainer';
 import { SyncPlaceholders } from 'workers/sync-engine/modules/boundaryBridge/application/SyncPlaceholders';
 import { UpdatePlaceholderFolder } from 'workers/sync-engine/modules/boundaryBridge/application/UpdatePlaceholderFolder';
 import { DependencyInjectionEventRepository } from '../common/eventRepository';
+import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
 
 export function buildBoundaryBridgeContainer(
   contentsContainer: ContentsContainer,
@@ -21,6 +22,7 @@ export function buildBoundaryBridgeContainer(
   sharedContainer: SharedContainer
 ): BoundaryBridgeContainer {
   const eventHistory = DependencyInjectionEventRepository.get();
+  const virtualDrive = DependencyInjectionVirtualDrive.virtualDrive;
 
   const fileCreationOrchestrator = new FileCreationOrchestrator(
     contentsContainer.contentsUploader,
@@ -52,7 +54,8 @@ export function buildBoundaryBridgeContainer(
   const syncPlaceholders = new SyncPlaceholders(
     itemsContainer.allStatusesTreeBuilder,
     syncRemoteFile,
-    syncRemoteFolder
+    syncRemoteFolder,
+    virtualDrive,
   );
 
   return {
diff --git a/src/workers/sync-engine/modules/boundaryBridge/application/SyncPlaceholders.ts b/src/workers/sync-engine/modules/boundaryBridge/application/SyncPlaceholders.ts
index ac385a7bf..628f4034e 100644
--- a/src/workers/sync-engine/modules/boundaryBridge/application/SyncPlaceholders.ts
+++ b/src/workers/sync-engine/modules/boundaryBridge/application/SyncPlaceholders.ts
@@ -3,19 +3,26 @@ import { UpdatePlaceholderFolder } from './UpdatePlaceholderFolder';
 import { File } from '../../files/domain/File';
 import { Folder } from '../../folders/domain/Folder';
 import { TreeBuilder } from '../../items/application/TreeBuilder';
+import { VirtualDrive } from 'virtual-drive/dist';
+import { trimPlaceholderId } from '../../placeholders/domain/CommonPlaceholder';
+import { FilePlaceholderIdPrefix } from '../../placeholders/domain/FilePlaceholderId';
+import { FolderPlaceholderIdPrefix } from '../../placeholders/domain/FolderPlaceholderId';
 
 export class SyncPlaceholders {
   constructor(
     private readonly treeBuilder: TreeBuilder,
     private readonly updatePlaceholderFile: UpdatePlaceholderFile,
-    private readonly updatePlaceholderFolder: UpdatePlaceholderFolder
+    private readonly updatePlaceholderFolder: UpdatePlaceholderFolder,
+    private readonly virtualDrive: VirtualDrive
   ) {}
 
   async run() {
     const tree = await this.treeBuilder.run();
 
+    const listPlaceholdersIds = (await this.virtualDrive.getItemsIds()).map(id => trimPlaceholderId(id));
+
     const folders = Object.values(tree).filter((item) =>
-      item.isFolder()
+      item.isFolder() && listPlaceholdersIds.includes(FolderPlaceholderIdPrefix + item.uuid)
     ) as Array<Folder>;
 
     const foldersActualization = folders.map((folder) => {
@@ -25,7 +32,7 @@ export class SyncPlaceholders {
     await Promise.all(foldersActualization);
 
     const files = Object.values(tree).filter((item) =>
-      item.isFile()
+      item.isFile() && listPlaceholdersIds.includes(FilePlaceholderIdPrefix + item.contentsId)
     ) as Array<File>;
 
     const filesActualization = files.map((file) =>
diff --git a/src/workers/sync-engine/modules/placeholders/domain/FilePlaceholderId.ts b/src/workers/sync-engine/modules/placeholders/domain/FilePlaceholderId.ts
index f78cec85c..d67b5b95c 100644
--- a/src/workers/sync-engine/modules/placeholders/domain/FilePlaceholderId.ts
+++ b/src/workers/sync-engine/modules/placeholders/domain/FilePlaceholderId.ts
@@ -1,10 +1,11 @@
-export type FilePlaceholderIdPrefix = 'FILE:';
+export type FilePlaceholderIdPrefixType = 'FILE:';
+export const FilePlaceholderIdPrefix = 'FILE:';
 
-export type FilePlaceholderId = `${FilePlaceholderIdPrefix}${string}`;
+export type FilePlaceholderId = `${FilePlaceholderIdPrefixType}${string}`;
 
 function typedCheck(
   input: string,
-  prefix: FilePlaceholderIdPrefix = 'FILE:'
+  prefix: FilePlaceholderIdPrefixType = 'FILE:'
 ): input is FilePlaceholderId {
   return input.startsWith(prefix);
 }
@@ -14,7 +15,7 @@ export function isFilePlaceholderId(input: string): input is FilePlaceholderId {
 
 function typedCreate(
   id: string,
-  prefix: FilePlaceholderIdPrefix = 'FILE:'
+  prefix: FilePlaceholderIdPrefixType = 'FILE:'
 ): FilePlaceholderId {
   return (prefix + id) as FilePlaceholderId;
 }
diff --git a/src/workers/sync-engine/modules/placeholders/domain/FolderPlaceholderId.ts b/src/workers/sync-engine/modules/placeholders/domain/FolderPlaceholderId.ts
index cacfb1070..7d9feaf81 100644
--- a/src/workers/sync-engine/modules/placeholders/domain/FolderPlaceholderId.ts
+++ b/src/workers/sync-engine/modules/placeholders/domain/FolderPlaceholderId.ts
@@ -1,10 +1,11 @@
-export type FolderPlaceholderIdPrefix = 'FOLDER:';
+export type FolderPlaceholderIdPrefixType = 'FOLDER:';
+export const FolderPlaceholderIdPrefix = 'FOLDER:';
 
-export type FolderPlaceholderId = `${FolderPlaceholderIdPrefix}${string}`;
+export type FolderPlaceholderId = `${FolderPlaceholderIdPrefixType}${string}`;
 
 function typedCheck(
   input: string,
-  prefix: FolderPlaceholderIdPrefix = 'FOLDER:'
+  prefix: FolderPlaceholderIdPrefixType = 'FOLDER:'
 ): input is FolderPlaceholderId {
   return input.startsWith(prefix);
 }
@@ -17,7 +18,7 @@ export function isFolderPlaceholderId(
 
 function typedCreate(
   id: string,
-  prefix: FolderPlaceholderIdPrefix = 'FOLDER:'
+  prefix: FolderPlaceholderIdPrefixType = 'FOLDER:'
 ): FolderPlaceholderId {
   return (prefix + id) as FolderPlaceholderId;
 }

From dfccba4c074e5a97c5975b7271f6996fb0a810ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Gonz=C3=A1lez?= <cgonzalez@shokworks.io>
Date: Thu, 19 Oct 2023 07:10:38 -0400
Subject: [PATCH 011/188] wip: abort progresss

---
 src/workers/sync-engine/BindingManager.ts     | 29 ++++++++++++++--
 .../controllers/DownloadFileController.ts     |  4 +++
 .../application/ContentsDownloader.ts         | 33 ++++++++++++++++---
 .../contentHandlers/ContentFileDownloader.ts  |  2 ++
 .../EnvironmentContentFileDownloader.ts       | 16 ++++++++-
 5 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/src/workers/sync-engine/BindingManager.ts b/src/workers/sync-engine/BindingManager.ts
index dd4793e76..c71bf41b7 100644
--- a/src/workers/sync-engine/BindingManager.ts
+++ b/src/workers/sync-engine/BindingManager.ts
@@ -4,8 +4,12 @@ import { buildControllers } from './callbacks-controllers/buildControllers';
 import { VirtualDrive } from 'virtual-drive/dist';
 import { executeControllerWithFallback } from './callbacks-controllers/middlewares/executeControllerWithFallback';
 import { FilePlaceholderId } from './modules/placeholders/domain/FilePlaceholderId';
+import { ipcRendererSyncEngine } from './ipcRendererSyncEngine';
 
-export type CallbackDownload = (success: boolean, filePath: string) => boolean;
+export type CallbackDownload = (
+  success: boolean,
+  filePath: string
+) => Promise<{ finished: boolean; progress: number }>;
 export class BindingsManager {
   private static readonly PROVIDER_NAME = 'Internxt';
 
@@ -71,11 +75,30 @@ export class BindingsManager {
             callback
           );
           Logger.debug('Execute Fetch Data Callback, sending path:', path);
-
+          const file = controllers.downloadFile.fileFinderByContentsId(
+            contentsId
+              .replace(
+                // eslint-disable-next-line no-control-regex
+                /[\x00-\x1F\x7F-\x9F]/g,
+                ''
+              )
+              .split(':')[1]
+          );
           let finished = false;
           while (!finished) {
-            finished = callback(true, path);
+            const result = await callback(true, path);
+            finished = result.finished;
             Logger.debug('condition', finished);
+            ipcRendererSyncEngine.send('FILE_DOWNLOADING', {
+              name: file.name,
+              extension: file.type,
+              nameWithExtension: file.nameWithExtension,
+              size: file.size,
+              processInfo: {
+                elapsedTime: 0,
+                progress: result.progress,
+              },
+            });
           }
 
           try {
diff --git a/src/workers/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts b/src/workers/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts
index 527741fde..6d15ba769 100644
--- a/src/workers/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts
+++ b/src/workers/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts
@@ -21,6 +21,10 @@ export class DownloadFileController extends CallbackController {
     return await this.downloader.run(file, cb);
   }
 
+  fileFinderByContentsId(contentsId: string) {
+    return this.fileFinder.run(contentsId);
+  }
+
   async execute(
     filePlaceholderId: FilePlaceholderId,
     cb: CallbackDownload
diff --git a/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts b/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts
index 03ddf5ed8..cf8f52568 100644
--- a/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts
+++ b/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts
@@ -9,15 +9,22 @@ import path from 'path';
 import { CallbackDownload } from '../../../BindingManager';
 import { TemporalFolderProvider } from './temporalFolderProvider';
 import { EventBus } from '../../shared/domain/EventBus';
+import Logger from 'electron-log';
+import { Readable } from 'stream';
 
 export class ContentsDownloader {
+  private readableDownloader: Readable | null;
+  private hydrationFailed: boolean;
   constructor(
     private readonly managerFactory: ContentsManagersFactory,
     private readonly localWriter: LocalFileWriter,
     private readonly ipc: SyncEngineIpc,
     private readonly temporalFolderProvider: TemporalFolderProvider,
     private readonly eventBus: EventBus
-  ) {}
+  ) {
+    this.readableDownloader = null;
+    this.hydrationFailed = false;
+  }
 
   private async registerEvents(
     downloader: ContentFileDownloader,
@@ -39,18 +46,33 @@ export class ContentsDownloader {
       });
     });
 
-    downloader.on('progress', (progress: number) => {
-      cb(true, filePath);
+    downloader.on('progress', async (progress: number) => {
+      Logger.debug('INSIDE PROGRESS=======================');
+      const result = await cb(true, filePath);
+      const hydrationProgress = result.progress;
+
+      if (result.finished) {
+        downloader.forceStop();
+        Logger.debug('Downloader force stop', this.readableDownloader);
+        this.readableDownloader?.destroy();
+        this.readableDownloader?.emit('close');
+        this.hydrationFailed = true;
+      }
+
       this.ipc.send('FILE_DOWNLOADING', {
         name: file.name,
         extension: file.type,
         nameWithExtension: file.nameWithExtension,
         size: file.size,
-        processInfo: { elapsedTime: downloader.elapsedTime(), progress },
+        processInfo: {
+          elapsedTime: downloader.elapsedTime(),
+          progress: hydrationProgress,
+        },
       });
     });
 
     downloader.on('error', (error: Error) => {
+      Logger.error('INSIDE ERROR=======================', error);
       this.ipc.send('FILE_DOWNLOAD_ERROR', {
         name: file.name,
         extension: file.type,
@@ -60,6 +82,8 @@ export class ContentsDownloader {
     });
 
     downloader.on('finish', () => {
+      Logger.error('INSIDE FINISH=======================');
+      this.hydrationFailed = false;
       // The file download being finished does not mean it has been hidratated
       // TODO: We might want to track this time instead of the whole completion time
     });
@@ -71,6 +95,7 @@ export class ContentsDownloader {
     this.registerEvents(downloader, file, cb);
 
     const readable = await downloader.download(file);
+    this.readableDownloader = readable;
     const localContents = LocalFileContents.downloadedFrom(
       file,
       readable,
diff --git a/src/workers/sync-engine/modules/contents/domain/contentHandlers/ContentFileDownloader.ts b/src/workers/sync-engine/modules/contents/domain/contentHandlers/ContentFileDownloader.ts
index f9d0afb51..586057f85 100644
--- a/src/workers/sync-engine/modules/contents/domain/contentHandlers/ContentFileDownloader.ts
+++ b/src/workers/sync-engine/modules/contents/domain/contentHandlers/ContentFileDownloader.ts
@@ -11,6 +11,8 @@ export type FileDownloadEvents = {
 export interface ContentFileDownloader {
   download(file: File): Promise<Readable>;
 
+  forceStop(): void;
+
   on(
     event: keyof FileDownloadEvents,
     handler: FileDownloadEvents[keyof FileDownloadEvents]
diff --git a/src/workers/sync-engine/modules/contents/infrastructure/download/EnvironmentContentFileDownloader.ts b/src/workers/sync-engine/modules/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
index 2baed0769..f05530225 100644
--- a/src/workers/sync-engine/modules/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
+++ b/src/workers/sync-engine/modules/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
@@ -7,17 +7,31 @@ import {
 } from '../../domain/contentHandlers/ContentFileDownloader';
 import { File } from '../../../files/domain/File';
 import { DownloadOneShardStrategy } from '@internxt/inxt-js/build/lib/core';
+import { ActionState } from '@internxt/inxt-js/build/api';
+import Logger from 'electron-log';
 
 export class EnvironmentContentFileDownloader implements ContentFileDownloader {
   private eventEmitter: EventEmitter;
   private stopwatch: Stopwatch;
 
+  private state: ActionState | null;
+
   constructor(
     private readonly fn: DownloadStrategyFunction<DownloadOneShardStrategy>,
     private readonly bucket: string
   ) {
     this.eventEmitter = new EventEmitter();
     this.stopwatch = new Stopwatch();
+    this.state = null;
+  }
+
+  forceStop(): void {
+    //@ts-ignore
+    // Logger.debug('Finish emitter type', this.state?.type);
+    // Logger.debug('Finish emitter stop method', this.state?.stop);
+    this.state?.stop();
+    // this.eventEmitter.emit('error');
+    // this.eventEmitter.emit('finish');
   }
 
   download(file: File): Promise<Readable> {
@@ -26,7 +40,7 @@ export class EnvironmentContentFileDownloader implements ContentFileDownloader {
     this.eventEmitter.emit('start');
 
     return new Promise((resolve, reject) => {
-      this.fn(
+      this.state = this.fn(
         this.bucket,
         file.contentsId,
         {

From 80fe3782dfc1e8d74de8793be08247aa6120b8a3 Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Thu, 19 Oct 2023 13:37:18 +0200
Subject: [PATCH 012/188] fixed errordetails and types check

---
 src/renderer/pages/ProcessIssues/List.tsx           | 13 +++++--------
 .../modules/files/application/FileDeleter.ts        |  2 ++
 src/workers/types.ts                                |  3 ++-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/renderer/pages/ProcessIssues/List.tsx b/src/renderer/pages/ProcessIssues/List.tsx
index e1917a562..687a88a54 100644
--- a/src/renderer/pages/ProcessIssues/List.tsx
+++ b/src/renderer/pages/ProcessIssues/List.tsx
@@ -18,7 +18,6 @@ import useFatalErrorActions from '../../hooks/FatalErrorActions';
 import { generalErrors } from '../../messages/general-error';
 import { shortMessages } from '../../messages/process-error';
 import { getBaseName } from '../../utils/path';
-import Button from 'renderer/components/Button';
 import { FatalError } from '../../components/Backups/FatalError';
 
 export default function ProcessIssuesList({
@@ -183,9 +182,8 @@ function GeneralIssueItem({
         </h1>
 
         <CaretDown
-          className={`transform transition-all duration-200 ${
-            isSelected ? 'rotate-180' : 'rotate-0'
-          }`}
+          className={`transform transition-all duration-200 ${isSelected ? 'rotate-180' : 'rotate-0'
+            }`}
           size={20}
         />
       </div>
@@ -225,7 +223,7 @@ function Item({
   issues,
   isSelected,
   onClick,
-  onInfoClick,
+  //onInfoClick,
 }: {
   errorName: ProcessErrorName;
   issues: ProcessIssue[];
@@ -262,9 +260,8 @@ function Item({
           </Button> */}
 
           <CaretDown
-            className={`transform transition-all duration-200 ${
-              isSelected ? 'rotate-180' : 'rotate-0'
-            }`}
+            className={`transform transition-all duration-200 ${isSelected ? 'rotate-180' : 'rotate-0'
+              }`}
             size={20}
           />
         </div>
diff --git a/src/workers/sync-engine/modules/files/application/FileDeleter.ts b/src/workers/sync-engine/modules/files/application/FileDeleter.ts
index 9fbbd9a50..67e5b94a8 100644
--- a/src/workers/sync-engine/modules/files/application/FileDeleter.ts
+++ b/src/workers/sync-engine/modules/files/application/FileDeleter.ts
@@ -5,6 +5,7 @@ import { FileRepository } from '../domain/FileRepository';
 import { FileStatuses } from '../domain/FileStatus';
 import { PlaceholderCreator } from '../../placeholders/domain/PlaceholderCreator';
 import { File } from '../domain/File';
+import { createErrorDetails } from '../../../../utils/reporting';
 
 export class FileDeleter {
   constructor(
@@ -80,6 +81,7 @@ export class FileDeleter {
         action: 'DELETE_ERROR',
         errorName: 'BAD_RESPONSE',
         process: 'SYNC',
+        errorDetails: createErrorDetails(error, 'Deleting file', 'Bad respone')
       });
 
       this.placeholderCreator.file(file);
diff --git a/src/workers/types.ts b/src/workers/types.ts
index 0b6409d00..bc846cbda 100644
--- a/src/workers/types.ts
+++ b/src/workers/types.ts
@@ -204,6 +204,7 @@ export type GeneralIssue = {
     stack: string;
   };
 };
+
 export type ProcessIssue = ProcessInfoBase & {
   action:
     | 'UPLOAD_ERROR'
@@ -211,9 +212,9 @@ export type ProcessIssue = ProcessInfoBase & {
     | 'RENAME_ERROR'
     | 'DELETE_ERROR'
     | 'METADATA_READ_ERROR';
-
   errorName: ProcessErrorName;
   process: 'SYNC' | 'BACKUPS';
+  errorDetails: ErrorDetails;
 };
 
 export type ProcessInfoUpdatePayload =

From a7d3430419f3e68a21e460ddb9f9fa82d9b12019 Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Thu, 19 Oct 2023 13:42:28 +0200
Subject: [PATCH 013/188] Revert "fixed errordetails and types check"

This reverts commit 80fe3782dfc1e8d74de8793be08247aa6120b8a3.
---
 src/renderer/pages/ProcessIssues/List.tsx           | 13 ++++++++-----
 .../modules/files/application/FileDeleter.ts        |  2 --
 src/workers/types.ts                                |  3 +--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/renderer/pages/ProcessIssues/List.tsx b/src/renderer/pages/ProcessIssues/List.tsx
index 687a88a54..e1917a562 100644
--- a/src/renderer/pages/ProcessIssues/List.tsx
+++ b/src/renderer/pages/ProcessIssues/List.tsx
@@ -18,6 +18,7 @@ import useFatalErrorActions from '../../hooks/FatalErrorActions';
 import { generalErrors } from '../../messages/general-error';
 import { shortMessages } from '../../messages/process-error';
 import { getBaseName } from '../../utils/path';
+import Button from 'renderer/components/Button';
 import { FatalError } from '../../components/Backups/FatalError';
 
 export default function ProcessIssuesList({
@@ -182,8 +183,9 @@ function GeneralIssueItem({
         </h1>
 
         <CaretDown
-          className={`transform transition-all duration-200 ${isSelected ? 'rotate-180' : 'rotate-0'
-            }`}
+          className={`transform transition-all duration-200 ${
+            isSelected ? 'rotate-180' : 'rotate-0'
+          }`}
           size={20}
         />
       </div>
@@ -223,7 +225,7 @@ function Item({
   issues,
   isSelected,
   onClick,
-  //onInfoClick,
+  onInfoClick,
 }: {
   errorName: ProcessErrorName;
   issues: ProcessIssue[];
@@ -260,8 +262,9 @@ function Item({
           </Button> */}
 
           <CaretDown
-            className={`transform transition-all duration-200 ${isSelected ? 'rotate-180' : 'rotate-0'
-              }`}
+            className={`transform transition-all duration-200 ${
+              isSelected ? 'rotate-180' : 'rotate-0'
+            }`}
             size={20}
           />
         </div>
diff --git a/src/workers/sync-engine/modules/files/application/FileDeleter.ts b/src/workers/sync-engine/modules/files/application/FileDeleter.ts
index 67e5b94a8..9fbbd9a50 100644
--- a/src/workers/sync-engine/modules/files/application/FileDeleter.ts
+++ b/src/workers/sync-engine/modules/files/application/FileDeleter.ts
@@ -5,7 +5,6 @@ import { FileRepository } from '../domain/FileRepository';
 import { FileStatuses } from '../domain/FileStatus';
 import { PlaceholderCreator } from '../../placeholders/domain/PlaceholderCreator';
 import { File } from '../domain/File';
-import { createErrorDetails } from '../../../../utils/reporting';
 
 export class FileDeleter {
   constructor(
@@ -81,7 +80,6 @@ export class FileDeleter {
         action: 'DELETE_ERROR',
         errorName: 'BAD_RESPONSE',
         process: 'SYNC',
-        errorDetails: createErrorDetails(error, 'Deleting file', 'Bad respone')
       });
 
       this.placeholderCreator.file(file);
diff --git a/src/workers/types.ts b/src/workers/types.ts
index bc846cbda..0b6409d00 100644
--- a/src/workers/types.ts
+++ b/src/workers/types.ts
@@ -204,7 +204,6 @@ export type GeneralIssue = {
     stack: string;
   };
 };
-
 export type ProcessIssue = ProcessInfoBase & {
   action:
     | 'UPLOAD_ERROR'
@@ -212,9 +211,9 @@ export type ProcessIssue = ProcessInfoBase & {
     | 'RENAME_ERROR'
     | 'DELETE_ERROR'
     | 'METADATA_READ_ERROR';
+
   errorName: ProcessErrorName;
   process: 'SYNC' | 'BACKUPS';
-  errorDetails: ErrorDetails;
 };
 
 export type ProcessInfoUpdatePayload =

From 4a42274ec98b7fcfc27737ecf7587f73dc098464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Gonz=C3=A1lez?= <cgonzalez@shokworks.io>
Date: Thu, 19 Oct 2023 11:08:47 -0400
Subject: [PATCH 014/188] fix: revert cancel management

---
 .../contents/application/ContentsDownloader.ts       | 12 +++++-------
 .../download/EnvironmentContentFileDownloader.ts     |  1 -
 .../test/__mocks__/ContentFileDownloaderMock.ts      |  4 ++++
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts b/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts
index cf8f52568..85dd361c6 100644
--- a/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts
+++ b/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts
@@ -14,7 +14,6 @@ import { Readable } from 'stream';
 
 export class ContentsDownloader {
   private readableDownloader: Readable | null;
-  private hydrationFailed: boolean;
   constructor(
     private readonly managerFactory: ContentsManagersFactory,
     private readonly localWriter: LocalFileWriter,
@@ -23,7 +22,6 @@ export class ContentsDownloader {
     private readonly eventBus: EventBus
   ) {
     this.readableDownloader = null;
-    this.hydrationFailed = false;
   }
 
   private async registerEvents(
@@ -46,17 +44,19 @@ export class ContentsDownloader {
       });
     });
 
-    downloader.on('progress', async (progress: number) => {
-      Logger.debug('INSIDE PROGRESS=======================');
+    downloader.on('progress', async () => {
       const result = await cb(true, filePath);
       const hydrationProgress = result.progress;
+      Logger.debug(
+        '\n\n******************************************hydrationProgress : \n\n',
+        hydrationProgress
+      );
 
       if (result.finished) {
         downloader.forceStop();
         Logger.debug('Downloader force stop', this.readableDownloader);
         this.readableDownloader?.destroy();
         this.readableDownloader?.emit('close');
-        this.hydrationFailed = true;
       }
 
       this.ipc.send('FILE_DOWNLOADING', {
@@ -72,7 +72,6 @@ export class ContentsDownloader {
     });
 
     downloader.on('error', (error: Error) => {
-      Logger.error('INSIDE ERROR=======================', error);
       this.ipc.send('FILE_DOWNLOAD_ERROR', {
         name: file.name,
         extension: file.type,
@@ -83,7 +82,6 @@ export class ContentsDownloader {
 
     downloader.on('finish', () => {
       Logger.error('INSIDE FINISH=======================');
-      this.hydrationFailed = false;
       // The file download being finished does not mean it has been hidratated
       // TODO: We might want to track this time instead of the whole completion time
     });
diff --git a/src/workers/sync-engine/modules/contents/infrastructure/download/EnvironmentContentFileDownloader.ts b/src/workers/sync-engine/modules/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
index f05530225..84ee41f95 100644
--- a/src/workers/sync-engine/modules/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
+++ b/src/workers/sync-engine/modules/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
@@ -8,7 +8,6 @@ import {
 import { File } from '../../../files/domain/File';
 import { DownloadOneShardStrategy } from '@internxt/inxt-js/build/lib/core';
 import { ActionState } from '@internxt/inxt-js/build/api';
-import Logger from 'electron-log';
 
 export class EnvironmentContentFileDownloader implements ContentFileDownloader {
   private eventEmitter: EventEmitter;
diff --git a/src/workers/sync-engine/modules/contents/test/__mocks__/ContentFileDownloaderMock.ts b/src/workers/sync-engine/modules/contents/test/__mocks__/ContentFileDownloaderMock.ts
index 1d2e87ef2..2ecb8e19d 100644
--- a/src/workers/sync-engine/modules/contents/test/__mocks__/ContentFileDownloaderMock.ts
+++ b/src/workers/sync-engine/modules/contents/test/__mocks__/ContentFileDownloaderMock.ts
@@ -13,6 +13,10 @@ export class ContentFileDownloaderMock implements ContentFileDownloader {
     return this.mock();
   }
 
+  forceStop(): void {
+    return;
+  }
+
   on(
     event: keyof FileDownloadEvents,
     fn:

From 0b072617fcedecd33b4062a676eab61de71bf3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Gonz=C3=A1lez?= <cgonzalez@shokworks.io>
Date: Thu, 19 Oct 2023 11:09:14 -0400
Subject: [PATCH 015/188] fix: revert cancel management

---
 .../contents/test/application/ContentsDownloader.test.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/workers/sync-engine/modules/contents/test/application/ContentsDownloader.test.ts b/src/workers/sync-engine/modules/contents/test/application/ContentsDownloader.test.ts
index 05d0104b7..7974cc475 100644
--- a/src/workers/sync-engine/modules/contents/test/application/ContentsDownloader.test.ts
+++ b/src/workers/sync-engine/modules/contents/test/application/ContentsDownloader.test.ts
@@ -40,9 +40,9 @@ describe('Contents Downloader', () => {
         new ReadableHelloWorld()
       );
 
-      await SUT.run(FileMother.any(), () => {
+      await SUT.run(FileMother.any(), async () => {
         /* do nothing */
-        return true;
+        return { finished: true, progress: 100 };
       });
 
       expect(factory.mockDownloader.onMock).toBeCalledWith(
@@ -56,8 +56,9 @@ describe('Contents Downloader', () => {
     factory.mockDownloader.mock.mockResolvedValueOnce(new ReadableHelloWorld());
 
     const file = FileMother.any();
-    await SUT.run(file, () => {
-      return true;
+    await SUT.run(file, async () => {
+      /* do nothing */
+      return { finished: true, progress: 100 };
     });
 
     expect(localWriter.writeMock).toBeCalledWith(

From 9eb244342abda32373434c21128c31ecca8736b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Gonz=C3=A1lez?= <cgonzalez@shokworks.io>
Date: Thu, 19 Oct 2023 13:04:11 -0400
Subject: [PATCH 016/188] feat/break-stopped-hydration

---
 src/workers/sync-engine/BindingManager.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/workers/sync-engine/BindingManager.ts b/src/workers/sync-engine/BindingManager.ts
index c71bf41b7..21ce40865 100644
--- a/src/workers/sync-engine/BindingManager.ts
+++ b/src/workers/sync-engine/BindingManager.ts
@@ -12,7 +12,7 @@ export type CallbackDownload = (
 ) => Promise<{ finished: boolean; progress: number }>;
 export class BindingsManager {
   private static readonly PROVIDER_NAME = 'Internxt';
-
+  private progressBuffer = 0;
   constructor(
     private readonly container: DependencyContainer,
     private readonly paths: {
@@ -88,6 +88,11 @@ export class BindingsManager {
           while (!finished) {
             const result = await callback(true, path);
             finished = result.finished;
+            if (this.progressBuffer == result.progress) {
+              break;
+            } else {
+              this.progressBuffer += result.progress;
+            }
             Logger.debug('condition', finished);
             ipcRendererSyncEngine.send('FILE_DOWNLOADING', {
               name: file.name,
@@ -101,6 +106,7 @@ export class BindingsManager {
             });
           }
 
+          this.progressBuffer = 0;
           try {
             await controllers.notifyPlaceholderHydrationFinished.execute(
               contentsId

From ad831093e73a42a0aef452453816bc6833bec8ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Gonz=C3=A1lez?= <cgonzalez@shokworks.io>
Date: Thu, 19 Oct 2023 13:14:59 -0400
Subject: [PATCH 017/188] wip

---
 src/workers/sync-engine/BindingManager.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/workers/sync-engine/BindingManager.ts b/src/workers/sync-engine/BindingManager.ts
index 21ce40865..97e0f6f79 100644
--- a/src/workers/sync-engine/BindingManager.ts
+++ b/src/workers/sync-engine/BindingManager.ts
@@ -91,7 +91,7 @@ export class BindingsManager {
             if (this.progressBuffer == result.progress) {
               break;
             } else {
-              this.progressBuffer += result.progress;
+              this.progressBuffer = result.progress;
             }
             Logger.debug('condition', finished);
             ipcRendererSyncEngine.send('FILE_DOWNLOADING', {

From 797f4762027b097a5978950e949bb3149972cfff Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 19 Oct 2023 19:16:58 +0200
Subject: [PATCH 018/188] feat: release 2.0.0

---
 package.json             | 2 +-
 release/app/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a5947e340..6281e4f89 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.0-a10",
+  "version": "2.0.0",
   "author": "Internxt <hello@internxt.com>",
   "description": "Internxt Drive client UI",
   "license": "AGPL-3.0",
diff --git a/release/app/package.json b/release/app/package.json
index 508d5f75b..7f31c2a10 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.0-a10",
+  "version": "2.0.0",
   "description": "Internxt Drive client UI",
   "main": "./dist/main/main.js",
   "author": "Internxt <hello@internxt.com>",

From 45fc3e69c967522dd8d5f5ba9907a26dc9c95360 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 19 Oct 2023 19:20:13 +0200
Subject: [PATCH 019/188] chore: add certificate

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6281e4f89..5b4c3e039 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,8 @@
     "win": {
       "target": [
         "nsis"
-      ]
+      ],
+      "certificateSubjectName": "Internxt Universal Technologies SL"
     },
     "linux": {
       "target": [

From ba40697e0cdd672ead428679de9ea1ef1b5e3da6 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 23 Oct 2023 18:19:03 +0200
Subject: [PATCH 020/188] feat: add retrive all files use case

---
 src/workers/sync-engine/BindingManager.ts     | 24 +++++++++++++++++--
 .../boundaryBridge/build.ts                   |  4 ++--
 .../files/FilesContainer.ts                   |  6 +++--
 .../dependency-injection/files/builder.ts     | 14 ++++++-----
 .../items/ItemsContainer.ts                   |  2 +-
 .../dependency-injection/items/builder.ts     |  2 +-
 src/workers/sync-engine/index.ts              |  4 +---
 .../files/application/RetrieveAllFiles.ts     | 10 ++++++++
 .../modules/files/domain/FileRepository.ts    |  2 ++
 .../infrastructure/HttpFileRepository.ts      |  4 ++++
 .../test/__mocks__/FileRepositoryMock.ts      |  5 ++++
 11 files changed, 60 insertions(+), 17 deletions(-)
 create mode 100644 src/workers/sync-engine/modules/files/application/RetrieveAllFiles.ts

diff --git a/src/workers/sync-engine/BindingManager.ts b/src/workers/sync-engine/BindingManager.ts
index 97e0f6f79..fd5098c25 100644
--- a/src/workers/sync-engine/BindingManager.ts
+++ b/src/workers/sync-engine/BindingManager.ts
@@ -5,6 +5,8 @@ import { VirtualDrive } from 'virtual-drive/dist';
 import { executeControllerWithFallback } from './callbacks-controllers/middlewares/executeControllerWithFallback';
 import { FilePlaceholderId } from './modules/placeholders/domain/FilePlaceholderId';
 import { ipcRendererSyncEngine } from './ipcRendererSyncEngine';
+import { AbsolutePathToRelativeConverter } from './modules/shared/application/AbsolutePathToRelativeConverter';
+import { PlatformPathConverter } from './modules/shared/application/PlatformPathConverter';
 
 export type CallbackDownload = (
   success: boolean,
@@ -178,7 +180,25 @@ export class BindingsManager {
     await this.container.virtualDrive.disconnectSyncRoot();
   }
 
-  cleanUp() {
-    VirtualDrive.unregisterSyncRoot(this.paths.root);
+  async cleanUp() {
+    await VirtualDrive.unregisterSyncRoot(this.paths.root);
+
+    const files = await this.container.retrieveAllFiles.run();
+
+    const items = [...files];
+
+    const win32AbsolutePaths = items.map((item) => {
+      const posixRelativePath = item.path.value;
+      // este path es relativo al root y en formato posix
+
+      const win32RelativePaths =
+        PlatformPathConverter.posixToWin(posixRelativePath);
+
+      return this.container.relativePathToAbsoluteConverter.run(
+        win32RelativePaths
+      );
+    });
+
+    Logger.debug('items: ', win32AbsolutePaths);
   }
 }
diff --git a/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts b/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts
index 1706e361f..15b105da4 100644
--- a/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts
+++ b/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts
@@ -31,7 +31,7 @@ export function buildBoundaryBridgeContainer(
   );
 
   const treePlaceholderCreator = new TreePlaceholderCreator(
-    itemsContainer.treeBuilder,
+    itemsContainer.existingItemsTreeBuilder,
     placeholderContainer.placeholderCreator
   );
 
@@ -55,7 +55,7 @@ export function buildBoundaryBridgeContainer(
     itemsContainer.allStatusesTreeBuilder,
     syncRemoteFile,
     syncRemoteFolder,
-    virtualDrive,
+    virtualDrive
   );
 
   return {
diff --git a/src/workers/sync-engine/dependency-injection/files/FilesContainer.ts b/src/workers/sync-engine/dependency-injection/files/FilesContainer.ts
index 3b549e441..0da76325d 100644
--- a/src/workers/sync-engine/dependency-injection/files/FilesContainer.ts
+++ b/src/workers/sync-engine/dependency-injection/files/FilesContainer.ts
@@ -1,5 +1,7 @@
+import { ManagedFileRepository } from 'workers/sync-engine/modules/files/domain/ManagedFileRepository';
 import { CreateFilePlaceholderOnDeletionFailed } from '../../modules/files/application/CreateFilePlaceholderOnDeletionFailed';
 import { FileByPartialSearcher } from '../../modules/files/application/FileByPartialSearcher';
+import { FileClearer } from '../../modules/files/application/FileClearer';
 import { FileCreator } from '../../modules/files/application/FileCreator';
 import { FileDeleter } from '../../modules/files/application/FileDeleter';
 import { FileFinderByContentsId } from '../../modules/files/application/FileFinderByContentsId';
@@ -7,8 +9,7 @@ import { FilePathUpdater } from '../../modules/files/application/FilePathUpdater
 import { FilePlaceholderCreatorFromContentsId } from '../../modules/files/application/FilePlaceholderCreatorFromContentsId';
 import { FileSearcher } from '../../modules/files/application/FileSearcher';
 import { LocalRepositoryRepositoryRefresher } from '../../modules/files/application/LocalRepositoryRepositoryRefresher';
-import { FileClearer } from '../../modules/files/application/FileClearer';
-import { ManagedFileRepository } from 'workers/sync-engine/modules/files/domain/ManagedFileRepository';
+import { RetrieveAllFiles } from '../../modules/files/application/RetrieveAllFiles';
 import { SameFileWasMoved } from '../../modules/files/application/SameFileWasMoved';
 
 export interface FilesContainer {
@@ -24,4 +25,5 @@ export interface FilesContainer {
   fileClearer: FileClearer;
   managedFileRepository: ManagedFileRepository;
   sameFileWasMoved: SameFileWasMoved;
+  retrieveAllFiles: RetrieveAllFiles;
 }
diff --git a/src/workers/sync-engine/dependency-injection/files/builder.ts b/src/workers/sync-engine/dependency-injection/files/builder.ts
index 4cc4f00a9..df2444e59 100644
--- a/src/workers/sync-engine/dependency-injection/files/builder.ts
+++ b/src/workers/sync-engine/dependency-injection/files/builder.ts
@@ -1,26 +1,27 @@
-import { CreateFilePlaceholderOnDeletionFailed } from 'workers/sync-engine/modules/files/application/CreateFilePlaceholderOnDeletionFailed';
-import { FilePlaceholderCreatorFromContentsId } from 'workers/sync-engine/modules/files/application/FilePlaceholderCreatorFromContentsId';
 import crypt from '../../../utils/crypt';
 import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
+import { CreateFilePlaceholderOnDeletionFailed } from '../../modules/files/application/CreateFilePlaceholderOnDeletionFailed';
 import { FileByPartialSearcher } from '../../modules/files/application/FileByPartialSearcher';
+import { FileClearer } from '../../modules/files/application/FileClearer';
 import { FileCreator } from '../../modules/files/application/FileCreator';
 import { FileDeleter } from '../../modules/files/application/FileDeleter';
 import { FileFinderByContentsId } from '../../modules/files/application/FileFinderByContentsId';
 import { FilePathUpdater } from '../../modules/files/application/FilePathUpdater';
+import { FilePlaceholderCreatorFromContentsId } from '../../modules/files/application/FilePlaceholderCreatorFromContentsId';
 import { FileSearcher } from '../../modules/files/application/FileSearcher';
 import { LocalRepositoryRepositoryRefresher } from '../../modules/files/application/LocalRepositoryRepositoryRefresher';
+import { RetrieveAllFiles } from '../../modules/files/application/RetrieveAllFiles';
+import { SameFileWasMoved } from '../../modules/files/application/SameFileWasMoved';
 import { HttpFileRepository } from '../../modules/files/infrastructure/HttpFileRepository';
 import { DependencyInjectionHttpClientsProvider } from '../common/clients';
 import { DependencyInjectionEventBus } from '../common/eventBus';
+import { DependencyInjectionEventRepository } from '../common/eventRepository';
 import { DependencyInjectionTraverserProvider } from '../common/traverser';
 import { DependencyInjectionUserProvider } from '../common/user';
 import { FoldersContainer } from '../folders/FoldersContainer';
 import { PlaceholderContainer } from '../placeholders/PlaceholdersContainer';
-import { FilesContainer } from './FilesContainer';
-import { FileClearer } from '../../modules/files/application/FileClearer';
 import { SharedContainer } from '../shared/SharedContainer';
-import { SameFileWasMoved } from 'workers/sync-engine/modules/files/application/SameFileWasMoved';
-import { DependencyInjectionEventRepository } from '../common/eventRepository';
+import { FilesContainer } from './FilesContainer';
 
 export async function buildFilesContainer(
   folderContainer: FoldersContainer,
@@ -115,6 +116,7 @@ export async function buildFilesContainer(
     fileClearer,
     managedFileRepository: fileRepository,
     sameFileWasMoved,
+    retrieveAllFiles: new RetrieveAllFiles(fileRepository),
   };
 
   return { container, subscribers: [] };
diff --git a/src/workers/sync-engine/dependency-injection/items/ItemsContainer.ts b/src/workers/sync-engine/dependency-injection/items/ItemsContainer.ts
index 1f6962eb7..6302698cd 100644
--- a/src/workers/sync-engine/dependency-injection/items/ItemsContainer.ts
+++ b/src/workers/sync-engine/dependency-injection/items/ItemsContainer.ts
@@ -1,6 +1,6 @@
 import { TreeBuilder } from '../../modules/items/application/TreeBuilder';
 
 export interface ItemsContainer {
-  treeBuilder: TreeBuilder;
+  existingItemsTreeBuilder: TreeBuilder;
   allStatusesTreeBuilder: TreeBuilder;
 }
diff --git a/src/workers/sync-engine/dependency-injection/items/builder.ts b/src/workers/sync-engine/dependency-injection/items/builder.ts
index 338fe0a3c..962b48896 100644
--- a/src/workers/sync-engine/dependency-injection/items/builder.ts
+++ b/src/workers/sync-engine/dependency-injection/items/builder.ts
@@ -37,7 +37,7 @@ export function buildItemsContainer(): ItemsContainer {
   );
 
   return {
-    treeBuilder,
+    existingItemsTreeBuilder: treeBuilder,
     allStatusesTreeBuilder,
   };
 }
diff --git a/src/workers/sync-engine/index.ts b/src/workers/sync-engine/index.ts
index 470497a0b..6e87ef80a 100644
--- a/src/workers/sync-engine/index.ts
+++ b/src/workers/sync-engine/index.ts
@@ -5,7 +5,6 @@ import packageJson from '../../../package.json';
 import { BindingsManager } from './BindingManager';
 import fs from 'fs/promises';
 import { iconPath } from 'workers/utils/icon';
-import { VirtualDrive } from 'virtual-drive/dist';
 
 async function ensureTheFolderExist(path: string) {
   try {
@@ -56,8 +55,7 @@ async function setUp() {
 
     try {
       await bindings.stop();
-
-      await VirtualDrive.unregisterSyncRoot(virtualDrivePath);
+      await bindings.cleanUp();
 
       Logger.info('[SYNC ENGINE] sync engine stopped and cleared successfully');
 
diff --git a/src/workers/sync-engine/modules/files/application/RetrieveAllFiles.ts b/src/workers/sync-engine/modules/files/application/RetrieveAllFiles.ts
new file mode 100644
index 000000000..64c19c306
--- /dev/null
+++ b/src/workers/sync-engine/modules/files/application/RetrieveAllFiles.ts
@@ -0,0 +1,10 @@
+import { File } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+
+export class RetrieveAllFiles {
+  constructor(private readonly repository: FileRepository) {}
+
+  run(): Promise<Array<File>> {
+    return this.repository.all();
+  }
+}
diff --git a/src/workers/sync-engine/modules/files/domain/FileRepository.ts b/src/workers/sync-engine/modules/files/domain/FileRepository.ts
index 9add2f3eb..537c0df57 100644
--- a/src/workers/sync-engine/modules/files/domain/FileRepository.ts
+++ b/src/workers/sync-engine/modules/files/domain/FileRepository.ts
@@ -18,6 +18,8 @@ export interface FileRepository {
 
   searchOnFolder(folderId: FolderAttributes['id']): Promise<Array<File>>;
 
+  all(): Promise<Array<File>>;
+
   /** @deprecated */
   clear(): void;
 }
diff --git a/src/workers/sync-engine/modules/files/infrastructure/HttpFileRepository.ts b/src/workers/sync-engine/modules/files/infrastructure/HttpFileRepository.ts
index 1bf04836e..5a8d31865 100644
--- a/src/workers/sync-engine/modules/files/infrastructure/HttpFileRepository.ts
+++ b/src/workers/sync-engine/modules/files/infrastructure/HttpFileRepository.ts
@@ -39,6 +39,10 @@ export class HttpFileRepository
     return remoteItemsGenerator.getAll();
   }
 
+  public all(): Promise<Array<File>> {
+    return Promise.resolve(Object.values(this.files));
+  }
+
   public async init(startingFiles: Record<string, File> = {}): Promise<void> {
     const raw = await this.getTree();
 
diff --git a/src/workers/sync-engine/modules/files/test/__mocks__/FileRepositoryMock.ts b/src/workers/sync-engine/modules/files/test/__mocks__/FileRepositoryMock.ts
index 230c9da08..9fea08d26 100644
--- a/src/workers/sync-engine/modules/files/test/__mocks__/FileRepositoryMock.ts
+++ b/src/workers/sync-engine/modules/files/test/__mocks__/FileRepositoryMock.ts
@@ -13,6 +13,11 @@ export class FileRepositoryMock implements FileRepository {
   public mockSearchOnFolder = jest.fn();
   public mockClear = jest.fn();
   public mockInsert = jest.fn();
+  public mockAll = jest.fn();
+
+  all(): Promise<Array<File>> {
+    return this.mockAll();
+  }
 
   insert(file: File): Promise<void> {
     return this.mockInsert(file);

From 45c751126f9da12f8532c8fd3791abbfbbeaf69c Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 23 Oct 2023 18:29:19 +0200
Subject: [PATCH 021/188] feat: add retrive all files use case

---
 src/workers/sync-engine/BindingManager.ts              |  4 ++--
 .../dependency-injection/folders/FoldersContainer.ts   |  2 ++
 .../dependency-injection/folders/builder.ts            |  2 ++
 .../modules/folders/application/RetrieveAllFolders.ts  | 10 ++++++++++
 .../modules/folders/domain/FolderRepository.ts         |  2 ++
 .../folders/infrastructure/HttpFolderRepository.ts     |  4 ++++
 .../folders/test/__mocks__/FolderRepositoryMock.ts     |  5 +++++
 7 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 src/workers/sync-engine/modules/folders/application/RetrieveAllFolders.ts

diff --git a/src/workers/sync-engine/BindingManager.ts b/src/workers/sync-engine/BindingManager.ts
index fd5098c25..850308790 100644
--- a/src/workers/sync-engine/BindingManager.ts
+++ b/src/workers/sync-engine/BindingManager.ts
@@ -5,7 +5,6 @@ import { VirtualDrive } from 'virtual-drive/dist';
 import { executeControllerWithFallback } from './callbacks-controllers/middlewares/executeControllerWithFallback';
 import { FilePlaceholderId } from './modules/placeholders/domain/FilePlaceholderId';
 import { ipcRendererSyncEngine } from './ipcRendererSyncEngine';
-import { AbsolutePathToRelativeConverter } from './modules/shared/application/AbsolutePathToRelativeConverter';
 import { PlatformPathConverter } from './modules/shared/application/PlatformPathConverter';
 
 export type CallbackDownload = (
@@ -184,8 +183,9 @@ export class BindingsManager {
     await VirtualDrive.unregisterSyncRoot(this.paths.root);
 
     const files = await this.container.retrieveAllFiles.run();
+    const folders = await this.container.retrieveAllFolders.run();
 
-    const items = [...files];
+    const items = [...files, ...folders];
 
     const win32AbsolutePaths = items.map((item) => {
       const posixRelativePath = item.path.value;
diff --git a/src/workers/sync-engine/dependency-injection/folders/FoldersContainer.ts b/src/workers/sync-engine/dependency-injection/folders/FoldersContainer.ts
index 58dd3a1a2..ae8c99429 100644
--- a/src/workers/sync-engine/dependency-injection/folders/FoldersContainer.ts
+++ b/src/workers/sync-engine/dependency-injection/folders/FoldersContainer.ts
@@ -11,6 +11,7 @@ import { OfflineFolderPathUpdater } from '../../modules/folders/application/Offl
 import { SynchronizeOfflineModifications } from '../../modules/folders/application/SynchronizeOfflineModifications';
 import { SynchronizeOfflineModificationsOnFolderCreated } from '../../modules/folders/application/SynchronizeOfflineModificationsOnFolderCreated';
 import { ManagedFolderRepository } from '../../modules/folders/domain/ManagedFolderRepository';
+import { RetrieveAllFolders } from '../../modules/folders/application/RetrieveAllFolders';
 
 export interface FoldersContainer {
   folderCreator: FolderCreator;
@@ -28,4 +29,5 @@ export interface FoldersContainer {
     synchronizeOfflineModifications: SynchronizeOfflineModifications;
   };
   managedFolderRepository: ManagedFolderRepository;
+  retrieveAllFolders: RetrieveAllFolders;
 }
diff --git a/src/workers/sync-engine/dependency-injection/folders/builder.ts b/src/workers/sync-engine/dependency-injection/folders/builder.ts
index b9b1c7536..32ec71c12 100644
--- a/src/workers/sync-engine/dependency-injection/folders/builder.ts
+++ b/src/workers/sync-engine/dependency-injection/folders/builder.ts
@@ -13,6 +13,7 @@ import { OfflineFolderCreator } from '../../modules/folders/application/Offline/
 import { OfflineFolderMover } from '../../modules/folders/application/Offline/OfflineFolderMover';
 import { OfflineFolderPathUpdater } from '../../modules/folders/application/Offline/OfflineFolderPathUpdater';
 import { OfflineFolderRenamer } from '../../modules/folders/application/Offline/OfflineFolderRenamer';
+import { RetrieveAllFolders } from '../../modules/folders/application/RetrieveAllFolders';
 import { SynchronizeOfflineModifications } from '../../modules/folders/application/SynchronizeOfflineModifications';
 import { SynchronizeOfflineModificationsOnFolderCreated } from '../../modules/folders/application/SynchronizeOfflineModificationsOnFolderCreated';
 import { HttpFolderRepository } from '../../modules/folders/infrastructure/HttpFolderRepository';
@@ -116,5 +117,6 @@ export async function buildFoldersContainer(
       synchronizeOfflineModifications,
     },
     managedFolderRepository: repository,
+    retrieveAllFolders: new RetrieveAllFolders(repository),
   };
 }
diff --git a/src/workers/sync-engine/modules/folders/application/RetrieveAllFolders.ts b/src/workers/sync-engine/modules/folders/application/RetrieveAllFolders.ts
new file mode 100644
index 000000000..0363affb6
--- /dev/null
+++ b/src/workers/sync-engine/modules/folders/application/RetrieveAllFolders.ts
@@ -0,0 +1,10 @@
+import { Folder } from '../domain/Folder';
+import { FolderRepository } from '../domain/FolderRepository';
+
+export class RetrieveAllFolders {
+  constructor(private readonly repository: FolderRepository) {}
+
+  run(): Promise<Array<Folder>> {
+    return this.repository.all();
+  }
+}
diff --git a/src/workers/sync-engine/modules/folders/domain/FolderRepository.ts b/src/workers/sync-engine/modules/folders/domain/FolderRepository.ts
index 771aa25a3..2c2c74175 100644
--- a/src/workers/sync-engine/modules/folders/domain/FolderRepository.ts
+++ b/src/workers/sync-engine/modules/folders/domain/FolderRepository.ts
@@ -3,6 +3,8 @@ import { Nullable } from '../../../../../shared/types/Nullable';
 import { FolderPath } from './FolderPath';
 
 export interface FolderRepository {
+  all(): Promise<Array<Folder>>;
+
   search(path: string): Nullable<Folder>;
 
   searchByPartial(partial: Partial<FolderAttributes>): Nullable<Folder>;
diff --git a/src/workers/sync-engine/modules/folders/infrastructure/HttpFolderRepository.ts b/src/workers/sync-engine/modules/folders/infrastructure/HttpFolderRepository.ts
index dcd9c81f7..b7ad78207 100644
--- a/src/workers/sync-engine/modules/folders/infrastructure/HttpFolderRepository.ts
+++ b/src/workers/sync-engine/modules/folders/infrastructure/HttpFolderRepository.ts
@@ -64,6 +64,10 @@ export class HttpFolderRepository
     await this.init(this.folders);
   }
 
+  all(): Promise<Array<Folder>> {
+    return Promise.resolve(Object.values(this.folders));
+  }
+
   search(path: string): Nullable<Folder> {
     return this.folders[path];
   }
diff --git a/src/workers/sync-engine/modules/folders/test/__mocks__/FolderRepositoryMock.ts b/src/workers/sync-engine/modules/folders/test/__mocks__/FolderRepositoryMock.ts
index 8be199534..9f4748c4e 100644
--- a/src/workers/sync-engine/modules/folders/test/__mocks__/FolderRepositoryMock.ts
+++ b/src/workers/sync-engine/modules/folders/test/__mocks__/FolderRepositoryMock.ts
@@ -13,6 +13,11 @@ export class FolderRepositoryMock implements FolderRepository {
   public mockSearchOnFolder = jest.fn();
   public mockTrash = jest.fn();
   public mockClear = jest.fn();
+  public mockAll = jest.fn();
+
+  all(): Promise<Array<Folder>> {
+    return this.mockAll();
+  }
 
   search(pathLike: string): Nullable<Folder> {
     return this.mockSearch(pathLike);

From d61ddb6b5afa63ec6b9e3821f3e60b0a422c7235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Gonz=C3=A1lez?= <cgonzalez@shokworks.io>
Date: Mon, 23 Oct 2023 17:14:07 -0400
Subject: [PATCH 022/188] feat: include start with bindings reloading

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5b4c3e039..5ba24a489 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,9 @@
     "test:unit": "jest --silent",
     "test:e2e": "playwright test --config=src/test",
     "type-check": "tsc --noEmit --pretty --skipLibCheck",
-    "prepare": "husky install"
+    "prepare": "husky install",
+    "reload-virtual-drive": "cd release/app && yarn reload-virtual-drive && cd ../.. && yarn",
+    "start:reload-bindings": "npm run reload-virtual-drive && npm run start"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [

From 52daac882723711e3b55f16bd75df603154ba2e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Gonz=C3=A1lez?= <cgonzalez@shokworks.io>
Date: Mon, 23 Oct 2023 22:52:07 -0400
Subject: [PATCH 023/188] fix: logout management

---
 release/app/package-lock.json                 | 239 +++---------------
 release/app/yarn.lock                         |  97 ++-----
 src/workers/sync-engine/BindingManager.ts     |   7 +
 .../items/application/ItemsSearcher.ts        |  26 ++
 4 files changed, 85 insertions(+), 284 deletions(-)
 create mode 100644 src/workers/sync-engine/modules/items/application/ItemsSearcher.ts

diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 24541ebea..868268cd2 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,19 +1,32 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.8",
+  "version": "2.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "internxt-drive",
-      "version": "2.0.8",
+      "version": "2.0.0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@parcel/watcher": "^2.0.5",
         "@rudderstack/rudder-sdk-node": "^1.1.4",
         "better-sqlite3": "^8.3.0",
-        "typeorm": "^0.3.16"
+        "typeorm": "^0.3.16",
+        "virtual-drive": "../../../node-win"
+      }
+    },
+    "../../../node-win": {
+      "version": "1.0.1",
+      "hasInstallScript": true,
+      "license": "ISC",
+      "dependencies": {
+        "tsconfig-paths": "^4.2.0"
+      },
+      "devDependencies": {
+        "@types/node": "^20.5.0",
+        "node-gyp": "^9.4.0",
+        "typescript": "^5.1.6"
       }
     },
     "node_modules/@babel/runtime": {
@@ -67,26 +80,6 @@
         "darwin"
       ]
     },
-    "node_modules/@parcel/watcher": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.1.0.tgz",
-      "integrity": "sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^3.2.1",
-        "node-gyp-build": "^4.3.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
     "node_modules/@rudderstack/rudder-sdk-node": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@rudderstack/rudder-sdk-node/-/rudder-sdk-node-1.1.4.tgz",
@@ -278,18 +271,6 @@
         "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "license": "MIT",
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/buffer": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
@@ -699,18 +680,6 @@
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "license": "MIT"
     },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "license": "MIT",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/fn.name": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
@@ -891,15 +860,6 @@
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "license": "MIT"
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -909,27 +869,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
     "node_modules/is-retry-allowed": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz",
@@ -1041,19 +980,6 @@
         "is-buffer": "~1.1.6"
       }
     },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "license": "MIT",
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
     "node_modules/mimic-response": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
@@ -1174,23 +1100,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
-      "license": "MIT"
-    },
-    "node_modules/node-gyp-build": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz",
-      "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==",
-      "license": "MIT",
-      "bin": {
-        "node-gyp-build": "bin.js",
-        "node-gyp-build-optional": "optional.js",
-        "node-gyp-build-test": "build-test.js"
-      }
-    },
     "node_modules/node-gyp-build-optional-packages": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz",
@@ -1272,18 +1181,6 @@
       "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
       "license": "MIT"
     },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/prebuild-install": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
@@ -1651,18 +1548,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/triple-beam": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
@@ -1817,6 +1702,10 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/virtual-drive": {
+      "resolved": "../../../node-win",
+      "link": true
+    },
     "node_modules/winston": {
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/winston/-/winston-3.8.2.tgz",
@@ -1954,17 +1843,6 @@
       "integrity": "sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==",
       "optional": true
     },
-    "@parcel/watcher": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.1.0.tgz",
-      "integrity": "sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==",
-      "requires": {
-        "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^3.2.1",
-        "node-gyp-build": "^4.3.0"
-      }
-    },
     "@rudderstack/rudder-sdk-node": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@rudderstack/rudder-sdk-node/-/rudder-sdk-node-1.1.4.tgz",
@@ -2099,14 +1977,6 @@
         "balanced-match": "^1.0.0"
       }
     },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "requires": {
-        "fill-range": "^7.0.1"
-      }
-    },
     "buffer": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
@@ -2387,14 +2257,6 @@
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
     },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
     "fn.name": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
@@ -2502,29 +2364,11 @@
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
-    },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
     },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-    },
     "is-retry-allowed": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz",
@@ -2605,15 +2449,6 @@
         "is-buffer": "~1.1.6"
       }
     },
-    "micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "requires": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      }
-    },
     "mimic-response": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
@@ -2693,16 +2528,6 @@
         "semver": "^7.3.5"
       }
     },
-    "node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
-    },
-    "node-gyp-build": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz",
-      "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="
-    },
     "node-gyp-build-optional-packages": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz",
@@ -2763,11 +2588,6 @@
         }
       }
     },
-    "picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
-    },
     "prebuild-install": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
@@ -3009,14 +2829,6 @@
         "thenify": ">= 3.1.0 < 4"
       }
     },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
     "triple-beam": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
@@ -3074,6 +2886,15 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
     },
+    "virtual-drive": {
+      "version": "file:../../../node-win",
+      "requires": {
+        "@types/node": "^20.5.0",
+        "node-gyp": "^9.4.0",
+        "tsconfig-paths": "^4.2.0",
+        "typescript": "^5.1.6"
+      }
+    },
     "winston": {
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/winston/-/winston-3.8.2.tgz",
diff --git a/release/app/yarn.lock b/release/app/yarn.lock
index 59d51ba15..a07508864 100644
--- a/release/app/yarn.lock
+++ b/release/app/yarn.lock
@@ -35,36 +35,6 @@
   resolved "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz"
   integrity sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==
 
-"@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz"
-  integrity sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==
-
-"@msgpackr-extract/msgpackr-extract-darwin-x64@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.2.0.tgz#fb877fe6bae3c4d3cea29786737840e2ae689066"
-  integrity sha512-vq0tT8sjZsy4JdSqmadWVw6f66UXqUCabLmUVHZwUFzMgtgoIIQjT4VVRHKvlof3P/dMCkbMJ5hB1oJ9OWHaaw==
-
-"@msgpackr-extract/msgpackr-extract-linux-arm64@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.2.0.tgz#986179c38b10ac41fbdaf7d036c825cbc72855d9"
-  integrity sha512-hlxxLdRmPyq16QCutUtP8Tm6RDWcyaLsRssaHROatgnkOxdleMTgetf9JsdncL8vLh7FVy/RN9i3XR5dnb9cRA==
-
-"@msgpackr-extract/msgpackr-extract-linux-arm@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.2.0.tgz#15f2c6fe9e0adc06c21af7e95f484ff4880d79ce"
-  integrity sha512-SaJ3Qq4lX9Syd2xEo9u3qPxi/OB+5JO/ngJKK97XDpa1C587H9EWYO6KD8995DAjSinWvdHKRrCOXVUC5fvGOg==
-
-"@msgpackr-extract/msgpackr-extract-linux-x64@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.2.0.tgz#30cae5c9a202f3e1fa1deb3191b18ffcb2f239a2"
-  integrity sha512-94y5PJrSOqUNcFKmOl7z319FelCLAE0rz/jPCWS+UtdMZvpa4jrQd+cJPQCLp2Fes1yAW/YUQj/Di6YVT3c3Iw==
-
-"@msgpackr-extract/msgpackr-extract-win32-x64@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.2.0.tgz#016d855b6bc459fd908095811f6826e45dd4ba64"
-  integrity sha512-XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA==
-
 "@rudderstack/rudder-sdk-node@^1.1.4":
   version "1.1.4"
   resolved "https://registry.npmjs.org/@rudderstack/rudder-sdk-node/-/rudder-sdk-node-1.1.4.tgz"
@@ -148,7 +118,7 @@ base64-js@^1.3.1:
   resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-better-sqlite3@^8.3.0:
+"better-sqlite3@^7.1.2 || ^8.0.0", better-sqlite3@^8.3.0:
   version "8.3.0"
   resolved "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.3.0.tgz"
   integrity sha512-JTmvBZL/JLTc+3Msbvq6gK6elbU9/wVMqiudplHrVJpr7sVMR9KJrNhZAbW+RhXKlpMcuEhYkdcHa3TXKNXQ1w==
@@ -277,16 +247,16 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
 color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
+
 color-string@^1.6.0:
   version "1.9.1"
   resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"
@@ -480,7 +450,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4:
+inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@2:
   version "2.0.4"
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -490,7 +460,7 @@ ini@~1.3.0:
   resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-ioredis@^5.0.0:
+ioredis@^5.0.0, ioredis@^5.0.4:
   version "5.2.5"
   resolved "https://registry.npmjs.org/ioredis/-/ioredis-5.2.5.tgz"
   integrity sha512-7HKo/ClM2DGLRXdFq8ruS3Uuadensz4A76wPOU0adqlOqd1qkhoLPDaBhmVhUhNGpB+J65/bhLmNB8DDY99HJQ==
@@ -535,11 +505,6 @@ join-component@^1.1.0:
   resolved "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz"
   integrity sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==
 
-json5@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
-  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
-
 kuler@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz"
@@ -619,11 +584,6 @@ minimist@^1.2.0, minimist@^1.2.3:
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
-minimist@^1.2.6:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
 mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   version "0.5.3"
   resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"
@@ -634,16 +594,16 @@ mkdirp@^2.1.3:
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz"
   integrity sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==
 
-ms@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
-
 ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
 msgpackr-extract@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-2.2.0.tgz"
@@ -835,7 +795,7 @@ safe-stable-stringify@^2.3.1:
 
 semver@^7.3.2, semver@^7.3.5:
   version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
@@ -886,6 +846,13 @@ standard-as-callback@^2.1.0:
   resolved "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz"
   integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
 
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
@@ -895,13 +862,6 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
@@ -909,11 +869,6 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
-
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
@@ -971,15 +926,6 @@ triple-beam@^1.3.0:
   resolved "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz"
   integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
 
-tsconfig-paths@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
-  integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
-  dependencies:
-    json5 "^2.2.2"
-    minimist "^1.2.6"
-    strip-bom "^3.0.0"
-
 tslib@^2.5.0:
   version "2.5.0"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"
@@ -1030,6 +976,7 @@ uuid@^9.0.0:
 
 virtual-drive@../../../node-win:
   version "1.0.1"
+  resolved "file:../../../node-win"
   dependencies:
     tsconfig-paths "^4.2.0"
 
diff --git a/src/workers/sync-engine/BindingManager.ts b/src/workers/sync-engine/BindingManager.ts
index 850308790..1e6b35173 100644
--- a/src/workers/sync-engine/BindingManager.ts
+++ b/src/workers/sync-engine/BindingManager.ts
@@ -6,6 +6,7 @@ import { executeControllerWithFallback } from './callbacks-controllers/middlewar
 import { FilePlaceholderId } from './modules/placeholders/domain/FilePlaceholderId';
 import { ipcRendererSyncEngine } from './ipcRendererSyncEngine';
 import { PlatformPathConverter } from './modules/shared/application/PlatformPathConverter';
+import { ItemsSearcher } from './modules/items/application/ItemsSearcher';
 
 export type CallbackDownload = (
   success: boolean,
@@ -182,6 +183,12 @@ export class BindingsManager {
   async cleanUp() {
     await VirtualDrive.unregisterSyncRoot(this.paths.root);
 
+    //********************************************************************************************* */
+    const itemsSearcher = new ItemsSearcher();
+    const remainingItems = itemsSearcher.listFilesAndFolders(this.paths.root);
+
+    Logger.debug('remainingItems: ', remainingItems);
+    //********************************************************************************************* */
     const files = await this.container.retrieveAllFiles.run();
     const folders = await this.container.retrieveAllFolders.run();
 
diff --git a/src/workers/sync-engine/modules/items/application/ItemsSearcher.ts b/src/workers/sync-engine/modules/items/application/ItemsSearcher.ts
new file mode 100644
index 000000000..9a7b4f963
--- /dev/null
+++ b/src/workers/sync-engine/modules/items/application/ItemsSearcher.ts
@@ -0,0 +1,26 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+export class ItemsSearcher {
+  listFilesAndFolders(directory: string): string[] {
+    let result: string[] = [];
+
+    // Lee el contenido del directorio
+    const items = fs.readdirSync(directory);
+
+    for (const item of items) {
+      const fullPath = path.join(directory, item);
+      const stat = fs.statSync(fullPath);
+
+      if (stat.isDirectory()) {
+        result.push(fullPath);
+        // Si es un directorio, explora su contenido de forma recursiva
+        result = result.concat(this.listFilesAndFolders(fullPath));
+      } else if (stat.isFile()) {
+        result.push(fullPath);
+      }
+    }
+
+    return result;
+  }
+}

From 651176815338e721c64bc985b084cbcb979b2fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Gonz=C3=A1lez?= <cgonzalez@shokworks.io>
Date: Tue, 24 Oct 2023 07:25:55 -0400
Subject: [PATCH 024/188] fix: include unsync items deletion

---
 release/app/package-lock.json             |  1 +
 src/workers/sync-engine/BindingManager.ts | 35 ++++++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 868268cd2..14777a90a 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -17,6 +17,7 @@
       }
     },
     "../../../node-win": {
+      "name": "virtual-drive",
       "version": "1.0.1",
       "hasInstallScript": true,
       "license": "ISC",
diff --git a/src/workers/sync-engine/BindingManager.ts b/src/workers/sync-engine/BindingManager.ts
index 1e6b35173..7d41f0f44 100644
--- a/src/workers/sync-engine/BindingManager.ts
+++ b/src/workers/sync-engine/BindingManager.ts
@@ -7,6 +7,7 @@ import { FilePlaceholderId } from './modules/placeholders/domain/FilePlaceholder
 import { ipcRendererSyncEngine } from './ipcRendererSyncEngine';
 import { PlatformPathConverter } from './modules/shared/application/PlatformPathConverter';
 import { ItemsSearcher } from './modules/items/application/ItemsSearcher';
+import * as fs from 'fs';
 
 export type CallbackDownload = (
   success: boolean,
@@ -183,12 +184,9 @@ export class BindingsManager {
   async cleanUp() {
     await VirtualDrive.unregisterSyncRoot(this.paths.root);
 
-    //********************************************************************************************* */
     const itemsSearcher = new ItemsSearcher();
     const remainingItems = itemsSearcher.listFilesAndFolders(this.paths.root);
 
-    Logger.debug('remainingItems: ', remainingItems);
-    //********************************************************************************************* */
     const files = await this.container.retrieveAllFiles.run();
     const folders = await this.container.retrieveAllFolders.run();
 
@@ -206,6 +204,35 @@ export class BindingsManager {
       );
     });
 
-    Logger.debug('items: ', win32AbsolutePaths);
+    Logger.debug('remainingItems', remainingItems);
+    Logger.debug('win32AbsolutePaths', win32AbsolutePaths);
+    // find all common string in remainingItems and win32AbsolutePaths
+    // and delete them
+    const commonItems = remainingItems.filter((item) =>
+      win32AbsolutePaths.includes(item)
+    );
+
+    const toDeleteFolder: string[] = [];
+
+    commonItems.forEach((item) => {
+      try {
+        const stat = fs.statSync(item);
+        if (stat.isDirectory()) {
+          toDeleteFolder.push(item);
+        } else if (stat.isFile()) {
+          fs.unlinkSync(item);
+        }
+      } catch (error) {
+        Logger.error(error);
+      }
+    });
+
+    toDeleteFolder.forEach((item) => {
+      try {
+        fs.rmdirSync(item, { recursive: true });
+      } catch (error) {
+        Logger.error(error);
+      }
+    });
   }
 }

From e3ef99057f96b1a0032f3f88784118e5f35712ca Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 26 Oct 2023 13:43:54 +0200
Subject: [PATCH 025/188] fix: ignore files missing folder id

---
 src/main/remote-sync/RemoteSyncManager.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/remote-sync/RemoteSyncManager.ts b/src/main/remote-sync/RemoteSyncManager.ts
index 7b9217797..5876e1cbe 100644
--- a/src/main/remote-sync/RemoteSyncManager.ts
+++ b/src/main/remote-sync/RemoteSyncManager.ts
@@ -466,6 +466,9 @@ export class RemoteSyncManager {
     };
   };
   private async createOrUpdateSyncedFileEntry(remoteFile: RemoteSyncedFile) {
+    if (!remoteFile.folderId) {
+      return;
+    }
     await this.db.files.create(remoteFile);
   }
 

From f3bd0dcd752c4267475778f14e591f84a45397cd Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 26 Oct 2023 13:47:55 +0200
Subject: [PATCH 026/188] fix: ignore remote folders

---
 src/main/remote-sync/RemoteSyncManager.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/remote-sync/RemoteSyncManager.ts b/src/main/remote-sync/RemoteSyncManager.ts
index 5876e1cbe..db87a1487 100644
--- a/src/main/remote-sync/RemoteSyncManager.ts
+++ b/src/main/remote-sync/RemoteSyncManager.ts
@@ -475,6 +475,10 @@ export class RemoteSyncManager {
   private async createOrUpdateSyncedFolderEntry(
     remoteFolder: RemoteSyncedFolder
   ) {
+    if (!remoteFolder.id) {
+      return;
+    }
+
     await this.db.folders.create({
       ...remoteFolder,
       parentId: remoteFolder.parentId ?? undefined,

From c8991e9185962f9a2d50ffbf15dae0716d9d8f8a Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 26 Oct 2023 17:28:12 +0200
Subject: [PATCH 027/188] wip

---
 package.json                                  |   2 +-
 release/app/package.json                      |   4 +-
 release/app/yarn.lock                         | 854 ++++++++++++++++--
 src/main/background-processes/sync-engine.ts  | 225 ++---
 src/workers/fuse-native.d.ts                  |  52 ++
 src/workers/sync-engine/BindingManager.ts     | 266 ++----
 .../DependencyContainer.ts                    |   5 +-
 .../DependencyContainerFactory.ts             |   4 -
 .../boundaryBridge/build.ts                   |   1 -
 src/workers/sync-engine/index.ts              |  10 +-
 .../VirtualDrivePlaceholderCreator.ts         |   1 -
 yarn.lock                                     |   6 +-
 12 files changed, 1002 insertions(+), 428 deletions(-)
 create mode 100644 src/workers/fuse-native.d.ts

diff --git a/package.json b/package.json
index 5ba24a489..5e73914f7 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never",
     "publish": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish always",
     "postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts && opencollective-postinstall",
-    "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:backups && npm run start:sync-engine && npm run start:renderer",
+    "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:renderer",
     "start:main": "cross-env NODE_ENV=development electron -r ts-node/register/transpile-only ./src/main/main.ts",
     "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
     "start:sync": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync.ts",
diff --git a/release/app/package.json b/release/app/package.json
index 7f31c2a10..5c157e9c6 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -11,10 +11,10 @@
     "reload-virtual-drive": "yarn add  --ignore-scripts ../../../node-win && npm run link-modules"
   },
   "dependencies": {
+    "@cocalc/fuse-native": "^2.4.0",
     "@rudderstack/rudder-sdk-node": "^1.1.4",
     "better-sqlite3": "^8.3.0",
-    "typeorm": "^0.3.16",
-    "virtual-drive": "../../../node-win"
+    "typeorm": "^0.3.16"
   },
   "license": "MIT"
 }
diff --git a/release/app/yarn.lock b/release/app/yarn.lock
index a07508864..7b8c9fb48 100644
--- a/release/app/yarn.lock
+++ b/release/app/yarn.lock
@@ -16,6 +16,16 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
+"@cocalc/fuse-native@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@cocalc/fuse-native/-/fuse-native-2.4.0.tgz#feee5b75fef36a1b1b37135d8ccdc28d5dacf1e8"
+  integrity sha512-mhg+JZZkGq6cGN9Icy7Uu1J5/M1gR44t38DpxjZlRH4oyFcwpH2090/CFv2jGVaTOPrjgvxlb0jHNx9J7WUing==
+  dependencies:
+    nanoresource "^1.3.0"
+    napi-macros "^2.0.0"
+    node-gyp "^9.4.0"
+    node-gyp-build "^4.6.0"
+
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"
@@ -35,6 +45,60 @@
   resolved "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz"
   integrity sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==
 
+"@isaacs/cliui@^8.0.2":
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
+  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
+  dependencies:
+    string-width "^5.1.2"
+    string-width-cjs "npm:string-width@^4.2.0"
+    strip-ansi "^7.0.1"
+    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
+    wrap-ansi "^8.1.0"
+    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
+
+"@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz#901c5937e1441572ea23e631fe6deca68482fe76"
+  integrity sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==
+
+"@msgpackr-extract/msgpackr-extract-darwin-x64@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.2.0.tgz#fb877fe6bae3c4d3cea29786737840e2ae689066"
+  integrity sha512-vq0tT8sjZsy4JdSqmadWVw6f66UXqUCabLmUVHZwUFzMgtgoIIQjT4VVRHKvlof3P/dMCkbMJ5hB1oJ9OWHaaw==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm64@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.2.0.tgz#986179c38b10ac41fbdaf7d036c825cbc72855d9"
+  integrity sha512-hlxxLdRmPyq16QCutUtP8Tm6RDWcyaLsRssaHROatgnkOxdleMTgetf9JsdncL8vLh7FVy/RN9i3XR5dnb9cRA==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.2.0.tgz#15f2c6fe9e0adc06c21af7e95f484ff4880d79ce"
+  integrity sha512-SaJ3Qq4lX9Syd2xEo9u3qPxi/OB+5JO/ngJKK97XDpa1C587H9EWYO6KD8995DAjSinWvdHKRrCOXVUC5fvGOg==
+
+"@msgpackr-extract/msgpackr-extract-linux-x64@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.2.0.tgz#30cae5c9a202f3e1fa1deb3191b18ffcb2f239a2"
+  integrity sha512-94y5PJrSOqUNcFKmOl7z319FelCLAE0rz/jPCWS+UtdMZvpa4jrQd+cJPQCLp2Fes1yAW/YUQj/Di6YVT3c3Iw==
+
+"@msgpackr-extract/msgpackr-extract-win32-x64@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.2.0.tgz#016d855b6bc459fd908095811f6826e45dd4ba64"
+  integrity sha512-XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA==
+
+"@npmcli/fs@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e"
+  integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==
+  dependencies:
+    semver "^7.3.5"
+
+"@pkgjs/parseargs@^0.11.0":
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
+  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
+
 "@rudderstack/rudder-sdk-node@^1.1.4":
   version "1.1.4"
   resolved "https://registry.npmjs.org/@rudderstack/rudder-sdk-node/-/rudder-sdk-node-1.1.4.tgz"
@@ -66,11 +130,48 @@
   resolved "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.5.tgz"
   integrity sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==
 
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
+abbrev@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
+agent-base@6, agent-base@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
+agentkeepalive@^4.2.1:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
+  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
+  dependencies:
+    humanize-ms "^1.2.1"
+
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
+ansi-regex@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
+  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
@@ -78,6 +179,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+ansi-styles@^6.1.0:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
+  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
+
 any-promise@^1.0.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"
@@ -88,6 +194,19 @@ app-root-path@^3.1.0:
   resolved "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz"
   integrity sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==
 
+"aproba@^1.0.3 || ^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
+
+are-we-there-yet@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
+  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^3.6.0"
+
 async@^3.2.3:
   version "3.2.4"
   resolved "https://registry.npmjs.org/async/-/async-3.2.4.tgz"
@@ -118,30 +237,38 @@ base64-js@^1.3.1:
   resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-"better-sqlite3@^7.1.2 || ^8.0.0", better-sqlite3@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.3.0.tgz"
-  integrity sha512-JTmvBZL/JLTc+3Msbvq6gK6elbU9/wVMqiudplHrVJpr7sVMR9KJrNhZAbW+RhXKlpMcuEhYkdcHa3TXKNXQ1w==
+better-sqlite3@^8.3.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/better-sqlite3/-/better-sqlite3-8.7.0.tgz#bcc341856187b1d110a8a47234fa89c48c8ef538"
+  integrity sha512-99jZU4le+f3G6aIl6PmmV0cxUIWqKieHxsiF7G34CVFiE+/UabpYqkU0NJIkY/96mQKikHeBjtR27vFfs5JpEw==
   dependencies:
     bindings "^1.5.0"
-    prebuild-install "^7.1.0"
+    prebuild-install "^7.1.1"
 
 bindings@^1.5.0:
   version "1.5.0"
-  resolved "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz"
+  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
   integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
   dependencies:
     file-uri-to-path "1.0.0"
 
 bl@^4.0.3:
   version "4.1.0"
-  resolved "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
   integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
   dependencies:
     buffer "^5.5.0"
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
 brace-expansion@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"
@@ -151,7 +278,7 @@ brace-expansion@^2.0.1:
 
 buffer@^5.5.0:
   version "5.7.1"
-  resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
   dependencies:
     base64-js "^1.3.1"
@@ -180,6 +307,24 @@ bull@^4.7.0:
     semver "^7.3.2"
     uuid "^8.3.0"
 
+cacache@^17.0.0:
+  version "17.1.4"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.1.4.tgz#b3ff381580b47e85c6e64f801101508e26604b35"
+  integrity sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==
+  dependencies:
+    "@npmcli/fs" "^3.1.0"
+    fs-minipass "^3.0.0"
+    glob "^10.2.2"
+    lru-cache "^7.7.1"
+    minipass "^7.0.3"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    p-map "^4.0.0"
+    ssri "^10.0.0"
+    tar "^6.1.11"
+    unique-filename "^3.0.0"
+
 chalk@^4.0.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
@@ -195,9 +340,19 @@ charenc@0.0.2:
 
 chownr@^1.1.1:
   version "1.1.4"
-  resolved "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
 cli-highlight@^2.1.11:
   version "2.1.11"
   resolved "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz"
@@ -247,16 +402,16 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
-color-name@^1.0.0, color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
+color-name@^1.0.0, color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 color-string@^1.6.0:
   version "1.9.1"
   resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"
@@ -265,6 +420,11 @@ color-string@^1.6.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 color@^3.1.3:
   version "3.2.1"
   resolved "https://registry.npmjs.org/color/-/color-3.2.1.tgz"
@@ -286,6 +446,16 @@ component-type@^1.2.1:
   resolved "https://registry.npmjs.org/component-type/-/component-type-1.2.1.tgz"
   integrity sha512-Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg==
 
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+
+console-control-strings@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
+
 cron-parser@^4.2.1:
   version "4.7.1"
   resolved "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz"
@@ -293,6 +463,15 @@ cron-parser@^4.2.1:
   dependencies:
     luxon "^3.2.1"
 
+cross-spawn@^7.0.0:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 crypt@0.0.2:
   version "0.0.2"
   resolved "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"
@@ -305,7 +484,7 @@ date-fns@^2.29.3:
   dependencies:
     "@babel/runtime" "^7.21.0"
 
-debug@^4.3.4:
+debug@4, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -319,48 +498,80 @@ debuglog@^1.0.0:
 
 decompress-response@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
   integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
   dependencies:
     mimic-response "^3.1.0"
 
 deep-extend@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
+
 denque@^2.0.1:
   version "2.1.0"
   resolved "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz"
   integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
 
 detect-libc@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz"
-  integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d"
+  integrity sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==
 
 dotenv@^16.0.3:
   version "16.0.3"
   resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz"
   integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==
 
+eastasianwidth@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
+  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
+
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+emoji-regex@^9.2.2:
+  version "9.2.2"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
+  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
+
 enabled@2.0.x:
   version "2.0.0"
   resolved "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz"
   integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==
 
+encoding@^0.1.13:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+  dependencies:
+    iconv-lite "^0.6.2"
+
 end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.4"
-  resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
+env-paths@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
+  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
+
+err-code@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
+  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
@@ -368,9 +579,14 @@ escalade@^3.1.1:
 
 expand-template@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
   integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
 
+exponential-backoff@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
+  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
+
 fecha@^4.2.0:
   version "4.2.3"
   resolved "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz"
@@ -378,7 +594,7 @@ fecha@^4.2.0:
 
 file-uri-to-path@1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
 fn.name@1.x.x:
@@ -391,16 +607,52 @@ follow-redirects@^1.14.8:
   resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
+foreground-child@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
+  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
+  dependencies:
+    cross-spawn "^7.0.0"
+    signal-exit "^4.0.1"
+
 fs-constants@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
+fs-minipass@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+  dependencies:
+    minipass "^3.0.0"
+
+fs-minipass@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54"
+  integrity sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==
+  dependencies:
+    minipass "^7.0.3"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
+gauge@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
+  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+  dependencies:
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.3"
+    console-control-strings "^1.1.0"
+    has-unicode "^2.0.1"
+    signal-exit "^3.0.7"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.5"
+
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
@@ -413,9 +665,32 @@ get-port@^5.1.1:
 
 github-from-package@0.0.0:
   version "0.0.0"
-  resolved "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
   integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==
 
+glob@^10.2.2:
+  version "10.3.10"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
+  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^2.3.5"
+    minimatch "^9.0.1"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+    path-scurry "^1.10.1"
+
+glob@^7.1.3, glob@^7.1.4:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^8.1.0:
   version "8.1.0"
   resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"
@@ -427,21 +702,77 @@ glob@^8.1.0:
     minimatch "^5.0.1"
     once "^1.3.0"
 
+graceful-fs@^4.2.6:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-unicode@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
+
 highlight.js@^10.7.1:
   version "10.7.3"
   resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"
   integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
 
+http-cache-semantics@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
+
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+  dependencies:
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
+
+https-proxy-agent@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
+  dependencies:
+    ms "^2.0.0"
+
+iconv-lite@^0.6.2:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 ieee754@^1.1.13, ieee754@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
+
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
@@ -450,17 +781,17 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@2:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4:
   version "2.0.4"
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 ini@~1.3.0:
   version "1.3.8"
-  resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-ioredis@^5.0.0, ioredis@^5.0.4:
+ioredis@^5.0.0:
   version "5.2.5"
   resolved "https://registry.npmjs.org/ioredis/-/ioredis-5.2.5.tgz"
   integrity sha512-7HKo/ClM2DGLRXdFq8ruS3Uuadensz4A76wPOU0adqlOqd1qkhoLPDaBhmVhUhNGpB+J65/bhLmNB8DDY99HJQ==
@@ -475,6 +806,11 @@ ioredis@^5.0.0, ioredis@^5.0.4:
     redis-parser "^3.0.0"
     standard-as-callback "^2.1.0"
 
+ip@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
+  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+
 is-arrayish@^0.3.1:
   version "0.3.2"
   resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"
@@ -490,6 +826,11 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
+is-lambda@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
+  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
+
 is-retry-allowed@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz"
@@ -500,6 +841,20 @@ is-stream@^2.0.0:
   resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+
+jackspeak@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
+  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 join-component@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz"
@@ -553,11 +908,42 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@^7.7.1:
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
+  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
+
+"lru-cache@^9.1.1 || ^10.0.0":
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a"
+  integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==
+
 luxon@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz"
   integrity sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==
 
+make-fetch-happen@^11.0.3:
+  version "11.1.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
+  integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
+  dependencies:
+    agentkeepalive "^4.2.1"
+    cacache "^17.0.0"
+    http-cache-semantics "^4.1.1"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^7.7.1"
+    minipass "^5.0.0"
+    minipass-fetch "^3.0.0"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^7.0.0"
+    ssri "^10.0.0"
+
 md5@^2.3.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz"
@@ -569,9 +955,16 @@ md5@^2.3.0:
 
 mimic-response@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
   integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
 
+minimatch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimatch@^5.0.1:
   version "5.1.6"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"
@@ -579,31 +972,107 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@^9.0.1:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.2.0, minimist@^1.2.3:
-  version "1.2.7"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
+minipass-collect@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-fetch@^3.0.0:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.4.tgz#4d4d9b9f34053af6c6e597a64be8e66e42bf45b7"
+  integrity sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==
+  dependencies:
+    minipass "^7.0.3"
+    minipass-sized "^1.0.3"
+    minizlib "^2.1.2"
+  optionalDependencies:
+    encoding "^0.1.13"
+
+minipass-flush@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-pipeline@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-sized@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
+  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass@^3.0.0:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
+  dependencies:
+    yallist "^4.0.0"
+
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.3:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
+  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
+
+minizlib@^2.1.1, minizlib@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+  dependencies:
+    minipass "^3.0.0"
+    yallist "^4.0.0"
 
 mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   version "0.5.3"
-  resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"
+  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
+mkdirp@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 mkdirp@^2.1.3:
   version "2.1.6"
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz"
   integrity sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==
 
-ms@^2.1.1, ms@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 msgpackr-extract@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-2.2.0.tgz"
@@ -634,15 +1103,32 @@ mz@^2.4.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
+nanoresource@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/nanoresource/-/nanoresource-1.3.0.tgz#823945d9667ab3e81a8b2591ab8d734552878cd0"
+  integrity sha512-OI5dswqipmlYfyL3k/YMm7mbERlh4Bd1KuKdMHpeoVD1iVxqxaTMKleB4qaA2mbQZ6/zMNSxCXv9M9P/YbqTuQ==
+  dependencies:
+    inherits "^2.0.4"
+
 napi-build-utils@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
+napi-macros@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.2.2.tgz#817fef20c3e0e40a963fbf7b37d1600bd0201044"
+  integrity sha512-hmEVtAGYzVQpCKdbQea4skABsdXW4RUh5t5mJ2zzqowJS2OyXZTU1KhDVFhx+NlWZ4ap9mqR9TcDO3LTTttd+g==
+
+negotiator@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
+
 node-abi@^3.3.0:
-  version "3.31.0"
-  resolved "https://registry.npmjs.org/node-abi/-/node-abi-3.31.0.tgz"
-  integrity sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ==
+  version "3.51.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d"
+  integrity sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA==
   dependencies:
     semver "^7.3.5"
 
@@ -651,6 +1137,45 @@ node-gyp-build-optional-packages@5.0.3:
   resolved "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz"
   integrity sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==
 
+node-gyp-build@^4.6.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.1.tgz#24b6d075e5e391b8d5539d98c7fc5c210cac8a3e"
+  integrity sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==
+
+node-gyp@^9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.0.tgz#2a7a91c7cba4eccfd95e949369f27c9ba704f369"
+  integrity sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==
+  dependencies:
+    env-paths "^2.2.0"
+    exponential-backoff "^3.1.1"
+    glob "^7.1.4"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^11.0.3"
+    nopt "^6.0.0"
+    npmlog "^6.0.0"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
+    which "^2.0.2"
+
+nopt@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
+  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
+  dependencies:
+    abbrev "^1.0.0"
+
+npmlog@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
+  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+  dependencies:
+    are-we-there-yet "^3.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^4.0.3"
+    set-blocking "^2.0.0"
+
 object-assign@^4.0.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
@@ -658,7 +1183,7 @@ object-assign@^4.0.1:
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
@@ -675,6 +1200,13 @@ p-finally@^1.0.0:
   resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"
   integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
 p-timeout@^3.2.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"
@@ -699,9 +1231,27 @@ parse5@^6.0.1:
   resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-prebuild-install@^7.1.0:
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-scurry@^1.10.1:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
+  integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
+  dependencies:
+    lru-cache "^9.1.1 || ^10.0.0"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+
+prebuild-install@^7.1.1:
   version "7.1.1"
-  resolved "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
   integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==
   dependencies:
     detect-libc "^2.0.0"
@@ -717,9 +1267,17 @@ prebuild-install@^7.1.0:
     tar-fs "^2.0.0"
     tunnel-agent "^0.6.0"
 
+promise-retry@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
+  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
+  dependencies:
+    err-code "^2.0.2"
+    retry "^0.12.0"
+
 pump@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
   integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
   dependencies:
     end-of-stream "^1.1.0"
@@ -734,7 +1292,7 @@ randombytes@^2.1.0:
 
 rc@^1.2.7:
   version "1.2.8"
-  resolved "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
   dependencies:
     deep-extend "^0.6.0"
@@ -742,7 +1300,16 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0:
+readable-stream@^3.1.1:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+readable-stream@^3.4.0, readable-stream@^3.6.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
@@ -783,6 +1350,18 @@ require-directory@^2.1.1:
   resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
   integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
+
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
@@ -793,6 +1372,11 @@ safe-stable-stringify@^2.3.1:
   resolved "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz"
   integrity sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA==
 
+"safer-buffer@>= 2.1.2 < 3.0.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
 semver@^7.3.2, semver@^7.3.5:
   version "7.5.4"
   resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"
@@ -807,6 +1391,11 @@ serialize-javascript@^6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
+
 sha.js@^2.4.11:
   version "2.4.11"
   resolved "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"
@@ -815,14 +1404,36 @@ sha.js@^2.4.11:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+signal-exit@^3.0.7:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+
+signal-exit@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
 simple-concat@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
   integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
 
 simple-get@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543"
   integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
   dependencies:
     decompress-response "^6.0.0"
@@ -836,6 +1447,35 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
+smart-buffer@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
+  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
+
+socks-proxy-agent@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
+  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
+  dependencies:
+    agent-base "^6.0.2"
+    debug "^4.3.3"
+    socks "^2.6.2"
+
+socks@^2.6.2:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
+  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
+  dependencies:
+    ip "^2.0.0"
+    smart-buffer "^4.2.0"
+
+ssri@^10.0.0:
+  version "10.0.5"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.5.tgz#e49efcd6e36385196cb515d3a2ad6c3f0265ef8c"
+  integrity sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==
+  dependencies:
+    minipass "^7.0.3"
+
 stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"
@@ -846,14 +1486,16 @@ standard-as-callback@^2.1.0:
   resolved "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz"
   integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
-    safe-buffer "~5.2.0"
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
 
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -862,6 +1504,29 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string-width@^5.0.1, string-width@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
+  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
+  dependencies:
+    eastasianwidth "^0.2.0"
+    emoji-regex "^9.2.2"
+    strip-ansi "^7.0.1"
+
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
@@ -869,9 +1534,16 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
+strip-ansi@^7.0.1:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
+  dependencies:
+    ansi-regex "^6.0.1"
+
 strip-json-comments@~2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
 supports-color@^7.1.0:
@@ -883,7 +1555,7 @@ supports-color@^7.1.0:
 
 tar-fs@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
   integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
   dependencies:
     chownr "^1.1.1"
@@ -893,7 +1565,7 @@ tar-fs@^2.0.0:
 
 tar-stream@^2.1.4:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
   integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
   dependencies:
     bl "^4.0.3"
@@ -902,6 +1574,18 @@ tar-stream@^2.1.4:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
+tar@^6.1.11, tar@^6.1.2:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
+  integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^5.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
 text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz"
@@ -933,7 +1617,7 @@ tslib@^2.5.0:
 
 tunnel-agent@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
   integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
   dependencies:
     safe-buffer "^5.0.1"
@@ -959,6 +1643,20 @@ typeorm@^0.3.16:
     uuid "^9.0.0"
     yargs "^17.6.2"
 
+unique-filename@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
+  integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==
+  dependencies:
+    unique-slug "^4.0.0"
+
+unique-slug@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
+  integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==
+  dependencies:
+    imurmurhash "^0.1.4"
+
 util-deprecate@^1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
@@ -974,11 +1672,19 @@ uuid@^9.0.0:
   resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"
   integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
 
-virtual-drive@../../../node-win:
-  version "1.0.1"
-  resolved "file:../../../node-win"
+which@^2.0.1, which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
-    tsconfig-paths "^4.2.0"
+    isexe "^2.0.0"
+
+wide-align@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
+  dependencies:
+    string-width "^1.0.2 || 2 || 3 || 4"
 
 winston-transport@^4.5.0:
   version "4.5.0"
@@ -1006,6 +1712,15 @@ winston@^3.6.0:
     triple-beam "^1.3.0"
     winston-transport "^4.5.0"
 
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
@@ -1015,6 +1730,15 @@ wrap-ansi@^7.0.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
+  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
+  dependencies:
+    ansi-styles "^6.1.0"
+    string-width "^5.0.1"
+    strip-ansi "^7.0.1"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
diff --git a/src/main/background-processes/sync-engine.ts b/src/main/background-processes/sync-engine.ts
index c5e4b8de7..55846cf3a 100644
--- a/src/main/background-processes/sync-engine.ts
+++ b/src/main/background-processes/sync-engine.ts
@@ -1,171 +1,108 @@
-import { BrowserWindow, ipcMain } from 'electron';
-import path from 'path';
 import Logger from 'electron-log';
 import eventBus from '../event-bus';
+import { getRootVirtualDrive } from '../virutal-root-folder/service';
+import fuse from '@cocalc/fuse-native';
 
-let worker: BrowserWindow | null = null;
-let workerIsRunning = false;
-let startingWorker = false;
+let _fuse: {
+  unmount(arg0: (err: any) => void): unknown;
+  mount: (arg0: (err: any) => void) => void;
+};
 
 function spawnSyncEngineWorker() {
-  if (startingWorker) {
-    Logger.info('[MAIN] Worker is already starting');
-    return;
-  }
-  if (workerIsRunning) {
-    Logger.info('[MAIN] Worker is already running');
-    return;
-  }
+  const ops = {
+    getattr: (path: string, cb: (code: number, params?: any) => void) => {
+      if (path === '/') {
+        cb(0, { mode: 16877, size: 0 });
+      } else if (path === '/hello.txt') {
+        cb(0, { mode: 33188, size: 12 });
+      } else {
+        cb(fuse.ENOENT);
+      }
+    },
+    readdir: (path: string, cb: (code: number, params?: any) => void) => {
+      if (path === '/') {
+        cb(0, ['.', '..', 'hello.txt']);
+      } else {
+        cb(fuse.ENOENT);
+      }
+    },
+    open: (path: string, flags, cb: (code: number, params?: any) => void) => {
+      if (path === '/hello.txt') {
+        cb(0, 123); // Use a unique file descriptor (123 in this example)
+      } else {
+        cb(fuse.ENOENT);
+      }
+    },
+    read: (
+      path: string,
+      fd,
+      buf,
+      len,
+      pos,
+      cb: (code: number, params?: any) => void
+    ) => {
+      if (path !== '/hello.txt') {
+        return cb(fuse.ENOENT);
+      }
 
-  startingWorker = true;
+      const data = Buffer.from('Hello, FUSE!');
+
+      if (pos >= data.length) {
+        return cb(0);
+      }
 
-  worker = new BrowserWindow({
-    webPreferences: {
-      nodeIntegration: true,
-      contextIsolation: false,
-      backgroundThrottling: false,
+      const slice = data.slice(pos, pos + len);
+      slice.copy(buf);
+      cb(slice.length);
     },
-    show: false,
-  });
-  worker
-    .loadFile(
-      process.env.NODE_ENV === 'development'
-        ? '../../release/app/dist/sync-engine/index.html'
-        : `${path.join(__dirname, '..', 'sync-engine')}/index.html`
-    )
-    .then(() => {
-      Logger.info('[MAIN] Sync engine worker loaded');
-    })
-    .catch((err) => {
-      Logger.error('[MAIN] Error loading sync engine worker', err);
-    });
+    release: function (
+      readPath: string,
+      fd: number,
+      cb: (status: number) => void
+    ): void {
+      throw new Error('Function not implemented.');
+    },
+  };
 
-  worker.on('close', () => {
-    worker?.destroy();
+  const root = getRootVirtualDrive();
 
-    if (workerIsRunning) {
-      Logger.warn('The sync engine process ended unexpectedly, relaunching');
-      workerIsRunning = false;
-      spawnSyncEngineWorker();
+  Logger.debug('ROOT FOLDER: ', root);
+
+  _fuse = new fuse(root, ops, {
+    debug: true,
+    mkdir: true,
+    force: true,
+  });
+  _fuse.mount((err: any) => {
+    if (err) {
+      Logger.error(`FUSE mount error: ${err}`);
     }
   });
 
-  ipcMain.once('SYNC_ENGINE_PROCESS_SETUP_SUCCESSFUL', () => {
-    Logger.debug('[MAIN] SYNC ENGINE RUNNING');
-    workerIsRunning = true;
-    startingWorker = false;
-  });
+  fuse.isConfigured((isConfigured: boolean) => {
+    Logger.info(`FUSE is configured: ${isConfigured}`);
 
-  ipcMain.on('SYNC_ENGINE_PROCESS_SETUP_FAILED', () => {
-    Logger.debug('[MAIN] SYNC ENGINE NOT RUNNING');
-    workerIsRunning = false;
-    startingWorker = false;
+    if (!isConfigured) {
+      fuse.configure((...params: any[]) => {
+        Logger.debug(`FUSE configure cb params: ${{ params }}`);
+      });
+    }
   });
 }
 
 export async function stopSyncEngineWatcher() {
-  Logger.info('[MAIN] STOPPING SYNC ENGINE WORKER...');
-
-  if (!workerIsRunning) {
-    Logger.info('[MAIN] WORKER WAS NOT RUNNING');
-    worker?.destroy();
-    worker = null;
-    return;
-  }
-
-  const stopPromise = new Promise<void>((resolve, reject) => {
-    ipcMain.once('SYNC_ENGINE_STOP_ERROR', (_, error: Error) => {
-      Logger.error('[MAIN] Error stopping sync engine worker', error);
-      reject(error);
-    });
-
-    ipcMain.once('SYNC_ENGINE_STOP_SUCCESS', () => {
-      resolve();
-      Logger.info('[MAIN] Sync engine stopped');
-    });
-
-    const millisecondsToWait = 10_000;
-
-    setTimeout(() => {
-      reject(
-        new Error(
-          `Timeout waiting for sync engine to stop after ${millisecondsToWait} milliseconds`
-        )
-      );
-    }, millisecondsToWait);
+  _fuse?.unmount((err: any) => {
+    if (err) {
+      Logger.error(`FUSE unmount error: ${err}`);
+    }
   });
-
-  try {
-    worker?.webContents.send('STOP_SYNC_ENGINE_PROCESS');
-
-    await stopPromise;
-  } catch (err) {
-    // TODO: handle error
-    Logger.error(err);
-  } finally {
-    worker?.destroy();
-    workerIsRunning = false;
-    worker = null;
-  }
 }
 
 async function stopAndClearSyncEngineWatcher() {
-  Logger.info('[MAIN] STOPPING AND CLEAR SYNC ENGINE WORKER...');
-
-  if (!workerIsRunning) {
-    Logger.info('[MAIN] WORKER WAS NOT RUNNING');
-    worker?.destroy();
-    worker = null;
-    return;
-  }
-
-  const response = new Promise<void>((resolve, reject) => {
-    ipcMain.once(
-      'ERROR_ON_STOP_AND_CLEAR_SYNC_ENGINE_PROCESS',
-      (_, error: Error) => {
-        Logger.error('[MAIN] Error stopping sync engine worker', error);
-        reject(error);
-      }
-    );
-
-    ipcMain.once('SYNC_ENGINE_STOP_AND_CLEAR_SUCCESS', () => {
-      resolve();
-      Logger.info('[MAIN] Sync engine stopped and cleared');
-    });
-
-    const millisecondsToWait = 10_000;
-
-    setTimeout(() => {
-      reject(
-        new Error(
-          `Timeout waiting for sync engine to stop after ${millisecondsToWait} milliseconds`
-        )
-      );
-    }, millisecondsToWait);
-  });
-
-  try {
-    worker?.webContents.send('STOP_AND_CLEAR_SYNC_ENGINE_PROCESS');
-
-    await response;
-  } catch (err) {
-    // TODO: handle error
-    Logger.error(err);
-  } finally {
-    worker?.destroy();
-    workerIsRunning = false;
-    worker = null;
-  }
+  stopSyncEngineWatcher();
 }
 
-export function updateSyncEngine() {
-  try {
-    worker?.webContents.send('UPDATE_SYNC_ENGINE_PROCESS');
-  } catch (err) {
-    // TODO: handle error
-    Logger.error(err);
-  }
-}
+export function updateSyncEngine() {}
 
 eventBus.on('USER_LOGGED_OUT', stopAndClearSyncEngineWatcher);
 eventBus.on('USER_WAS_UNAUTHORIZED', stopAndClearSyncEngineWatcher);
diff --git a/src/workers/fuse-native.d.ts b/src/workers/fuse-native.d.ts
new file mode 100644
index 000000000..f87fc42b8
--- /dev/null
+++ b/src/workers/fuse-native.d.ts
@@ -0,0 +1,52 @@
+declare module 'fuse-native' {
+  export interface FuseStat {
+    mtime: Date;
+    atime: Date;
+    ctime: Date;
+    size: number;
+    mode: number;
+    uid: number;
+    gid: number;
+  }
+
+  export interface FuseHandlers {
+    readdir(
+      readPath: string,
+      cb: (status: number, entries: string[]) => void
+    ): void;
+    getattr(
+      readPath: string,
+      cb: (status: number, stat?: FuseStat) => void
+    ): void;
+    open(
+      readPath: string,
+      flags: number,
+      cb: (status: number, fd: number) => void
+    ): void;
+    release(readPath: string, fd: number, cb: (status: number) => void): void;
+    read(
+      readPath: string,
+      fd: number,
+      buf: Buffer,
+      len: number,
+      pos: number,
+      cb: (bytesRead: number) => void
+    ): void;
+  }
+
+  interface FuseOptions {
+    displayFolder?: string;
+    debug?: boolean;
+  }
+
+  class Fuse {
+    // static isConfigured(): boolean
+    mnt: string;
+
+    constructor(mnt: string, handlers: FuseHandlers, opts?: FuseOptions);
+    mount(cb: (error: Error | null) => void): void;
+    unmount(cb: (error: Error | null) => void): void;
+  }
+
+  export default Fuse;
+}
diff --git a/src/workers/sync-engine/BindingManager.ts b/src/workers/sync-engine/BindingManager.ts
index 7d41f0f44..2c9d9d338 100644
--- a/src/workers/sync-engine/BindingManager.ts
+++ b/src/workers/sync-engine/BindingManager.ts
@@ -1,7 +1,5 @@
 import Logger from 'electron-log';
-import { DependencyContainer } from './dependency-injection/DependencyContainer';
 import { buildControllers } from './callbacks-controllers/buildControllers';
-import { VirtualDrive } from 'virtual-drive/dist';
 import { executeControllerWithFallback } from './callbacks-controllers/middlewares/executeControllerWithFallback';
 import { FilePlaceholderId } from './modules/placeholders/domain/FilePlaceholderId';
 import { ipcRendererSyncEngine } from './ipcRendererSyncEngine';
@@ -15,9 +13,10 @@ export type CallbackDownload = (
 ) => Promise<{ finished: boolean; progress: number }>;
 export class BindingsManager {
   private static readonly PROVIDER_NAME = 'Internxt';
-  private progressBuffer = 0;
+
+  private fuse: any | null = null;
+
   constructor(
-    private readonly container: DependencyContainer,
     private readonly paths: {
       root: string;
       icon: string;
@@ -25,214 +24,89 @@ export class BindingsManager {
   ) {}
 
   async start(version: string, providerId: string) {
-    await this.stop();
-
-    const controllers = buildControllers(this.container);
-
-    const callbacks = {
-      notifyDeleteCallback: (
-        contentsId: string,
-        callback: (response: boolean) => void
-      ) => {
-        controllers.delete
-          .execute(contentsId)
-          .then(() => {
-            callback(true);
-          })
-          .catch((error: Error) => {
-            Logger.error(error);
-            callback(false);
-          });
-      },
-      notifyDeleteCompletionCallback: () => {
-        Logger.info('Deletion completed');
+    const fuse = require('fuse-native');
+    const ops = {
+      getattr: (path: string, cb: (code: number, params?: any) => void) => {
+        if (path === '/') {
+          cb(0, { mode: 16877, size: 0 });
+        } else if (path === '/hello.txt') {
+          cb(0, { mode: 33188, size: 12 });
+        } else {
+          cb(Fuse.ENOENT);
+        }
       },
-      notifyRenameCallback: (
-        absolutePath: string,
-        contentsId: string,
-        callback: (response: boolean) => void
-      ) => {
-        const fn = executeControllerWithFallback({
-          handler: controllers.renameOrMove.execute.bind(
-            controllers.renameOrMove
-          ),
-          fallback: controllers.offline.renameOrMove.execute.bind(
-            controllers.offline.renameOrMove
-          ),
-        });
-        fn(absolutePath, contentsId, callback);
+      readdir: (path: string, cb: (code: number, params?: any) => void) => {
+        if (path === '/') {
+          cb(0, ['.', '..', 'hello.txt']);
+        } else {
+          cb(Fuse.ENOENT);
+        }
       },
-      notifyFileAddedCallback: (
-        absolutePath: string,
-        callback: (acknowledge: boolean, id: string) => boolean
-      ) => {
-        controllers.addFile.execute(absolutePath, callback);
+      open: (path: string, flags, cb: (code: number, params?: any) => void) => {
+        if (path === '/hello.txt') {
+          cb(0, 123); // Use a unique file descriptor (123 in this example)
+        } else {
+          cb(Fuse.ENOENT);
+        }
       },
-      fetchDataCallback: async (
-        contentsId: FilePlaceholderId,
-        callback: CallbackDownload
+      read: (
+        path: string,
+        fd,
+        buf,
+        len,
+        pos,
+        cb: (code: number, params?: any) => void
       ) => {
-        try {
-          const path = await controllers.downloadFile.execute(
-            contentsId,
-            callback
-          );
-          Logger.debug('Execute Fetch Data Callback, sending path:', path);
-          const file = controllers.downloadFile.fileFinderByContentsId(
-            contentsId
-              .replace(
-                // eslint-disable-next-line no-control-regex
-                /[\x00-\x1F\x7F-\x9F]/g,
-                ''
-              )
-              .split(':')[1]
-          );
-          let finished = false;
-          while (!finished) {
-            const result = await callback(true, path);
-            finished = result.finished;
-            if (this.progressBuffer == result.progress) {
-              break;
-            } else {
-              this.progressBuffer = result.progress;
-            }
-            Logger.debug('condition', finished);
-            ipcRendererSyncEngine.send('FILE_DOWNLOADING', {
-              name: file.name,
-              extension: file.type,
-              nameWithExtension: file.nameWithExtension,
-              size: file.size,
-              processInfo: {
-                elapsedTime: 0,
-                progress: result.progress,
-              },
-            });
+        if (path === '/hello.txt') {
+          const data = Buffer.from('Hello, FUSE!');
+          if (pos >= data.length) {
+            cb(0);
+          } else {
+            const slice = data.slice(pos, pos + len);
+            slice.copy(buf);
+            cb(slice.length);
           }
-
-          this.progressBuffer = 0;
-          try {
-            await controllers.notifyPlaceholderHydrationFinished.execute(
-              contentsId
-            );
-          } catch (error) {
-            Logger.error('notify: ', error);
-          }
-
-          // Esperar hasta que la ejecución de fetchDataCallback esté completa antes de continuar
-          await new Promise((resolve) => {
-            setTimeout(() => {
-              Logger.debug('timeout');
-              resolve(true);
-            }, 500);
-          });
-        } catch (error) {
-          Logger.error(error);
-          callback(false, '');
+        } else {
+          cb(Fuse.ENOENT);
         }
       },
-      validateDataCallback: () => {
-        Logger.debug('validateDataCallback');
-      },
-      cancelFetchDataCallback: () => {
-        Logger.debug('cancelFetchDataCallback');
-      },
-      fetchPlaceholdersCallback: () => {
-        Logger.debug('fetchPlaceholdersCallback');
-      },
-      cancelFetchPlaceholdersCallback: () => {
-        Logger.debug('cancelFetchPlaceholdersCallback');
-      },
-      notifyFileOpenCompletionCallback: () => {
-        Logger.debug('notifyFileOpenCompletionCallback');
-      },
-      notifyFileCloseCompletionCallback: () => {
-        Logger.debug('notifyFileCloseCompletionCallback');
-      },
-      notifyDehydrateCallback: () => {
-        Logger.debug('notifyDehydrateCallback');
-      },
-      notifyDehydrateCompletionCallback: () => {
-        Logger.debug('notifyDehydrateCompletionCallback');
-      },
-      notifyRenameCompletionCallback: () => {
-        Logger.debug('notifyRenameCompletionCallback');
-      },
-      noneCallback: () => {
-        Logger.debug('noneCallback');
+      release: function (
+        readPath: string,
+        fd: number,
+        cb: (status: number) => void
+      ): void {
+        throw new Error('Function not implemented.');
       },
     };
+    // this.fuse = new fuse(this.paths.root, ops, { debug: true });
+    // this.fuse.mount((err: any) => {
+    //   if (err) {
+    //     Logger.error(`FUSE mount error: ${err}`);
+    //   }
+    // });
 
-    await this.container.virtualDrive.registerSyncRoot(
-      BindingsManager.PROVIDER_NAME,
-      version,
-      providerId,
-      callbacks,
-      this.paths.icon
-    );
-
-    await this.container.virtualDrive.connectSyncRoot();
-  }
-
-  watch() {
-    this.container.virtualDrive.watchAndWait(this.paths.root);
-  }
-
-  async stop() {
-    await this.container.virtualDrive.disconnectSyncRoot();
-  }
-
-  async cleanUp() {
-    await VirtualDrive.unregisterSyncRoot(this.paths.root);
-
-    const itemsSearcher = new ItemsSearcher();
-    const remainingItems = itemsSearcher.listFilesAndFolders(this.paths.root);
-
-    const files = await this.container.retrieveAllFiles.run();
-    const folders = await this.container.retrieveAllFolders.run();
-
-    const items = [...files, ...folders];
+    Logger.debug('FUSE: ', { fuse });
 
-    const win32AbsolutePaths = items.map((item) => {
-      const posixRelativePath = item.path.value;
-      // este path es relativo al root y en formato posix
+    fuse.isConfigured((isConfigured: boolean) => {
+      Logger.info(`FUSE is configured: ${isConfigured}`);
 
-      const win32RelativePaths =
-        PlatformPathConverter.posixToWin(posixRelativePath);
-
-      return this.container.relativePathToAbsoluteConverter.run(
-        win32RelativePaths
-      );
-    });
-
-    Logger.debug('remainingItems', remainingItems);
-    Logger.debug('win32AbsolutePaths', win32AbsolutePaths);
-    // find all common string in remainingItems and win32AbsolutePaths
-    // and delete them
-    const commonItems = remainingItems.filter((item) =>
-      win32AbsolutePaths.includes(item)
-    );
-
-    const toDeleteFolder: string[] = [];
-
-    commonItems.forEach((item) => {
-      try {
-        const stat = fs.statSync(item);
-        if (stat.isDirectory()) {
-          toDeleteFolder.push(item);
-        } else if (stat.isFile()) {
-          fs.unlinkSync(item);
-        }
-      } catch (error) {
-        Logger.error(error);
+      if (!isConfigured) {
+        fuse.configure((...params: any[]) => {
+          Logger.debug(`FUSE configure cb params: ${{ params }}`);
+        });
       }
     });
+  }
+
+  watch() {}
 
-    toDeleteFolder.forEach((item) => {
-      try {
-        fs.rmdirSync(item, { recursive: true });
-      } catch (error) {
-        Logger.error(error);
+  async stop() {
+    this.fuse?.unmount((err: any) => {
+      if (err) {
+        Logger.error(`FUSE unmount error: ${err}`);
       }
     });
   }
+
+  async cleanUp() {}
 }
diff --git a/src/workers/sync-engine/dependency-injection/DependencyContainer.ts b/src/workers/sync-engine/dependency-injection/DependencyContainer.ts
index 10b52ea8f..00f30a3be 100644
--- a/src/workers/sync-engine/dependency-injection/DependencyContainer.ts
+++ b/src/workers/sync-engine/dependency-injection/DependencyContainer.ts
@@ -1,5 +1,4 @@
 /* eslint-disable max-len */
-import { VirtualDrive } from 'virtual-drive/dist';
 import { ContentsContainer } from './contents/ContentsContainer';
 import { FilesContainer } from './files/FilesContainer';
 import { FoldersContainer } from './folders/FoldersContainer';
@@ -15,6 +14,4 @@ export interface DependencyContainer
     FoldersContainer,
     PlaceholderContainer,
     SharedContainer,
-    BoundaryBridgeContainer {
-  virtualDrive: VirtualDrive;
-}
+    BoundaryBridgeContainer {}
diff --git a/src/workers/sync-engine/dependency-injection/DependencyContainerFactory.ts b/src/workers/sync-engine/dependency-injection/DependencyContainerFactory.ts
index 716207047..ba22d8d04 100644
--- a/src/workers/sync-engine/dependency-injection/DependencyContainerFactory.ts
+++ b/src/workers/sync-engine/dependency-injection/DependencyContainerFactory.ts
@@ -6,7 +6,6 @@ import { buildContentsContainer } from './contents/builder';
 import { buildFilesContainer } from './files/builder';
 import { buildFoldersContainer } from './folders/builder';
 import { buildItemsContainer } from './items/builder';
-import { DependencyInjectionVirtualDrive } from './common/virtualDrive';
 import { buildPlaceholdersContainer } from './placeholders/builder';
 import { buildBoundaryBridgeContainer } from './boundaryBridge/build';
 import { buildSharedContainer } from './shared/builder';
@@ -38,7 +37,6 @@ export class DependencyContainerFactory {
     }
 
     const { bus } = DependencyInjectionEventBus;
-    const { virtualDrive } = DependencyInjectionVirtualDrive;
 
     const sharedContainer = buildSharedContainer();
     const itemsContainer = buildItemsContainer();
@@ -67,8 +65,6 @@ export class DependencyContainerFactory {
       ...placeholderContainer,
       ...sharedContainer,
       ...boundaryBridgeContainer,
-
-      virtualDrive,
     };
 
     bus.addSubscribers(DomainEventSubscribers.from(container));
diff --git a/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts b/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts
index 15b105da4..971215272 100644
--- a/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts
+++ b/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts
@@ -11,7 +11,6 @@ import { SharedContainer } from '../shared/SharedContainer';
 import { SyncPlaceholders } from 'workers/sync-engine/modules/boundaryBridge/application/SyncPlaceholders';
 import { UpdatePlaceholderFolder } from 'workers/sync-engine/modules/boundaryBridge/application/UpdatePlaceholderFolder';
 import { DependencyInjectionEventRepository } from '../common/eventRepository';
-import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
 
 export function buildBoundaryBridgeContainer(
   contentsContainer: ContentsContainer,
diff --git a/src/workers/sync-engine/index.ts b/src/workers/sync-engine/index.ts
index 6e87ef80a..762772a96 100644
--- a/src/workers/sync-engine/index.ts
+++ b/src/workers/sync-engine/index.ts
@@ -1,6 +1,5 @@
 import Logger from 'electron-log';
 import { ipcRenderer } from 'electron';
-import { DependencyContainerFactory } from './dependency-injection/DependencyContainerFactory';
 import packageJson from '../../../package.json';
 import { BindingsManager } from './BindingManager';
 import fs from 'fs/promises';
@@ -24,10 +23,7 @@ async function setUp() {
 
   await ensureTheFolderExist(virtualDrivePath);
 
-  const factory = new DependencyContainerFactory();
-  const container = await factory.build();
-
-  const bindings = new BindingsManager(container, {
+  const bindings = new BindingsManager({
     root: virtualDrivePath,
     icon: iconPath,
   });
@@ -45,7 +41,7 @@ async function setUp() {
   ipcRenderer.on('UPDATE_SYNC_ENGINE_PROCESS', async () => {
     Logger.info('[SYNC ENGINE] Updating sync engine');
 
-    await container.syncPlaceholders.run();
+    // await container.syncPlaceholders.run();
 
     Logger.info('[SYNC ENGINE] sync engine updated successfully');
   });
@@ -71,7 +67,7 @@ async function setUp() {
     '{E9D7EB38-B229-5DC5-9396-017C449D59CD}'
   );
 
-  await container.treePlaceholderCreator.run();
+  // await container.treePlaceholderCreator.run();
 
   bindings.watch();
 }
diff --git a/src/workers/sync-engine/modules/placeholders/infrastructure/VirtualDrivePlaceholderCreator.ts b/src/workers/sync-engine/modules/placeholders/infrastructure/VirtualDrivePlaceholderCreator.ts
index 972d21630..a58c1726d 100644
--- a/src/workers/sync-engine/modules/placeholders/infrastructure/VirtualDrivePlaceholderCreator.ts
+++ b/src/workers/sync-engine/modules/placeholders/infrastructure/VirtualDrivePlaceholderCreator.ts
@@ -1,4 +1,3 @@
-import { VirtualDrive } from 'virtual-drive/dist';
 import { File } from '../../files/domain/File';
 import { Folder } from '../../folders/domain/Folder';
 import { PlaceholderCreator } from '../domain/PlaceholderCreator';
diff --git a/yarn.lock b/yarn.lock
index b08729e41..40a09d2d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5256,9 +5256,9 @@ electron-updater@^4.6.4:
     semver "^7.3.5"
 
 electron@^25.8.1:
-  version "25.8.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.1.tgz#092fab5a833db4d9240d4d6f36218cf7ca954f86"
-  integrity sha512-GtcP1nMrROZfFg0+mhyj1hamrHvukfF6of2B/pcWxmWkd5FVY1NJib0tlhiorFZRzQN5Z+APLPr7aMolt7i2AQ==
+  version "25.9.3"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-25.9.3.tgz#cdd53a30fb914adadcfbd34124237fb38b1c07d0"
+  integrity sha512-dacaHg/PuwVcFRgPDCM5j7UDzqGJWOsbBRdS5wPKLNS/ejPeccIjuNUT1cqcrpvCJKAFW8swHWg9kdizNSEDHQ==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^18.11.18"

From 231c257a4b9cd4d6d1fd990866aae88fe241e52a Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Fri, 27 Oct 2023 13:55:12 +0200
Subject: [PATCH 028/188] wip

---
 package.json                                 |   2 +-
 release/app/package.json                     |   2 +-
 release/app/yarn.lock                        | 693 +------------------
 src/main/background-processes/sync-engine.ts |  74 +-
 yarn.lock                                    | 247 ++++++-
 5 files changed, 266 insertions(+), 752 deletions(-)

diff --git a/package.json b/package.json
index 5e73914f7..f0d005442 100644
--- a/package.json
+++ b/package.json
@@ -203,7 +203,7 @@
     "detect-port": "^1.3.0",
     "dotenv": "^10.0.0",
     "dotenv-webpack": "^7.0.3",
-    "electron": "^25.8.1",
+    "electron": "19.1.9",
     "electron-builder": "^23.6.0",
     "electron-devtools-installer": "^3.2.0",
     "electron-notarize": "^1.1.1",
diff --git a/release/app/package.json b/release/app/package.json
index 5c157e9c6..cf5bb3900 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -11,7 +11,7 @@
     "reload-virtual-drive": "yarn add  --ignore-scripts ../../../node-win && npm run link-modules"
   },
   "dependencies": {
-    "@cocalc/fuse-native": "^2.4.0",
+    "@gcas/fuse": "^2.4.2",
     "@rudderstack/rudder-sdk-node": "^1.1.4",
     "better-sqlite3": "^8.3.0",
     "typeorm": "^0.3.16"
diff --git a/release/app/yarn.lock b/release/app/yarn.lock
index 7b8c9fb48..81352052d 100644
--- a/release/app/yarn.lock
+++ b/release/app/yarn.lock
@@ -16,16 +16,6 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@cocalc/fuse-native@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@cocalc/fuse-native/-/fuse-native-2.4.0.tgz#feee5b75fef36a1b1b37135d8ccdc28d5dacf1e8"
-  integrity sha512-mhg+JZZkGq6cGN9Icy7Uu1J5/M1gR44t38DpxjZlRH4oyFcwpH2090/CFv2jGVaTOPrjgvxlb0jHNx9J7WUing==
-  dependencies:
-    nanoresource "^1.3.0"
-    napi-macros "^2.0.0"
-    node-gyp "^9.4.0"
-    node-gyp-build "^4.6.0"
-
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"
@@ -40,23 +30,19 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
+"@gcas/fuse@^2.4.2":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@gcas/fuse/-/fuse-2.4.2.tgz#149bd97ec8a60988f4868bacd719c7e8a1c41876"
+  integrity sha512-l/vVd2eXAuzKG4QilN1VRa8za5glndSK+jxcLrzMiXRrvbbCJthwqcBZUE3VzoRL0T/l7197tW+MKR9YeQCtZQ==
+  dependencies:
+    nanoresource "^1.3.0"
+    napi-macros "^2.0.0"
+
 "@ioredis/commands@^1.1.1":
   version "1.2.0"
   resolved "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz"
   integrity sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==
 
-"@isaacs/cliui@^8.0.2":
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
-  integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==
-  dependencies:
-    string-width "^5.1.2"
-    string-width-cjs "npm:string-width@^4.2.0"
-    strip-ansi "^7.0.1"
-    strip-ansi-cjs "npm:strip-ansi@^6.0.1"
-    wrap-ansi "^8.1.0"
-    wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
-
 "@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz#901c5937e1441572ea23e631fe6deca68482fe76"
@@ -87,18 +73,6 @@
   resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.2.0.tgz#016d855b6bc459fd908095811f6826e45dd4ba64"
   integrity sha512-XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA==
 
-"@npmcli/fs@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-3.1.0.tgz#233d43a25a91d68c3a863ba0da6a3f00924a173e"
-  integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==
-  dependencies:
-    semver "^7.3.5"
-
-"@pkgjs/parseargs@^0.11.0":
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
-  integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
-
 "@rudderstack/rudder-sdk-node@^1.1.4":
   version "1.1.4"
   resolved "https://registry.npmjs.org/@rudderstack/rudder-sdk-node/-/rudder-sdk-node-1.1.4.tgz"
@@ -130,48 +104,11 @@
   resolved "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.5.tgz"
   integrity sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
-abbrev@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
-agent-base@6, agent-base@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
-  dependencies:
-    debug "4"
-
-agentkeepalive@^4.2.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
-  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
-  dependencies:
-    humanize-ms "^1.2.1"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-regex@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
-  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
-
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
@@ -179,11 +116,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-ansi-styles@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
-  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
-
 any-promise@^1.0.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"
@@ -194,19 +126,6 @@ app-root-path@^3.1.0:
   resolved "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz"
   integrity sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==
 
-"aproba@^1.0.3 || ^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
-  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
-
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^3.6.0"
-
 async@^3.2.3:
   version "3.2.4"
   resolved "https://registry.npmjs.org/async/-/async-3.2.4.tgz"
@@ -261,14 +180,6 @@ bl@^4.0.3:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
 brace-expansion@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"
@@ -307,24 +218,6 @@ bull@^4.7.0:
     semver "^7.3.2"
     uuid "^8.3.0"
 
-cacache@^17.0.0:
-  version "17.1.4"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-17.1.4.tgz#b3ff381580b47e85c6e64f801101508e26604b35"
-  integrity sha512-/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==
-  dependencies:
-    "@npmcli/fs" "^3.1.0"
-    fs-minipass "^3.0.0"
-    glob "^10.2.2"
-    lru-cache "^7.7.1"
-    minipass "^7.0.3"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    p-map "^4.0.0"
-    ssri "^10.0.0"
-    tar "^6.1.11"
-    unique-filename "^3.0.0"
-
 chalk@^4.0.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
@@ -343,16 +236,6 @@ chownr@^1.1.1:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
 cli-highlight@^2.1.11:
   version "2.1.11"
   resolved "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz"
@@ -420,11 +303,6 @@ color-string@^1.6.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
 color@^3.1.3:
   version "3.2.1"
   resolved "https://registry.npmjs.org/color/-/color-3.2.1.tgz"
@@ -446,16 +324,6 @@ component-type@^1.2.1:
   resolved "https://registry.npmjs.org/component-type/-/component-type-1.2.1.tgz"
   integrity sha512-Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg==
 
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-console-control-strings@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
-
 cron-parser@^4.2.1:
   version "4.7.1"
   resolved "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz"
@@ -463,15 +331,6 @@ cron-parser@^4.2.1:
   dependencies:
     luxon "^3.2.1"
 
-cross-spawn@^7.0.0:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
 crypt@0.0.2:
   version "0.0.2"
   resolved "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"
@@ -484,7 +343,7 @@ date-fns@^2.29.3:
   dependencies:
     "@babel/runtime" "^7.21.0"
 
-debug@4, debug@^4.3.3, debug@^4.3.4:
+debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -508,11 +367,6 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
-
 denque@^2.0.1:
   version "2.1.0"
   resolved "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz"
@@ -528,33 +382,16 @@ dotenv@^16.0.3:
   resolved "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz"
   integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==
 
-eastasianwidth@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
-  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emoji-regex@^9.2.2:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
-  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
-
 enabled@2.0.x:
   version "2.0.0"
   resolved "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz"
   integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==
 
-encoding@^0.1.13:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
-  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
-  dependencies:
-    iconv-lite "^0.6.2"
-
 end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -562,16 +399,6 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-env-paths@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
-  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
-
-err-code@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
-  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
-
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
@@ -582,11 +409,6 @@ expand-template@^2.0.3:
   resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
   integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
 
-exponential-backoff@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
-  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
-
 fecha@^4.2.0:
   version "4.2.3"
   resolved "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz"
@@ -607,52 +429,16 @@ follow-redirects@^1.14.8:
   resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
 
-foreground-child@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
-  integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==
-  dependencies:
-    cross-spawn "^7.0.0"
-    signal-exit "^4.0.1"
-
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
-fs-minipass@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
-  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-  dependencies:
-    minipass "^3.0.0"
-
-fs-minipass@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54"
-  integrity sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==
-  dependencies:
-    minipass "^7.0.3"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
-  dependencies:
-    aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
-    has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
-
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
@@ -668,29 +454,6 @@ github-from-package@0.0.0:
   resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
   integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==
 
-glob@^10.2.2:
-  version "10.3.10"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
-  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
-  dependencies:
-    foreground-child "^3.1.0"
-    jackspeak "^2.3.5"
-    minimatch "^9.0.1"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-    path-scurry "^1.10.1"
-
-glob@^7.1.3, glob@^7.1.4:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@^8.1.0:
   version "8.1.0"
   resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"
@@ -702,77 +465,21 @@ glob@^8.1.0:
     minimatch "^5.0.1"
     once "^1.3.0"
 
-graceful-fs@^4.2.6:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-unicode@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
-
 highlight.js@^10.7.1:
   version "10.7.3"
   resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"
   integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
 
-http-cache-semantics@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
-  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
-
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
-  dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
-
-https-proxy-agent@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
-  dependencies:
-    ms "^2.0.0"
-
-iconv-lite@^0.6.2:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
-  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
 ieee754@^1.1.13, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
-
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
@@ -806,11 +513,6 @@ ioredis@^5.0.0:
     redis-parser "^3.0.0"
     standard-as-callback "^2.1.0"
 
-ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
-
 is-arrayish@^0.3.1:
   version "0.3.2"
   resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"
@@ -826,11 +528,6 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-lambda@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
-  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
-
 is-retry-allowed@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz"
@@ -841,20 +538,6 @@ is-stream@^2.0.0:
   resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
-jackspeak@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
-  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
-  dependencies:
-    "@isaacs/cliui" "^8.0.2"
-  optionalDependencies:
-    "@pkgjs/parseargs" "^0.11.0"
-
 join-component@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz"
@@ -908,42 +591,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.7.1:
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
-  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
-
-"lru-cache@^9.1.1 || ^10.0.0":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a"
-  integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==
-
 luxon@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz"
   integrity sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==
 
-make-fetch-happen@^11.0.3:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz#85ceb98079584a9523d4bf71d32996e7e208549f"
-  integrity sha512-rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==
-  dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^17.0.0"
-    http-cache-semantics "^4.1.1"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^5.0.0"
-    minipass-fetch "^3.0.0"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^10.0.0"
-
 md5@^2.3.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz"
@@ -958,13 +610,6 @@ mimic-response@^3.1.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
   integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
 
-minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
 minimatch@^5.0.1:
   version "5.1.6"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"
@@ -972,92 +617,16 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^9.0.1:
-  version "9.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
-  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimist@^1.2.0, minimist@^1.2.3:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-fetch@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-3.0.4.tgz#4d4d9b9f34053af6c6e597a64be8e66e42bf45b7"
-  integrity sha512-jHAqnA728uUpIaFm7NWsCnqKT6UqZz7GcI/bDpPATuwYyKwJwW0remxSCxUlKiEty+eopHGa3oc8WxgQ1FFJqg==
-  dependencies:
-    minipass "^7.0.3"
-    minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
-  optionalDependencies:
-    encoding "^0.1.13"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-sized@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
-  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass@^3.0.0:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
-  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
-  dependencies:
-    yallist "^4.0.0"
-
-minipass@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
-  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
-
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.3:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c"
-  integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==
-
-minizlib@^2.1.1, minizlib@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
-  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-  dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
-
 mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 mkdirp@^2.1.3:
   version "2.1.6"
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz"
@@ -1068,7 +637,7 @@ ms@2.1.2:
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
+ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -1120,11 +689,6 @@ napi-macros@^2.0.0:
   resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.2.2.tgz#817fef20c3e0e40a963fbf7b37d1600bd0201044"
   integrity sha512-hmEVtAGYzVQpCKdbQea4skABsdXW4RUh5t5mJ2zzqowJS2OyXZTU1KhDVFhx+NlWZ4ap9mqR9TcDO3LTTttd+g==
 
-negotiator@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
-  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
-
 node-abi@^3.3.0:
   version "3.51.0"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d"
@@ -1137,45 +701,6 @@ node-gyp-build-optional-packages@5.0.3:
   resolved "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz"
   integrity sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==
 
-node-gyp-build@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.1.tgz#24b6d075e5e391b8d5539d98c7fc5c210cac8a3e"
-  integrity sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==
-
-node-gyp@^9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.0.tgz#2a7a91c7cba4eccfd95e949369f27c9ba704f369"
-  integrity sha512-dMXsYP6gc9rRbejLXmTbVRYjAHw7ppswsKyMxuxJxxOHzluIO1rGp9TOQgjFJ+2MCqcOcQTOPB/8Xwhr+7s4Eg==
-  dependencies:
-    env-paths "^2.2.0"
-    exponential-backoff "^3.1.1"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^11.0.3"
-    nopt "^6.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
-nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
-  dependencies:
-    abbrev "^1.0.0"
-
-npmlog@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
-  dependencies:
-    are-we-there-yet "^3.0.0"
-    console-control-strings "^1.1.0"
-    gauge "^4.0.3"
-    set-blocking "^2.0.0"
-
 object-assign@^4.0.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
@@ -1200,13 +725,6 @@ p-finally@^1.0.0:
   resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"
   integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
 p-timeout@^3.2.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"
@@ -1231,24 +749,6 @@ parse5@^6.0.1:
   resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
-path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
-path-scurry@^1.10.1:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698"
-  integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==
-  dependencies:
-    lru-cache "^9.1.1 || ^10.0.0"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
-
 prebuild-install@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
@@ -1267,14 +767,6 @@ prebuild-install@^7.1.1:
     tar-fs "^2.0.0"
     tunnel-agent "^0.6.0"
 
-promise-retry@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
-  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
-  dependencies:
-    err-code "^2.0.2"
-    retry "^0.12.0"
-
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -1350,18 +842,6 @@ require-directory@^2.1.1:
   resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
   integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
-
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
@@ -1372,11 +852,6 @@ safe-stable-stringify@^2.3.1:
   resolved "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz"
   integrity sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA==
 
-"safer-buffer@>= 2.1.2 < 3.0.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
 semver@^7.3.2, semver@^7.3.5:
   version "7.5.4"
   resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"
@@ -1391,11 +866,6 @@ serialize-javascript@^6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
-
 sha.js@^2.4.11:
   version "2.4.11"
   resolved "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"
@@ -1404,28 +874,6 @@ sha.js@^2.4.11:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-signal-exit@^3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
-signal-exit@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
-  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
-
 simple-concat@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
@@ -1447,35 +895,6 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
-smart-buffer@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
-  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
-
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
-
-socks@^2.6.2:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
-  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
-  dependencies:
-    ip "^2.0.0"
-    smart-buffer "^4.2.0"
-
-ssri@^10.0.0:
-  version "10.0.5"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-10.0.5.tgz#e49efcd6e36385196cb515d3a2ad6c3f0265ef8c"
-  integrity sha512-bSf16tAFkGeRlUNDjXu8FzaMQt6g2HZJrun7mtMbIPOddxt3GLMSz5VWUWcqTJUPfLEaDIepGxv+bYQW49596A==
-  dependencies:
-    minipass "^7.0.3"
-
 stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"
@@ -1486,16 +905,7 @@ standard-as-callback@^2.1.0:
   resolved "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz"
   integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -1504,15 +914,6 @@ standard-as-callback@^2.1.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string-width@^5.0.1, string-width@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
-  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
-  dependencies:
-    eastasianwidth "^0.2.0"
-    emoji-regex "^9.2.2"
-    strip-ansi "^7.0.1"
-
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
@@ -1520,13 +921,6 @@ string_decoder@^1.1.1:
   dependencies:
     safe-buffer "~5.2.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
@@ -1534,13 +928,6 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-ansi@^7.0.1:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
-  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
-  dependencies:
-    ansi-regex "^6.0.1"
-
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -1574,18 +961,6 @@ tar-stream@^2.1.4:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@^6.1.11, tar@^6.1.2:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
-  integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^5.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
 text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz"
@@ -1643,20 +1018,6 @@ typeorm@^0.3.16:
     uuid "^9.0.0"
     yargs "^17.6.2"
 
-unique-filename@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea"
-  integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==
-  dependencies:
-    unique-slug "^4.0.0"
-
-unique-slug@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-4.0.0.tgz#6bae6bb16be91351badd24cdce741f892a6532e3"
-  integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==
-  dependencies:
-    imurmurhash "^0.1.4"
-
 util-deprecate@^1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
@@ -1672,20 +1033,6 @@ uuid@^9.0.0:
   resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"
   integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
 
-which@^2.0.1, which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
-  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
-  dependencies:
-    string-width "^1.0.2 || 2 || 3 || 4"
-
 winston-transport@^4.5.0:
   version "4.5.0"
   resolved "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"
@@ -1712,15 +1059,6 @@ winston@^3.6.0:
     triple-beam "^1.3.0"
     winston-transport "^4.5.0"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
@@ -1730,15 +1068,6 @@ wrap-ansi@^7.0.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
-  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
-  dependencies:
-    ansi-styles "^6.1.0"
-    string-width "^5.0.1"
-    strip-ansi "^7.0.1"
-
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
diff --git a/src/main/background-processes/sync-engine.ts b/src/main/background-processes/sync-engine.ts
index 55846cf3a..4fcaf3977 100644
--- a/src/main/background-processes/sync-engine.ts
+++ b/src/main/background-processes/sync-engine.ts
@@ -1,7 +1,9 @@
 import Logger from 'electron-log';
 import eventBus from '../event-bus';
 import { getRootVirtualDrive } from '../virutal-root-folder/service';
-import fuse from '@cocalc/fuse-native';
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+// const fuse = require('@cocalc/fuse-native');
+const fuse = require('@gcas/fuse');
 
 let _fuse: {
   unmount(arg0: (err: any) => void): unknown;
@@ -14,7 +16,17 @@ function spawnSyncEngineWorker() {
       if (path === '/') {
         cb(0, { mode: 16877, size: 0 });
       } else if (path === '/hello.txt') {
-        cb(0, { mode: 33188, size: 12 });
+        Logger.debug('HELLO');
+        return process.nextTick(cb, 0, {
+          mtime: new Date(),
+          atime: new Date(),
+          ctime: new Date(),
+          nlink: 1,
+          size: 12,
+          mode: 33188,
+          uid: process.getuid ? process.getuid() : 0,
+          gid: process.getgid ? process.getgid() : 0,
+        });
       } else {
         cb(fuse.ENOENT);
       }
@@ -35,33 +47,30 @@ function spawnSyncEngineWorker() {
     },
     read: (
       path: string,
-      fd,
-      buf,
-      len,
-      pos,
+      fd: any,
+      buf: Buffer,
+      len: number,
+      pos: number,
       cb: (code: number, params?: any) => void
     ) => {
+      Logger.debug(path, fd, buf, len, pos);
       if (path !== '/hello.txt') {
-        return cb(fuse.ENOENT);
+        return process.nextTick(cb, fuse.ENOENT);
       }
+      const str = 'hello world\n'.slice(pos);
 
-      const data = Buffer.from('Hello, FUSE!');
+      if (!str) return process.nextTick(cb, 0);
+      buf.write(str);
 
-      if (pos >= data.length) {
-        return cb(0);
-      }
-
-      const slice = data.slice(pos, pos + len);
-      slice.copy(buf);
-      cb(slice.length);
-    },
-    release: function (
-      readPath: string,
-      fd: number,
-      cb: (status: number) => void
-    ): void {
-      throw new Error('Function not implemented.');
+      return process.nextTick(cb, str.length);
     },
+    // release: function (
+    //   readPath: string,
+    //   fd: number,
+    //   cb: (status: number) => void
+    // ): void {
+    //   throw new Error('Function not implemented.');
+    // },
   };
 
   const root = getRootVirtualDrive();
@@ -73,21 +82,26 @@ function spawnSyncEngineWorker() {
     mkdir: true,
     force: true,
   });
+
   _fuse.mount((err: any) => {
     if (err) {
       Logger.error(`FUSE mount error: ${err}`);
     }
   });
 
-  fuse.isConfigured((isConfigured: boolean) => {
-    Logger.info(`FUSE is configured: ${isConfigured}`);
+  // fuse.isConfigured((err: Error | null, isConfigured: boolean) => {
+  //   if (err) {
+  //     Logger.error('FUSE ERROR: ', err);
+  //   }
 
-    if (!isConfigured) {
-      fuse.configure((...params: any[]) => {
-        Logger.debug(`FUSE configure cb params: ${{ params }}`);
-      });
-    }
-  });
+  //   Logger.info(`FUSE is configured: ${isConfigured}`);
+
+  //   if (!isConfigured) {
+  //     fuse.configure((...params: any[]) => {
+  //       Logger.debug(`FUSE configure cb params: ${{ params }}`);
+  //     });
+  //   }
+  // });
 }
 
 export async function stopSyncEngineWatcher() {
diff --git a/yarn.lock b/yarn.lock
index 40a09d2d6..f345e2aa5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1126,20 +1126,21 @@
     glob "^7.1.6"
     minimatch "^3.0.4"
 
-"@electron/get@^2.0.0":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e"
-  integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==
+"@electron/get@^1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
+  integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
   dependencies:
     debug "^4.1.1"
     env-paths "^2.2.0"
     fs-extra "^8.1.0"
-    got "^11.8.5"
+    got "^9.6.0"
     progress "^2.0.3"
     semver "^6.2.0"
     sumchecker "^3.0.1"
   optionalDependencies:
     global-agent "^3.0.0"
+    global-tunnel-ng "^2.7.1"
 
 "@electron/universal@1.2.1":
   version "1.2.1"
@@ -2089,6 +2090,11 @@
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718"
   integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==
 
+"@sindresorhus/is@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
+  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+
 "@sindresorhus/is@^4.0.0":
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
@@ -2219,6 +2225,13 @@
     "@svgr/plugin-jsx" "^6.5.1"
     "@svgr/plugin-svgo" "^6.5.1"
 
+"@szmarczak/http-timer@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
+  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+  dependencies:
+    defer-to-connect "^1.0.1"
+
 "@szmarczak/http-timer@^4.0.5":
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
@@ -2636,10 +2649,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.32.tgz#5b5becc5da76fc055b2a601c8a3adbf13891227e"
   integrity sha512-zpnXe4dEz6PrWz9u7dqyRoq9VxwCvoXRPy/ewhmMa1CgEyVmtL1NJPQ2MX+4pf97vetquVKkpiMx0MwI8pjNOw==
 
-"@types/node@^18.11.18":
-  version "18.16.17"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.17.tgz#d2512c03313db6329f7cb515fc8b508e658230c4"
-  integrity sha512-QAkjjRA1N7gPJeAP4WLXZtYv6+eMXFNviqktCDt4GLcmCugMr5BcRHfkOjCQzvCsnMp+L79a54zBkbw356xv9Q==
+"@types/node@^16.11.26":
+  version "16.18.59"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.59.tgz#4cdbd631be6d9be266a96fb17b5d0d7ad6bbe26c"
+  integrity sha512-PJ1w2cNeKUEdey4LiPra0ZuxZFOGvetswE8qHRriV/sUkL5Al4tTmPV9D2+Y/TPIxTHHgxTfRjZVKWhPw/ORhQ==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
@@ -2826,13 +2839,6 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/yauzl@^2.9.1":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599"
-  integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==
-  dependencies:
-    "@types/node" "*"
-
 "@typescript-eslint/eslint-plugin@^5.4.0", "@typescript-eslint/eslint-plugin@^5.51.0", "@typescript-eslint/eslint-plugin@^5.6.0", "@typescript-eslint/eslint-plugin@^5.8.1":
   version "5.59.11"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz#8d466aa21abea4c3f37129997b198d141f09e76f"
@@ -3917,6 +3923,19 @@ cacheable-lookup@^5.0.3:
   resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
   integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
 
+cacheable-request@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
+  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
+  dependencies:
+    clone-response "^1.0.2"
+    get-stream "^5.1.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^3.0.0"
+    lowercase-keys "^2.0.0"
+    normalize-url "^4.1.0"
+    responselike "^1.0.2"
+
 cacheable-request@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817"
@@ -4314,6 +4333,16 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
+concat-stream@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
 concurrently@^6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-6.5.1.tgz#4518c67f7ac680cf5c34d5adf399a2a2047edc8c"
@@ -4344,6 +4373,14 @@ conf@^10.2.0:
     pkg-up "^3.1.0"
     semver "^7.3.5"
 
+config-chain@^1.1.11:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
+  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
 confusing-browser-globals@^1.0.10:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
@@ -4658,7 +4695,7 @@ debounce@^1.2.1:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@2.6.9, debug@^2.6.8:
+debug@2.6.9, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -4707,6 +4744,13 @@ decode-uri-component@^0.2.2:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
   integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
+decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==
+  dependencies:
+    mimic-response "^1.0.0"
+
 decompress-response@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
@@ -4772,6 +4816,11 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
+defer-to-connect@^1.0.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
+  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+
 defer-to-connect@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
@@ -5071,6 +5120,11 @@ duplexer2@^0.1.2:
   dependencies:
     readable-stream "^2.0.2"
 
+duplexer3@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e"
+  integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==
+
 duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -5255,14 +5309,14 @@ electron-updater@^4.6.4:
     lodash.isequal "^4.5.0"
     semver "^7.3.5"
 
-electron@^25.8.1:
-  version "25.9.3"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-25.9.3.tgz#cdd53a30fb914adadcfbd34124237fb38b1c07d0"
-  integrity sha512-dacaHg/PuwVcFRgPDCM5j7UDzqGJWOsbBRdS5wPKLNS/ejPeccIjuNUT1cqcrpvCJKAFW8swHWg9kdizNSEDHQ==
+electron@19.1.9:
+  version "19.1.9"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.9.tgz#01995eea4014f7cdb2f616f5f3492d4ed6f5e4f0"
+  integrity sha512-XT5LkTzIHB+ZtD3dTmNnKjVBWrDWReCKt9G1uAFLz6uJMEVcIUiYO+fph5pLXETiBw/QZBx8egduMEfIccLx+g==
   dependencies:
-    "@electron/get" "^2.0.0"
-    "@types/node" "^18.11.18"
-    extract-zip "^2.0.1"
+    "@electron/get" "^1.14.1"
+    "@types/node" "^16.11.26"
+    extract-zip "^1.0.3"
 
 emittery@^0.8.1:
   version "0.8.1"
@@ -5289,7 +5343,7 @@ enabled@2.0.x:
   resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"
   integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==
 
-encodeurl@~1.0.2:
+encodeurl@^1.0.2, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
@@ -5968,16 +6022,15 @@ express@^4.17.3:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-extract-zip@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
-  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
+extract-zip@^1.0.3:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
+  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
   dependencies:
-    debug "^4.1.1"
-    get-stream "^5.1.0"
+    concat-stream "^1.6.2"
+    debug "^2.6.9"
+    mkdirp "^0.5.4"
     yauzl "^2.10.0"
-  optionalDependencies:
-    "@types/yauzl" "^2.9.1"
 
 extsprintf@^1.2.0:
   version "1.4.1"
@@ -6342,6 +6395,13 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
+get-stream@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
 get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
@@ -6428,6 +6488,16 @@ global-agent@^3.0.0:
     semver "^7.3.2"
     serialize-error "^7.0.1"
 
+global-tunnel-ng@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
+  integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==
+  dependencies:
+    encodeurl "^1.0.2"
+    lodash "^4.17.10"
+    npm-conf "^1.1.3"
+    tunnel "^0.0.6"
+
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -6497,7 +6567,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-got@^11.7.0, got@^11.8.5:
+got@^11.7.0:
   version "11.8.6"
   resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
   integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
@@ -6514,6 +6584,23 @@ got@^11.7.0, got@^11.8.5:
     p-cancelable "^2.0.0"
     responselike "^2.0.0"
 
+got@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
+  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
+  dependencies:
+    "@sindresorhus/is" "^0.14.0"
+    "@szmarczak/http-timer" "^1.1.2"
+    cacheable-request "^6.0.0"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^4.1.0"
+    lowercase-keys "^1.0.1"
+    mimic-response "^1.0.1"
+    p-cancelable "^1.0.0"
+    to-readable-stream "^1.0.0"
+    url-parse-lax "^3.0.0"
+
 graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
@@ -6923,6 +7010,11 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
+ini@^1.3.4:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
 internal-slot@^1.0.3, internal-slot@^1.0.4, internal-slot@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
@@ -7863,6 +7955,11 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
+json-buffer@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+  integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==
+
 json-buffer@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
@@ -7992,6 +8089,13 @@ keyboardevents-areequal@^0.2.1:
   resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194"
   integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==
 
+keyv@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
+  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
+  dependencies:
+    json-buffer "3.0.0"
+
 keyv@^4.0.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
@@ -8231,7 +8335,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
-lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
+lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -8297,6 +8401,11 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
+lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+
 lowercase-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
@@ -8515,7 +8624,7 @@ mimic-fn@^3.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74"
   integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==
 
-mimic-response@^1.0.0:
+mimic-response@^1.0.0, mimic-response@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
@@ -8648,7 +8757,7 @@ minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp@^0.5.1, mkdirp@^0.5.5:
+mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
@@ -8849,11 +8958,24 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
 
+normalize-url@^4.1.0:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
+  integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
+
 normalize-url@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
+npm-conf@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
+  integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
+  dependencies:
+    config-chain "^1.1.11"
+    pify "^3.0.0"
+
 npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -9052,6 +9174,11 @@ ora@^5.1.0:
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
 
+p-cancelable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
+  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+
 p-cancelable@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
@@ -9240,6 +9367,11 @@ pify@^2.3.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
+
 pirates@^4.0.1, pirates@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
@@ -9586,6 +9718,11 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
 
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==
+
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
@@ -9664,6 +9801,11 @@ prop-types@^15.6.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
+
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -9933,7 +10075,7 @@ read-pkg@^6.0.0:
     parse-json "^5.2.0"
     type-fest "^1.0.1"
 
-readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@~2.3.6:
+readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@~2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -10123,6 +10265,13 @@ resolve@^2.0.0-next.4:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+responselike@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==
+  dependencies:
+    lowercase-keys "^1.0.0"
+
 responselike@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
@@ -11139,6 +11288,11 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
+to-readable-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
+  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -11280,6 +11434,11 @@ tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
+tunnel@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -11348,6 +11507,11 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
+
 typescript@^4.5.2, typescript@^4.5.4:
   version "4.9.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
@@ -11460,6 +11624,13 @@ url-loader@^4.1.1:
     mime-types "^2.1.27"
     schema-utils "^3.0.0"
 
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==
+  dependencies:
+    prepend-http "^2.0.0"
+
 url-parse@^1.5.3:
   version "1.5.10"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"

From 76d6f7d5d8130140b73673661b871d63747fa479 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Fri, 27 Oct 2023 14:14:27 +0200
Subject: [PATCH 029/188] feat: rename file

---
 src/main/background-processes/sync-engine.ts | 57 +++++++++++++++-----
 1 file changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/main/background-processes/sync-engine.ts b/src/main/background-processes/sync-engine.ts
index 4fcaf3977..94793e51c 100644
--- a/src/main/background-processes/sync-engine.ts
+++ b/src/main/background-processes/sync-engine.ts
@@ -1,6 +1,9 @@
 import Logger from 'electron-log';
 import eventBus from '../event-bus';
 import { getRootVirtualDrive } from '../virutal-root-folder/service';
+import fs from 'fs';
+import { error } from 'console';
+import { resolve } from 'path';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 // const fuse = require('@cocalc/fuse-native');
 const fuse = require('@gcas/fuse');
@@ -10,30 +13,34 @@ let _fuse: {
   mount: (arg0: (err: any) => void) => void;
 };
 
+const files: Record<string, any> = {
+  '/hello.txt': {
+    mtime: new Date(),
+    atime: new Date(),
+    ctime: new Date(),
+    nlink: 1,
+    size: 12,
+    mode: 33188,
+    uid: 1234,
+    gid: 1234,
+  },
+};
+
 function spawnSyncEngineWorker() {
   const ops = {
     getattr: (path: string, cb: (code: number, params?: any) => void) => {
       if (path === '/') {
         cb(0, { mode: 16877, size: 0 });
-      } else if (path === '/hello.txt') {
-        Logger.debug('HELLO');
-        return process.nextTick(cb, 0, {
-          mtime: new Date(),
-          atime: new Date(),
-          ctime: new Date(),
-          nlink: 1,
-          size: 12,
-          mode: 33188,
-          uid: process.getuid ? process.getuid() : 0,
-          gid: process.getgid ? process.getgid() : 0,
-        });
+      } else if (files[path] !== undefined) {
+        return process.nextTick(cb, 0, files[path]);
       } else {
         cb(fuse.ENOENT);
       }
     },
     readdir: (path: string, cb: (code: number, params?: any) => void) => {
       if (path === '/') {
-        cb(0, ['.', '..', 'hello.txt']);
+        const filesNames = Object.keys(files).map((n) => n.split('/').join(''));
+        cb(0, ['.', '..', ...filesNames]);
       } else {
         cb(fuse.ENOENT);
       }
@@ -64,6 +71,30 @@ function spawnSyncEngineWorker() {
 
       return process.nextTick(cb, str.length);
     },
+    rename: async (src: string, dest: string, cb: any) => {
+      if (files[src] === undefined) {
+        return cb(fuse.ENOENT);
+      }
+
+      const srcFile = files[src];
+
+      const destFile = { ...srcFile };
+
+      delete files[src];
+      files[dest] = destFile;
+
+      await new Promise((resolve) => {
+        setTimeout(resolve, 100);
+      });
+
+      cb(0);
+      // fs.rename(src, dest, (error) => {
+      //   if (error) {
+      //     Logger.error('RENAME ERROR: ', error);
+      //     return cb(fuse.ENOENT);
+      //   }
+      // });
+    },
     // release: function (
     //   readPath: string,
     //   fd: number,

From 4ce3353a00c6ab4acdd928905f7510825ad00eec Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Fri, 27 Oct 2023 14:18:33 +0200
Subject: [PATCH 030/188] chore: refactor

---
 src/main/background-processes/sync-engine.ts | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/background-processes/sync-engine.ts b/src/main/background-processes/sync-engine.ts
index 94793e51c..c7d74e37d 100644
--- a/src/main/background-processes/sync-engine.ts
+++ b/src/main/background-processes/sync-engine.ts
@@ -46,11 +46,13 @@ function spawnSyncEngineWorker() {
       }
     },
     open: (path: string, flags, cb: (code: number, params?: any) => void) => {
-      if (path === '/hello.txt') {
-        cb(0, 123); // Use a unique file descriptor (123 in this example)
-      } else {
-        cb(fuse.ENOENT);
+      const file = files[path];
+
+      if (!file) {
+        return cb(fuse.ENOENT);
       }
+
+      cb(0, file.uid);
     },
     read: (
       path: string,
@@ -60,10 +62,12 @@ function spawnSyncEngineWorker() {
       pos: number,
       cb: (code: number, params?: any) => void
     ) => {
-      Logger.debug(path, fd, buf, len, pos);
-      if (path !== '/hello.txt') {
-        return process.nextTick(cb, fuse.ENOENT);
+      const file = files[path];
+
+      if (!file) {
+        return cb(fuse.ENOENT);
       }
+
       const str = 'hello world\n'.slice(pos);
 
       if (!str) return process.nextTick(cb, 0);

From 5661549c5413e819a7ea43a84eec835c8c5b914b Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Fri, 27 Oct 2023 14:35:13 +0200
Subject: [PATCH 031/188] feat: list and create folders

---
 src/main/background-processes/sync-engine.ts | 37 ++++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/main/background-processes/sync-engine.ts b/src/main/background-processes/sync-engine.ts
index c7d74e37d..386473994 100644
--- a/src/main/background-processes/sync-engine.ts
+++ b/src/main/background-processes/sync-engine.ts
@@ -4,6 +4,7 @@ import { getRootVirtualDrive } from '../virutal-root-folder/service';
 import fs from 'fs';
 import { error } from 'console';
 import { resolve } from 'path';
+import { PassThrough } from 'stream';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 // const fuse = require('@cocalc/fuse-native');
 const fuse = require('@gcas/fuse');
@@ -26,6 +27,19 @@ const files: Record<string, any> = {
   },
 };
 
+const folders: Record<string, any> = {
+  '/folder': {
+    uid: 12340,
+    gid: 12340,
+    mtime: new Date(),
+    atime: new Date(),
+    ctime: new Date(),
+    nlink: 1,
+    size: 12,
+    mode: 16877,
+  },
+};
+
 function spawnSyncEngineWorker() {
   const ops = {
     getattr: (path: string, cb: (code: number, params?: any) => void) => {
@@ -33,6 +47,8 @@ function spawnSyncEngineWorker() {
         cb(0, { mode: 16877, size: 0 });
       } else if (files[path] !== undefined) {
         return process.nextTick(cb, 0, files[path]);
+      } else if (folders[path]) {
+        return cb(0, folders[path]);
       } else {
         cb(fuse.ENOENT);
       }
@@ -40,7 +56,10 @@ function spawnSyncEngineWorker() {
     readdir: (path: string, cb: (code: number, params?: any) => void) => {
       if (path === '/') {
         const filesNames = Object.keys(files).map((n) => n.split('/').join(''));
-        cb(0, ['.', '..', ...filesNames]);
+        const foldersNames = Object.keys(folders).map((n) =>
+          n.split('/').join('')
+        );
+        cb(0, ['.', '..', ...filesNames, ...foldersNames]);
       } else {
         cb(fuse.ENOENT);
       }
@@ -92,12 +111,16 @@ function spawnSyncEngineWorker() {
       });
 
       cb(0);
-      // fs.rename(src, dest, (error) => {
-      //   if (error) {
-      //     Logger.error('RENAME ERROR: ', error);
-      //     return cb(fuse.ENOENT);
-      //   }
-      // });
+    },
+    create: async (path: string, mode: number, cb: any) => {},
+    mkdir: async (path: string, mode: number, cb: any) => {
+      folders[path] = {
+        uid: 123401,
+        gid: 123401,
+        mode: 16877,
+      };
+
+      cb(0);
     },
     // release: function (
     //   readPath: string,

From 471d17b596a7a77834cda9e4e2ebfc8874ea3a95 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Fri, 27 Oct 2023 17:37:20 +0200
Subject: [PATCH 032/188] prototype

---
 src/main/background-processes/sync-engine.ts | 268 ++++++++++++++-----
 1 file changed, 206 insertions(+), 62 deletions(-)

diff --git a/src/main/background-processes/sync-engine.ts b/src/main/background-processes/sync-engine.ts
index 386473994..670b2cdf4 100644
--- a/src/main/background-processes/sync-engine.ts
+++ b/src/main/background-processes/sync-engine.ts
@@ -1,52 +1,91 @@
 import Logger from 'electron-log';
 import eventBus from '../event-bus';
 import { getRootVirtualDrive } from '../virutal-root-folder/service';
-import fs from 'fs';
-import { error } from 'console';
-import { resolve } from 'path';
-import { PassThrough } from 'stream';
+import fs, { unlink } from 'fs';
+import _path from 'path';
+import { app } from 'electron';
+import path from 'path';
+
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 // const fuse = require('@cocalc/fuse-native');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const Chance = require('chance');
 
 let _fuse: {
   unmount(arg0: (err: any) => void): unknown;
   mount: (arg0: (err: any) => void) => void;
 };
 
-const files: Record<string, any> = {
-  '/hello.txt': {
-    mtime: new Date(),
-    atime: new Date(),
-    ctime: new Date(),
-    nlink: 1,
-    size: 12,
-    mode: 33188,
-    uid: 1234,
-    gid: 1234,
-  },
-};
+const temp = app.getPath('temp');
 
-const folders: Record<string, any> = {
-  '/folder': {
-    uid: 12340,
-    gid: 12340,
-    mtime: new Date(),
-    atime: new Date(),
-    ctime: new Date(),
-    nlink: 1,
-    size: 12,
-    mode: 16877,
-  },
-};
+const tempFolder = _path.join(temp, 'InternxtDrive');
+
+const files: Record<string, any> = {};
+
+const folders: Record<string, any> = {};
+
+const chance = new Chance();
+
+async function spawnSyncEngineWorker() {
+  await new Promise<void>((resolve) =>
+    fs.stat(tempFolder, (err) => {
+      if (err) {
+        fs.mkdirSync(tempFolder);
+      }
+      resolve();
+    })
+  );
+
+  const renameFile = async (src: string, dest: string) => {
+    const srcFile = files[src];
+
+    const destFile = { ...srcFile };
+
+    delete files[src];
+    files[dest] = destFile;
+
+    const oldPath = _path.join(tempFolder, src);
+    const newPath = _path.join(tempFolder, dest);
+
+    fs.renameSync(oldPath, newPath);
+  };
+
+  const renameFolder = async (src: string, dest: string) => {
+    const srcFolder = folders[src];
+
+    const destFolder = { ...srcFolder };
+
+    delete folders[src];
+    folders[dest] = destFolder;
+
+    const oldPath = _path.join(tempFolder, src);
+    const newPath = _path.join(tempFolder, dest);
+
+    fs.renameSync(oldPath, newPath);
+  };
 
-function spawnSyncEngineWorker() {
   const ops = {
     getattr: (path: string, cb: (code: number, params?: any) => void) => {
+      Logger.debug(`GETATTR ${path}`);
       if (path === '/') {
         cb(0, { mode: 16877, size: 0 });
       } else if (files[path] !== undefined) {
-        return process.nextTick(cb, 0, files[path]);
+        const file = files[path];
+
+        const getSize = () => {
+          try {
+            const { size } = fs.statSync(_path.join(tempFolder, path));
+            return size;
+          } catch {
+            return 0;
+          }
+        };
+
+        const size = getSize();
+
+        return process.nextTick(cb, 0, { ...file, size });
       } else if (folders[path]) {
         return cb(0, folders[path]);
       } else {
@@ -54,17 +93,45 @@ function spawnSyncEngineWorker() {
       }
     },
     readdir: (path: string, cb: (code: number, params?: any) => void) => {
+      Logger.debug(`READDIR ${path}`);
       if (path === '/') {
-        const filesNames = Object.keys(files).map((n) => n.split('/').join(''));
-        const foldersNames = Object.keys(folders).map((n) =>
-          n.split('/').join('')
-        );
+        const filesNames = Object.keys(files)
+          .filter((f) => {
+            return f.includes('f', 1);
+          })
+          .map((n) => n.split('/')[-1]);
+        const foldersNames = Object.keys(folders)
+          .filter((f) => !f.startsWith('/.Trash-'))
+          .map((n) => n.split('/').join(''));
         cb(0, ['.', '..', ...filesNames, ...foldersNames]);
       } else {
-        cb(fuse.ENOENT);
+        const isFolder = Object.keys(folders).includes(path);
+
+        if (!isFolder) {
+          return cb(fuse.ENOENT);
+        }
+
+        const filesNames = Object.keys(files)
+          .filter((f) => {
+            return f.includes(_path.dirname(path));
+          })
+          .map((f) => {
+            return _path.basename(f);
+          });
+
+        const foldersNames = Object.keys(folders)
+          .filter((f) => {
+            return f.includes(_path.dirname(path));
+          })
+          .map((f) => {
+            return _path.basename(f);
+          });
+
+        cb(0, ['.', '..', ...filesNames, ...foldersNames]);
       }
     },
     open: (path: string, flags, cb: (code: number, params?: any) => void) => {
+      Logger.debug(`OPEN ${path}`);
       const file = files[path];
 
       if (!file) {
@@ -81,54 +148,131 @@ function spawnSyncEngineWorker() {
       pos: number,
       cb: (code: number, params?: any) => void
     ) => {
-      const file = files[path];
+      Logger.debug(`READ ${path}`);
+      const fullPath = _path.join(tempFolder, path);
+      fs.readFile(fullPath, (err, data) => {
+        if (err) {
+          console.error(`Error reading file: ${err}`);
+          cb(fuse.ENOENT); // Indicate an error code, e.g., if the file doesn't exist
+          return;
+        }
 
-      if (!file) {
-        return cb(fuse.ENOENT);
-      }
+        // Convert the data to a Buffer
+        const dataBuffer = Buffer.from(data);
 
-      const str = 'hello world\n'.slice(pos);
+        // Determine the number of bytes to read based on the length and position
+        const bytesRead = Math.min(dataBuffer.length - pos, len);
 
-      if (!str) return process.nextTick(cb, 0);
-      buf.write(str);
+        // Copy the data to the provided buffer
+        dataBuffer.copy(buf, 0, pos, pos + bytesRead);
 
-      return process.nextTick(cb, str.length);
+        cb(bytesRead); // Indicate the number of bytes read
+      });
     },
     rename: async (src: string, dest: string, cb: any) => {
-      if (files[src] === undefined) {
-        return cb(fuse.ENOENT);
+      Logger.debug(`RENAME ${src} -> ${dest}`);
+      // ALSO HANDLES THE MOVE ACTION
+      if (files[src] !== undefined) {
+        await renameFile(src, dest);
+        cb(0);
+      }
+
+      if (folders[src] !== undefined) {
+        await renameFolder(src, dest);
+        cb(0);
       }
 
-      const srcFile = files[src];
+      return cb(fuse.ENOENT);
+    },
+    create: async (path: string, mode: number, cb: any) => {
+      Logger.debug(`CREATE ${path}`);
+      files[path] = {
+        uid: chance.integer({ min: 100 }),
+        gid: chance.integer({ min: 100 }),
+        mode: 33188,
+      };
+
+      cb(0);
+    },
+    write: (
+      path: string,
+      fd: string,
+      buffer: Buffer,
+      len: number,
+      pos: number,
+      cb: any
+    ) => {
+      Logger.debug(`WRITE ${path}`);
+      const fullPath = _path.join(tempFolder, path);
+      fs.open(fullPath, 'w', (err, fileDescriptor) => {
+        if (err) {
+          console.error(`Error opening file for writing: ${err}`);
+          cb(fuse.ENOENT); // Indicate an error code, e.g., if the file doesn't exist
+          return;
+        }
 
-      const destFile = { ...srcFile };
+        // Create a Buffer from the incoming data
+        const dataBuffer = Buffer.from(buffer.slice(0, len));
 
-      delete files[src];
-      files[dest] = destFile;
+        // Write data to the file at the specified position
+        fs.write(fileDescriptor, dataBuffer, 0, len, pos, (writeErr) => {
+          if (writeErr) {
+            console.error(`Error writing to file: ${writeErr}`);
+            cb(fuse.EIO); // Indicate an error code, e.g., EIO for I/O error
+          } else {
+            cb(len); // Indicate success by returning the number of bytes written
+          }
 
-      await new Promise((resolve) => {
-        setTimeout(resolve, 100);
+          // Close the file
+          fs.close(fileDescriptor, () => {
+            if (writeErr) {
+              console.error(`Error closing file: ${writeErr}`);
+            }
+          });
+        });
       });
-
-      cb(0);
     },
-    create: async (path: string, mode: number, cb: any) => {},
     mkdir: async (path: string, mode: number, cb: any) => {
+      Logger.debug(`MKDIR ${path}`);
       folders[path] = {
         uid: 123401,
         gid: 123401,
         mode: 16877,
       };
 
+      fs.mkdirSync(_path.join(tempFolder, path));
+
+      cb(0);
+    },
+    release: function (
+      readPath: string,
+      fd: number,
+      cb: (status: number) => void
+    ): void {
+      Logger.debug(`RELEASE ${readPath}`);
+      cb(0);
+    },
+    unlink: (path: string, cb: (code: number) => void) => {
+      Logger.debug(`UNLINK ${path}`);
+      delete files[path];
+
+      unlink(_path.join(tempFolder, path), (err) => {
+        if (err) {
+          Logger.error('ERROR DELETING FILE', err);
+          return cb(fuse.EIO);
+        }
+
+        cb(0);
+      });
+    },
+    rmdir: (path: string, cb: (code: number) => void) => {
+      Logger.debug(`RMDIR ${path}`);
+      delete folders[path];
+
+      fs.rmdirSync(_path.join(tempFolder, path));
+
       cb(0);
     },
-    // release: function (
-    //   readPath: string,
-    //   fd: number,
-    //   cb: (status: number) => void
-    // ): void {
-    //   throw new Error('Function not implemented.');
-    // },
   };
 
   const root = getRootVirtualDrive();
@@ -136,7 +280,7 @@ function spawnSyncEngineWorker() {
   Logger.debug('ROOT FOLDER: ', root);
 
   _fuse = new fuse(root, ops, {
-    debug: true,
+    debug: false,
     mkdir: true,
     force: true,
   });

From 629b7fa5eff47269e7856926ab380fd48a8485a4 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 2 Nov 2023 11:01:24 +0100
Subject: [PATCH 033/188] chore: version bump

---
 package.json             | 2 +-
 release/app/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5ba24a489..a1a5c0e5f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "author": "Internxt <hello@internxt.com>",
   "description": "Internxt Drive client UI",
   "license": "AGPL-3.0",
diff --git a/release/app/package.json b/release/app/package.json
index 7f31c2a10..b61502429 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Internxt Drive client UI",
   "main": "./dist/main/main.js",
   "author": "Internxt <hello@internxt.com>",

From ee1d771b55835253efa025301198be2258bc19c6 Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Tue, 7 Nov 2023 10:24:10 +0100
Subject: [PATCH 034/188] changed tray icons with white-filled new ones

---
 assets/tray/alert.png      | Bin 1745 -> 1504 bytes
 assets/tray/alert@2x.png   | Bin 4910 -> 3984 bytes
 assets/tray/alert@3x.png   | Bin 9304 -> 7059 bytes
 assets/tray/idle.png       | Bin 1656 -> 1432 bytes
 assets/tray/idle@2x.png    | Bin 4813 -> 3906 bytes
 assets/tray/idle@3x.png    | Bin 9442 -> 7050 bytes
 assets/tray/loading.png    | Bin 1399 -> 1171 bytes
 assets/tray/loading@2x.png | Bin 3520 -> 2778 bytes
 assets/tray/loading@3x.png | Bin 6703 -> 4910 bytes
 assets/tray/syncing.png    | Bin 1893 -> 1649 bytes
 assets/tray/syncing@2x.png | Bin 5222 -> 4277 bytes
 assets/tray/syncing@3x.png | Bin 9701 -> 7487 bytes
 12 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/tray/alert.png b/assets/tray/alert.png
index b2e12a6dbcb388a339a6f74ea463d6e73ada700a..eb3bb83e0a851709924f7d29932f438650e4368f 100644
GIT binary patch
delta 1487
zcmV;=1u**24d4rqBYy>_Nkl<Zcmb7{1C(Ul6@|b3#;%z-Y1B;Y&O(g(V|RD#bmzBi
z41U|j#I`+FY-6|-)x_v}J8zQr&N{s+{07hW?6c3k_pB0$*2vW@%5uUbPeU4!X@d+F
z2rwW60)qsuj~Lv%TOVswXs1i>M1Bi1iuJ(Gcvb}kfT^jD(SHXqO9i+dL<ATRvMB`s
zg~13EViLv(k*`5JRrXE<J`AANLoWq-V=iWVsL4PA$GNacnL+<KH1CBwfh-}1xO!YO
z4t!Xxhg{sIV4Y1HAOt(kv7-i2i8v<uO^}<+`@TnA{prukD*+cylz1&+Z=F$AB88CV
znJHDj<M>dBaDO3}AkM=|1U9R*<iTs!89D+SR+@evg8%R=m8I{U5J;-+`kBycL)2Ne
zY@mKwLjx_qjcwk&udA>Tljq-(#dFkJJP%`Pw0rM<8f?hQFl{Y<;JFS_VX0&r0Uv+c
zBu{zVavE-W^ES@B=u?eH%Ff+<$vCeWAEBWV%OeiD3V%(XBqptGEq=h+Hq$My%V2=v
zfo0nKk)x~Z=F;$j*WJOU9Xlg)FfV-8LwV;-uOst_&Xtv8zfpg+B2TpF{%4ec=*QF?
zHTfi6a`p>TX20P{FS?HXzx}fTwJLF&KYAQP150VR_`1(m|Gp4O^&M-pXvJw+K%T)a
zRH$@`kbgh%j>Gko$FCqtv33h*T<}o<Uvln?bkxL?34wcm%_E+6DS6rDb7Kn$K#P{2
zV)8zfzA(gm9IUe2`tcL1Qp}^_`LDUT3icbmv+*oyDp&qgxpOtU_WU}QU>@7p)Cg&&
z-6LCW5Cm%KynD|tx#-%@aOt^YG+c7di)qz@!hibeon5<sNlqXR0*q2XYvJ(m@g8AQ
zE>~bcpM3W*Jmv8Z1p3*u{U<#C)i<oC<Qpoq!O%?~j|fI_*~#N+;m|QAkvIEPtI#tv
zu#ByrIwMMvSbxDaA72fu=Ra`ewO?ret?aD?PYA4qgGZSfSJbAHchxM&hGPzSx-MP$
zGJg^$0@v_=uyE+;3FFav4kX{5oRGj}a~*e<ESgJV5_mI-MT19nkVg$In^qxq3U2^D
zOiclA2Hva%_dB#SCafk%{WJOv!vlBM_qJb5&1zs(WHoTu2>5EC)1)I5%NlE!#Of?q
z^Y8nnzI{Ll1pX&TA&&3wxRjxRyHjT~PJaYH<c%)NwKVTWIim~Y7^~}lm4N$9lo2=K
ziaKy`*2$xseR3?r#{k~|n0KGab|L?av^f*&F6A%co?K1<Z<&dEB9q3j35Eyno`Zj*
z{s(~Qt+Op5Y=Zz}RTxa;Vp{Mv*UX+b<0G1Puh&|n2SftRwLyIU%h#w9(O3IL_kVeP
zr?l6RzcsEuPpb(7aiI!Ro_N3k6H<vTWtTSS0B4;%P6|%WzSsNPSX3{P$g3$31__n6
zF{V&wCN5>;+@tLni=n}LaQ3M$BXhwO@9)y!au^d6&UyEMbS~^VCy*;BdGrAXx}a8`
zHO5hdPk(6T^x&7hmkTd{AA!7IMt>NbW`COZ^;sD%G>KxmGwreqED52henUg|<n8bJ
zqK(7S8*lprrKeid%qZz15y7MGU_-=8OAA{T7V2u=($NoD)YIFcI2+ji1EY+sSEV}?
z#kzQAOtY~m%?cC#2PG4lv+PADU|%h!uLW{r3RS^+;2;A1+%DTF&3fZ_T7Qx5DV8a-
zR*2SEYYu<?InV+uA-k^`0b#F<5ni5t<8_R}1;WP=15CG3=pRd2b6d{`%8u=IVZr}^
z&6|NqYKlUuY_E*y<e8768bBdk3!DI;d9CLF&|_*$WpOpoHjbT)>8m0-wrw$^7@ywZ
zJmHd+;CAi+afGg5b#C37vq<=vG^m(r(<?egZ?xRTv}5~rE+81A$b?{C(QEyoSBwcp
pZMTa;Et_vhY?xP+Zw9&~{to8TEdcBQXhr}4002ovPDHLkV1lhv);$0K

delta 1730
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
Y3nl&@+$$1BH~;_u07*qoM6N<$g10PDN&o-=

diff --git a/assets/tray/alert@2x.png b/assets/tray/alert@2x.png
index 5561e04c174b29fc169d6f7b28eb5752c36b2784..33fa7ece9cffb8348b35c426cf096559ecb7240b 100644
GIT binary patch
literal 3984
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

literal 4910
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

diff --git a/assets/tray/alert@3x.png b/assets/tray/alert@3x.png
index 37b9e637f57bc04e31e22bd2af51fffa615b859d..c8d7ea97c59ea3104c0a5ec64749840e35f156b6 100644
GIT binary patch
literal 7059
zcmV;E8*Jo>P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000|WNkl<Zcmbr8
z=W!fY5QO)?3ip-~$m=Xk2+TmtfXsjy5Z;?*1_*)503jd)A_F3WJ<VL#`>Jn?ORK8p
zxSpPwcPlhM`(L~4UbIiUH|^8+UD(^eUAyY;+h^TF#gk|6A0xju2rJp>?G+1URpXni
z_tXPV=*33vJsM@zp`}>;5zDXI6&Y&|(EOWE+MPS@W6oXFKLon=+0E;`J<$9NeynlT
zy=<4)x4C32--lg43FwftLh%@Y9zP$(`h{*|dC;fg!4K40A)kA60ci|%;ZbJ}F%}GS
zplUs~tLqQ#^5%7*`CfcG`9;^pLA!eN>vhorefk1RWem!4m{SkAr*O%QA!ehI(4)o-
za?A_Z4(_X_ABh@3AInSt3RZUn_aS=T2AXfhHxe)Ni+^A^k9(CiAd64^x~~{=EG8$t
zgnDZZ4GuP6d3FKR+;<)L^t#5^<_Y+|d-6ZV5Ar6^d<_<iq6^{rKz*X!*voa;z;(o`
zZFtp2y#(kLA6`H{i(giK#o-Iq7f>Jbd%zyb7r|$slR#5D;(K1$?v*d-KHWLID=}GK
zcKMeh(2T)@A=<LIxR<z~N4=<z+mn;!aC#P79FFn>>2==9YtljAG-Q1jaklk<@+;RQ
zkG5e@cTMcD2abJE5Al}2ediCb*S5=xhrl|ahfI6XZ{-$Y6=Sz+;@4id((zt=K;Lk#
z*DuNIaBAu^4)Xy(D>>|s_9ZtBc2kefGoJQF`{US;V1Z$IeqR>nYl99jzsA8`%L+rj
zLyM7*<<aU@Q!E|VCpIl%0^e)iZ}G@Zs*h^`V&83~7Ypw5!wxhK3xvt?yyJla?Z!V_
zw~3{E0b#{Jy;!d~qzMPm2M3;FX1eViz9;eA^j&98pXvave#AlE_LQBobMmq1>c_qf
zG!8l7^i5fut`o6v3igw*b@-N@Coed2`4jQ8*Xz>RXv$g)NBMwy6*G&uy=&Ha0p^Nt
zn%+a*cGM2c*WRYb?S5;$Lv{E8#Wn}n{Q1eNKvRK}h~|flfDpseo**nA3vc@Y$rD?h
z9yq2oAuq1Sli6wSar%){%;EUVV1LiEr_C4OX_k2Y=nm=*`lV$%*AMTp{cW!eG>N7<
z`SoiV5J#W%!&nb<>^zBEJPx>eJkJd^7Nfl}-}g#rpUL=K?W}(ECo^)~I)c%f`i^B6
z?AdFc>8hp=YjM06XcA3z%IqY*eu+6aZ~%sypD1xuKpd7M2NbIw)^qd@`Eaq{w=X+m
z>5)IHcNpJ%ICW2IrZwPiYr*CJ0)74S!&hZ?v<`^u7996!Cjzm!LiHzEOFKP^W9Z-1
z6pJ&#q6L^Kt4EuLWfpq|WZ?#ex47?`Y4xaz*~ztRN7n*#?-{-cVCUrR%uZehnkN5g
zXUDgNhdE4w9(yXgji?KHV0^`eymT^O@KyIY6UC92ub3QhTJ`%(cC9@D&0z+4ap8^K
z2M5b+V&5+;x`O7+#jB`Xvv+}}$$!fH@UiHiUiM%ui)df#0sQE-y!v989@X_`2k8?B
zhz*fHV0M6`m2*AS6!Sw1^r{Ezd!hwbwQ9YO-CWoEWa%|sH0>?zoj&ECq2`yr_g)ko
z-tz!kc3(9cA`6c=As!s8^!3OF`V52KeLa@zXf|{3wQGfDm@Ym&0G-e7O@4n%&vsxo
zHRI@RaeYQRJAB#fO!xm)Lka+fe=hcX3GDo{ui8MT#)-*4>M67IgC7{`WQ=dIqYUfA
z9mf0ELD1t+m!+Q>u5Z26QbRTAQ&a4_R%`jUO*HRLrh7r&lTi3&13gp@&RXP!h>LuO
z_3z`WZ{K|7>zo~Y*ZO>10@48N$ox?q=dugPyz2n!=t*a&={j4Qwzu)o_<OHwcK+G@
z5QHG_t_6{I$n6Q#5$y+@-mLO=5L`PdV&#RQ4)Y9gpz>&q?kOEO)*qn1@L1|8u9<o7
z=XQV&H^Om$I8TW9zotxg?=<Y4NZ?&heo%`Z=WW^lIjd?gy{#aqK9byr4;!=Hncam`
zhRZ-{A7hxAnVG6EGgFmx;iL>>x5}G;wUg1^cOd=WH{b5QH#-aRJr_eMFXh6n+j~uQ
z)TwtT++zvVLL7aXSm8-sE1|cjFP@<u7bf7D_PXQvTTqAfmhOo_PSk|P(mNXB{gQjq
z9G~ml&$2Z`_y8^di-CNoi02LDA|YZ}_17?N<W%eSURC|}`@dDoAC@EaT`x4<HhQR{
z2i$QMx8$XN3|6)OrM#<=zZ8r$h6vt8578Ga@BQxUtQ?;I20^k89|+cBI1cT+6wf7}
zJOMR`$%~$AJ@j`!{#qTp^`b?Z{1AZ0TF=lIe3^$I37Tzx7hnGxbfYF`k9s;kInLMK
zh~O6v`2GQ0bdKWi!xq3G;yEAC!C3Q{<Dmc62VZv_evXJ*QU?Q~H}iVRY35y$wA%i@
z`{7sS%e<_`9^5BS?&6Fe4`-@{-m`LO_M62`&!)j<89QbHOXr5zt#JGdFjydX>-JpP
z=_%TN+)b`0b)ts!X+Xm#r&qhv)06VFrfFS;>_#|l1Hy~_@;oaCX1*x~XRJgrK!2tx
z6A%L)&o;pi<#BK$R^H@=&$eE|+aG)l%@~M&#L|Olty1Rb_Vm2!^<)Nx)Bq<CG56;H
z-(#`tF)PvsD7kE4+8Bo&n1&S&eG7ge`T4*!&OK*{clPwlU$kDv<OR<zs7YvDi&!}q
zU-xRKr$_Z+Ss&m67wtlKB6ClhYN$3i8OXliWRY0I&jAP|!2kc;8hmoqpE3a4I6HXr
z`PTL+0)O4^%h-qXu;3p?v%j^wFYi<<<xxj>5j#l0T=imoPPgPS*4cGG!ndp(oJs+K
z1dSEOd&UCM2|u{PuTDDa{ti#kSIm!kt{*XLa3OD{oc4chPg5`NpHyAeBp7pEg>skG
zNl(yZm0)TKkd}@WyjKo2`<uLHIz2^CYk$6c`o1vuuxCv?-t{A^E?_ZFSzFyzsq;21
zL7w)`I`{zn6SDM)%7>T$%;SW92SmUJz+tXJmko|u*S148pPSy=U)n!KyDqJ@fVy_{
zT4UX=OVWS5?X=O$+TE8{rR$mOKz9??a?U@gyKzJ>%!&I&`|9ar6lh=^A~Gz`HKwm|
z4vyy<bV}ul=8-4eTDAQ>{nF>iSD5&yZ4W;AackW(#~*8Ga9OZR*5jNNX2h&KtK+-|
z_Xb<*;~d<~51Yto$MoFtJ_m)s=^HbkkQ~NKYCCSa`|Z}tI`NEqR7))u*;)@DEM^gC
zyl@`Qn*+_+=`TCKAj|tkYe6iVmdN{(1>DzrMKr2;&KGT*DgWS2^Xbq3=ax^=KfS!d
z_1V+fofoxz)=)d;U2OV~$l)>PcN;vfO+Nh5o-eyx$ZhOSbnyg@A~BYn>?m#SFh?C9
zK8mF#J7Rhte9xut*5N*_=Nx&`%~jjqO?SQJLyP8vPjq;C#vWylGGjVp|4aAocgP8A
z%4zOK&OJBo@E0)BBf!?E6uxvnF93>>;|=o;U>tYUWg`;bboX1Wmv`ieH=!RxZ)c4?
z(*Egr;v?^?o=q(KqMs0ZidiEEJ?QMzk#m`!wPHtE(L300J?nlIXL(=k6MlX`0<7}@
z_Zh=F$1P&@X+7_t4KvpEDN6j5H(RaUaY5A~H|1R@y?F031Fh~x&k}+k8oC2Lr%n4L
z=RfAn0yeVbc;hX~&CK&kUhwXC?c19$Ge=}mK(x%vyz6ixIA&&M6opBc;}eIO=0Fg(
znAMZ7yT2}dX+3#nyyIL>`l+z1tLlyW{|{vx7XxO!>RAGQ6!pWVkBv}T9;Lvu#B|oj
zFZ%WcJVnp+Zhzp}1w1`ZY7aVRq`F|%>%7F%E_R_lL1G17=XOyU8a8}EkZ3kGeb$cw
z#>(9Eanz?exg85#?0@dS2eZ35LtS5(iL!QfqW+p1u|E9*c4c?Ew6wEuo{186&ur@E
z#{tzD_mUHfQ)gVx0gF?Ts87B3YePRp!#+LJ@B4Z&M}oe8V=-OmPgk9@4^^Gnhn5id
zzJ>VHF^=9jpGeU$Ph~di>rMgcM2Qb@CI%r1^?6~TDAg|?i*+TBKCw#)KDYJO#o9k=
z-)6INDNm1e&fJV;tQ+slc7Pj@aeR=Os&nQn=KB`v%~i!Nsx`2A7objLk1i>v13pOF
zC~#T|GEP5WjJloCI)pK6O#O<0x809=`B&WZ!*p-wG=ANuXTuVK8x`S$Ea{wiID8Dw
zX*;yN=+0<6U6!%tlvjI6EOv@9K)cAJpFZZ&23kK+_&o2%Q}mViT#WMR!O(a{PR#(f
zn1m0D54;b55nY{2_oI7sVPL?8M(~AB_JB{x^poJ%d^>Y~$`AfbKAU4&M{0YkA@NUr
z?&?wP{~^!;?te}C5U0C&Zxto5UAQqUI{+t#hZGp&LFUocoO}sk98zGOo!1;YC$TGT
z{K2^_{-<CDxYv>R7lD~CwjGn|{1ZM%2L-?0<331|69Dxj1;lVB$%r>eB;VqeFX!rr
zc_5tq`LAAE$ntLnPI>)5#IX)$>gK(2M|1cKpb?$NGoCUnj!0awk5N~H^+jr4l%CQ)
ztjbS*_R3)vKR4Q6{pkN1@DU!0dr0$M?Bd{{nm!i5G9Yb<(FV|qSS#2@@bf(L^BG9S
z0CmkVosxt)Z1Q;TiW|Q_$nv}8TmS$3A&7I;^idD;vU_>(=)(fXxV!{%X^V`x$TMFH
zdF6+RFmAfkF7JVDHJ^Lw_k+Cm<BPed#eg5+2!`bX<A)&pFhSBD1W)R8lTy#O0_-8j
z1^oKIx5&%q(=c^-A9}c{nmY2+YU*e=^>d`0@2BYZTh*FFvt!f8W`H|aT)d=))>M?9
zO_XuZxS(eb^Bm7o;!HqdLi966-ua2IFV3^Wr8lP!pRJ}3KW+U|${h6DydJvxyEyYu
z_&>0~Ed+jm!ze~zQ_^p`PYqg5Yy^auHASD-TC8K|$2g$Y)0|xEmDm0`+U0Zct<^^^
zs-_Rkab{1M=O|}mOy-R7Ltf7=^h3C6>QK6H^`Tri<1;yjabAiT{W^fwFu%s>k8!!j
z>X9pM_-?;n|Iq*6&e-&!87#1i`l%Pf`?W{KdKEmeoq+7WX}q&<9JoPnt*L|FE?Rxi
z11WC4AYlizF~lTKVs*%%^=H@%o}RDvTmHqvzwrldO80OM(OWVX=k$!T$Fvv19Oh2v
z{*#}wJLq47t80iCQ9qzQ58GrQo(VRQMx<fFICGe1<g<8s{?YI0af8ypBGBJY<9+NG
zvc!Y3|Ll)_a}Ngn)FHJ#bDNU~W`Uazmz$^vZH0cy$^E`c7l@yi3OX2lmZvod2RzWb
z{Q7VA`}KE*Sw8A^S(|t64{+geo+#<l-h9fXkL0sbPwRNCMJ@tPQ5+7211Oecuz@cc
zE1GAHoRRa4(`IeW*SPxM@$oPBTmD0XFMnUBHMy_LyTLwh5;KsVQqwo{A*plDB8O6D
z7wPBwOK>RK13ZxRKz%c$M|gRni5T;2V9i6_|8BU@Uw-u;Bm4E^uAk;UDAC_uuX7e4
zMyWnf1%HM<J<~K>ps(598)c)tZw9y$e1N??fJ8!@MI_GRXvloL!0ZsCFUFXw*d4l<
z%dh{|$bS9R<ldV&OHUCW?<Z~g*}u$O2j`PIg`YJTv)sAy_P!2qies>z_8uP#QwqMK
ztn(wEc6nB7Q-XJX?2Fv-x&QjB_U?VH$vvJ}4|$dfWIue=X^Z4}p36DZ3FEn@*O@`e
z%{oBd)4(ZCo8SQy*o^~H9I^(@<=LV^)@V|aa)?2mo~MBu1l-j{Prc?U?Tb46<|}3Z
z65|=@!4IMh^sMOg(<eG%4yf9D_5znd!z>J$bW65_!7oKH+%9i^IZr8hMO<<?oWK0K
zZw~V7-#5te8{yaAPQ8@`Kfs-kG6PW`7oGg@#T-R^{CK+(IL{hp>&~h)b65X`nnP1e
zpfnqY*(@ae5yogU4#cNu9ZKfD<D;MFen<2C;DdM59Dp*xWxyBWqI-=q#u=smVs;|F
zy4{p#c53ajzy%xvJV0OvpZVF84Mcw`$UKXgFWA%}X{(%k>k-eVXC%*0V`9fX)a4z8
z1k#`Cj5BxT4sU(a$2<?6ew`ceJkClCk}>sJo%XJu02gp6u!GH_2yHfHO$Z+GREW92
zGe7B+^wYNUF?QQMKN{(Oyoj1V23{8up^tiy(lciT76;j{w&iL*C2Y<2QbTg&F3@Q2
zngRF#E4PP6Ef8&O)Z)@0ivr1~pC42GY{cT9S$|n?h=11gfBUy}LVviE{noH*dzuH5
zODq-|{2`A%!n4#V%}<}?k+kG=H*`qq4dzv=w%-h#i^&WMzOix}eR4t2nGZ>SabEKD
zT=uo!auEMt&)>P*(Y*hymD|_p-6my*Y=b<5`gsPj%vVWW{PeLV{m>)jP896@r@*;b
zglKauX_$J(*GQl9t&t+1;OY6{Fw37C==qu0dUNihF|jq>2N}^mHD*1Tu71vf*`c#0
z&nKUpQCZAOpVSXEA!Cj4&bo0I8UQS+#iTijiA}VT(l1RxKYV)V|251{2YdgwKFxc%
zMC#@<d@I@XZ{boIqqI0^#2l%k_W;X@P?ws)rq142A5>F2KHwTFw|1ETwxr@LWQP@P
zAjT<imbNr&HT^q2e5!nUM)v;!;f}f3?~2Xn1Csp+)=Lr7-qo*pGRKx)iwma>|2$|7
ztxKwj&HLg9XiRLDBtl<HE<s)_$U)VgngJH4oohe(6m~i6&;MtCeh9dJun+cy`#|WM
zx(Cv;=(Gi`;TvX0ct`T9PxAqO2%EgzOSy@0-ko~9*kMWCoNTNJMa0$y)DLKTYn-5N
zx)dBbb%!5z`7ginx89rHd-NgT`q5mmsb@oq-UO7Xw-BR@d7OngSx+`~IVZaACFRR~
z8rM5LcdPX;cK9Or09F9bT0AA20zv9vj8WQGfBT0{Ead6I|Gl`q*P7V;5ODJl|6kC?
zijB6wpeHt&Zv8E%&HkaAjJ?w?v6_shnx-?ZI%D;{fV4w?fQ?;iMw*2l8`cXOLQ|zS
zs7*pH<mq_~XF{#k@=Xr{*AMG$`G&L@0z3M&PswE-V}+DFp4niwNvWYbC~C7O*&Xvx
z^CE{O{WK@h$x9&hFl<P*>9Zz*Gz<=%x~;d6r|0b-JeHbYzTsQI_2azd8|Ip+?;a&s
zk3Pf(>>GZuIjiQ{4p4)-u%3(6x>*7_E9Xqtn$3xgXB`&xG@F$RsLO#S(YRj3m}jl9
zL_9rz8~*7zb(_z3oVQ}*Pl4-4b7FlroT;NJGWNG@oiB34X8$&4eV*D%bG{gB@&3pg
zmTz3=pgf!pSpjVp)HQOR_?s-OO?+(T3wXzG#X@iC9X@#r{u*xehfl#aZVNX2h|{-a
z_f<LwYW}D7vOQ`eNW$>^IChr;i3Q*NCj>%}`L_8|1||cOft>+lz-2%P4uK3#8CV&N
z@11EscW;ecmQ4A_LwC>g$J@J-s+j*rq;+h+o4*Y2G+)U7F&Mi4VQ0~s7$2+pfST~R
zQ!VGQulMs@yYIt#j_zXS&Nx3x+XwTf(u5-Xi0?8(z{N2{Hjv-+iacU+O*D1bmh#`C
zNWVi%KA<&#yRrkj6ml;@?;YeozMr!vF_6Ra!N-a+qdg;k8+&lK6iMHJn|l+|3Nt~C
zZSu^za0gMcmT$OVYRacXq~9@&^I3mzYyED2D6W3Lf15=!3!RZ`b!fAP>v{NA$6T8i
zzTFFY_7N-Z?nR`u^RM}liHKsBpjdv3Eg={z?2aCYvgPVI3$6(E{s*_8MOueuEa}tl
z-(>fRgBn*K>opepxoC2<liyXlU(P+Rg<LV-eiA7Sql*_!u?rWvuP}rKo1rE?toOA%
zmhkf$TmId%NbArGeNwGvUFV{&(dy(v<a%D50cY&${g^=yeDC3PK96&LT2uL>MgL6`
z1M;s2fZg)|;=cH@q808vz+>vg_WsRMq;-^^s;IkeL07eY7PiJ2o!s|9?#HWaXIRx)
zJSwmBu=5&2qh%Oxo<%C8aIR-2fW|<aiw&;q9+9#}EY{@cjKw|2XSQN%-9N8qBCTcr
z>YFI~a<!qWT2ZX}hUKor0>A1c=AM1yF8nrDj^|Pfp@Vq5JQS&raJv2Lr5d_;hIpfu
zWyrT06C~&t<ghNZ)P3~xSj_D9`0+`kb(9ZM>GiWGy~D3@_#$>7R~FxExoi7ajonAS
zpM%X({nfKbfFnMBX#|9=gx}(#eJG1^=Vw^2i8)pi*6Ww!I3Gn?hjO2y?}tp^Zcn~q
z&ILM39CPst_|%}ATy_Z9fqZ(!J?vMz;L{KPceJ327A6!ZMno>YizLTtO`M1a5a-0L
zV4ukg^ZxpPh_sIKqK2}E&#d-RF}~QlG#~5vSYxlCKC-$CAB}rq>$&_c?wZ{%KZ)ev
zz-$<;7#xPTc%3b2WLr454*@KvJzt2l30vdYQJp!K{$=(>%pxv2UE3Hm=ftKzeCwf|
zFY-!{uuj?GQKS|e=ZS`m^}+Zih`Xi^f!r(R&S{ow=Hp*Hh_ngY<A;ax;Ei0cn3q#$
zbj_X9P0v^FrdA(#4&-iH&tLr~)cM81Y%B$>NXG|uKLsLkuw|PbE6Z=PFttDJl0`OQ
z7|*{(pYwwH$`Vfl`H(HI`h(SiX^S&r>!;Xr?RS3_51hkN=z|%Cb@8hYk2ALjbXanw
zpILjs%G;V=Jc_g_!}R=1Je;#a?qmzSqghz;Drm+h2clQzoLEr*Y7c+o7XXLd-q|aS
zdBa`nn<$oZfxblNf*a^d>@x@JU68h!NSo4)Cv)joM9))EZ6@xBL!)alpE~ogwv*L9
zZ}M%mz%aI^r;iN$pPe8c>K*7V{8h2O1U<0cgFH}7P529z+mvCP9rlycZ?&F2MmITe
z-|orhuB}_?^Ii5qq)pf;X_%bd_j_lHR<sLl{48tt(Bzo~Be#oMt@@umi}Z(Rm*e|>
zda?+8LbjV63w-siR_q?LhvM*yrOxtmANIMtXpuGrXEUa!Uqd{?5P%<|<r4#OWAOtX
zE`3=LYdIB`eGBm-ju(A-_<|Q9ayf$zA|@{j?w8W^xU+M1B+{Sa!NzP!yo9`z;U>_8
z#fvDmy=OtEGdynU;{{lr{S3XCVRts`caNXC-S@8|qe;HzyvNU5^)AlDQv1F1JF|yz
zoQ)#A6`VKo4=u2@bMjeBJWAxZUP$1gz(SorY+rI>OU7Mb=U!(I<a@t!{2<cbq&&=_
x>@%6&ce}GMg<*R9wV-dyLpPbt`PTg{{tF@ESCI%&cQ60|002ovPDHLkV1iRQNvi+=

literal 9304
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
GLSTY`=KFI1

diff --git a/assets/tray/idle.png b/assets/tray/idle.png
index 74515fd48396fda802b02762cbc0b0ddeef02e25..d31b7f2000d6da63340f224506ef3fae5a5d7e3e 100644
GIT binary patch
delta 1414
zcmV;11$p}T444a$BYy>7Nkl<ZcmbV}1C(po5{CCv)Je{{w$*&L-?eSqwr|^fwr$(P
zrLlEwd$DT%z0aw1O|piy*4KaGuiELv=<wg$;`{Gz+UgZI{l+V4KI#`YvtQgop>n2{
zyd<MQdjl0Zyt~ET`j21Iv=ndj2Sx}JP~7lYuekAwSJcQp@PCS$NOHl|uHV2wJmluZ
zP2v-*C#Q!0s9#Vw6&Q;NlIp2mQ5}1Q_2d=S!L0Lo$wSS}wGXiL#Aj!^wkjXO`1v*c
z{lc1~UO^2z3IlYWE~p_r*Q)VzdbMQ9+Lzf?zkjKZ4^Xu<onOfoFTaXZ9)i383euQc
zy!>iX9+DZ<)qk=p9-RmKnR`c!H>~_W>0#yU0jK#DRt1t=^Xjt-vb>51597Y%c*nkt
z4{+pYdRQr^hn7-$=n<zW5carucq?e(;?G%H$@a4R?1kPwAFSb$&@Z4bkn>6&>>M@e
zA%{3M<PfEX9AujV7!TW?tN;JtORVEd-?`s;Qb0UTv48WUUq8$`j-R?3%mjF#6zl|Q
z(t{6hYVdx608Fk&mg3Jg^0n)CS;zPV-@yDp=nMAet@{CIN6}{*N#<5H@{UOj+Dm{H
z0ttI6|B&^cUE$vED-{p-L4N$?71mMR_78n0M+K7_xSIf5be<fzi_(MkSatpXKky>!
z_|muU&428C={xu65kAainc)$ja=9%%lNzv-19or{gt^oty~0mb;itI6I>ycWG8dt*
z!+MH7T_v}2ZbM11wMq8h#vv5K3M{qfyUTyWIv#!Ul>2XW?14w$40Nl$r6H5-w}q4a
zHglk$zp9}MvikoAp5s>u%$|39dGI>zyUFh8`+qt2OtSAr*5n0HkZ*A6=oe_=#}DhD
zLjUe|mf4d#K<<)7zXK(c?6aPQyx!|5&uX7_K@GJvps=O{JiAMO!P&89`}ab>yMg2D
z*?O(YO@KS9#@yufUV~&UL&@cuKCYiVqpGGqaCX?9_E=3oRgK5j>YHq9lh<n%C3>wS
zD1T=`A&fbTuiztl`PJfMqswI1?PTuub~S-u*3;$gzDe|4PJk_v=k;6x;|f>Ddo0s)
z{MHxw)#BKRi`*lBqrUZOc~IlFN%UAsi5^P`%9?oh++JnlZ&=6w?t9vy;|pK^oAu`2
z({J=_@0&#TMXW$`vD0|>MFd#L|Ijwh4uA9<SFhh@9b=|falG3?%G~L;$mQ)U&ZvoZ
zTfhm>uJbLrCgfzlULBPUzv6h;`D8uFbAO5<tK^2h<5c!+ZQ@<$qL{~tuJbq!P-DR<
zNnTn1i&s8y{DSi)0>9(Y$B$<H6n_b3%9C}Q?7oS2nazN##zNKPe_%uISO5MEvVS9f
z8a=f%$2SH&bqn`rk<MdK6YD(VR=o2})}ZG=j<53q>!_&vnRqB3dW0{0?T^~(cDoN+
zj7KwfMM-u{tkblkfB-u>w&%m%w}vb0eo7T}KjDhnfbIhqvdrUI+HK%MvL5U(cAS3X
zGutqqE;|G=Ir^tetmBlw0uGpLA%9(4jRu+vyxD$uDcS)&+3BS320f+sm}uvTyP_Q?
za;(E7pcF&{C<dUqPm;@y^Xff+0zn=6mh(vNPugsZKh=-=<F5h+Fk2nRF+Wh(4|1|(
z`d(10zU*YF+E+L6&Z(F`w!gt26HSjB7xl(4Aggbku>rc59z&5VUkskOH-B~(Fb01d
z5pUG2s5k0lG(CzV>5&{sjU<~(4Qx(f9~#sEN1ab2d%3;Ts4H=A^h{tZ?vD`jKifZ=
z9<e!^8h-D)QX|eqQo}i#8i7TCTxy_lVYu`KiX?}V-Nmi*_`naMF7^G-`oIV;12;Bv
UE5C%+&;S4c07*qoM6N<$g4VF^v;Y7A

delta 1640
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

diff --git a/assets/tray/idle@2x.png b/assets/tray/idle@2x.png
index 3c29290fe09cf808aa38ce0dac64deb2ac22c9f2..e9c2dbd36ce8e2da89a5dc0dc7b60eb993476ec3 100644
GIT binary patch
literal 3906
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
Qn*aa+07*qoM6N<$f*1n#1^@s6

literal 4813
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

diff --git a/assets/tray/idle@3x.png b/assets/tray/idle@3x.png
index ef9c3dcf71f3965f5c7c6f328d05ceb7cf99d0c3..e0fcb2f0830983240f414befe051f95c86ef4484 100644
GIT binary patch
literal 7050
zcmV;58+GJ~P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000|NNkl<Zcmb@H
zHIO9f5rykQmSC!C<chV}aD3;8$q_TNtn<XnygPg|Jz`62iJ6&YiDhcpJ+kEerB{E(
zcl&B8I!4`h6Y)0b<;%>!XL^fA`csc4x79aK-c#SaJ(2yq@T+<}`D=a4<PuoCW%~i;
zn;ypa+bQBeH74F_>xp`cMehx(+%_8O6`wk>YKp^08z_!B<e0y8f9(G79e>rFU#b2r
zVN&0+_3rj|p?D;it4YVapdM|0zFktwC)s9E$cJEs%Huv#SRp?W{a}(U4;pp(@C9nJ
zXtf`Zz+BTs%V+TL9%Dg22l(I~sK=Y%sz+Pz7K&N%|C4W<)H>*NJo;u+<pl)!0b5Ej
zs75<-^pLxmyyd3hX6i9J9#u2QG0*p+jvux7kh})a!ZOq0y4aiZewXx%`GKM+ZYmzl
zpL)FU0tsL0Eik&b2_K73eKUa`huCsiPnKSCXxQP&XZS7-YUY~`e0sYYyUc@!&+hOq
z>H~R?Q0#_X2@>5Fc%amx&UT}b6*d(|E%UIdR|388;k5`Y7T-X>K_`Pg;^<?30_;H^
zEuVo7xv;S#zUPU(7oS<Nw?NI_sT^%i+HVe_m<9`asH@@nUqd_)kGjs|CURlzaC(Lv
z4oBI6-fO(E*Fpz<a%fbx3!IJ~VE))O$)nxpV;#(5t^<z!LS52ZK7Gay;7nbQ)-MT-
z5D%H{dg|ncvcy8a7JPc)pkuxG4*GV?_4)?+I2xZm<M@1sYvnoYuNYl&9X>tXdGOd9
z?TgbsgnpuEZmLIXf31dVjUf&&pIF=mi|>2`i;~y!@Hjl;&~g2~9`j20Ufa=6JZ&fX
zr)dD<{%#KPSfDq(d1X;392Nx1;p#RI)S}M*YE!oug&#ne9H19#H3OQ?@qXtxueO<H
zlcTdI@xb(5XF#9#bhz;$_VT``>;OObSl?Cg7lgv$fw2CbYPiz0(88@?DrFhov4fT;
z&LI3U__^2WP3UAlEU|GSFVIUpW-&LpCi4X520tt@J;dmv$y{0XHodsrw5SI^`|yQ`
zZ4U7HgO%3`1;EK)J!-y`1p*r0+GT{p#~QEmfcO@BogSg5ReFBdjmv{8i5PC1i<raB
zhs*w+XRrP(@R%Jue{=_RgZIn#o%zLkpnB@cqENIba3u7;b{T_?UQWF@Kg<$24uH2C
z;Kt)wuBS1a+N=5O1!A9)xR2O5`q9@t<os3#m{y~2DJ(lnlQ%+_TK@0{OXq~5MgAv#
z`<E{XS<JwJeK6Gg9P20{I4oy55HbDBp6m2FA1-#*eSK$a20911!}-<^hdrs;9^^n@
zE5Ff$@mIiKz`+Zz7n%$a%^H?cYs(B`dII>RYS|vRkV-gtIK9Csv8Dx>iOmNbXf3mB
z&p}wY8Pu@mn<o6GWClCAmhb3VVBkIdHv#Ni3JV98-X|1A`%gVM|K+w2#q%v89{WJp
zE>s8kf$@dR_q?p~6@JuX4!MYxrzi8t5i<`SGuf3MfjP_|50|)iAAo~pw#BxeEV>}a
zgWv(UW`83TMe)Y3K1R-iRUDMUo@>HBESjjp346iv(WhbYsIGVLoP1(x^a16?W46H2
z<V-JWH{$FE=%okidzu!UT*F!)J<jd+VbL&MG{Ywc_knV_^~B<F`_J87#o>tu=-RVU
z>kR4eA|}`6xQ)fs<M7^o5A$`D>*U$YF+X+%F~fAtXErdM{@&zUeb=)ce0J1~!`<=W
z7-w+)B}H}M%$uS?0tSW?d+hm2SlE9yQFk5UoZFv!w1|B1Gh7E<e2W1!ulIMD-p39B
z9*}yr$@lKx*xxH_P?J72V&4@@UYZ{+7WSW6Di53yS!jjiR~hk8d9Z5A2NYNMfPNOi
zmyH;oe9T!e{|5RoJD~yCk@?egoXakNozMYZ4?T4Hnx@myw7rcli|(h|58(T9L_XaF
zf~<TZ4n*BV(+*C;qGt!8$MR@KKCn}Vc@7;&9{nkMq65eK(cpvCqtH{irt;l>_y8Th
z5sv#i=ApI!%nu7WzmH+3Z224~@;ho0>F_#sVW0Zc+uHF9C(X;=@j2o1NoW9g`8&-T
z&*r95I{m$Jj(PTAj>!40&w2G{@*JBtbtj-6X1ad=jrLLB<(=r!UBbT#1%E(5HXjs6
z5uX$>9+a3GekIUrJ<a%qo6Um{{kNI*M~`FkLl4ccogK2Rn9D6;;c1siYG(gY-xj+7
zM`DI7phiA+w|BAIt`$mLiNwi39MsyxaelNoicch2cpabt4ln(1=A*A%f1r8tol844
z?Sl{^_IWAqCExC0|ExLd&+^BA$vb3SZfBm~4~KX2-2i;*ReS&^uZHM}8{+b@3oZ64
zRxQ^99$Ozh0sP<o`Qm)Xs~0fK=HvslTVfs@K;MeAX8t9(_5l5UFSFQzw}R(2a(sBf
zbuH~)lzWd~?Js>?haHa?C?_Q4V^FrniCoTSE5IAS;NH2uik|(dPlX<HY=-TbTHpuZ
z<k@q5^{CHhCZ7xXZv!VRFka}{I~L`h<5w5<9!q63H~6wmDYS7wvGR@>)Y^#Q5<Bnk
zg&)lP2*3OD#jMF3d}7-nG0S(6o%5^b7cmb_(4P@J5Har;U`P2_-?4bYo?}-^9y{Y`
zvN-IXqmAeM!-2nG{ZH6)w9QA)zQ_yddq4a4%#U&S{10}{1U@$rJ7@W0znJT*$Mn%=
zzQ6<eTlC(<?mn8(FeKil5Fs8|HXbcNUdWG}ee%k6`EcDok}||4_vG8prCGm<TK@R?
zYwRKTZvKnW-EZ{#^|@xL4;^kJPP~Wi%CV5|WFL6Mb~`{1e*1sGkyZpm192CLI&lZ4
zgKu2;&0FvJ(i~q!|Diuy{MbEwz=Ql&J+uF{eXl|93C}!?F1h|3zqemAf4WYwu;*|i
zB)1?)y?8nhCPwp_UEcTS`YQTfXTNxSd>-s@w)Y(R>bxH^x*%~+DN7Dp+Pyss;Q8)(
z4j;fX4^a>fHF3nD7AayuafU=>Gg^-K0()$FuxO{J+<r#iwfE2dRrI{oCbTkQHoFGW
z_<1Y(k9Q{RyvykMt4%4r|Iu0wK$fIg6wct5#%zq$SlhP8wrAQ{d&i!s?zL^(w!MM1
z?eL#_^1S;+-mbs4V)J#)i#Tz0F0<>8W+!ftZiCeB>~FpSk2(4r;?=!er*W{t*3uU?
z@K;3v_Dsj&<EYNADVA$K>f{%-Lx1o6$oHrLO19OzyzXsZ9bEUqt#8gXO3aF^`f&?%
z@7U$x3wy?}AD{hkC)aAinV}$ZOY*DOAtPX$bI6t=SSJU2f!fCQSA2Hxu}-?+mAO`y
zKIG7!K3F=QQQ7Q640|TWY-irW`-5iYkj<llK6XgpV@e9v;niT!lo$L|n>hUCcYLP)
z{Qo@gDf*A|RF@vEzxsZc4}R9vTX|P_|8z)ZbzNqL!##o@vCY=gE#X#kf~ea)L7Tfo
zjx4zuDZfz+?1MKKaV0mE9EVRXx}`xMq;vEXy`UZX+y3&;xNolcy0?z;^lW((GsYgw
zop+gk_J|d1^5M+6P4+t%zWxF>nb65Vn-E90Uqu9pC5{Is7Ql8a)n$-m>nZxo;Nv~&
zr0v~2rJL=dEpHtD^t|;eo{QajndU?nxD&gQ;~DZ@sMGt=k>+rtW*0j)7R!;|hEL?s
zLHMTy=h*J^vEd1p)I~><x9s*$D?^_m@s;=VcJ+Oq-;R;1yvy<|o;~k?%(uxt0X{X-
z4U!+}8vUI><HHymO4gA=e3a~$9X<wu6Fg#oT<qM-@=+&k8{;YZRJ-lvpC04sc|)Ed
z?`cdQv_XfeXU5L49eoS#49K(HSQ!ciKFG4{;-S}<8G#tU_Q%P-q=Rib=&k+Rt`A0U
zc9?H2?G&=!Jt6z+8m?c(eJkoVqob{tbDgE^78@PE60#1rB#w)tlTV(I;^g%;mfh|t
zL!Y9-PtWq(KXuL?2ELN#WQS^YVp(Qgb*lV)Q(>35pFY4k2Q3Zs1wbLo<fj=m(Ba|3
zu4VhE6K}b-?yuUj^hbg?j({IKa}Mm|yTn25BY%FbfDZaQHX~(ihhjOhRX}zSiR15M
z=;Y)&fP5Cs{`sM|y)5?eFTe2v(HF2|H4i(64Mx7+kIZ*VHPQ{aOTHO)<75C1TvM{W
zi;Jy^n1Bt>z>m*dY<&2QIldCT^%OnH&&6UsJ<OJ7DYA|E=K*W_*{Z#IX;7>0QRTv?
zU*iVCw58yoE^UP}BI7sgPy9aT0P{PvfLvm^PO6Q+<eK+>)K%?b{Z`%kS<GG1{9y}e
zSD=|~E5<H)XKbWvVjI{2_dp8xn;A9eAg3MJ8GMkC_zH1@;s$X`0M8O`RX@cpzv2Bm
zeSFn$O^&I4$dYv1I=Xd9fjH8zzw+6phwId_+{<+?vA>a`go}$LfY72Ndnl%yku(Yt
zWPV>a_$jY~bIoz?x4-wxop^fw)b~Gd&Rp)n-1wP|S<~FuiC@pntrECFs-0^zG@7yV
zVo;DSXb`W#$C#%Ei)0DUHa*}{3wf_cUeS*GTY0Z%um`>Rc_lpuv!z(tw}5KCWRp9!
z9Nn_?cAqyBHnQmmHkM!1K?xV7VQjldAETM<9vv4BL)exi)}m()Ix^s1GhXsyJtOZM
zeEe-M`?z~nwG)`1UU1VrdfNc@TPFtaQDYu1w$V&4zpw}#yJZ;p1U2{ZfVkLMifdl@
zro^j0j6fVc+3lP@?n}+jeBsAqJwHoVZ|Y~EA9|AJ7_#fRxJCA}cOhSPu^;sF(;FZ6
zaK1jk1zI)^=nr8;@sPIvFO)!~Bk6%XWq5|n1Nzth-geyI_LqLF-ldiqEr@v*K)%hw
z_aZj6?1C&E>pnm`4@9yof{BtD#qs}{dwxMDHyU?vtb+YU3s&CqsqN1G9(mk#c?R{#
z`x)sVlJy>*jeEe)xtR;<`UZ0l;{%+pCWf6M@uL^%MG}si3g*QC_)4lpokIQ$gQR+y
z6Se$|?CkGn-BYx3J^S^urMW_KbnEb#&EU|)m#12pZ@@{ubYp5Y)632qHC%dL6h03W
z04L(n)G_>dA@Z$Par#;IefoMMTz>s~+Qs^9d+A5>e6BAYuv5js*UyFDe4)=bhdp#l
zIF8{<e0nxh%g!xPR3G775pB=)byBuqKgUxn@$lDxPu=-*m}TWXpWH6qkEiIG1!qe$
zamYNQ?_!MRB<6#r`LhK5jRbVi_^6S99?e2OC;N(Qq~RRfhV973*Cv$I10En(PtPCQ
z#s2;57k_M*tXSL6H+QZ)KQnqq+l5){`H@22Kl73wP`~L8>>~$kXW&OJIlD+kL;Uff
z>N=$ZK6t5S=Beg6?Pb@!YtfINpQ1b$dX~(VZDvdU((iw^Y-CjnaI<RXMhESZRm@Tc
zHj0o7(=6=Zq#W|`Q<vKK0rBi#agVL-t^IrCu~&EfK)V3)KRDY-Pn^u1w`QsDKrMfO
zvs%MWbnM*7@e+W`@r_Bvf)`wL^IUhj{$S{SCWiceF1|20XUS2QFc&k7=4D52VBI^_
zHy~c;7;q*dMxD4R`9&Y#OeaVd5Vi?9PVs3a<D1++{9$*o@HqxIp->A<%D(KnceX=+
z_k7s1+D9CF<>0*8mwdRT_jKOP^W(D}vbP1#8@djeV&0qkSVva%$ZsfG!3EDKZWt1H
z(2%v?eC$5As@>}=@4k8P5nub}&nnloebC`g(UtDK01C)H^lYbF^g9cD6x*6LbGShx
zqKqE0Rp4|N5M11x8ktLOp$@h=Ap>y0SWnN2yKO4WyZ=!awSWElzlZ;?=*WxNK}Xv0
z1{~0F?98e41;PH<)NV!xJiQeP#|+y<Ne_r_d%x2Peo69?iC4u-s_p#Cu6;*4^moC!
zmsCAZIP0b|w9b1!_%&v&_R)OY#GDL#<bduj)WDZ{)7%g&IlcP}I4zD9vbT$3E+83x
zgP3*Vf_*hoog@YQE8aN#>3P#<+@BelQ?mW^=YKG`-ic@3<ayFg=^loA;fI^z+|0;z
z@FhMsE`t5d<bJ271VQ#>U}T$UX*>LixA0O7pKa@kVQ0DIhzrWlr>Enuxa)>8<vLZ*
zqFDR4flrb6dWtS!u7b=xvY)-fCtjW*ajH92b*wid!YOKGS+GX~7}gU?$1^{;wxv@8
z8Gg9rJ2v~`503Hlyx8;6i`uTa@2KC_XTElD-S_Azaz49P(*4kLKX#V{^1~s<P4Fi)
zllz`rR7?REYi(O%6Q`kd4<KYdH9YK`I@XCl;^^lOy^)@m@Atjad_rM9^|USS;QIP-
z>?jG`r=Sx{cgnt!IL1V9Vm84(^ML*WG_-@3piJz05<U~*Oa)&Of1jUp;@J51Km1%h
zC4U%tA3Z(ms29DXmn5Lqio2{Ue;xW1{q5gfUOTs5)yF-!4Zi9|2D&%}9uhPv)+Y3c
zg6txogHlNWzVdUd(q~`%fx*YW?Ao`nR8<o&$HYFC?Pb@zb*#U#RImTgqnaSiF)zwO
zF>;am04EkfM;1ZS#C<|KCYfT%#z#)&PjUA+f9(r~-o$?`^ze*<iG4<MPfFrvX8L~n
zyFVTN6g~ab%-#3#Ztmq7=o`J^xUY5YCTTn6FdsD=DZdVfZ~{aXI-v+A*I)q0Eu9O$
zZ$Qnm;x22(dwTACDK(kP{c?SwpEu3@h$lXWGQ*xC&6;~m30a>=u`G9-$+F}aH_9KP
zk>ghr`y5X&!9F$Yec~0%y)Cm}jZZL$V^jMzZ~WxoW6Zwj{T?{_QLoUGegIycd-lce
zALA+dp8KYqtN!>v=6jBGt1RvB=Pr#LzYvNK4)%7D-X`uswgEOxTi{{$KCW~)Z_V~H
z`04ri@7pDZoz+rT(qN7>Gl+g^W?}!s&Mc}m{3&|IE8`yz;Ar(-($VP;s(G0cy_wwm
zSbc!wik*8Or{KIONmruKNeWqa3|VM&)SWLG>*+av?Kb+*6U^UFetNPC`oo{_>@l9A
zf9d(V#QmaPVGimG)qT)&{~h!+t7Lot6OL`An{3FQ*sHT0E4CBDMiwJ%awNxkdS0s>
z=Aj-l`T)6a#IZA9^9$zaDSF@Vr|5Ivb3Q!{*~og|i1jm6H;ov%ziOm>UrIXgF)Dsc
zv1Fm}OJ*CN`HqE7t@GB*w&OfKN8RZn>e7q8*j@k*b7aXJ*!vxNdi&SE{d@RR^t4yF
zhd|vtN7b7f7{Rx0f2IGjncVA`FHY=rw1$OzbQ?N$adD%Hmo6?ztWZlw)YCKk?LB|Z
zY{@;c%%JyV<_Kx-YUbllzq*X^6ls?WmG6UAcfn>xV)%T!D&}~R@5_3Ej(&?A4oq4C
zk@kF|A<m9|$=f9Vq+l+(aQ6pp(mQ^O4tjHY{-rnTui=(*{+iAPv$oGu9N!72U)k47
zHAi@2aZl_3Gq6~WgXGgkxT>YEW%LHjne~T1{+ZmzwV0>wZ<*ulP;(qR`U{N+FP<DF
zm>hc8Pxx;qWesIn5rpB3z58Z)wvIb_ip#hUnulmawi)i8k>P}p;SL#2iaQ|^H&jj6
zd|T%~cQyE4b=hClea}pByEWLUzUS-5iM~qIidMm|whl+5_F<LWi=XE}og;{DY2!|b
z;^ew~m%JZm=$@HoDEcN(HSNyzTkWCiW19u_cV;VfQePjsqmGZN`oOaE#Dzkavuorz
zExJJ5kr}cl6rF8QM~_i;q$lr}@<BS&x3B5%-ng{CW1XR#&9*z%-H({SLX~!Vs;xOR
zB9}j2)n>`0*`bl^h)Z5(vNQ8z&%XPS3oAWn$Q#5RnHjqDVWY0&y>zeL8_P|zcm70k
z{-$vInl=Y(#jt#(jXJk2KDBOhP1dcJOK3cN;s8@omwJIdd}l4F`LtK+rB7pWH}TQX
zyYVJipPzkyd;b8<)Xue+t57F}+-4)^fP4&H<wM!otb-r5sv$o8_*jAYl9#@9pRF@;
zPtl#)*w-OWj=P2*b;RplAor}bs~;Op<3HObYgh45W;cZazqqZeL@wf!l~VHtORs88
zjqP9tH98Zl*840+Pp*r(T^fZMsW0hRZ_QCJcd5Hl&wSYpUv^N6=s33;P2)d1b}WtT
zQU5kUOSq_6J6myBaK9MDYdyKN2t8G=Qo`~PYu|E?$HlT`7MFJGdQwvY-8r9~lC`{t
zGk4}(=tFb0?i^ao;*K#R$nO*yzcpuF(KnjLe;gBhBt%?%zulysJ1EhEUt={-F2}H`
zC+5&oEp*SK22Gur&jItYj`)yzbgs@Xed;9-d9T&`jK*m=>{;JyLch0@r5L&d7LP~S
zjK?r)%2rM8^&0BNO9d_b{q>?3OJ;qwu@61Wi9RRI#ODrPD|4~L$#>m1&q$V?#*$-~
zrQiCK#j}jY@gJBPFJ0HSqTYCsCLtE@&e2EhVy1W>%SB$bQjNqreABF2Nt?K9Q^%~R
zE2&ocM8_=qvokqnrT3vO#oR{y!i`3=MLi^}`I*{mi0vC(F5>A-F87%xv6?rZT-FdR
zwd8_B?LrJnAhp;ceVlu72f0`6le-H=dS5Y`3<m<IT(PU2EPQPP7!qftxa~Qk`QmKW
zlXK9Z{*bz%r@g7Z=8_*+t!lB);ZStG?nqAi4(A@@#qWowtnD(IOm?6hEu3dfKeyv~
zYfhLTc9e56lo+-`55xm?=wb5*c3VNuNIFgty^{B*hgg~?8Yx!7Qiq@KYg+8*ke~a7
z|NBCAl(Tx{`LC<U9GC6s*@(s5H}J{T`neMM;&B1p6k|?5v{hec?bj#fXLKXRJ~FRV
zm`jdXkz+2Fz7&J+Eq1=qbRhvro_67seS{Z!quEVi>~J<eBDtWnX0^v+73xC+n>DDT
zm!7U2#?+;Ftv6D<=8~n~@*TTD*32^%?R`!E?I_&|p&iWLWXt|h7fx`wnIh+6Hsu4U
z(_SIPYrpn_&y#wcr+pI7=hDmPVLl&FGhp_=7T;$yhl0bQ@V|!saOVDYIQwUBI2{i>
zQy1fG45n=n`~Y7p=L#2^sdgwfYUqo2>_g1p%r5AVE7Y<Nb@WP&-dTJ9vHhOhw(HW9
zjplIRaM%r}T|Z?D-PR7L-?oAFrKkT(6t``B2)CMdT029|i!c5D0mw_Q_K`;?`=*mE
z3}OcLPV7Cnve2J<><vyBOn+*2-_(xz(~agx;BYhyhci2Ev1^Pwdc!N9Jz;R=r*?_2
zY@t6KUE0}-Io9LUbIny!JokBwv!S`<JH*Xq{lbh?V-zR$@)~^OPx~l;n8vs5VETjJ
oVCE&u-)USswSD#sqd8js2Tqmt?f#g1&j0`b07*qoM6N<$f|2)wl>h($

literal 9442
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

diff --git a/assets/tray/loading.png b/assets/tray/loading.png
index 8b1d0c3f974e1ca3f0cec48cc08014390cc2a36f..b58c1b1f0133e66b3f186c17f5de319173bdd669 100644
GIT binary patch
delta 1151
zcmV-_1c3YZ3X=(tBYy;1Nkl<ZcmcJS1#IL<5Jg**cr3^13oSFvd1jfJnVFe+w9MVP
zk(WZp%*@OuI0nHnGc%)juS!#Kx~6A&*V5CkuK&BbV=oHxX+G#W$L~<p>zoeNvt);=
zluTCXhz>PW^B!NL+7xxDNy+wAi)5mvlk8L@MXm>o=7ovM9e*-eq0cIbid1p?$~Ze5
z8!|YgWl*7H5)=sts!tf6r<t}NT>@W;Joiva1_$)f@PiN(IdGDMuopR?vipUJgFEn(
z3z-Nz`SG*{z(A!s9s-~UT_EyExfd!_>fwHK4$U`uP<!$8AR*)DE%M{#S^}UHrkeC<
zNVboyiL{c(%74Sz!f&Tjep{`x05hW<hSV^i59H1^?Qy`$=bj6I;@QG)yH97>L&|yX
zmCy8%BS#`Gx#6Xw=5M*@HJ1J2tKWErqfmw48V0rA1r4Azfy1ev98#hG_~Sn|c+9-3
z(1#oWxjAcYLXVLgRDqrW<&87p0z33^P&?8OSwC6hE`Q}w2J0`r`Hf}53!ch3&&yg1
zzvVV42&@T@`W~&Hd+8JYDXx32Hm9JrE@;iAbu^oR3vAJ~ctF-#)%Jn`q5Uc5T%wcE
zH+zu5o;}M@Lg89?%~RTIzDbiJ5CjFX>mB9yvBTbY=NtHGe__3Ckbx|bg8k8Ks!dXO
zfepHj6o0Y7P|kBNeME=ZfXDMqH>g~*3H0y+>mYanP%h}B`KKV@O@OygQJ$+kCqj5l
z*XW4GsK>@_yhiQNcUc!$wdsbOS$hUQPk4=2!2$p!Xnpj4SoM%~0q9wK+{P=6HP(DK
z0vA}OT>t{aGKT4+2EBIBp*Fonlt(jMK9{ZChJRE8!fm)j8$c5vlX}YZzxe8>qh0{L
zhQT^MFMBqhso(;OG~$s))JNr{tN3rj=U#YEKl9Ritas5>PtZJTrpk4eaO*G75e<p@
zHbIX~)=wOV9`eT@|FHh3DIx5cr|da40)jfj98??Zm(8(WeOPf1_7!HJwm(JNWqc;q
z2!HNDs3+XAS!ALDWrmWMuDHuO0EVC+@y1)9@lSEZBjjO@&jVHD;RR-B2QZWo@3PK%
z_0Y@YOX_l?Ch6=P^vcP%=i^>n3%7LoZntcjc1!AT5URiUg1`Fop*yfoKIfv#vi{os
z;s;&7^#VAsZf^EjBEM)#$|;!y=9COYlYg{Jb-dFmIPf+`{g(64(=Oo{iXLV{Bj01t
zCh~1!B~v#Er+CtQr)Yw9;b2e#YPJTSd9W^te8sX+kFu0I3QI(+Xks6yXq+a<FxC?F
zWSCI9Pa)jnb7RF5d*Xixomk<R9gZBM0WeX|KCz-Po1~m11wQ$u!`nD=l+N=<fp~dF
zfte#zUao%8=s=iHo;NzkFBrbb@khX>VTi^$dkv}_<^z(H_gNkF3Wn|Qibf_xu1Cs2
zGUgBK<rEBEnqM$%Yo0$uI|vQ}WouRgR7V-idzl{2atenncjT}^_{q&P{|5}*hl=UO
Rqg((0002ovPDHLkV1k^>JM{nn

delta 1381
zcmV-r1)BPk3HJ(+BYyx1a7bBm000XU000XU0RWnu7ytkO0drDELIAGL9O(c600d`2
zO+f$vv5yP<VFdsH1q?|<K~#7Fl~+A%97Pm<Z|-anDpxc#OF{1z3UU^T1O)^u3K9qj
zTu@NN_!L>uIkE0e#5oy+&Jc+d6b>|?0J22^NCDkdq=cHrOMj7u>L@IcJMTQ+?9R`d
z*>e=%X|%I5Z@%~c-YkOn_4fZ*I(K~h9w~L62$umU13-v>1bz+eYi%!nB0|oyoL|2J
z1>?>KFXZloM<3jN&_XN@2yqF{@*}9r_}Cxjq@lfa<;6oUz^yNSe*?8X2sDgKc2myh
z=qP}Bjf}n^&3{tTp#_n0lV07r^3ov=?mWn#C`LqVZmcr`0e2=v-8pd>BXME!-|XbM
zCd_6nLgVX-IM7!bxp`#?N^}ORGdXX2D@13_8&z*%AC?xHYNH9L-<6P-yaKRhs5Geu
z7+I;ErmRTN+@2?t_8=hya6HoaCXm%$f;sifgD?+v(SK&fuA(IR{qYH_Fo|M-bS6b`
zwy_jhQxXIPMbH#_t<%0Rb|kkx|80Y5hQU`Tps~HR-n#2(2X{spO!ZMk6NIpmnIoAB
zrXkC;dY1k+Po?&I!;w$Tt@W4pSj#a;ARY?z;q~>EyC4lR)uReei(%g_A4Mbt@S`Fu
z|7@YB8h<BU2@D0UG0lVwT{&PvMWZcA2Dk6?8J&4W93JS1m-3nmt(_&%5*3;@2E+R;
z2i|F~<e-Z_x-**k<(gwY9A#8c&+Ivj(m_-WDU^2s38~ziv{=J}U2zax(SBu*Igc4Q
z-)djjbL)nNa5_ryJSI8oYHI;rAmJm5{G=-l%71mr7V+uG6-26yq*vtHBA)A(fgRzw
zdF*1dhC9QbL_(#tFZmg3Bd%<>Umefe9t?kOF`E&jCBtJ=gk_c#NWVvsnhYN_6uCk$
z=YZ4uGLvL{)o@)FL@DUf!<h(D5EB<gwg?N|Q~(V{mv=LnRWwhSDD5>gt4IZ3qeItn
z)ql>``A}0$R{RS!35vgsK}#%hmN!D!bA}IM&AX~BuVjPG=XJG4W$6vkThZx!`|4}G
zl>has7kk`S{&cm0tQD~gWbH9LwjIiug(!?l+QfG*22>pNkv6DTnRX)mOi6u73!h4Z
z3|!V~irrCy6<lyubI0(bPYzmUxc738sDBT&$~wpYQ6+?VQEJ^m&XkmIZ(i!f8q>ZR
zGAnLuu5wYL@oBX`<)eb%r64+Rv4_+QBh&AE`a_qrsr5Q*O!bD`Ys^fqfC<$4i!DYJ
zVogz62MjTWptFALcRIoJgW&<!dfjtcA?ohV$M=@KD=ON4O=GBHiy*{>LJ*xw<bNxM
zXTE*ya!+blOlKoX&N1~+(%jg*WctHc;`#uG5Rj%993#{>TqjdS5u1MZyDpgT1*cIE
zx^;8++t?MwN$Cnql#9CL&E0Q~_&qC6B;OSL$f^36ux+2$8u%dtEP*Uq;Z`)^*8EvX
zZ+~3eF7jhJ+%YX}c@!U-E7@N>sec5JSy$cO`2Gi7FO=ER5s{txwIxpv4nqWVL|bm>
z>;n81PP-M!KJWxN4UcO;={e(yLf=!xqeow|BPWnltQzBVO@PyBOk{COg+qF{fa*up
z>#a@LWpDeN3d!5cX<9n7+CZAaETnMNPcXsMq}!d&Te)v>{lV9l*&pV*{a!4=*?#Fq
za{OfkGK9>0f{n)e+t=Rt9w7PL>kan#LjhmsID3;L`FW;(CIYueB?H@Y<-Tjhk#JZF
n^ADmr(z^JCX0T_h?)Lu&6lJE~fb7QQ00000NkvXXu0mjflc$PJ

diff --git a/assets/tray/loading@2x.png b/assets/tray/loading@2x.png
index fe53822d48bf054bbb2d21f27c8aa26543de28ea..2c58b8e7735d9281c33432cd33557d1b7e5adca7 100644
GIT binary patch
delta 2771
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
Z{{W^_OkV~a(-Z&z002ovPDHLkV1iG1k)Hqn

delta 3519
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

diff --git a/assets/tray/loading@3x.png b/assets/tray/loading@3x.png
index 5738d01797cafc1bcabfb76e8258a4f7f8e7cc18..7729e9662ee2c1272e6e7f414e2e0d872a2223b1 100644
GIT binary patch
literal 4910
zcmV+}6VdF6P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000v8Nkl<Zc-qCA
zZ)n}udB@L2tACNMu4Fqk#(2Rbjv~vho4B59(xOO?qd2ys#EGkUA<Gg^(_G^ziefa+
z^Y6N<qIrsKJR?FG#gtG&31bu!$_OC@Q%VVYF-jPFQHm*hQN{>)G4?V$=jdF0?)`o5
zJ-O#6nH0Wyp7Z?qK7Y==$4H@Ot^eEf&E?JIJ=ga1@4h~^Vb`_s@~&$y^?m*7RC)Kc
z=_>lZetpi$ieM;zzGC6+S*^d{`_Uc9ku$lR;gy;Jxt!izSLa;s{md}6!Ogb&`b7Wk
zt7GMz*Y>#CEzDX_D9JATzVfa&$6b?tX}hn~EWs@i$bx~y)p3xc`P2|zE(kvoE<Fo3
zP@BIbC*2PEc3+)v7h+*j(Q@E@!#6w1LrcTGyWaFmk3brgVG_>iv2k!wt@Yk=jolvh
z8}pC*EljIuDae1~cV3y+!b>@+{@~*h6w0UE8D~L8T%0c+r}0_?d%V`0f6X^yjo*O&
z!K-7AJPwvr3~;PFe|isvYH>;QTC)FExR=AiGy?}kN8iw!Q)?P#a4F+_xy2mf)K(mD
zXm9CA=x68Bw0%L!76t$gz%Sn=x<Vd<NCv=8Q|Q*`hZGK$K@Pb<c&J<JSE(QmkVAhZ
zTSxoj!eVuFSLm@zP=opW5Bi2KPx)lv8$bsXMHin+1|n8;c$@1bc$(w`nIXEk$T>QD
zW4^w@%Tqi@kte8saB*xUY0(26LhR1Q8IT9yXu_>Fttr4KIoJcYE>L6CuX%i9E@zP$
zb*6_dk6V~paB$f94|{TiO^d|i?mkL|^1l3@HVj>U$ih^CVxJy+3DX2GkO=TmwCLiM
z3ti5ofyK<B*2g&kcWo~6RO0X5`S)|~DUv71I=|r?0Di#w^Fnoan#GR|yXcNXxq)(N
z9qI$@#F9&n_QGr}_M<yuH`w9TS#~ZwW?>xMkMQY#V_FJE06C4gv$uIW5*y$Qutnkv
zgI<tYqvRp+5|dC*^uC>M%x(SF)lLgz+>idjHwMdfi<?IVl#mwKDMp_2hk_Zg)~`N^
zK|07Vd~4tY^n@e^n=X~Um{DdDt^np?28lxt+~5C(g)#0&`Ju&Ua5|tvfL>|>zn~yl
zuJY1^*ra9&2|pkngo_ftKz$13iS(?q;m^wl=l|To7*nbIVeh~X=2je+B8_>!^Z6wN
zNfVMUG4K+Pw4ev_u?Zh`&N3{(Pp;U}=|`8Zc`}E@<ofO%nE#tCk5szM#s@1~7&3q}
zq}X!{lNj<iqdTB$4bH;N2Y}kz2R7oAABmqD)GF<m&xE7Ze)+)2P91OW1B=`3`~Ur&
zI7C9|lfqf;Syk6Oa*3~4h&{3h<s+9K!kIYfQx>RmwBXa)_M*HbFMmd2?;rTV0n@wV
z;%I5WEyRNXSybkvj|n#C^JgW_$b%2Pb{OHdfEPP;n$-^d2b~z;ZE(^HxzyuKU24KD
zJ)!ITa8bMOflE)BzJbcg+Qvk0;46pac@URdyazUx9emi!*x-jpmZ`lcScurMQImS;
z;=`t#e4yZv9puh^4_^9H)BE7XS5^!c2@Gd|j{@YB(Q9+Ep^<BqBQM@eh44sUxpR3S
zNbC(4`snyuslB)y*@5CB^|dxJx~K2?3!p$0S-nIrH;Ek@xl;M;v;V7n{`u!gIP$_x
z;Zq$*4+7r{H4<R+;7LZj=bjyZH)BdWF1*_65a2?~#pmYVOCI{p?>?<;+q)qBNNx3H
z&3t$M>(k^u7O#KE0;NVF=moeRrTg7b0St+5{Xu3mKJ4}Jg4@6PZTj#xK7=FmAa&>g
zXb+a_gF+tyorPX>p|XqkIqWlh1GE5xsSl|>E(zPv$Wo!F=+R@#Qb%eyot{9j4Gk~B
znE;ok^HEo!z3CpcXJeIDOZT5A*y%fh40d!~J~rYw<DZ+qmAVA~%?W(;q{Hc%ISM^J
z3)eq@56HYpJ0qs9M`M4yx?-#*DAW&G_x<OyT01t)yY>DjsmpNxhQOVO#p{Kho*a+P
z$Ff1O7<&O2)*EwKw?(aO+ryWVpQ2A~{Lt{_)cP(bxz=Yb*P26T#zHWT3{U_GzQ7J5
z94AlzxWH5No8(?@|ME8lzHPTwIl8yo#l~yuyda*3p1XkU=xYaqcwTB0e2Q+#Qlw6h
zr_a5+4wnq>=8jBh`#BxP+APA^%IzLiUl<fyExZjK3AcTUD*WS^@)Uh%QESqR$I$R1
z+zIc#eR}9scHpqO4}5^Qa3-gEZrFEbAW@Jg=b$UNm_`!)@X5DQKc)Vg1BdkLYyae*
zKThVII``9Bj!frD-jV0=z$SjD8zuD4AZPP-7EBCroQb2ja4z5cD0x{EQ#ZBGP{S@V
zneQj>ek}9L+<MOZ5`(UB05tx98b{z06_5s?w-8G_wp{$SJs0fPKlv%Lc^9R|(03Lr
z*Z(9xJ%ctc@MOC5S!Avr@#uBC<U*pmFdP)!fWr6LVqVT<_0152F5F@}d~!MYQ@i}5
z+rsZY$>~qeJM;v!@0RSUYi!sbe)kQS3C@`SIoqUQ559)+_~cAnh|T$nJVl2mmK~q}
zAe^>~OwE7WKRvV6*+d4P%meT@w&^a}Cw5a>HCUk22!OzS`mr_556G~~u-><I_xaT4
z!^dykbHP46^F?x99=+?F%%C=MB#v`@m%y;7=`2Wxkcb}6NXU^A*Btn#y*xZ|qrg-2
zkwf~^Gy6`c&FmI+=jt5TbQjo}2e4BGJ2EB6Jvc{^`8aYI0&p4Jc)j0AP-K}!E{&Qp
zv)W1tdnw8Ji}z<(+*uaLSqTe)eDnZpMV_M6r^nT3x-6MrZ7K6+d44#lXCQSF9SKTR
z+crz2eu&{fSANfv=QuoZ{cc@=f97;P)kAOE_cmhLh0K6mcA@()9E6~$9bZH*4*N`e
zxbDkexb|MdCGp{k%ow!;jYl@CYhsBs=WJ)Ng)_D~dxoxg*p)9x`%KKO=Tqdls=bwT
zhU8__KT>ALru*@7^#UMraOa?BoRJYdV<3DEa5*R^^}&I|m)GqA1`k{me(Gz#EGiz0
z1T0!(*%P}mI8t%Ci4D6pk%omU@2$tvQ?!1Tl9yiNw2wDoX<3j8mJKw=HH%H-qkuze
z{`!;Ot>x)~i$1a8OX!o?y68E=K|Mfy)8bO%*h<`b<G|R$8lIjD3AIw^Q(u?YRmNZ-
znsTtZ1-78$qu5mDY(WwuIikZ812Ki3q8tD8L9V87({IG*=8N<fh1ORX76{}*wgQ$3
zIMXzKaz&4x!AHOR&tkuH4b4>Y^J#Cv7U@Imk$LechykX1>tw@4I=dD_CLqeu<uREx
zyXb{0x7P4yhYzR)T)pUrOLd@gwYsA)Cz1;QAT$XY`4z5sosV2^*F3nT&ftObEVLlT
zPF#UENcu--G1%SNOJcC2*TyP;d}b~n4HTsTv9*vNwXer7W0vE;D_e%9<23<uNUYA8
zKA-N-Ucjl9!<JLwwog@&Sp@qjlB#-$YfOw!aS9%4VGH`gm7lT5HR8sP-f!50&ZJO3
zy3Wfk@v+B7`w17|;DbEGh8+abP#Av%#Kdz3_s_Awb;8(lOVmj0F-UZLHJ2iO>`3vM
zphyCwFW2b)oK@}knl-JUM$=1m&&GN#pQmW>4E@oQo5P-Ue(cRZnCgqgy)0+bU0q~=
zb6{i1oN0=4@B=QW4z(9oE2%S|@bskrZt%XVlSk%zV3ynr^qKqMNep?he58Ys<fhBh
z#&fag!a+Px`{4d_cWwDRMVILz2KtN7wl&Ds`M7w#0WVd8tb*de*|XpWIlq%|1&I!y
zUQp`O<KjKipQ6(;gY*mNS^a8LdsdZP09=M7MRzOq&AtFWY+e!@=bXRtFUg<g{f92v
zPxNAer|4fpFVc_N^sHbP#J9*{aOBBe^ay%}&)Z{{L!RV<+L*z8v&l<*`=_^EFFt?S
zE;RiqTBMiaU}mK5&hLPE@!1PlIe4%<pR{tu2Dkvu6ad5nVnLB-WMJRSYW*!crtJT@
z;(ybhqJgRAeX+oro#g#3py8h2HV_lkoo@txzzZ2?iIJv(#?CLLKRuJvKNP-+m#!uA
z{Osrd=4OQlh&>MW5}7rF6T7KNR*5f<tZA&~G_?=zn<?`2<m!Tte(@j4d?#MM*0^8v
z_&zi)5-)vcMu~8uuRk{Lm@M}6?454f@4&w4<frIU8^2{>a*Z<=&$SnDvSQ&5$T*1O
zoQdyVYm4yR_~FlsJw3`rJuA;$e7nF?^zmvw(4C+&A2x+@sNYzkibEhnM`jif5$Dkn
z8i9ig5bl7nXXlfbblW~JQeS%Zuust^$^5hS;^1dq>M%d{7}$;Oix@)yq$`0FEKvLq
zh@S%3$+b_9{aeqS^uP5C>^%!-94@xVQzSJS&+9NDe%X;gcsz_F0}*0kGA9KzhD~9g
zp7j5|yRh^wjnk*{hYybRxt!EG?wbQQkUH@hb!VE3G&t`*CeOZA<gb`;fbb1P0`Tv@
z{%wJ$=*Mux`H7Ku@im3%y!XUw7*3FAb&E)G;#F$Q;NCL@pPn;t(HA!CS?G7wKQ?{|
zuGXI-+v{0sDA-FfeD8Vz-q-><HoC${4@mQI_$=Oj=fl)x*yrk&@*$-^;=ql!ZWViq
zv<_zle)@>)4A=|!?u<A#x`bwzAm<>TlUQrZoPF}la)GDk_m$1}zXZSb)T~~eZS!{i
z)RFiU$+F{1*ZnBi6&JAa#H$#evoeYhXW^wMa=J$#u9E`~7khdp&n^dkc*B``$Sm|i
zkIa&djaQ01MYi|T)X(wKgCHZmzDMRj+6#DoW|bT;7(R+<L)fu7S>);QIrIbI);jdl
zcsa|(o}$2+UnG*gh{F!(3F&rkx;7pEo;sg(U>E^0L9exEUiVMWjY3b)z{69*8|?!f
z8+|z4Jw^O(kbv0>Hv=Dt?%-bPcMt=x+Y2~8V{FnXpB&JEWDxP=Be$+Wzr;ItexEw9
zzqG(95>QL}iug{vuvqXZnvxn#>&ec5?)3Oyn9fbdPk3YhxR6_$L)M@uc4F%a?H``C
z@A!?%sWaCd++saWoegkjFR`6?ana^F9%@iidhv*#^%5s+4eBFn`pT?yy?WirL*o}&
zB>ljx2!3V&HMyIfeZ|;YII07VhqISbn0VqWaz64ndr1?-1v}^p;BxW7P3_tkodNiT
zaF#f9YBQtu2M0NgYiMunUps!(bZ&V1kEMXubugAF(0C+ZxOlGilfj2w`Ey+4W@0B_
zICRlX`eV*WeRPTId-~g^qx|e2b@U&@X>}*jy%b%Ek7cVqxIBW78gLV<{2GV7iB0NK
zpFR~jqd<4VToFWhOPh{7V9X<vU+w5SdOq*$LP}ynaq<(8z?l``*S-sKr0q=McJD60
zbZ$I0v3?6WQme~3^|IEpudc-SfUN0^$c*?_xsSeLVT}9Hw&CbN9jPMjE7JgH@`6oy
z^sK|d<#l-AEQE4&7G1Q?C3C0ju5-hYeHO;}A3L9KbI*_thm<8?U;9GJhlNL_+Egku
zUvuKR<k7R#Y;8}S{l{K2X80=>#@HVo?fp+ZQAduR19pkShLi;p(<DbhOoUVV$*Ovr
z)n$&bRH-kZR;*Wi;#X{V>Y#;jFssU@;cj~gv-QOxMG7)}F=!6Zdhn(3Y93so$Lpl`
zKn|ClgWd6KraWG@FdjkiXzPD^a3y(+<OFEmSPs~0WpRwf?VMw=u{_P!n9QQ(-nup(
z-fLm12ny&dk3AC#O5raDUw$8LrLionC+uxCw$8q>Kd~^iFk;wpw5z=|cDlZSNORtQ
zD05i9fe(GD7cH}hFP*2e{N%Lx+M#<aOdU9Yo}SSS?d8W`>nOWLgk?Bc@@Gqo?h#*}
z<a0(BK7WR@joM)_a?zC!cpJbbePWkha<fVt{nhkqcR9nmpF>at<??X3y>#d_%{a;O
z(HVwC5syxDvJCRD2{*vjh`*JkCxBYgt8!}X_R<s6ru0O=g#iEs0Q1OK+j^fk-c~xe
zQWz;qbiOJ&yd;NM?_&tgaF7e|i|zqG_A-3LdmYKba@<l|>Qa;1+T-Id@a!}ON(5b{
z(Qmf*9-8$<6#hbTx|8@FG>*$uPL@Qx>IpW^T0?tf7IYx9=WV@@pYP}!{kDbqB5;Vq
ze;Yb_M-R659(=v6G?H(cCc8&ivJRy2U%0f9=F22TE?wf0DL!IU*WBLG^X;XPC(XuV
zJr<@FptJ^m5uH7w-|FZY{j;{7(ewT?01NB(k|nPCf*qY4wN>*tqYIbt6Wde<-6MQ>
zgd5)oyx9M?y?gjCJ9`d3+TZ_V$-<<7Ljjnr&v&+UAAG2zdt{`oXXKfVo`aL^-6Mb1
z-t*Y&?e{$PI!yy>(}gjN2MY&q5yzQ${MeB|>QPe`-rjTYb&q>SrtOR`cXp3H=Vo@Z
g_w^m@wJ=5T|2`@+78g`PAOHXW07*qoM6N<$f)<PN@&Et;

literal 6703
zcmV+~8qnp5P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00009a7bBm001F4
z001F40Y#QEU;qFB0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH8N^9MK~#7FwOw6|
zUDs7!>)e?%p$~BZwGU7j3U5fn^r2D(6;7d`0;O@Gl~T3AmJm`4X*^0on8xm0lb;Fs
z8=F8Xpz633sg+w~R}fNuf{iEv!9$bM2M{1epp+CrnKp@WJaf-tpL6!lx7Ob0+<PYO
zO0MrYd#}Cz_u7Bw++li!@Zj(K-ND)J>>yA01`#<xLMuXifXQ8Zs9bsN%7}e|6bP{?
z=K;Jx!{e~~mPOhQ)tfRF*^!EOLb20nr()S5;T?Co?R0&1vOIa_SAOwL&(JFXrhUN1
zNB`!K`}%pF$xXs^V316&F@gnq@bEr!9JC#DT<}hzT_4|tp`+yjZHKtJC^Gxp+Asak
z85#)-J7Bu?#RIRpeEBw>)yIVSK$#STWpA0q$9tl2p}TME6}ru$JO^oRS0tzJ`rw;S
zH+^WKCW|1o5ns!eyIdJIC{b?wMR3OCpHjC#Izwev4x(Wh`>tt#etW;|?oTe#Bj!3_
z<G23$l>54^7s2-GLN8yq?bX7a*KS_fet8*M%zWzd%P*gtuHLxQhuX`gNjcYCx^%%I
z97LkU;0pDY>QJ!ou<*sQp`heB?Mt%tWlb6=pC@ZxzfDzj<Jt$_yj?;mHgEI&rAuF=
zHs#R#RGk@TK;u5=4H!+DIS3A>ea0?igwz)J7jY#HtFfKJ_XB#7HfhKm*XxAJ7P#pZ
zH<9lyR$8Va6eeQr$CnA!-97s<rc_TTlaRJ%pi}!Q@v0LcKLMWH$(6~_;t7<Qy0$F`
z9^S-aa9bk@*ebMRgYRWP+Qhki$k?oFvqH1I^Ba%<)oW;;10Hz%3!82Zd{77sql}o0
z5^tkHlku2H8L|7+*vQ{ExV}9lqcRl~%jBRIPb5fNkXaHQo3@=%YwtudMyx>wN^(M3
z2*SiSmk-Krpqe+yfa>^ez&+v^Z)p+dr)w$TVcpQsu_z!9d)-HOKfJI_>DrbNjUKz-
zwf4(zITvnX4`@=4`*$5Bv5c&beeZ6+En_Pzn{qO=i71<vi$xTmC5g9`WEGvh1FiO&
z44(o&du{ay*Y;l73i&3Sk8eEwrI?DM10Hzn3rD5NRVbK9WFlS?4ifo#xYbG(%3_-)
zWe7x-__SlZ7{@#yCP6MHzm^iklM6Di_n5?Vl<I?yk!FV(uM<})-bv5}Xj{IDC%K)2
z+0JTcUwI<z;{PMjWrF#VQkkcYgxlQ65{)R>J{miOf_Er{aHlxKK#RumZ6ZHWQI{Nn
z_(>*aOT+Tjfs|xT`~>w?x=;#8%H@vwLwU3h%ZH|qKK-rH0T2A<)9-Qv;&*e*JJ_&}
z156z3L>ovkB|jjAsDs=Q+7q<RdDPK?B4{iyiXSAAZs!<@gR0n^BNQEhGNIhW+VCR!
zT0CwSEH&A|S4|$kCZRmqN9g)%mUj<F2N3Pvgi$5nRW_d?uw7HvK^LX@bj0AMbcfO<
z<BOphQ(NS&ou%87O0AYoE}InVLcPY-_n}S2bW2O)?Af!EfBov~{>N2b9|bo83>mDi
zeyH6dPOvkad3a;%#@1ggy8wLs+Uu6zQ2paqUi-$*_$gKpQpyMg$*+2@PYOrHX&e_Q
zmiG20(Q?>yfxJoVykCDyu{>Rix-ZoyxpS-Fgv7`Q`m4;L?Rfpmmu7EVTAs)o!a%5$
z$=oeQK9>X2G)3d8ser_tUm-E6feF7L7bLo@m`0~tgCu^?F8i)=YNd1zc|D#VaH5xj
zkX2|4dm6Ewk)dhHN_>M;->~HVy`dexu%h{5C^G@x)j>tkK@pqmR53%e{aht~QVtU8
zkr5GW`?ko>>tK%98IE+kq0U+8i;}aY8J()@N;0vxMUY#n`g@n0i++HpWD{d`g;I7*
zv8?16p3_!(%FTVRj9KrcY*LVVg=t%GURE7DDD+gKL0MZF%(Rzl`ktl-yhfAnqr|4F
zq`cP1d3>9=J)EE{>-P=<tv-i_Ez<{9eui<X4Z&yJzdOB63T4tPoZQ}6k}c;^^td8q
z1J+9=^j%A&U`WAv%I7$Z;#c<g@O1U9J2V0|9=mX%b3#AuMfiIq!}a!uZ++_z(n#3&
zjlcLetJOT7{dHOS^_APvdwm&4Gyxe!IKaxa%k?^qg*`e-&0+T<a$$L2T{HO4_(mED
zE)dowY|9VjB`e2VNVKZdNC=nCsV500J^vxCut1lKI9**`)3J@m{_GHqfVI^dw_Wqo
zo)PenY*v(&2brOr`~PG^lSaVCM=z|n0d^YHN;;FaM^Qe>?4a-yjqj);gZM2;eoS|L
z*Q#A10^8zhYr1)%@FYb)+<n`RPTh3jnM@WHjFOk(eOI>K(i#g_>I?06DaH5kE~u}B
zDvUQ3)fD$!l4roHVmw^B_U#0xVuZ9@Dw>Q>MNG5R)Ehl7YXC;gb4zet?IZO(weDK4
zMBO4yf?$yTk63v~+t;^m{;Q;d)2)8@^@6~^si)@5YmsC3Z2tL8Gy>LcecMGx<+PsW
z8AD59Q5LW2{iU8-rsc3k1J40Wm6+P24joG6_Mu-tWcak>r^_-vz9ue&N$-R<FsWp8
zD%!0lQ*IswEXdI(gU8$6t(Q*G2xw%JHuaSFNTiNVv0EXyM$+<{p!D|@dRN4H9SkbT
zpwYmRwx?~Bgm#AZfomswTQmaNXKHFWnlcgc6JrpGJ$&Zc3_Xuif@>ywZq`$;5E0q!
z_OSBTGyD8JfT3+#gLrJAEGVm35ow4X<UPa_B1pZV%${T+y>P%0aAq~#bpO~?wEDJ-
zZW(!6JRRJEvO_|vIP;kkO`8$0vFT=NLdO`kr%-ma?PY`6$e^Bj1Y7D;whpRrG87LC
z!T<q-FCL8Gfs8#J!lT7_5E1uDKq8llHa0J;&<NNimx@@ng9YLtjp&1uCSB2N_v9Gb
ztt?KaL@Q4%Xi-r;LuU@OK{$xP?~YW$t1zlVWdkvVa6SXYD2X!^DAxmH%84X#3-^HV
z?iP)JE)`X)J`+G!2U$86Zs2|UHjM$^b*abAdMFV=ngoW+Y(bQrP2;^Fa-aeBt1z3|
zoF+b};(%&%ei|Dn=1DO*IqIP((V_b{KYxryz=v0V?7Z9EIUi_s-*`u7?q2=zGc*D=
zHvja9+gLvmsMx$sq<cd)4w4>|JR0FR7=k6(7EkdiQUp^&>kPbP5GM_`NdP-5NrH#=
z9+!E2WAn)s8Ua^i=_thwHRLJVmCQz_o+nq_4&^$5E=pgJThC~$?q<S)0bHQLaGjnD
zA_6CXY8VV5=Mt%IsRnC<PNY?0pzHp3sc5oABcM%1vUk$h!^u$ZBlS!g<F9xEChiO9
ziCOnWN|ziY;bK{|D>V*Cd07o+ak%F+7>8*GD-M*NH1O#NBPq}hpD22IWMm(y=qFFP
z0r_H}>6CD(=j~_4(712&$s@JYN9;s`%=EL%1gIN?XtW8m16?~kwf^c^+IA4e0VISc
zgl-&Y3HjDanfO?UZ!g}>={XpMoI)p#8RJtCi(4BI?{IV8ATm1jxUpnC5ld6e(xgp#
zt_gHTS_-6a?`J+u+e$6IB<B+5!l|_wUV;;$I5kxGc90@NpK6ziXp2TblWv4&O)5G)
zKK1ar<Gh0Mg;bg^DoN{N?$t?~NUnPZAprfN(RIZV);N87SZN$Q^zXxw)h4~rHxV9q
z^z*mPSWaoax%`XhbTyzVd%JYs2eJ^R^zuQRYIG_Z0}bt(X-XO2(p69N_JYj$E|*m~
z5!(d|9~^KLUWo?fDM(6md@3Rtm5RoI<FF;|`^!CgA*N7XugU_Rt)u*2dYmA5A~wf{
zb32Mq%7Hy&Ml7-e6|3q)_doK-qh>{mfQ$a-c=1p&4kg1V-Gl~%AKM~cY0j;#fmir&
zI}N2cDyuzg<#i)L9B9pTz+n{9^cI|!MOJw4Vzi>Gnu^-g(;hE+J~&aZ5sXnTMu)Vl
zr7TK?3OyS5MUZ4~3S&Sv4>k>yu%vOM5H3YJrE*X}(?3vCeU7dYxX8bd$&q8FZ?<KW
z2Tn%M1YfDXV8@CU24k$=ekud?7PoZom+m45?|bBlDZN72*nDEWn{qD7pP(1?p%1kk
zs4HAoL1D?d)sQj6_CtpwMdx5r9HJX&Bt9{SnAY#xeBvPO6S~wRQ<=lRbP%<O?5MY7
z`j_bB*KH4IR>xfGI<Y~1kN7;VTP{ErhYf`!`=1rnGP{7ZlW3ZGpYG!Gx?XHSJGjT~
z@swc(^!HE^45Vrg$P>u-hk!T=7gv+ueK8-vv(XpNA($*Lmx}&yN+aRkNB-y-`FGyL
zOa}0sF)7N{U5BNkI#jazJ`DI_pPxf}qTzA1c`71!nd~G8B3*D7Q!-|4dDu${D4Jbr
z8vy7=dMGU1*EL<Fkua%t&pR4BHVOswS4lGHYvfEuL`6J}D55Cas6dSusSbRcR>JCy
z`>?wiqQojdS`dy(>D^FV{o)>YdV4)`i7f(dkkW1Yojh^pJ1){lSX({3EzBolw39vv
zVc<t9mk)!rMmpz}tUd&_KwGh6Kx{1b1+xyisc$e$=$2?YyeFj~Zq_LUAllMPZv{8I
zGvE`qzhg@KgyX9}eaca~$dOkvhfsdJn6{gfZY3QtQ1C<$X<O%_W6)vhKnBSq1L}IL
zL!(C}3Ih*DITdK80v#U}FW*S75GK5L)P3!AbZZqH!CXpykd2_+expgT$6C9Qxo1Vc
z83RZlD)pcnKZVG!Q@1D_bom5$KI&PEiH?|*y{T#$f5KIOHWj%v*2%zXS2oSOBr6L&
zzLYl77Ck)e;3p4yV9)P^b;7t(sjxQgXK)wTOC7$DmnAvQj0v8Rbs7%tM0&7q4p~mz
z`OYa_B{+Wj&zvIRi)cKQEkQC^m;*rEDg5jp#&mF14_&}MJrPq-G%8XPqzn-&si!bV
zs^`Hb!AMY$;>-c0qVz0HlX~h`oO&!wCbQ<J7<Sn1%Y<)`A;_t$Ph=j@(z?d+j*)I4
zFZ!TL(sM&q$*4gnJGfXV<$Sh=2PGKp<4h@YM02=)c$=;=v@}^x>J>kc)lH{XRa3N)
zN-Knp(R{jI#p=ER)dP@OpV5^-g+3^Q_!ir=Xj9MODSeaR`0a<Aldy}!y2+gTavNR<
zE4ORv0UkvsE)y+gFd@~(4kD7br~F~oz^S>eDjAh}Ha5?#G@mhTCKG9AMP(UF@~3;w
z>TC}ve8gq|O(X4w;%YA-DLYI5+!XMcB$uBEe5j2d%J!3bW-~hHK3ikjv^=Dl6%}Ak
zu*W_uJ^0ddZQBD*m5`0s#6-T?1BubVB^Ht&%47q4;?vD~es)SD;J!!B9ii^^(L?t>
zbZ*oM+VML>D)Mp!P{D<EfU>BYv4!;54$ESYOSE~VkcSeP@j7l=DM8KpAX7*Y>v&cZ
z8l8F^t@XrD)~B22M!onknUGIKWOM*I@tJhN==TORGooz8R_s#R232OH3}0xtuVI-K
zPzr6KPG&MX_0+R^UD~IaBcTJ!yWMZyEed{tb~MTqMFL~OZxSi6&cI$x0#4G#E^T|m
ziCA!{m=D&Qt~D1=2HU!A-t7~2jZHm&aK!0##L^O`o9=n&+#wnPC+;|W-pOzt>BMVU
zRHqV@1GIGLRp|z@AhE?jhMVqGyW?J-c4=nC(OmDVcMG_!v8iacO+`HFRi?5@2AnZq
zh^p9yhK!!&a>$*L2KiN`45T$T>scF@dX`=4q4*+&p)KwH(aO@^xYuE)tA}@l>!Tz+
z5pH`zm{3Tmo~SrzV|#O-_JYFvCCVZBC!5_EU&MMLwIa`HTs(f~yGK2Oc+W$hIV5%S
zB85<zMUV;zKN~sL;L-><amUY{m-cm7QnpA}U^rAv084V`Dc2}_CER!@kMz?Hphsp(
zI0B?O;Zv*!<7h7gQFbPKyGLmxxLmyzb{zG3L^3`sJUSK4mM2qce|DarGmAbV#o$B`
zf?h!;AiRCNymp;bMMO#w-suMq(~3UjibfZ`9U+u=UjdEUyJnkt?dEM70rx%hnRVB0
zCCFj7cVpU%63EKr%HF88L6?e}RkDv>2`?C;MuBHxvH~(BnYvF{Cv=X`I|dc{Qer~_
zBn@1+$LX&W>Qjf{Gso{5mwGn3fp^+RQ+nEQ^GM5sXGcBKa^lW+Uv%a=9e7Z;LXSLS
z_9c5lpylW*??`IND@XM!CG@zzpRr49!a)Y&V$9(FNb?TYWaR6k4a~0WUO<(^&`q%k
zy)Hx}=RcM`m)~;pX1;7ol$*`|75R*y-=#~}`YoDllT%QK_U9`_!pjLAZJUbp$q|v{
zD?h?psHfCn-JZ?()bsFXZ*%Qe(!fQ%As_N>+Ouz!J#_D{e|mH(s+o_*R4pOUDCx#T
zN~REuJ`;5xeP*l<Vkm9pH?yD`a}^FcxVJ5m>e5^D5_26ok?lSZ(V35|z2^*#F~r8F
zR;2b1)KXFoc?TN=Luo?<!}0otqeUa2Nkxvy>EKYJG{)KksK5(*BOctSrzTXp_=-|`
z-%CV$DwO#v<&Zeidrrs%>)j~tQqQ>8M;ln0Ox8&RW-{HnLdhs8?S$Y7xBv%clgSp1
zgxT`)w0$$5u-Aj$AeRL^8%A3ogkMgqh6Yt2nUx7JQ}^)Qrk=VUpL!lVd&JQ_k`G{{
z<V58|FR*FT8*g8!NM`j>pK*|y|9)lQd%$yU5at(%^fXfso;W34>=TW{;!@AeXJ`a8
z>B9BObsXRn%_t`kP6yKrg^Uhi(#-4A>A1DQiM5+uDw5M$cQb8QAy+=M>9d_%Shm~I
z-$0cTgQTiZ{t%M|-TS*A&6v!_y*}E&Y|^~J=muWO`&8x(K{r@@-AkH3t+;&Ml`R@8
z&+@CL92RJiL)JG3>I&d};L^}@eD4FFKI;}B@9u&H;t1*BKB~$C-E<)Sf-SUnz2+Hr
z`%L3yXwWVFYLC;*!J7Ie5jInSiVwJgn_^^(=A*8;qZb!uz#<2r$CcXwmF72yJby}i
z!d|W*5A+}x5Ok>fsbjDYhwMNgljoOaEmZt{osP`kF1arDzl6qR<Qtd-d`a66lJId*
z3_KmKTLkez6%WnkTuqT+bWUhrOPWuD-IDQ12Y{G(>l>&L%Q-mqmB7C??Q6lgck-Vd
zOvOaJfQ)foOv><4g>I(wCFgtohmbautdj24LrkJ=K%%>TAl_Z~bVoF5YC3=;Ig%6_
z*fd*2h7{H7urkYDP*E+qy=c1%*q5o=UaEQWEXyvXaO;z(hjaY%Bgmx(T^1-5pdAZh
z2$suDzn%*s_+{$2N2Zc}uzskZ+^(MOJzG70Nt(Zy_rl`tHiQdnhf(bps_P5QzVAMI
zi{gzbr+v`s;Ok%e_P?wipT6fsmxrF}7f|QitWIp7w`pTY@lt)C;rl@5&>b>*pUnPR
z`s5kX)zFc$JzRf!`r(Iv;-z-{-;?_H6cZ^B!2#L|hWSpADb^c7GMpYqqk}~X_mtDk
z>@&wO0^cYrTiS}Kxu^U-&?sdHkxw;W-LEFT{I#cCyB8vJ)_jV~V*!SCk)Ya(9+U-W
zlEI03O5&k-8GB<PI;SsPqk-8F3uQRO41QaIC>a~&5nJ9~Kfm|#m5((|S_e$0ANq#d
zy8T@>^&-*VHu|z?3MXr(9n|YpA_$2*Y3LC^{WNy=TbjWLhL4byopKqKJYFBfVIw>8
z@a?jv{_v$akX5)kGo2p2939ZWWcKO@UFGu&t>ladW1$P)eoi*Hb!Ew5rkx1%A~?Yt
z30&YS)@ejNolWupYvf{jep&dp1738%-FLt9tB&KXWnt0tItrM2dW9*&tpa@KERQI=
zg;0_Mj6rFyg`wQGv)d~rdBw;h1)bT@5Tj3$g^IK)(dQyIv(v9_eDV{n@D}QU(3^^N
zR30i+X5)O;&I9d-U`Q4#LjWGY;eGH4?d*4`L!NHM^tt0}?^C}Toc&fry?p6*_w{8f
z0L6_jA7!wZ!Pk1Q44H@LglxA~^%OFQ>Ef7XFx_+FZ9(BRpN77oW7?TIgzz^fOLb)Q
z?9;C~=Dc>f`UNsj^y|jPC%<ox<bt!tccNQEBnXT#k-UiAC(FVLXLqrRIdfLx#bu>Q
z%Tc^1h`_LrHtjp&fIu3L8FkZtGHc#F%GB)pFVXCW*Vc}1lY!!|rL3*J|6gV_dy8xN
z<sc)8-dDoO2!ZjV_RtP{MASK4i`~lyC;EZQc7L4ssPu;QtZ{7`iW3|Py}`31t6w_X
zWx`2TxhG^inyu`~?8cJuiRPr-M;|?V-Ak7*f6R&Z-f$?RzrA+7&_$O0!M@TD_?2)v
z>e541w+tY$ZF%0qfD;GnQuG@B`91Q>X?m<b`Ic*z-gn0x@BMG;frZArd+tB;0oPg9
z9og4OrilI?1B=j5sl;3d7%D6A9IBtkw{&mYIe4iSxo`dMBO9~;pM{|54KH54G<8jm
zIQFkCn?qtw?GrM@rtU$k>ePUvdXV|UY;AMVIVVEm5mJaw`~>tsn~?88Uflxw7Rud@
z7B9JfKVDr|ZQQ;3{{N%}U||OYXdLmv|6Tf^lkulq<2O0RueM>F{$`?af*CXm#h5!u
z{ee-i`8<dYLwO)I6oUh7s_^@|WEx|f(dnPu8O~=X@~YoIe*EVDpb;?I0SNcs|A}v#
z5&wvr-yNj(vGMx*UGcIL{dFyZ&}&iKI8c|u%HAu3_y}%H!<1%CAyUDrdNx$@nk@^B
zP)3d8%KpoX@}jGGj+zhiKi4yPR+g&2pZ@AC|4#da{|Aa@=dGYVUcCSS002ovPDHLk
FV1g(E^A!L9

diff --git a/assets/tray/syncing.png b/assets/tray/syncing.png
index d1fff40a86c73cd018bf356629b8fc8ebfd72401..ded996464f28adf64b37a521028890f20f6a7545 100644
GIT binary patch
delta 1633
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

delta 1879
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
RWoQ5Z002ovPDHLkV1l$3kiq}}

diff --git a/assets/tray/syncing@2x.png b/assets/tray/syncing@2x.png
index e44e3b2c29f7ce4e3d06970bbd2399c0b5768e42..effea034c147718f58f780690ae3e892143702c7 100644
GIT binary patch
literal 4277
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
XD=wVnBde;400000NkvXXu0mjfdw*qP

literal 5222
zcmV-s6q)OZP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH6Z=U-K~#7F#amyD
zoYz%9=bIgSHoK`mmxfwRz+*c>d8qI@PrP}IKrK-vZzPbSD9F1OMHLjSEmf!#q1mlK
zM50oiz(a~qy$cWY0l`LqL`7l8Pw<wF#6v{>c(!V&A3{Az>}1wE-#wgr&pG$rZ+3R<
zO)7D%_00Eu_s_ZK&+q)X-yl3dD;K_9LIsQb^(+vyq2NEh9UeOVj@A<i$njM{{1v$`
z_-FnxO`2Gr1EKaOz0DU0a*ar#6A^|dDAUHV00X`^AV&kf9`N-x|J{HFY!9}t_TfGa
zr#&n`|7RV5nJ%x^Nn7v)d5ZmDB>7}|Jz+$(DajLj@X}$P3E#s=-l^YoVg|@1hJHwq
znlyNfK?IIqy})8)@LyMZ2U0QVrbyg%nX6a)gkd@gn<U{pGk{Pij*>>*F(E1aAVSm)
z)EQVOfgsltqKq&c?_-Prm4J*1w1Lni*J%w$xL!1iwMiO*6E@$5y=sdmYg-T5tWJoD
zKpH0v>%<eF>2xCKKzqoy7`~HAH>whv$_1^E`N(m<0us|Hr_1_zLAX9Pn-|8JP-8&(
z<e##AH@0|!HtLfkP1VS>39Q?%NZKTBYN#3%=LyV=M2XGR=T~zQO-VHB+O~%9ryxii
z4yG8UM7~dyDAhH{<3+PNH`xAz{yqly%~Mfq@r`yATUdbb067ut(;zg0P-SRrvYWV1
zx)9CXsHG%nU4o3=eu$H;?o$|uc!Ck5qEQ)bo)LX$e#A^z^?=EEuFVzDWqoP~sRTCq
z{uO$dmuvYnaRiFVg+C$3Y5z*lFzmqpInc3u<>FYf`}{{bkKV&Hmh?W!8Zx&kgHyK2
z7))znn8)U`y%5=2ZMrvmJ&Mev&yQ{@a3vR3lY52($uv!SYv`N$jA@SnWl&Ysbsb?S
zF6)Q=*2X6=t&uM1Twvxxz1bCz#z!j%vb8yostbeH|EL!<z=7+A6+;sV)HT7=<S<Gl
zNXfV^-N-SwowMtpsv;~>36nmL5=N1T&FxG|$liybwjM<w$Y=<ELEW8D8zdsJh|Ckn
zmp%A>3HB(>*ysjElnbjR4QFnve*=tGBQPtN0yqx&LO81Ficq73^m&dI87P=9Po^Ee
zQ38Z$(xw7Q2`Hgs-9PScIfkeC^e%ohIzCf<G;_W{()(#wf~;wC!Tc!_6DCkd5YR%0
zQ7s+is~W~*^r^~U)w;BkAO(k!DP&PkW>$V3af(5&&@eBHmqg!_2?dX0Uc%WJMwC`_
zaR#Bf5LpV4+dg-WA*${S)#nPRDEl$R2{PECLd-BYO|IbYj0wUM(Lj=L2F!g@3i%+(
z$h<)T205f^L6CVDOx%}w$fDSw0DM(dXPE(XR_CyfOm>8rZNQ>DyFp-_PZ5|9LrK^<
zprSt4W-&oc%BBr2TA?ilF-54k!VKtg*fdjxyd`b%!etJ&XL#W<KFk-}_jO+g>!t7>
z-w6H`G4)hSf)I@p9tTaFs74JcP>N77#@rdPfVX*;_r&5*z%&Al0V9@tzpO1DynAAN
zgcVsf({fty8c<TkvS7a;I%o+%A}Hqy1$`*6!R}<W4+pgJ$<?-V?p2=Zm=I(B(jh?f
zh90>yzzRaW&ED;)!Ru@Hn|muT*q|^dLZzW!7P{IdV`#>x#Y+}sL4vrlXzXI+s?MG(
zUMKws{!_Q&_g_*~U56<xFvrmv#OP4nkj$Y0ad4jkiqXx%OVbz|SXfnE@HtChUZhP;
z%IVf^%@}Bb?S=cD!iOLKL#oFkpd2GZdH~47)8uxH$vpn*`)~a5i_?hZb+)))2jUdE
zj){gc0V3>t@W!8<nmXST-&o?6zY9<kHs-UYj5O^buBBTn1XwE)DAu4x!cQ+5K^FCc
zswz5^4CxtAT-U4PG=dv5)iU=VBuyewdy4aj<MSa(gFVxf=GS5(x?tL3VL6DeCi}D?
z3@8hjbS?Ga1(<&@RhQ1H{vmdz7`cUcDRX(MvPj3Pz2SXK;e|fC+-o^go#X(N;(IS7
zx90m!o6GIp>oOT_HBqy46t`mnQ@SacovME{Ie%SfNEwOJFqorOXIiATYspK(g<x|Q
z<^rAn)al>9GL7)}-+W<>k@GdsIb-@Ni~5f~_gS4b$EQwzV}(I(NrV$O1xXw18qz&*
z8b2tb!Xp`9s7hnD5il)K4X973*_r2d1WAeGy@O#>_<DQV23$c`jc63Hp}0dwjV4T2
z{r1<}y!md-QDhT}08v1Y3rs-}qkzZy6m=C*`;RIj(usHwlO#)eOmjf5sT}Q2_X>C3
ze4)qVu0e<rT$Xg*U-hd-b)E65RH%ex|Ad-<P_`e9F)RgF0El=Y<BQBD<AlmJQa6QZ
z(h%^VjX|x+`Ajf?OGr1VGk5xHQ%zyUjn=@IsLU<_cJ93Wt+i=m=1+f(Yn1MM4tkQ_
z8vh*COu=w03N>iCUi+<8VV**LrlqYBJ;4$QSqvq0tw_<+xT|56eX4IK_wBj%m4$;g
zGw5F%@GQ$F9iC=++UC9LbEht-j}OuX+q@S>@bL(FOcOsH<uPW8IRwHBk+OjjU<?$r
z(jzIVsu|@N;G%8Wc+LAsv<Ro0LjPMm9&(NQz7)PsX%*~lfx2}yQ4y4Lwqb&7!-`wE
z*&1d+9*Frqh1s&%J{iCyJje?p2{3Ew6>&q|XyEn2eEUjw+Qw$s?q`6mP3sfpKxmsw
zRu#bH-vKkVN2o`f2pVBp=`Cn5CC`ELCs+J8%!4vW`9>ZTLVi!bD==jJ6^la5FZyxr
zZvWage2ms=U-8-6O<lt`pLq3H+jkhgIZ=WgUG}7439{KCGmC2Gr`4FWMM{z2jM;hw
z^IA<H2vorU^JK_agA;O24NaZ)!oM%uSDx~A4~J|`a$CG?k0;t}Lh%aE(SML}yk5Ci
zRg2gtE;1n(NtM!ROpKD~g)OiK{2pZ+&^(r69$>*W86zYw4XjB@W9h6~ij9qlBwV}m
z!#}?YhiLPUeYNAobEp3oJ@^ETnb96Ox5RpXiK%IWZagaQ{LlZc8F)R10HZxME7p!b
zj|0bSLsKl7vw;^r>1IAjYqh`9Zn(xO({xE05Y!jve(rZ%Zo{c~P_uk#iE(lTmSLGw
zNps{gDAW7R;>fv=V+udbHsAhghrP#jc5H2bNFt$d77fPOJjLsPDM$+8Z<Y*c?jY_6
zvpK|@IAvFO#;Q16f&b^`wXiDO1tx5{!JjiJEW{ip5o#5c@SGCtoAeR)150Qodx<Af
z?!5y)g;ugUR~0UB@E1y9MS%mKYTx<M%e@B~KkUEU=a2P3_d}2Vw!^%<QR74obNR*~
zyFUpr3<UEVxPJGY?<~W|Z1azOrNbHO3KufZ^K{3d=Bjccu*X8(Xf_+YfoybY!@0-4
zOcVWlRNf5eL1e1Zrc{iHT&wdedJ^n6o5h6(A!xkKJ^JM(o~X-{wzZn!=gVG-NOY>l
zibv%f!LJ@UQfy3Hmo?zGoJ=V8s*~5{8Y7$hUdFV2ijs*XP=ZT$-}%c8I7ADmy|;Ir
z*Et`E%3YUe7-4d^80l1xOcVjS&pTSa^P|7&O<Jcwt)2vzKoVkN438E3M5h(pIEf9#
z5-W~MF%@dzv&7k&rL7-!^DOm+;@;jCkMG#p5oCSP?%*mDdzruOK*~e1xRo?(4fjLk
z_@U2T?oL{((R_GeRnc5SU|A%-^rN}9u{cOWBoeVeOaipP0YYpMMBhK+-16|w_5-`V
zR(q+<$od~V_Ooe25D#1Y_m6)3-Cx`L;MMKM+}T$Oc{}8n<hdoKq$;YOON_VEeE2Eg
zaX0eyimWqcg#t-7>@?Mq9gHrMYKc;mxMpA|nHsZYZE$P74-eQ{Czjg9E^P4>$F$f=
zF$+xzPGshg=f3;S^(!plQ+$6%RS)AIQPK{nbF9uix_qh509Bc&#(A|Tnm~;JfLe(u
zR$ehOPME~1zrGHKXbqt2Aa#DQVn-~@^2V9}OCSEv`tk8`o)I7Zc>NTUvX<zTIzg&q
zYMSiawUQZ~7?9`m8K*I`JxH5UCb%f|#AO*PXvL}zxCV!4b0>atiTvw$lpV+fB@R`a
z*Nz;;Q+ID&pNb_+<wiWj(F!)?seFiQsN98Awkwj<m18lQ%YZHX3#Tt*;8;^HEl>nN
zT|JEIEAid*$_zzqWG&ck9`!DCJ*a*wlV0BDPdwj2s<wz?Js_9^sa8^qSOds+e1Bnp
z*?nefT5-Yj4v;+8gaM@%sNrv|Ul_k}_tsw@3iTiU-1Cb({-k*tOhosO(9AQo`Pt7t
zzk+V`YCg7XFO_`%A6P6~e5TO05;)KC8dJ2)^z;zaoFHKqe_Rv>nCr5Cs@9|}vvD&8
zia22yAkNWuzUiPkl<NCdRqj%JSqdT({Lx9&q=$a?xh`*zt4Gzbvb|UeL!MjN{qWvR
z9=lj`g`OHdt{dL^oAsl^<}>~^+U!hI^cm=qpQp$HF0Y}7w<s`6l#Cx*kjyw4?iIdw
zRb3w5`d%Ln*@C~1_#@`Xgx(z9`rDvMtrO3-ndDW?D{%M2*{#_}p4|c|ua}UUrI;@B
zYINR@9Sm4|h&B|Pq)sIoTaJdUg+e@<1U5Chmmo%?uY~wkSj@FTPFmfI!*{>egG08t
zM}A|0CpZ>sifX&)UwGD5xNr_ADP~y9m%PIJ%an?<c8C*&c_m};reYVRgpIJG;%ou2
zXeb;?=YeuSsxAfcYB9v~0%ZbHzd5_R3Lm3Y)F{Eq-3h>81nw2<!wTKeXUWxqX`>Tt
z7xcpvyHGjz$aA4K*cuJDA)aKV^GI~nf`K6F;RdOcQ^sedWk+M^pBih*<w1Y*z-Z5_
zaO*R_-kJCit9GWk0P3>~=fZqtxmaR&Z+Xl+<-kkXxr9raT)|#oz+kZH&0qjy+ROoz
ze;3yE?L`I5-`S_=648)Z)zE?zDUP6fY54Bn^<YZF(P)KZ<CBx0RvKj{&yv)XgB<38
z9>S94EELZsK;LMgct(JdgN8X9*(waE12tW;Pu|1v0$i;4U=8hq%Wy~;cOw8o1jhc+
zxoQ=rwAP8mHji0Bpz^>@F`SkV+cVecyGz5tW}hFv2eL7YufK}wfxb14Y7P>os9Ezl
zRzI%cd^)Wj4k9CeQutq6L|2zGKJx}z1J%k-Qa#B9s^*1hsvp`OZiS;YH##-xaRVCL
z0O`EZm|IYF*81?e+bPQwZ44Sna*Uq@r+B6OY0ZzqdBof!iwn`Ssi#w|`yrRaD&{aQ
z$l_5XRsq%lDko2)W`aQzis9R>PcO#z8ue`_Q4*}x*!<mNlNfM!Z?E5K*ghpI3lqre
zG!j#AQpNk~*mQY4UJGxWCxHLSOk2z~Jl!zij4J5pnJ4L>AWLTHHiID7>C}~p8p^4u
zOPQWxV~h(ZdkY&A=M#4!y+n~oCgk?}n+GUIz39K?kkbQUr}de|FlPAfW>4P$r}#ny
z|2Yqo1mE2K-_7Gg2j|QMvZVUlZ7tKF6|g)-0;M3rqJr&$z2UY!%%VTS@fRo3hA?fo
zRtTZYJwdL{`n~NDeG(76pH3Q(jj5`x$B@>~EG{WBTH@vZ>lIX-8~$W-)flNDxr0>v
zvd0d8yY=ZWb@~3ul*8DGwCnjkMXPFT8uDZG$5~PoD#Qd}jxR&xJo=J+AtEf~r?V!p
zA-Ic^7_bY)2KT#d9>?5S(3*Rrn?R%M2G0E0r^U;|+y8jMHW?*NwAS)W(fiGkZJ(f<
zfjnig*1GK3bE*8&7LV>gcCurqAoV*|i%T_7af#L!bGgR<AWn?E;q8CAFo_AR^66Ec
zs4MeJiQV3*%x7g2JvAKsOCRpjn&s0A1r}QnLgoChCd_zqcks`r{k8pKWKA?L9U%vG
ziV$G0mZfARS9y6Uf^0mc^fO3QqvsG!bq+FvAso3DY`3;f-7|@b<Kq1`f24f6%eeX~
zxat_H+UrZ6Am&|Nw!Q&>N5lVSTX>=^F?MLNyoc!%VuTXGB<moLslZ${AVrkgtpc|@
z8otrnNA>XaVYBu4Yus%KQXoVTyojvi{l(_&<DHq-<2OdbH)}4qRerI{``F}8Ur1{j
zc1VSg>H8*Y(0Yvlfw0!2H)d$&S?+TzB0A(6NTNuX9~hGQJac*qrcR0nTFt@S!}7)1
z`Pt8ZXUH2K=K*i1f24KBza0GqNJ5xI%SrxkrE&BORJ(88h?_ZjrpNOi74y;MG7Itv
z*6w@XU(VM|(c-W_WX}2oWYO$~AeNUY9e)$#h>SH8ja)|*L)NjB^KAAWjaqK^t?$Ex
zHX6S5pUv4bo@t$kLAsgojq!iyXIf{L8nb718m;z|yv(x@vB*4?7!y--V-{zh8D~6>
z6ToWJW?T7pkRMKFKZ#9S9D}<2geHbSdKIp%Pvn}PmJcR}gCF$ZfYvI1b%`VmZbv(#
zw0aT>L;xlri;*OXOJM!t?)(2b@y)fy_ziDY&Dkej;rTfWg9Y7u{4pfP#p918jgk8S
zTP21t-Z!wM^YH91ZcH)-q2ulC=Ik#p9o2D9N8Gi>7m5o6@r^GRrGyge`P+ST@XYQ9
zKX@4qXb4kUtNfLYt9&8@i;2sS0UX+aA&_AN<N>gd9qt*!q|zIXpBa;v_CENx4Y*Hh
zl^s6aX{_?Fi|DgMm97LLQU8*y6ZZJ=+VIZ78uma8$O)*bqQij3fd!rA0+=sDd7L;Y
zvtWGh&h*h@2EhCkrNkV5bh|M_PYnmXJ{+RW%y&8sV$CcH|5N@F!cXSCyM#V-b!V;t
gn}b2`fls3T5APQZ@2G<=4FCWD07*qoM6N<$g3C<|t^fc4

diff --git a/assets/tray/syncing@3x.png b/assets/tray/syncing@3x.png
index 119baf6c891d10c6e2158dfe37346542c551136d..c58f9a2feead5963c5323b288ee726edb74d3b7e 100644
GIT binary patch
literal 7487
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
JPDHLkV1iil5_JFo

literal 9701
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


From 43ec739a8945c8c28706620bee825f25555e0663 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Tue, 7 Nov 2023 10:46:20 +0100
Subject: [PATCH 035/188] wip

---
 release/app/package.json                     |   1 +
 release/app/yarn.lock                        | 540 ++++++++++++++++++-
 src/main/background-processes/sync-engine.ts |  24 +-
 3 files changed, 557 insertions(+), 8 deletions(-)

diff --git a/release/app/package.json b/release/app/package.json
index cf5bb3900..d4ef5a050 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -11,6 +11,7 @@
     "reload-virtual-drive": "yarn add  --ignore-scripts ../../../node-win && npm run link-modules"
   },
   "dependencies": {
+    "@cocalc/fuse-native": "^2.4.0",
     "@gcas/fuse": "^2.4.2",
     "@rudderstack/rudder-sdk-node": "^1.1.4",
     "better-sqlite3": "^8.3.0",
diff --git a/release/app/yarn.lock b/release/app/yarn.lock
index 81352052d..fead08ea2 100644
--- a/release/app/yarn.lock
+++ b/release/app/yarn.lock
@@ -16,6 +16,16 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
+"@cocalc/fuse-native@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@cocalc/fuse-native/-/fuse-native-2.4.0.tgz#feee5b75fef36a1b1b37135d8ccdc28d5dacf1e8"
+  integrity sha512-mhg+JZZkGq6cGN9Icy7Uu1J5/M1gR44t38DpxjZlRH4oyFcwpH2090/CFv2jGVaTOPrjgvxlb0jHNx9J7WUing==
+  dependencies:
+    nanoresource "^1.3.0"
+    napi-macros "^2.0.0"
+    node-gyp "^9.4.0"
+    node-gyp-build "^4.6.0"
+
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"
@@ -30,6 +40,11 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
+"@gar/promisify@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
+  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
+
 "@gcas/fuse@^2.4.2":
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/@gcas/fuse/-/fuse-2.4.2.tgz#149bd97ec8a60988f4868bacd719c7e8a1c41876"
@@ -73,6 +88,22 @@
   resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.2.0.tgz#016d855b6bc459fd908095811f6826e45dd4ba64"
   integrity sha512-XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA==
 
+"@npmcli/fs@^2.1.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
+  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
+  dependencies:
+    "@gar/promisify" "^1.1.3"
+    semver "^7.3.5"
+
+"@npmcli/move-file@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
+  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
+  dependencies:
+    mkdirp "^1.0.4"
+    rimraf "^3.0.2"
+
 "@rudderstack/rudder-sdk-node@^1.1.4":
   version "1.1.4"
   resolved "https://registry.npmjs.org/@rudderstack/rudder-sdk-node/-/rudder-sdk-node-1.1.4.tgz"
@@ -104,6 +135,38 @@
   resolved "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.5.tgz"
   integrity sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==
 
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
+abbrev@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
+agent-base@6, agent-base@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
+agentkeepalive@^4.2.1:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
+  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
+  dependencies:
+    humanize-ms "^1.2.1"
+
+aggregate-error@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
@@ -126,6 +189,19 @@ app-root-path@^3.1.0:
   resolved "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz"
   integrity sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==
 
+"aproba@^1.0.3 || ^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
+
+are-we-there-yet@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
+  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^3.6.0"
+
 async@^3.2.3:
   version "3.2.4"
   resolved "https://registry.npmjs.org/async/-/async-3.2.4.tgz"
@@ -180,6 +256,14 @@ bl@^4.0.3:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
 brace-expansion@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"
@@ -218,6 +302,30 @@ bull@^4.7.0:
     semver "^7.3.2"
     uuid "^8.3.0"
 
+cacache@^16.1.0:
+  version "16.1.3"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
+  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
+  dependencies:
+    "@npmcli/fs" "^2.1.0"
+    "@npmcli/move-file" "^2.0.0"
+    chownr "^2.0.0"
+    fs-minipass "^2.1.0"
+    glob "^8.0.1"
+    infer-owner "^1.0.4"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    mkdirp "^1.0.4"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^3.0.2"
+    ssri "^9.0.0"
+    tar "^6.1.11"
+    unique-filename "^2.0.0"
+
 chalk@^4.0.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
@@ -236,6 +344,16 @@ chownr@^1.1.1:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
+chownr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
+
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
 cli-highlight@^2.1.11:
   version "2.1.11"
   resolved "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz"
@@ -303,6 +421,11 @@ color-string@^1.6.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
+color-support@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
+
 color@^3.1.3:
   version "3.2.1"
   resolved "https://registry.npmjs.org/color/-/color-3.2.1.tgz"
@@ -324,6 +447,16 @@ component-type@^1.2.1:
   resolved "https://registry.npmjs.org/component-type/-/component-type-1.2.1.tgz"
   integrity sha512-Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg==
 
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+
+console-control-strings@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
+
 cron-parser@^4.2.1:
   version "4.7.1"
   resolved "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz"
@@ -343,7 +476,7 @@ date-fns@^2.29.3:
   dependencies:
     "@babel/runtime" "^7.21.0"
 
-debug@^4.3.4:
+debug@4, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -367,6 +500,11 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
+
 denque@^2.0.1:
   version "2.1.0"
   resolved "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz"
@@ -392,6 +530,13 @@ enabled@2.0.x:
   resolved "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz"
   integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==
 
+encoding@^0.1.13:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
+  dependencies:
+    iconv-lite "^0.6.2"
+
 end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -399,6 +544,16 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
+env-paths@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
+  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
+
+err-code@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
+  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
@@ -409,6 +564,11 @@ expand-template@^2.0.3:
   resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
   integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
 
+exponential-backoff@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
+  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
+
 fecha@^4.2.0:
   version "4.2.3"
   resolved "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz"
@@ -434,11 +594,32 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
+fs-minipass@^2.0.0, fs-minipass@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
+  dependencies:
+    minipass "^3.0.0"
+
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
+gauge@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
+  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
+  dependencies:
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.3"
+    console-control-strings "^1.1.0"
+    has-unicode "^2.0.1"
+    signal-exit "^3.0.7"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.5"
+
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
@@ -454,7 +635,19 @@ github-from-package@0.0.0:
   resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
   integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==
 
-glob@^8.1.0:
+glob@^7.1.3, glob@^7.1.4:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^8.0.1, glob@^8.1.0:
   version "8.1.0"
   resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"
   integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
@@ -465,21 +658,82 @@ glob@^8.1.0:
     minimatch "^5.0.1"
     once "^1.3.0"
 
+graceful-fs@^4.2.6:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
+has-unicode@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
+
 highlight.js@^10.7.1:
   version "10.7.3"
   resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"
   integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
 
+http-cache-semantics@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
+
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+  dependencies:
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
+
+https-proxy-agent@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
+  dependencies:
+    ms "^2.0.0"
+
+iconv-lite@^0.6.2:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 ieee754@^1.1.13, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
+
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
+infer-owner@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
@@ -513,6 +767,11 @@ ioredis@^5.0.0:
     redis-parser "^3.0.0"
     standard-as-callback "^2.1.0"
 
+ip@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
+  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
+
 is-arrayish@^0.3.1:
   version "0.3.2"
   resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"
@@ -528,6 +787,11 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
+is-lambda@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
+  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
+
 is-retry-allowed@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz"
@@ -538,6 +802,11 @@ is-stream@^2.0.0:
   resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+
 join-component@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz"
@@ -591,11 +860,38 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+lru-cache@^7.7.1:
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
+  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
+
 luxon@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz"
   integrity sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==
 
+make-fetch-happen@^10.0.3:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
+  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
+  dependencies:
+    agentkeepalive "^4.2.1"
+    cacache "^16.1.0"
+    http-cache-semantics "^4.1.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
+    is-lambda "^1.0.1"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
+    minipass-collect "^1.0.2"
+    minipass-fetch "^2.0.3"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.3"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^7.0.0"
+    ssri "^9.0.0"
+
 md5@^2.3.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz"
@@ -610,6 +906,13 @@ mimic-response@^3.1.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
   integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
 
+minimatch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimatch@^5.0.1:
   version "5.1.6"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"
@@ -622,11 +925,75 @@ minimist@^1.2.0, minimist@^1.2.3:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
+minipass-collect@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-fetch@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
+  integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
+  dependencies:
+    minipass "^3.1.6"
+    minipass-sized "^1.0.3"
+    minizlib "^2.1.2"
+  optionalDependencies:
+    encoding "^0.1.13"
+
+minipass-flush@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-pipeline@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-sized@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
+  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
+  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
+  dependencies:
+    yallist "^4.0.0"
+
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
+minizlib@^2.1.1, minizlib@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
+  dependencies:
+    minipass "^3.0.0"
+    yallist "^4.0.0"
+
 mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
+mkdirp@^1.0.3, mkdirp@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+
 mkdirp@^2.1.3:
   version "2.1.6"
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz"
@@ -637,7 +1004,7 @@ ms@2.1.2:
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.1.1, ms@^2.1.3:
+ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -689,6 +1056,11 @@ napi-macros@^2.0.0:
   resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.2.2.tgz#817fef20c3e0e40a963fbf7b37d1600bd0201044"
   integrity sha512-hmEVtAGYzVQpCKdbQea4skABsdXW4RUh5t5mJ2zzqowJS2OyXZTU1KhDVFhx+NlWZ4ap9mqR9TcDO3LTTttd+g==
 
+negotiator@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
+
 node-abi@^3.3.0:
   version "3.51.0"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d"
@@ -701,6 +1073,45 @@ node-gyp-build-optional-packages@5.0.3:
   resolved "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz"
   integrity sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==
 
+node-gyp-build@^4.6.0:
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.1.tgz#24b6d075e5e391b8d5539d98c7fc5c210cac8a3e"
+  integrity sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==
+
+node-gyp@^9.4.0:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.1.tgz#8a1023e0d6766ecb52764cc3a734b36ff275e185"
+  integrity sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==
+  dependencies:
+    env-paths "^2.2.0"
+    exponential-backoff "^3.1.1"
+    glob "^7.1.4"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^10.0.3"
+    nopt "^6.0.0"
+    npmlog "^6.0.0"
+    rimraf "^3.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
+    which "^2.0.2"
+
+nopt@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
+  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
+  dependencies:
+    abbrev "^1.0.0"
+
+npmlog@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
+  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
+  dependencies:
+    are-we-there-yet "^3.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^4.0.3"
+    set-blocking "^2.0.0"
+
 object-assign@^4.0.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
@@ -725,6 +1136,13 @@ p-finally@^1.0.0:
   resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"
   integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
+p-map@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
 p-timeout@^3.2.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"
@@ -749,6 +1167,11 @@ parse5@^6.0.1:
   resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+
 prebuild-install@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
@@ -767,6 +1190,19 @@ prebuild-install@^7.1.1:
     tar-fs "^2.0.0"
     tunnel-agent "^0.6.0"
 
+promise-inflight@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
+
+promise-retry@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
+  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
+  dependencies:
+    err-code "^2.0.2"
+    retry "^0.12.0"
+
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -842,6 +1278,18 @@ require-directory@^2.1.1:
   resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
   integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
+retry@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
+
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
@@ -852,6 +1300,11 @@ safe-stable-stringify@^2.3.1:
   resolved "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz"
   integrity sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA==
 
+"safer-buffer@>= 2.1.2 < 3.0.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
 semver@^7.3.2, semver@^7.3.5:
   version "7.5.4"
   resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"
@@ -866,6 +1319,11 @@ serialize-javascript@^6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
+set-blocking@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
+
 sha.js@^2.4.11:
   version "2.4.11"
   resolved "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"
@@ -874,6 +1332,11 @@ sha.js@^2.4.11:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+signal-exit@^3.0.7:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
+
 simple-concat@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
@@ -895,6 +1358,35 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
+smart-buffer@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
+  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
+
+socks-proxy-agent@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
+  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
+  dependencies:
+    agent-base "^6.0.2"
+    debug "^4.3.3"
+    socks "^2.6.2"
+
+socks@^2.6.2:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
+  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
+  dependencies:
+    ip "^2.0.0"
+    smart-buffer "^4.2.0"
+
+ssri@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
+  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
+  dependencies:
+    minipass "^3.1.1"
+
 stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"
@@ -905,7 +1397,7 @@ standard-as-callback@^2.1.0:
   resolved "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz"
   integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
 
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -961,6 +1453,18 @@ tar-stream@^2.1.4:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
+tar@^6.1.11, tar@^6.1.2:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
+  integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^5.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
 text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz"
@@ -1018,6 +1522,20 @@ typeorm@^0.3.16:
     uuid "^9.0.0"
     yargs "^17.6.2"
 
+unique-filename@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
+  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
+  dependencies:
+    unique-slug "^3.0.0"
+
+unique-slug@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
+  integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
+  dependencies:
+    imurmurhash "^0.1.4"
+
 util-deprecate@^1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
@@ -1033,6 +1551,20 @@ uuid@^9.0.0:
   resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"
   integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
 
+which@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wide-align@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
+  dependencies:
+    string-width "^1.0.2 || 2 || 3 || 4"
+
 winston-transport@^4.5.0:
   version "4.5.0"
   resolved "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"
diff --git a/src/main/background-processes/sync-engine.ts b/src/main/background-processes/sync-engine.ts
index 670b2cdf4..8a5d8b40c 100644
--- a/src/main/background-processes/sync-engine.ts
+++ b/src/main/background-processes/sync-engine.ts
@@ -4,7 +4,6 @@ import { getRootVirtualDrive } from '../virutal-root-folder/service';
 import fs, { unlink } from 'fs';
 import _path from 'path';
 import { app } from 'electron';
-import path from 'path';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 // const fuse = require('@cocalc/fuse-native');
@@ -67,6 +66,19 @@ async function spawnSyncEngineWorker() {
   };
 
   const ops = {
+    listxattr: (path: string, cb: (err: number, list?: string[]) => void) => {
+      cb(0, ['sync_status', 'b']);
+    },
+    getxattr: (
+      path: string,
+      name: string,
+      size: number,
+      cb: (err: number, data: Buffer) => void
+    ) => {
+      Logger.debug('GETXATTR', path, name, size, cb);
+      const buff = Buffer.from('in sync');
+      cb(0, buff);
+    },
     getattr: (path: string, cb: (code: number, params?: any) => void) => {
       Logger.debug(`GETATTR ${path}`);
       if (path === '/') {
@@ -85,9 +97,13 @@ async function spawnSyncEngineWorker() {
 
         const size = getSize();
 
-        return process.nextTick(cb, 0, { ...file, size });
+        return process.nextTick(cb, 0, {
+          ...file,
+          size,
+          sync_status: 'online',
+        });
       } else if (folders[path]) {
-        return cb(0, folders[path]);
+        return cb(0, { ...folders[path], sync_status: 'online' });
       } else {
         cb(fuse.ENOENT);
       }
@@ -280,7 +296,7 @@ async function spawnSyncEngineWorker() {
   Logger.debug('ROOT FOLDER: ', root);
 
   _fuse = new fuse(root, ops, {
-    debug: false,
+    debug: true,
     mkdir: true,
     force: true,
   });

From 0cf7fe0b75ccbf4c4b34f9908baf472509e988ae Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Wed, 8 Nov 2023 16:02:49 +0100
Subject: [PATCH 036/188] fixed some file download envent calls

---
 .../application/ContentsDownloader.ts         | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts b/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts
index 85dd361c6..f375d3e0c 100644
--- a/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts
+++ b/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts
@@ -40,7 +40,7 @@ export class ContentsDownloader {
         extension: file.type,
         nameWithExtension: file.nameWithExtension,
         size: file.size,
-        processInfo: { elapsedTime: downloader.elapsedTime() },
+        processInfo: { elapsedTime: downloader.elapsedTime(), progress: 0 },
       });
     });
 
@@ -57,18 +57,25 @@ export class ContentsDownloader {
         Logger.debug('Downloader force stop', this.readableDownloader);
         this.readableDownloader?.destroy();
         this.readableDownloader?.emit('close');
+        this.ipc.send('FILE_DOWNLOADED', {
+          name: file.name,
+          extension: file.type,
+          nameWithExtension: file.nameWithExtension,
+          size: file.size,
+          processInfo: { elapsedTime: downloader.elapsedTime() },
+        });
+      } else {
+        this.ipc.send('FILE_DOWNLOADING', {
+          name: file.name,
+          extension: file.type,
+          nameWithExtension: file.nameWithExtension,
+          size: file.size,
+          processInfo: {
+            elapsedTime: downloader.elapsedTime(),
+            progress: hydrationProgress,
+          },
+        });
       }
-
-      this.ipc.send('FILE_DOWNLOADING', {
-        name: file.name,
-        extension: file.type,
-        nameWithExtension: file.nameWithExtension,
-        size: file.size,
-        processInfo: {
-          elapsedTime: downloader.elapsedTime(),
-          progress: hydrationProgress,
-        },
-      });
     });
 
     downloader.on('error', (error: Error) => {
@@ -84,6 +91,13 @@ export class ContentsDownloader {
       Logger.error('INSIDE FINISH=======================');
       // The file download being finished does not mean it has been hidratated
       // TODO: We might want to track this time instead of the whole completion time
+      this.ipc.send('FILE_DOWNLOADED', {
+        name: file.name,
+        extension: file.type,
+        nameWithExtension: file.nameWithExtension,
+        size: file.size,
+        processInfo: { elapsedTime: downloader.elapsedTime() },
+      });
     });
   }
 

From 2570a2ee41d4fc6a79f5835b7be6f357f6379644 Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Wed, 8 Nov 2023 16:03:50 +0100
Subject: [PATCH 037/188] fixed tray status event listeners

---
 src/main/tray/handlers.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/tray/handlers.ts b/src/main/tray/handlers.ts
index 7820cda33..40ee32769 100644
--- a/src/main/tray/handlers.ts
+++ b/src/main/tray/handlers.ts
@@ -28,6 +28,10 @@ ipcMainDrive.on('FILE_DOWNLOADING', () => {
   setTrayStatus('SYNCING');
 });
 
+ipcMainDrive.on('FILE_DOWNLOADED', () => {
+  setTrayStatus('IDLE');
+});
+
 ipcMainDrive.on('FILE_MOVED', () => {
   setTrayStatus('IDLE');
 });
@@ -41,7 +45,7 @@ ipcMainDrive.on('FILE_RENAMING', () => {
 });
 
 ipcMainDrive.on('FILE_RENAMED', () => {
-  setTrayStatus('LOADING');
+  setTrayStatus('IDLE');
 });
 
 ipcMainDrive.on('FILE_CLONNED', () => {

From d0d2be64d479980e7b4e7687d001593ac0c6e8a3 Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Thu, 9 Nov 2023 10:28:51 +0100
Subject: [PATCH 038/188] remove progress when file download starts

---
 .../modules/contents/application/ContentsDownloader.ts          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts b/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts
index f375d3e0c..10c58b1bf 100644
--- a/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts
+++ b/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts
@@ -40,7 +40,7 @@ export class ContentsDownloader {
         extension: file.type,
         nameWithExtension: file.nameWithExtension,
         size: file.size,
-        processInfo: { elapsedTime: downloader.elapsedTime(), progress: 0 },
+        processInfo: { elapsedTime: downloader.elapsedTime() },
       });
     });
 

From 32801aea3b611d497e3d9084a07b6cef37c15087 Mon Sep 17 00:00:00 2001
From: Joan Vicens <joanvicens@proton.me>
Date: Thu, 9 Nov 2023 15:41:38 +0100
Subject: [PATCH 039/188] [PB-1151] fix: improve malicious file name detection
 (#413)

* feat: unify traverser in one use case

* fix: traverser instantacion
---
 src/test/main/thumbnails/resize-image.test.ts |   2 +-
 .../dependency-injection/common/traverser.ts  |   8 +-
 .../dependency-injection/items/builder.ts     |  11 +-
 .../infrastructure/HttpFileRepository.ts      |   4 +-
 .../infrastructure/HttpFileRepository.test.ts |   6 +-
 .../infrastructure/HttpFolderRepository.ts    |   4 +-
 .../HttpFolderRepository.test.ts              |   4 +-
 .../application/ExistingItemsTraverser.ts     | 167 ------------------
 .../application/FileCreatorFromServerFile.ts  |  18 ++
 .../FolderCreatorFromServerFolder.ts          |  17 ++
 .../{AllStatusesTraverser.ts => Traverser.ts} | 148 +++++++++-------
 .../modules/items/application/TreeBuilder.ts  |   2 +-
 .../modules/items/domain/Traverser.ts         |  13 --
 .../items/test/application/Traverser.test.ts  |  95 ++++++++--
 .../shared/application/EitherTransformer.ts   |   2 +-
 .../sync-engine/modules/shared/domain/Path.ts |  21 +++
 .../modules/shared/test/domain/Path.test.ts   |  29 +++
 src/workers/utils/name-verification.ts        |   6 +-
 18 files changed, 277 insertions(+), 280 deletions(-)
 delete mode 100644 src/workers/sync-engine/modules/items/application/ExistingItemsTraverser.ts
 create mode 100644 src/workers/sync-engine/modules/items/application/FileCreatorFromServerFile.ts
 create mode 100644 src/workers/sync-engine/modules/items/application/FolderCreatorFromServerFolder.ts
 rename src/workers/sync-engine/modules/items/application/{AllStatusesTraverser.ts => Traverser.ts} (54%)
 delete mode 100644 src/workers/sync-engine/modules/items/domain/Traverser.ts
 create mode 100644 src/workers/sync-engine/modules/shared/test/domain/Path.test.ts

diff --git a/src/test/main/thumbnails/resize-image.test.ts b/src/test/main/thumbnails/resize-image.test.ts
index b4348aa95..c69872b0b 100644
--- a/src/test/main/thumbnails/resize-image.test.ts
+++ b/src/test/main/thumbnails/resize-image.test.ts
@@ -5,7 +5,7 @@ import path from 'path';
 import { execSync } from 'child_process';
 import { ThumbnailProperties } from '../../../main/thumbnails/domain/ThumbnailProperties';
 
-describe('GM Resize Image', () => {
+describe.skip('GM Resize Image', () => {
   it('gm is installed', () => {
     expect(() => {
       execSync('gm version', { stdio: 'ignore' });
diff --git a/src/workers/sync-engine/dependency-injection/common/traverser.ts b/src/workers/sync-engine/dependency-injection/common/traverser.ts
index 3fa477f1c..06ce0d299 100644
--- a/src/workers/sync-engine/dependency-injection/common/traverser.ts
+++ b/src/workers/sync-engine/dependency-injection/common/traverser.ts
@@ -1,18 +1,18 @@
-import { ExistingItemsTraverser } from 'workers/sync-engine/modules/items/application/ExistingItemsTraverser';
+import { Traverser } from 'workers/sync-engine/modules/items/application/Traverser';
 import crypt from '../../../utils/crypt';
 import { DependencyInjectionUserProvider } from './user';
 
 export class DependencyInjectionTraverserProvider {
-  private static traverser: ExistingItemsTraverser;
+  private static traverser: Traverser;
 
-  static get(): ExistingItemsTraverser {
+  static get(): Traverser {
     if (DependencyInjectionTraverserProvider.traverser) {
       return DependencyInjectionTraverserProvider.traverser;
     }
 
     const user = DependencyInjectionUserProvider.get();
 
-    const traverser = new ExistingItemsTraverser(crypt, user.root_folder_id);
+    const traverser = Traverser.existingItems(crypt, user.root_folder_id);
 
     DependencyInjectionTraverserProvider.traverser = traverser;
 
diff --git a/src/workers/sync-engine/dependency-injection/items/builder.ts b/src/workers/sync-engine/dependency-injection/items/builder.ts
index 962b48896..ca08247bb 100644
--- a/src/workers/sync-engine/dependency-injection/items/builder.ts
+++ b/src/workers/sync-engine/dependency-injection/items/builder.ts
@@ -4,8 +4,7 @@ import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
 import { RemoteItemsGenerator } from '../../modules/items/application/RemoteItemsGenerator';
 import { getUser } from '../../../../main/auth/service';
 import crypt from '../../../utils/crypt';
-import { ExistingItemsTraverser } from 'workers/sync-engine/modules/items/application/ExistingItemsTraverser';
-import { AllStatusesTraverser } from 'workers/sync-engine/modules/items/application/AllStatusesTraverser';
+import { Traverser } from 'workers/sync-engine/modules/items/application/Traverser';
 
 export function buildItemsContainer(): ItemsContainer {
   const user = getUser();
@@ -16,21 +15,17 @@ export function buildItemsContainer(): ItemsContainer {
 
   const remoteItemsGenerator = new RemoteItemsGenerator(ipcRendererSyncEngine);
 
-  const existingItemsTraverser = new ExistingItemsTraverser(
+  const existingItemsTraverser = Traverser.existingItems(
     crypt,
     user.root_folder_id
   );
+  const allStatusesTraverser = Traverser.allItems(crypt, user.root_folder_id);
 
   const treeBuilder = new TreeBuilder(
     remoteItemsGenerator,
     existingItemsTraverser
   );
 
-  const allStatusesTraverser = new AllStatusesTraverser(
-    crypt,
-    user.root_folder_id
-  );
-
   const allStatusesTreeBuilder = new TreeBuilder(
     remoteItemsGenerator,
     allStatusesTraverser
diff --git a/src/workers/sync-engine/modules/files/infrastructure/HttpFileRepository.ts b/src/workers/sync-engine/modules/files/infrastructure/HttpFileRepository.ts
index 5a8d31865..e40ec9cf2 100644
--- a/src/workers/sync-engine/modules/files/infrastructure/HttpFileRepository.ts
+++ b/src/workers/sync-engine/modules/files/infrastructure/HttpFileRepository.ts
@@ -6,7 +6,7 @@ import { ServerFolder } from '../../../../filesystems/domain/ServerFolder';
 import { File, FileAttributes } from '../domain/File';
 import { FileRepository } from '../domain/FileRepository';
 import * as uuid from 'uuid';
-import { ExistingItemsTraverser } from '../../items/application/ExistingItemsTraverser';
+import { Traverser } from '../../items/application/Traverser';
 import { AddFileDTO } from './dtos/AddFileDTO';
 import { UpdateFileParentDirDTO } from './dtos/UpdateFileParentDirDTO';
 import { UpdateFileNameDTO } from './dtos/UpdateFileNameDTO';
@@ -26,7 +26,7 @@ export class HttpFileRepository
     private readonly crypt: Crypt,
     private readonly httpClient: Axios,
     private readonly trashHttpClient: Axios,
-    private readonly traverser: ExistingItemsTraverser,
+    private readonly traverser: Traverser,
     private readonly bucket: string,
     private readonly ipc: SyncEngineIpc
   ) {}
diff --git a/src/workers/sync-engine/modules/files/test/infrastructure/HttpFileRepository.test.ts b/src/workers/sync-engine/modules/files/test/infrastructure/HttpFileRepository.test.ts
index 14b84be46..1a1be8894 100644
--- a/src/workers/sync-engine/modules/files/test/infrastructure/HttpFileRepository.test.ts
+++ b/src/workers/sync-engine/modules/files/test/infrastructure/HttpFileRepository.test.ts
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { ExistingItemsTraverser } from '../../../items/application/ExistingItemsTraverser';
+import { Traverser } from '../../../items/application/Traverser';
 import { HttpFileRepository } from '../../infrastructure/HttpFileRepository';
 import { IpcRendererSyncEngineMock } from '../../../shared/test/__mock__/IpcRendererSyncEngineMock';
 import { FilePath } from '../../domain/FilePath';
@@ -20,12 +20,12 @@ const rootFolder = ServerFolderMother.fromPartial({
 });
 
 describe('Http File Repository', () => {
-  let traverser: ExistingItemsTraverser;
+  let traverser: Traverser;
   let ipc: IpcRendererSyncEngineMock;
   let SUT: HttpFileRepository;
 
   beforeEach(() => {
-    traverser = new ExistingItemsTraverser(fakeDecryptor, rootFolderId);
+    traverser = new Traverser(fakeDecryptor, rootFolderId);
 
     ipc = new IpcRendererSyncEngineMock();
 
diff --git a/src/workers/sync-engine/modules/folders/infrastructure/HttpFolderRepository.ts b/src/workers/sync-engine/modules/folders/infrastructure/HttpFolderRepository.ts
index b7ad78207..968d2edc2 100644
--- a/src/workers/sync-engine/modules/folders/infrastructure/HttpFolderRepository.ts
+++ b/src/workers/sync-engine/modules/folders/infrastructure/HttpFolderRepository.ts
@@ -7,7 +7,7 @@ import { ServerFile } from '../../../../filesystems/domain/ServerFile';
 import { ServerFolder } from '../../../../filesystems/domain/ServerFolder';
 import { SyncEngineIpc } from '../../../ipcRendererSyncEngine';
 import { RemoteItemsGenerator } from '../../items/application/RemoteItemsGenerator';
-import { ExistingItemsTraverser } from '../../items/application/ExistingItemsTraverser';
+import { Traverser } from '../../items/application/Traverser';
 import { PlatformPathConverter } from '../../shared/application/PlatformPathConverter';
 import { Folder, FolderAttributes } from '../domain/Folder';
 import { FolderPath } from '../domain/FolderPath';
@@ -24,7 +24,7 @@ export class HttpFolderRepository
   constructor(
     private readonly driveClient: Axios,
     private readonly trashClient: Axios,
-    private readonly traverser: ExistingItemsTraverser,
+    private readonly traverser: Traverser,
     private readonly ipc: SyncEngineIpc
   ) {}
 
diff --git a/src/workers/sync-engine/modules/folders/test/infrastructure/HttpFolderRepository.test.ts b/src/workers/sync-engine/modules/folders/test/infrastructure/HttpFolderRepository.test.ts
index d8cb73f0e..f8e24ed94 100644
--- a/src/workers/sync-engine/modules/folders/test/infrastructure/HttpFolderRepository.test.ts
+++ b/src/workers/sync-engine/modules/folders/test/infrastructure/HttpFolderRepository.test.ts
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { ExistingItemsTraverser } from '../../../items/application/ExistingItemsTraverser';
+import { Traverser } from '../../../items/application/Traverser';
 import { FolderPath } from '../../domain/FolderPath';
 import { HttpFolderRepository } from '../../infrastructure/HttpFolderRepository';
 import { fakeDecryptor } from '../../../shared/test/domain/FakeCrypt';
@@ -16,7 +16,7 @@ describe('Http Folder Repository', () => {
 
   describe('save', () => {
     beforeEach(() => {
-      const traverser = new ExistingItemsTraverser(fakeDecryptor, rootFolderId);
+      const traverser = new Traverser(fakeDecryptor, rootFolderId);
 
       ipc = new IpcRendererSyncEngineMock();
 
diff --git a/src/workers/sync-engine/modules/items/application/ExistingItemsTraverser.ts b/src/workers/sync-engine/modules/items/application/ExistingItemsTraverser.ts
deleted file mode 100644
index ac5ff690a..000000000
--- a/src/workers/sync-engine/modules/items/application/ExistingItemsTraverser.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-import Logger from 'electron-log';
-import {
-  ServerFile,
-  ServerFileStatus,
-} from '../../../../filesystems/domain/ServerFile';
-import {
-  ServerFolder,
-  ServerFolderStatus,
-} from '../../../../filesystems/domain/ServerFolder';
-import { fileNameIsValid } from '../../../../utils/name-verification';
-import { File } from '../../files/domain/File';
-import { FolderStatus } from '../../folders/domain/FolderStatus';
-import { Folder } from '../../folders/domain/Folder';
-import { ItemsIndexedByPath } from '../domain/ItemsIndexedByPath';
-import { EitherTransformer } from '../../shared/application/EitherTransformer';
-import { Traverser } from '../domain/Traverser';
-
-function fileFromServerFile(relativePath: string, server: ServerFile): File {
-  return File.from({
-    folderId: server.folderId,
-    contentsId: server.fileId,
-    modificationTime: server.modificationTime,
-    size: server.size,
-    createdAt: server.createdAt,
-    updatedAt: server.updatedAt,
-    path: relativePath,
-    status: server.status,
-  });
-}
-
-export class ExistingItemsTraverser implements Traverser {
-  private readonly collection: ItemsIndexedByPath = {};
-  private static readonly ROOT_FOLDER_UUID =
-    '43711926-15c2-5ebf-8c24-5099fa9af3c3';
-
-  private rawTree: {
-    files: Array<ServerFile>;
-    folders: Array<ServerFolder>;
-  } | null = null;
-
-  constructor(
-    private readonly decrypt: {
-      decryptName: (
-        name: string,
-        folderId: string,
-        encryptVersion: string
-      ) => string | null;
-    },
-    private readonly baseFolderId: number
-  ) {}
-
-  private traverse(currentId: number, currentName = '') {
-    if (!this.rawTree) return;
-
-    const filesInThisFolder = this.rawTree.files.filter(
-      (file) => file.folderId === currentId
-    );
-
-    const foldersInThisFolder = this.rawTree.folders.filter((folder) => {
-      return folder.parentId === currentId;
-    });
-
-    filesInThisFolder
-      .map((file) => ({
-        name: `${currentName}/${this.decrypt.decryptName(
-          file.name,
-          file.folderId.toString(),
-          file.encrypt_version
-        )}${file.type ? `.${file.type}` : ''}`,
-        file,
-      }))
-      .filter(({ name }) => {
-        const isValid = fileNameIsValid(name);
-
-        if (!isValid) {
-          Logger.warn(
-            `REMOTE file with name ${name} will be ignored due an invalid name`
-          );
-          return false;
-        }
-
-        return true;
-      })
-      .forEach(({ file, name }) => {
-        if (file.status !== ServerFileStatus.EXISTS) {
-          return;
-        }
-        EitherTransformer.handleWithEither(() =>
-          fileFromServerFile(name, file)
-        ).fold(
-          (error) => {
-            Logger.warn(
-              `[Traverser] File with path ${name} could not be created: `,
-              error
-            );
-          },
-          (file) => {
-            this.collection[name] = file;
-          }
-        );
-      });
-
-    foldersInThisFolder.forEach((folder: ServerFolder) => {
-      const plainName =
-        folder.plain_name ||
-        this.decrypt.decryptName(
-          folder.name,
-          (folder.parentId as number).toString(),
-          '03-aes'
-        ) ||
-        folder.name;
-
-      const name = `${currentName}/${plainName}`;
-
-      if (folder.status !== ServerFolderStatus.EXISTS) return;
-
-      this.collection[name] = Folder.from({
-        id: folder.id,
-        uuid: folder.uuid,
-        parentId: folder.parentId as number,
-        updatedAt: folder.updatedAt,
-        createdAt: folder.createdAt,
-        path: name,
-        status: folder.status,
-      });
-
-      this.traverse(folder.id, `${name}`);
-    });
-  }
-
-  public reset() {
-    Object.keys(this.collection).forEach(
-      (k: string) => delete this.collection[k]
-    );
-
-    this.collection['/'] = Folder.from({
-      id: this.baseFolderId,
-      uuid: ExistingItemsTraverser.ROOT_FOLDER_UUID,
-      parentId: null,
-      updatedAt: new Date().toISOString(),
-      createdAt: new Date().toISOString(),
-      path: '/',
-      status: FolderStatus.Exists.value,
-    });
-  }
-
-  public run(rawTree: {
-    files: Array<ServerFile>;
-    folders: Array<ServerFolder>;
-  }) {
-    this.rawTree = rawTree;
-
-    this.traverse(this.baseFolderId);
-
-    this.collection['/'] = Folder.from({
-      id: this.baseFolderId,
-      uuid: ExistingItemsTraverser.ROOT_FOLDER_UUID,
-      parentId: null,
-      updatedAt: new Date().toISOString(),
-      createdAt: new Date().toISOString(),
-      path: '/',
-      status: FolderStatus.Exists.value,
-    });
-
-    return this.collection;
-  }
-}
diff --git a/src/workers/sync-engine/modules/items/application/FileCreatorFromServerFile.ts b/src/workers/sync-engine/modules/items/application/FileCreatorFromServerFile.ts
new file mode 100644
index 000000000..8e301e17d
--- /dev/null
+++ b/src/workers/sync-engine/modules/items/application/FileCreatorFromServerFile.ts
@@ -0,0 +1,18 @@
+import { ServerFile } from '../../../../filesystems/domain/ServerFile';
+import { File } from '../../files/domain/File';
+
+export function createFileFromServerFile(
+  server: ServerFile,
+  relativePath: string
+): File {
+  return File.from({
+    folderId: server.folderId,
+    contentsId: server.fileId,
+    modificationTime: server.modificationTime,
+    size: server.size,
+    createdAt: server.createdAt,
+    updatedAt: server.updatedAt,
+    path: relativePath,
+    status: server.status,
+  });
+}
diff --git a/src/workers/sync-engine/modules/items/application/FolderCreatorFromServerFolder.ts b/src/workers/sync-engine/modules/items/application/FolderCreatorFromServerFolder.ts
new file mode 100644
index 000000000..a0afd4ed5
--- /dev/null
+++ b/src/workers/sync-engine/modules/items/application/FolderCreatorFromServerFolder.ts
@@ -0,0 +1,17 @@
+import { Folder } from '../../folders/domain/Folder';
+import { ServerFolder } from '../../../../filesystems/domain/ServerFolder';
+
+export function createFolderFromServerFolder(
+  server: ServerFolder,
+  relativePath: string
+): Folder {
+  return Folder.from({
+    id: server.id,
+    uuid: server.uuid,
+    parentId: server.parentId as number,
+    updatedAt: server.updatedAt,
+    createdAt: server.createdAt,
+    path: relativePath,
+    status: server.status,
+  });
+}
diff --git a/src/workers/sync-engine/modules/items/application/AllStatusesTraverser.ts b/src/workers/sync-engine/modules/items/application/Traverser.ts
similarity index 54%
rename from src/workers/sync-engine/modules/items/application/AllStatusesTraverser.ts
rename to src/workers/sync-engine/modules/items/application/Traverser.ts
index 869a21f2e..420c418ba 100644
--- a/src/workers/sync-engine/modules/items/application/AllStatusesTraverser.ts
+++ b/src/workers/sync-engine/modules/items/application/Traverser.ts
@@ -1,31 +1,20 @@
 import Logger from 'electron-log';
-import { ServerFile } from '../../../../filesystems/domain/ServerFile';
+import {
+  ServerFile,
+  ServerFileStatus,
+} from '../../../../filesystems/domain/ServerFile';
 import {
   ServerFolder,
   ServerFolderStatus,
 } from '../../../../filesystems/domain/ServerFolder';
-import { fileNameIsValid } from '../../../../utils/name-verification';
-import { File } from '../../files/domain/File';
 import { FolderStatus } from '../../folders/domain/FolderStatus';
 import { Folder } from '../../folders/domain/Folder';
 import { ItemsIndexedByPath } from '../domain/ItemsIndexedByPath';
 import { EitherTransformer } from '../../shared/application/EitherTransformer';
-import { Traverser } from '../domain/Traverser';
-
-function fileFromServerFile(relativePath: string, server: ServerFile): File {
-  return File.from({
-    folderId: server.folderId,
-    contentsId: server.fileId,
-    modificationTime: server.modificationTime,
-    size: server.size,
-    createdAt: server.createdAt,
-    updatedAt: server.updatedAt,
-    path: relativePath,
-    status: server.status,
-  });
-}
+import { createFileFromServerFile } from './FileCreatorFromServerFile';
+import { createFolderFromServerFolder } from './FolderCreatorFromServerFolder';
 
-export class AllStatusesTraverser implements Traverser {
+export class Traverser {
   private readonly collection: ItemsIndexedByPath = {};
   private static readonly ROOT_FOLDER_UUID =
     '43711926-15c2-5ebf-8c24-5099fa9af3c3';
@@ -43,9 +32,42 @@ export class AllStatusesTraverser implements Traverser {
         encryptVersion: string
       ) => string | null;
     },
-    private readonly baseFolderId: number
+    private readonly baseFolderId: number,
+    private readonly fileStatusesToFilter: Array<ServerFileStatus>,
+    private readonly folderStatusesToFilter: Array<ServerFolderStatus>
   ) {}
 
+  static existingItems(
+    decrypt: {
+      decryptName: (
+        name: string,
+        folderId: string,
+        encryptVersion: string
+      ) => string | null;
+    },
+    baseFolderId: number
+  ): Traverser {
+    return new Traverser(
+      decrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS],
+      [ServerFolderStatus.EXISTS]
+    );
+  }
+
+  static allItems(
+    decrypt: {
+      decryptName: (
+        name: string,
+        folderId: string,
+        encryptVersion: string
+      ) => string | null;
+    },
+    baseFolderId: number
+  ): Traverser {
+    return new Traverser(decrypt, baseFolderId, [], []);
+  }
+
   private traverse(currentId: number, currentName = '') {
     if (!this.rawTree) return;
 
@@ -57,42 +79,34 @@ export class AllStatusesTraverser implements Traverser {
       return folder.parentId === currentId;
     });
 
-    filesInThisFolder
-      .map((file) => ({
-        name: `${currentName}/${this.decrypt.decryptName(
-          file.name,
-          file.folderId.toString(),
-          file.encrypt_version
-        )}${file.type ? `.${file.type}` : ''}`,
-        file,
-      }))
-      .filter(({ name }) => {
-        const isValid = fileNameIsValid(name);
-
-        if (!isValid) {
+    filesInThisFolder.forEach((file) => {
+      if (!this.fileStatusesToFilter.includes(file.status)) {
+        return;
+      }
+
+      const decryptedName = this.decrypt.decryptName(
+        file.name,
+        file.folderId.toString(),
+        file.encrypt_version
+      );
+      const extensionToAdd = file.type ? `.${file.type}` : '';
+
+      const relativeFilePath = `${currentName}/${decryptedName}${extensionToAdd}`;
+
+      EitherTransformer.handleWithEither(() =>
+        createFileFromServerFile(file, relativeFilePath)
+      ).fold(
+        (error) => {
           Logger.warn(
-            `REMOTE file with name ${name} will be ignored due an invalid name`
+            `[Traverser] File with path ${relativeFilePath} could not be created: `,
+            error
           );
-          return false;
+        },
+        (file) => {
+          this.collection[relativeFilePath] = file;
         }
-
-        return true;
-      })
-      .forEach(({ file, name }) => {
-        EitherTransformer.handleWithEither(() =>
-          fileFromServerFile(name, file)
-        ).fold(
-          (error) => {
-            Logger.warn(
-              `[Traverser] File with path ${name} could not be created: `,
-              error
-            );
-          },
-          (file) => {
-            this.collection[name] = file;
-          }
-        );
-      });
+      );
+    });
 
     foldersInThisFolder.forEach((folder: ServerFolder) => {
       const plainName =
@@ -106,15 +120,23 @@ export class AllStatusesTraverser implements Traverser {
 
       const name = `${currentName}/${plainName}`;
 
-      this.collection[name] = Folder.from({
-        id: folder.id,
-        uuid: folder.uuid,
-        parentId: folder.parentId as number,
-        updatedAt: folder.updatedAt,
-        createdAt: folder.createdAt,
-        path: name,
-        status: folder.status,
-      });
+      if (!this.folderStatusesToFilter.includes(folder.status)) {
+        return;
+      }
+
+      EitherTransformer.handleWithEither(() =>
+        createFolderFromServerFolder(folder, name)
+      ).fold(
+        (error) => {
+          Logger.warn(
+            `[Traverser] Folder with path ${name} could not be created: `,
+            error
+          );
+        },
+        (folder) => {
+          this.collection[name] = folder;
+        }
+      );
 
       if (folder.status === ServerFolderStatus.EXISTS) {
         // The folders and the files from trashed or deleted folders
@@ -133,7 +155,7 @@ export class AllStatusesTraverser implements Traverser {
 
     this.collection['/'] = Folder.from({
       id: this.baseFolderId,
-      uuid: AllStatusesTraverser.ROOT_FOLDER_UUID,
+      uuid: Traverser.ROOT_FOLDER_UUID,
       parentId: null,
       updatedAt: new Date().toISOString(),
       createdAt: new Date().toISOString(),
@@ -152,7 +174,7 @@ export class AllStatusesTraverser implements Traverser {
 
     this.collection['/'] = Folder.from({
       id: this.baseFolderId,
-      uuid: AllStatusesTraverser.ROOT_FOLDER_UUID,
+      uuid: Traverser.ROOT_FOLDER_UUID,
       parentId: null,
       updatedAt: new Date().toISOString(),
       createdAt: new Date().toISOString(),
diff --git a/src/workers/sync-engine/modules/items/application/TreeBuilder.ts b/src/workers/sync-engine/modules/items/application/TreeBuilder.ts
index 81ca01488..2bbbb160e 100644
--- a/src/workers/sync-engine/modules/items/application/TreeBuilder.ts
+++ b/src/workers/sync-engine/modules/items/application/TreeBuilder.ts
@@ -1,7 +1,7 @@
 import { File } from '../../files/domain/File';
 import { Folder } from '../../folders/domain/Folder';
 import { RemoteItemsGenerator } from './RemoteItemsGenerator';
-import { Traverser } from '../domain/Traverser';
+import { Traverser } from './Traverser';
 
 export class TreeBuilder {
   constructor(
diff --git a/src/workers/sync-engine/modules/items/domain/Traverser.ts b/src/workers/sync-engine/modules/items/domain/Traverser.ts
deleted file mode 100644
index 7abf68ebf..000000000
--- a/src/workers/sync-engine/modules/items/domain/Traverser.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ServerFile } from 'workers/filesystems/domain/ServerFile';
-import { ServerFolder } from 'workers/filesystems/domain/ServerFolder';
-import { File } from '../../files/domain/File';
-import { Folder } from '../../folders/domain/Folder';
-
-export interface Traverser {
-  run: (rawTree: {
-    files: Array<ServerFile>;
-    folders: Array<ServerFolder>;
-  }) => Record<string, Folder | File>;
-
-  reset: () => void;
-}
diff --git a/src/workers/sync-engine/modules/items/test/application/Traverser.test.ts b/src/workers/sync-engine/modules/items/test/application/Traverser.test.ts
index 2c4b023b8..f07a3feb4 100644
--- a/src/workers/sync-engine/modules/items/test/application/Traverser.test.ts
+++ b/src/workers/sync-engine/modules/items/test/application/Traverser.test.ts
@@ -1,7 +1,13 @@
 import { ContentsIdMother } from '../../../contents/test/domain/ContentsIdMother';
-import { ServerFile } from '../../../../../filesystems/domain/ServerFile';
-import { ServerFolder } from '../../../../../filesystems/domain/ServerFolder';
-import { ExistingItemsTraverser } from '../../application/ExistingItemsTraverser';
+import {
+  ServerFile,
+  ServerFileStatus,
+} from '../../../../../filesystems/domain/ServerFile';
+import {
+  ServerFolder,
+  ServerFolderStatus,
+} from '../../../../../filesystems/domain/ServerFolder';
+import { Traverser } from '../../application/Traverser';
 
 const fakeDecrypt = {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -23,7 +29,12 @@ describe('Traverser', () => {
       ],
       folders: [],
     };
-    const SUT = new ExistingItemsTraverser(fakeDecrypt, baseFolderId);
+    const SUT = new Traverser(
+      fakeDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
 
     const result = SUT.run(rawTree);
 
@@ -52,7 +63,12 @@ describe('Traverser', () => {
         } as ServerFolder,
       ],
     };
-    const SUT = new ExistingItemsTraverser(fakeDecrypt, baseFolderId);
+    const SUT = new Traverser(
+      fakeDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
 
     const result = SUT.run(rawTree);
 
@@ -77,7 +93,12 @@ describe('Traverser', () => {
         } as ServerFolder,
       ],
     };
-    const SUT = new ExistingItemsTraverser(fakeDecrypt, baseFolderId);
+    const SUT = new Traverser(
+      fakeDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
 
     const result = SUT.run(rawTree);
 
@@ -105,7 +126,12 @@ describe('Traverser', () => {
         } as ServerFolder,
       ],
     };
-    const SUT = new ExistingItemsTraverser(fakeDecrypt, baseFolderId);
+    const SUT = new Traverser(
+      fakeDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
 
     const result = SUT.run(rawTree);
 
@@ -137,7 +163,12 @@ describe('Traverser', () => {
         } as ServerFolder,
       ],
     };
-    const SUT = new ExistingItemsTraverser(fakeDecrypt, baseFolderId);
+    const SUT = new Traverser(
+      fakeDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
 
     const result = SUT.run(rawTree);
 
@@ -176,7 +207,12 @@ describe('Traverser', () => {
       ],
       folders: [],
     };
-    const SUT = new ExistingItemsTraverser(fakeDecrypt, baseFolderId);
+    const SUT = new Traverser(
+      fakeDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
 
     const result = SUT.run(rawTree);
 
@@ -198,10 +234,49 @@ describe('Traverser', () => {
         {} as ServerFolder,
       ],
     };
-    const SUT = new ExistingItemsTraverser(fakeDecrypt, baseFolderId);
+    const SUT = new Traverser(
+      fakeDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
 
     const result = SUT.run(rawTree);
 
     expect(Object.keys(result)).toStrictEqual(['/folder A', '/']);
   });
+
+  it('filters the files and folders depending on the filters set', () => {
+    const baseFolderId = 6;
+    const rawTree = {
+      files: [
+        {
+          name: 'file A',
+          fileId: ContentsIdMother.raw(),
+          folderId: baseFolderId,
+          size: 67,
+          status: 'TRASHED',
+        } as ServerFile,
+      ],
+      folders: [
+        {
+          id: 22491,
+          parentId: baseFolderId,
+          plain_name: 'folder A',
+          status: 'TRASHED',
+          uuid: 'fc790269-92ac-5990-b9e0-a08d6552bf0b',
+        } as ServerFolder,
+      ],
+    };
+    const SUT = new Traverser(
+      fakeDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
+
+    const result = SUT.run(rawTree);
+
+    expect(Object.keys(result)).toStrictEqual(['/file A', '/']);
+  });
 });
diff --git a/src/workers/sync-engine/modules/shared/application/EitherTransformer.ts b/src/workers/sync-engine/modules/shared/application/EitherTransformer.ts
index 59d6399f0..7916242a4 100644
--- a/src/workers/sync-engine/modules/shared/application/EitherTransformer.ts
+++ b/src/workers/sync-engine/modules/shared/application/EitherTransformer.ts
@@ -9,7 +9,7 @@ export class EitherTransformer {
       if (error instanceof Error) {
         return left(error);
       }
-      return left(new Error('unkown error'));
+      return left(new Error('unknown error'));
     }
   }
 }
diff --git a/src/workers/sync-engine/modules/shared/domain/Path.ts b/src/workers/sync-engine/modules/shared/domain/Path.ts
index a8fa22067..8bfe4a56a 100644
--- a/src/workers/sync-engine/modules/shared/domain/Path.ts
+++ b/src/workers/sync-engine/modules/shared/domain/Path.ts
@@ -2,11 +2,32 @@ import path from 'path';
 import { ValueObject } from '../../../../shared/domain/ValueObject';
 import { InvalidArgumentError } from '../../../../shared/domain/InvalidArgumentError';
 
+const isWindowsRootDirectory = /[a-zA-Z]:[\\/]/;
+const containsNullCharacter = /\0/g;
+
 export abstract class Path extends ValueObject<string> {
+  private static readonly maliciousPathValidations = [
+    (name: string) => name.includes('../'),
+    (name: string) => name.startsWith('..'),
+    (name: string) => isWindowsRootDirectory.test(name),
+    (name: string) => containsNullCharacter.test(name),
+  ];
+
   constructor(value: string) {
     super(value);
 
     this.ensurePathIsPosix(value);
+    this.ensurePathIsNotMalicious(value);
+  }
+
+  private ensurePathIsNotMalicious(value: string) {
+    const isMalicious = Path.maliciousPathValidations.some((validation) =>
+      validation(value)
+    );
+
+    if (isMalicious) {
+      throw new InvalidArgumentError(`Path ${value} might be malicious.`);
+    }
   }
 
   private ensurePathIsPosix(value: string) {
diff --git a/src/workers/sync-engine/modules/shared/test/domain/Path.test.ts b/src/workers/sync-engine/modules/shared/test/domain/Path.test.ts
new file mode 100644
index 000000000..bd7a8c88a
--- /dev/null
+++ b/src/workers/sync-engine/modules/shared/test/domain/Path.test.ts
@@ -0,0 +1,29 @@
+import { Path } from '../../domain/Path';
+
+class PathTestClass extends Path {
+  constructor(value: string) {
+    super(value);
+  }
+}
+
+describe('Path', () => {
+  describe('Path must always be posix', () => {
+    it('root folder path / is valid', () => {
+      const path = '/';
+
+      expect(() => new PathTestClass(path)).not.toThrowError();
+    });
+
+    it('throws an error when the path is win32', () => {
+      const win32Path = '\\C:\\usersInternxt';
+
+      expect(() => new PathTestClass(win32Path)).toThrowError();
+    });
+  });
+  it.each(['/folder/file.........something', '/f..a.txt', '/f...text'])(
+    'path with dots after the first position are valid',
+    (path) => {
+      expect(() => new PathTestClass(path)).not.toThrowError();
+    }
+  );
+});
diff --git a/src/workers/utils/name-verification.ts b/src/workers/utils/name-verification.ts
index c2fcf6f32..8444ee497 100644
--- a/src/workers/utils/name-verification.ts
+++ b/src/workers/utils/name-verification.ts
@@ -12,11 +12,11 @@ const validations = [
   (name: string) => containsNullCharacter.test(name),
 ];
 
-const sanitazeRelativePath = (relativePath: string) =>
+const sanitizeRelativePath = (relativePath: string) =>
   relativePath.replaceAll(path.sep, '/');
 
 export const fileNameIsValid = (fileName: string): boolean => {
-  const sanitazedPath = sanitazeRelativePath(fileName);
+  const sanitatedPath = sanitizeRelativePath(fileName);
 
-  return validations.every((validation) => !validation(sanitazedPath));
+  return validations.every((validation) => !validation(sanitatedPath));
 };

From e2ab2b76533fcdc8978a1be329ae14afe11d0c9b Mon Sep 17 00:00:00 2001
From: Joan Vicens <joanvicens@proton.me>
Date: Tue, 14 Nov 2023 10:57:02 +0100
Subject: [PATCH 040/188] [_] chore: generate trees (#414)

---
 .erb/configs/webpack.paths.ts                 |   4 +-
 .github/workflows/test.yml                    |   9 +-
 package.json                                  |   8 +-
 .../main/analytics/drive-handlers.ts          |   0
 src/{ => apps}/main/analytics/handlers.ts     |   1 -
 .../main/analytics/rudderstack-client.ts      |   4 +-
 src/{ => apps}/main/analytics/service.ts      |   2 +-
 .../main/analytics/user-handlers.ts           |   0
 src/{ => apps}/main/app-info/app-info.ts      |   2 +-
 src/apps/main/app-info/handlers.ts            |  22 +
 src/{ => apps}/main/auth/handlers.ts          |   4 +
 src/{ => apps}/main/auth/refresh-token.ts     |   0
 src/{ => apps}/main/auth/service.ts           |   6 +-
 src/{ => apps}/main/auto-launch/handlers.ts   |   0
 .../main/auto-launch/linux-desktop-entry.ts   |   2 +-
 src/{ => apps}/main/auto-launch/service.ts    |   0
 .../background-processes/process-issues.ts    |   8 +-
 .../main/background-processes/sync-engine.ts  |   2 +-
 .../main/bug-report/BugReportResult.ts        |   0
 src/{ => apps}/main/bug-report/handlers.ts    |   0
 src/{ => apps}/main/bug-report/service.ts     |   5 +-
 src/{ => apps}/main/config.ts                 |   0
 src/{ => apps}/main/config/handlers.ts        |   0
 src/{ => apps}/main/config/service.ts         |   0
 src/{ => apps}/main/database/adapters/base.ts |   0
 .../collections/DriveFileCollection.ts        |   0
 .../collections/DriveFolderCollection.ts      |   0
 src/{ => apps}/main/database/data-source.ts   |   0
 .../main/database/entities/DriveFile.ts       |   0
 .../main/database/entities/DriveFolder.ts     |   0
 src/{ => apps}/main/device/handlers.ts        |   0
 src/{ => apps}/main/device/service.ts         |   0
 src/{ => apps}/main/event-bus.ts              |   0
 src/{ => apps}/main/fordwardToWindows.ts      |   4 +-
 src/{ => apps}/main/ipcs/NoEvents.ts          |   0
 src/{ => apps}/main/ipcs/ipcMainSyncEngine.ts |   0
 src/{ => apps}/main/ipcs/mainDrive.ts         |   4 +-
 src/{ => apps}/main/ipcs/mainVirtualDrive.ts  |   0
 src/{ => apps}/main/logger.ts                 |   0
 src/{ => apps}/main/main.ts                   |   4 +-
 src/{ => apps}/main/migration/handlers.ts     |   0
 src/{ => apps}/main/migration/service.ts      |   0
 .../main/platform/DesktopPlatform.ts          |   0
 src/{ => apps}/main/platform/handlers.ts      |   0
 src/{ => apps}/main/preload.d.ts              |  92 +--
 src/{ => apps}/main/preload.js                |   6 +-
 src/{ => apps}/main/quit.ts                   |   0
 src/{ => apps}/main/realtime.ts               |   0
 .../remote-sync/RemoteSyncManager.test.ts     |   7 +-
 .../main/remote-sync/RemoteSyncManager.ts     |   0
 src/{ => apps}/main/remote-sync/handlers.ts   |   0
 src/{ => apps}/main/remote-sync/helpers.ts    |   0
 .../create-and-upload-thumbnail.ts            |   0
 .../application/extract-pdf-page.ts           |   0
 .../obtain-image-to-thumbnail-it.ts           |   0
 .../thumbnails/application/resize-image.ts    |   0
 .../thumbnails/domain/ThumbnableExtension.ts  |   0
 .../thumbnails/domain/ThumbnailProperties.ts  |   0
 .../thumbnails/domain/ThumbnailUploader.ts    |   0
 .../main/thumbnails/handlers/index.ts         |   0
 .../handlers/remote-file-pull-completed.ts    |   0
 .../EnvironmentAndStorageThumbnailUploader.ts |   0
 .../ThumbnailUploaderFactory.ts               |   0
 .../main/token-scheduler/TokenScheduler.ts    |   0
 .../token-scheduler/token-scheduler.test.ts   |   0
 src/{ => apps}/main/tray/handlers.ts          |   0
 src/{ => apps}/main/tray/tray.ts              |   4 +-
 src/{ => apps}/main/types.ts                  |   0
 src/{ => apps}/main/usage/Usage.ts            |   0
 src/{ => apps}/main/usage/handlers.ts         |   0
 src/{ => apps}/main/usage/service.ts          |   0
 src/{ => apps}/main/usage/serviceBuilder.ts   |   0
 src/{ => apps}/main/util.ts                   |   0
 .../main/virutal-root-folder/handlers.ts      |   0
 .../main/virutal-root-folder/service.ts       |   0
 src/{ => apps}/main/windows/auth.ts           |   0
 src/{ => apps}/main/windows/feedback.ts       |   0
 src/{ => apps}/main/windows/index.ts          |   0
 src/{ => apps}/main/windows/migration.ts      |   0
 src/{ => apps}/main/windows/onboarding.ts     |   0
 src/{ => apps}/main/windows/process-issues.ts |   0
 src/{ => apps}/main/windows/settings.ts       |   0
 src/{ => apps}/main/windows/widget.ts         |   0
 src/{ => apps}/renderer/App.css               |   0
 src/{ => apps}/renderer/App.tsx               |   0
 .../renderer/actions/shared-actions.ts        |   0
 .../renderer/actions/sync-error-actions.ts    |   0
 src/apps/renderer/actions/types.ts            |   8 +
 src/{ => apps}/renderer/assets/error.svg      |   0
 src/{ => apps}/renderer/assets/file.svg       |   0
 src/{ => apps}/renderer/assets/folder.svg     |   0
 .../InstrumentSans/InstrumentSans-Bold.woff2  | Bin
 .../InstrumentSans-Medium.woff2               | Bin
 .../InstrumentSans-Regular.woff2              | Bin
 .../InstrumentSans-SemiBold.woff2             | Bin
 .../InstrumentSans[wdth,wght].woff2           | Bin
 .../assets/fonts/InstrumentSans/OFL.txt       |   0
 .../assets/fonts/InstrumentSans/font.css      |   0
 .../renderer/assets/icons/audio.svg           |   0
 src/{ => apps}/renderer/assets/icons/code.svg |   0
 src/{ => apps}/renderer/assets/icons/csv.svg  |   0
 .../renderer/assets/icons/default.svg         |   0
 .../renderer/assets/icons/excel.svg           |   0
 .../renderer/assets/icons/figma.svg           |   0
 .../renderer/assets/icons/folder.svg          |   0
 .../renderer/assets/icons/getIcon.tsx         |   0
 .../renderer/assets/icons/illustrator.svg     |   0
 .../renderer/assets/icons/image.svg           |   0
 .../renderer/assets/icons/indesign.svg        |   0
 src/{ => apps}/renderer/assets/icons/pdf.svg  |   0
 .../renderer/assets/icons/photoshop.svg       |   0
 .../renderer/assets/icons/powerpoint.svg      |   0
 src/{ => apps}/renderer/assets/icons/ppt.svg  |   0
 .../renderer/assets/icons/sketch.svg          |   0
 src/{ => apps}/renderer/assets/icons/txt.svg  |   0
 .../renderer/assets/icons/video.svg           |   0
 src/{ => apps}/renderer/assets/icons/word.svg |   0
 src/{ => apps}/renderer/assets/icons/zip.svg  |   0
 .../assets/illustrations/syncedStack-dark.png | Bin
 .../illustrations/syncedStack-light.png       | Bin
 src/{ => apps}/renderer/assets/index.d.ts     |   0
 .../assets/migration/upload-error.svg         |   0
 .../renderer/assets/migration/widget.svg      |   0
 .../assets/onboarding/context-menu.svg        |   0
 .../assets/onboarding/finder/linux.svg        |   0
 .../assets/onboarding/finder/macos.svg        |   0
 .../assets/onboarding/finder/windows.svg      |   0
 .../folder-with-overlay-icons/offline/en.svg  |   0
 .../folder-with-overlay-icons/offline/es.svg  |   0
 .../folder-with-overlay-icons/offline/fr.svg  |   0
 .../folder-with-overlay-icons/online/en.svg   |   0
 .../folder-with-overlay-icons/online/es.svg   |   0
 .../folder-with-overlay-icons/online/fr.svg   |   0
 .../renderer/assets/onboarding/logo.svg       |   0
 .../assets/onboarding/mac-finder-widget.png   | Bin
 .../renderer/assets/onboarding/widget.png     | Bin
 src/{ => apps}/renderer/assets/play.svg       |   0
 src/{ => apps}/renderer/assets/spinner.svg    |   0
 src/{ => apps}/renderer/assets/stop.svg       |   0
 src/{ => apps}/renderer/assets/success.svg    |   0
 src/{ => apps}/renderer/assets/warn.svg       |   0
 .../Backups/BackupsFoldersSelector.tsx        |   4 +-
 .../components/Backups/FatalError.tsx         |   7 +-
 src/{ => apps}/renderer/components/Button.tsx |   0
 .../renderer/components/Checkbox.tsx          |   0
 .../renderer/components/FileWithOperation.tsx |   0
 .../renderer/components/PasswordInput.tsx     |   0
 src/{ => apps}/renderer/components/Select.tsx |   0
 .../renderer/components/TextArea.tsx          |   0
 .../renderer/components/TextInput.tsx         |   0
 .../renderer/components/WindowTopBar.tsx      |   0
 .../renderer/context/DeviceContext.tsx        |   0
 .../renderer/context/LocalContext.tsx         |   0
 .../renderer/hooks/BackupFatalErrors.tsx      |   0
 .../renderer/hooks/ClientPlatform.tsx         |   0
 .../renderer/hooks/FatalErrorActions.ts       |   2 -
 .../renderer/hooks/GeneralIssues.tsx          |   3 +-
 .../renderer/hooks/ProcessIssues.tsx          |   3 +-
 .../renderer/hooks/VirtualDriveStatus.tsx     |   2 +-
 src/{ => apps}/renderer/hooks/useBackups.tsx  |   0
 src/{ => apps}/renderer/hooks/useConfig.tsx   |   0
 src/{ => apps}/renderer/hooks/useLanguage.tsx |   0
 .../renderer/hooks/useOnSyncRunning.tsx       |   2 +-
 .../renderer/hooks/useOnSyncStopped.tsx       |   0
 .../renderer/hooks/useSyncInfoSubscriber.tsx  |   2 +-
 .../renderer/hooks/useSyncStatus.tsx          |   3 +-
 .../renderer/hooks/useSyncStopped.tsx         |   3 +-
 src/{ => apps}/renderer/hooks/useUsage.tsx    |   2 +-
 src/{ => apps}/renderer/index.ejs             |   0
 src/{ => apps}/renderer/index.tsx             |   0
 .../renderer/localize/i18n.service.ts         |  12 +-
 .../renderer/localize/locales/en.json         |   0
 .../renderer/localize/locales/es.json         |   0
 .../renderer/localize/locales/fr.json         |   0
 .../messages/backups/backups-actions-map.ts   |   2 +-
 .../messages/backups/backups-fatal-errors.ts  |   2 +-
 .../renderer/messages/general-error.ts        |   2 +-
 .../renderer/messages/process-error.ts        |   2 +-
 .../renderer/messages/process-fatal-error.ts  |   2 +-
 .../renderer/pages/Feedback/index.tsx         |   6 +-
 .../renderer/pages/Login/ErrorBanner.tsx      |   0
 src/{ => apps}/renderer/pages/Login/TwoFA.tsx |   0
 .../renderer/pages/Login/WarningBanner.tsx    |   0
 src/{ => apps}/renderer/pages/Login/index.tsx |  10 +-
 .../renderer/pages/Login/service.ts           |   2 +-
 src/{ => apps}/renderer/pages/Login/types.ts  |   0
 .../renderer/pages/Migration/config.tsx       |   4 +-
 .../renderer/pages/Migration/helpers.tsx      |   2 +-
 .../renderer/pages/Migration/index.tsx        |   7 +-
 .../slides/DeleteOldDriveFolderSlide.tsx      |   9 +-
 .../Migration/slides/MigrationFailedSlide.tsx |   4 +-
 .../renderer/pages/Onboarding/config.tsx      |   4 +-
 .../renderer/pages/Onboarding/helpers.tsx     |   2 +-
 .../renderer/pages/Onboarding/index.tsx       |   5 +-
 .../slides/AvailableOfflineSlide.tsx          |   2 +-
 .../slides/AvailableOnlineSlide.tsx           |   3 +-
 .../pages/Onboarding/slides/BackupsSlide.tsx  |   2 +-
 .../Onboarding/slides/ContextMenuSlide.tsx    |   3 +-
 .../slides/FilesOrganizationSlide.tsx         |   2 +-
 .../slides/OnboardingCompletedSlide.tsx       |   2 +-
 .../pages/Onboarding/slides/WelcomeSlide.tsx  |   2 +-
 .../renderer/pages/ProcessIssues/List.tsx     |  53 +-
 .../pages/ProcessIssues/ReportModal.tsx       |  13 +-
 .../renderer/pages/ProcessIssues/index.tsx    |   5 +-
 .../renderer/pages/Settings/Account/Usage.tsx |   0
 .../pages/Settings/Account/UserInfo.tsx       |   2 +-
 .../renderer/pages/Settings/Account/index.tsx |   6 +-
 .../pages/Settings/General/AppInfo.tsx        |   2 +-
 .../pages/Settings/General/DeviceName.tsx     |   4 +-
 .../pages/Settings/General/LanguagePicker.tsx |   2 +-
 .../Settings/General/StartAutomatically.tsx   |   0
 .../pages/Settings/General/ThemePicker.tsx    |   2 +-
 .../renderer/pages/Settings/General/index.tsx |   0
 .../renderer/pages/Settings/Header.tsx        |   0
 .../renderer/pages/Settings/index.tsx         |   0
 .../pages/Widget/AnimationWrapper.tsx         |   0
 .../renderer/pages/Widget/Header.tsx          |   0
 src/{ => apps}/renderer/pages/Widget/Item.tsx |  10 +-
 .../renderer/pages/Widget/NoInfoToShow.tsx    |   0
 .../renderer/pages/Widget/SyncAction.tsx      |  15 +-
 .../renderer/pages/Widget/SyncErrorBanner.tsx |   9 +-
 .../renderer/pages/Widget/SyncFailed.tsx      |   0
 .../renderer/pages/Widget/SyncInfo.tsx        |  10 +-
 .../pages/Widget/VirtualDriveError.tsx        |   0
 .../renderer/pages/Widget/index.tsx           |   2 -
 src/{ => apps}/renderer/utils/errors.ts       |   0
 src/{ => apps}/renderer/utils/http-request.ts |   0
 src/{ => apps}/renderer/utils/path.ts         |   0
 src/apps/renderer/utils/query.ts              |   5 +
 src/{ => apps}/renderer/utils/usage.ts        |   0
 src/{ => apps}/shared/FileTypes/FileTypes.ts  |   0
 src/{ => apps}/shared/HttpClient/Clients.ts   |   0
 .../shared/HttpClient/HttpClient.ts           |   0
 .../HttpClient/background-process-clients.ts} |   3 +-
 .../HttpClient/http-client.test.skip.ts       |   0
 .../shared/HttpClient/main-process-client.ts  |   0
 .../HttpClient/responses/file-created.ts      |   0
 src/{ => apps}/shared/IPC/IPCs.ts             |   0
 src/{ => apps}/shared/IPC/events/drive.ts     |   0
 .../shared/IPC/events/sync-engine.ts          |   6 +-
 .../shared/IPC/events/virtual-drive.ts        |   0
 src/{ => apps}/shared/ItemKind.ts             |   0
 src/{ => apps}/shared/Locale/DayJsLocales.ts  |   0
 src/{ => apps}/shared/Locale/Language.ts      |   0
 src/{ => apps}/shared/fs/PathTypeChecker .ts  |   0
 .../shared/fs/ReadStreamToBuffer.ts           |   0
 .../shared/fs/ensure-folder-exists.ts         |   0
 .../shared/fs/write-readable-to-file.ts       |   0
 src/{workers => apps/shared}/types.ts         |   0
 src/{ => apps}/shared/types/Nullable.ts       |   0
 src/{ => apps}/shared/types/Primitives.ts     |   0
 src/apps/shared/types/Process.ts              |   1 +
 src/{ => apps}/shared/types/Stopwatch.ts      |   0
 src/{ => apps}/shared/types/Theme.ts          |   0
 .../shared/types/VirtualDriveStatus.ts        |   0
 .../sync-engine/BindingManager.ts             |  39 +-
 .../callbacks-controllers/buildControllers.ts |   3 +-
 .../controllers/AddController.ts              |  20 +-
 .../controllers/CallbackController.ts         |  17 +-
 .../controllers/DeleteController.ts           |   6 +-
 .../controllers/DownloadFileController.ts     |  13 +-
 .../NotifyPlaceholderHydrationFinished.ts     |   4 +-
 .../controllers/RenameOrMoveController.ts     |   8 +-
 .../offline/OfflineRenameOrMoveController.ts  |   6 +-
 .../helpers/rawPathIsFolder.ts                |   0
 .../executeControllerWithFallback.ts          |   0
 .../DependencyContainer.ts                    |   2 -
 .../DependencyContainerFactory.ts             |  20 +-
 .../boundaryBridge/BoundaryBridgeContainer.ts |   5 +
 .../boundaryBridge/build.ts                   |  19 +
 .../dependency-injection/common/clients.ts    |   4 +-
 .../dependency-injection/common/crypt.ts      |   0
 .../dependency-injection/common/eventBus.ts   |   6 +-
 .../common/eventRepository.ts                 |   4 +-
 .../common/localRootFolderPath.ts             |   2 +-
 .../dependency-injection/common/mnemonic.ts   |   2 +-
 .../dependency-injection/common/sdk.ts        |  35 +
 .../dependency-injection/common/traverser.ts  |   4 +-
 .../dependency-injection/common/user.ts       |   4 +-
 .../common/virtualDrive.ts                    |   0
 .../contents/ContentsContainer.ts             |  11 +
 .../dependency-injection/contents/builder.ts  |  26 +-
 .../files/FilesContainer.ts                   |  25 +
 .../dependency-injection/files/builder.ts     | 126 ++++
 .../folders/FoldersContainer.ts               |  33 +
 .../dependency-injection/folders/builder.ts   | 145 ++++
 .../items/ItemsContainer.ts                   |   2 +-
 .../dependency-injection/items/builder.ts     |  22 +-
 .../shared/SharedContainer.ts                 |   7 +
 .../dependency-injection/shared/builder.ts    |  12 +-
 src/{workers => apps}/sync-engine/index.ts    |   7 +-
 .../sync-engine/ipcRendererSyncEngine.ts      |   4 +-
 src/{workers => apps}/utils/date.ts           |   0
 .../utils/file-is-on-folder.ts                |   0
 src/{workers => apps}/utils/http-request.ts   |   2 +-
 src/{workers => apps}/utils/icon.ts           |   2 +-
 src/{workers => apps}/utils/is-online.ts      |   0
 .../utils/name-verification.ts                |   0
 src/{workers => apps}/utils/reporting.ts      |   2 +-
 .../utils/test/file-is-on-folder.test.ts      |   0
 .../utils/test/name-verification.test.ts      |   0
 .../utils/test/sensible-files.json            |   0
 src/{workers => apps}/utils/types/Tuple.ts    |   0
 src/context/desktop/app/domain/AppIssue.ts    |  10 +
 src/context/desktop/sync/domain/SyncStatus.ts |   1 +
 .../desktop/sync/domain/SyncStoppedPayload.ts |   8 +
 .../shared/domain/AggregateRoot.ts            |   4 +-
 .../shared/domain/DomainEvent.ts              |   0
 .../shared/domain/DomainEventSubscriber.ts}   |   2 +-
 .../shared/domain/Either.ts                   |   0
 .../shared/domain/EnumValueObject.ts          |   0
 .../shared/domain/InvalidArgumentError.ts     |   0
 .../shared}/domain/ServerFile.ts              |   0
 .../shared}/domain/ServerFolder.ts            |   0
 .../shared/domain/ValueObject.ts              |   6 +-
 .../shared/infrastructure}/crypt.ts           |   0
 .../application/FileCreationOrchestrator.ts   |   0
 .../application/ContentsDownloader.ts         |  18 +-
 .../contents/application/ContentsUploader.ts  |   2 +-
 .../NotifyMainProcessHydrationFinished.ts     |   4 +-
 .../ReadLocalFileContentsToBuffer.ts          |   0
 .../application/RetryContentsUploader.ts      |   0
 .../application/temporalFolderProvider.ts     |   0
 .../contents/domain/ContentsId.ts             |   4 +-
 .../domain/ContentsManagersFactory.ts         |   0
 .../contents/domain/ContentsSize.ts           |   0
 .../contents/domain/LocalFileContents.ts      |   4 +-
 .../contents/domain/LocalFileProvider.ts      |   0
 .../contents/domain/LocalFileWriter.ts        |   0
 .../contents/domain/RemoteFileContents.ts     |   5 +-
 .../contentHandlers/ContentFileDownloader.ts  |   0
 .../contentHandlers/ContentFileUploader.ts    |   0
 .../events/ContentsDownloadedDomainEvent.ts   |   2 +-
 ...onmentRemoteFileContentsManagersFactory.ts |   0
 .../infrastructure/FSLocalFileProvider.ts     |   0
 .../infrastructure/FSLocalFileWriter.ts       |   4 +-
 .../EnvironmentContentFileDownloader.ts       |   2 +-
 .../upload/EnvironmentContentFileUploader.ts  |   2 +-
 .../CreateFilePlaceholderOnDeletionFailed.ts  |   6 +-
 .../files/application/FileCreator.ts          |  16 +-
 .../application/FileCreatorFromServerFile.ts  |  18 +
 .../files/application/FileDeleter.ts          |  25 +-
 .../application/FileFinderByContentsId.ts     |   2 +-
 .../files/application/FilePathUpdater.ts      |  23 +-
 .../FilePlaceholderCreatorFromContentsId.ts   |   6 +-
 .../application/FilesPlaceholderUpdater.ts}   |  57 +-
 .../application/FilesPlaceholdersCreator.ts   |  14 +
 .../files/application/RepositoryPopulator.ts  |  12 +
 .../files/application/RetrieveAllFiles.ts     |   0
 .../files/application/SameFileWasMoved.ts     |  20 +-
 .../application/WebdavFileMimeTypeResolver.ts |   0
 .../virtual-drive}/files/domain/File.ts       |  71 +-
 .../virtual-drive}/files/domain/FilePath.ts   |   0
 .../files/domain/FileRepository.ts            |  13 +
 .../virtual-drive}/files/domain/FileSize.ts   |   0
 .../virtual-drive}/files/domain/FileStatus.ts |   4 +-
 .../files/domain/MimeTypesMap.ts              |   0
 .../virtual-drive/files/domain/OfflineFile.ts | 110 +++
 .../files/domain/OldFileRepository.ts}        |   7 +-
 .../files/domain/PlaceholderId.ts}            |   0
 .../domain/errors/ActionNotPermittedError.ts  |   0
 .../errors/FileActionCannotModifyExtension.ts |   0
 .../FileActionOnlyCanAffectOneLevelError.ts   |   0
 .../domain/errors/FileAlreadyExistsError.ts   |   0
 ...leCannotBeMovedToTheOriginalFolderError.ts |   0
 .../FileNameShouldBeEqualToOriginalError.ts   |   0
 .../FileNameShouldDifferFromOriginalError.ts  |   0
 .../files/domain/errors/FileNotFoundError.ts  |   0
 .../domain/errors/UnknownFileActionError.ts   |   0
 .../domain/events/FileCreatedDomainEvent.ts   |   2 +-
 .../domain/events/FileDeletedDomainEvent.ts   |   2 +-
 .../domain/events/FileMovedDomainEvent.ts     |   2 +-
 .../domain/events/FileRenamedDomainEvent.ts   |   2 +-
 .../events/OptimisticFileDeletionFailed.ts    |   2 +-
 .../domain/file-systems/LocalFileSystem.ts    |   7 +
 .../domain/file-systems/RemoteFileSystem.ts   |  12 +
 .../infrastructure/InMemoryFileRepository.ts  |  63 ++
 .../infrastructure/NodeWinLocalFileSystem.ts  |  37 +
 .../infrastructure/SDKRemoteFileSystem.ts     |  77 ++
 .../files/infrastructure/dtos/AddFileDTO.ts   |   0
 .../infrastructure/dtos/UpdateFileNameDTO.ts  |   0
 .../dtos/UpdateFileParentDirDTO.ts            |   0
 .../AllParentFoldersStatusIsExists.ts         |   0
 .../application/FolderByPartialSearcher.ts    |   0
 .../folders/application/FolderCreator.ts      |  16 +-
 .../FolderCreatorFromServerFolder.ts          |  19 +
 .../folders/application/FolderDeleter.ts      |  18 +-
 .../folders/application/FolderFinder.ts       |   4 +-
 .../folders/application/FolderMover.ts        |  11 +-
 .../folders/application/FolderPathUpdater.ts  |   6 +-
 .../folders/application/FolderRenamer.ts      |   7 +-
 .../application/FolderRepositoryInitiator.ts  |  14 +
 .../application/FoldersPlaceholderCreator.ts  |  14 +
 .../Offline/OfflineFolderCreator.ts           |   2 +-
 .../application/Offline/OfflineFolderMover.ts |   7 +-
 .../Offline/OfflineFolderPathUpdater.ts       |   2 +-
 .../Offline/OfflineFolderRenamer.ts           |   0
 .../folders/application/RetrieveAllFolders.ts |   0
 .../SynchronizeOfflineModifications.ts        |  12 +-
 ...nizeOfflineModificationsOnFolderCreated.ts |   6 +-
 .../application/UpdatePlaceholderFolder.ts    |  51 +-
 .../virtual-drive}/folders/domain/Folder.ts   |  38 +-
 .../folders/domain/FolderPath.ts              |   0
 .../folders}/domain/FolderPlaceholderId.ts    |   0
 .../folders/domain/FolderRepository.ts        |  13 +
 .../folders/domain/FolderStatus.ts            |   4 +-
 .../folders/domain/FolderUuid.ts              |   4 +-
 .../folders/domain/ManagedFolderRepository.ts |   0
 .../folders/domain/OfflineFolder.ts           |  16 +-
 .../folders/domain/OfflineFolderRepository.ts |   9 +
 .../folders/domain/OldFolderRepository.ts}    |   7 +-
 .../domain/errors/ActionNotPermittedError.ts  |   0
 .../domain/errors/FolderNotFoundError.ts      |   0
 .../domain/events/FolderCreatedDomainEvent.ts |   2 +-
 .../domain/events/FolderRenamedDomainEvent.ts |   2 +-
 .../domain/file-systems/LocalFileSystem.ts    |   5 +
 .../domain/file-systems/RemoteFileSystem.ts   |  12 +
 .../infrastructure/HttpRemoteFileSystem.ts    | 104 +++
 .../InMemoryFolderRepository.ts               |  58 ++
 .../InMemoryOfflineFolderRepository.ts        |  47 ++
 .../infrastructure/NodeWinLocalFileSystem.ts  |  24 +
 .../infrastructure/dtos/CreateFolderDTO.ts    |   5 +
 .../dtos/UpdateFolderNameDTO.ts               |   0
 .../application/FileCreatorFromServerFile.ts  |   2 +-
 .../FolderCreatorFromServerFolder.ts          |   2 +-
 .../items/application/ItemsSearcher.ts        |   0
 .../items/application/RemoteItemsGenerator.ts |   7 +-
 .../items/application/Traverser.ts            | 154 ++++
 .../items/application/TreeBuilder.ts          |   9 +-
 .../virtual-drive/items/domain/FileNode.ts    |  22 +
 .../virtual-drive/items/domain/FolderNode.ts  |  33 +
 .../items/domain/ItemsIndexedByPath.ts        |   0
 .../virtual-drive/items/domain/NameDecrypt.ts |   7 +
 .../virtual-drive/items/domain/Node.ts        |   4 +
 .../virtual-drive/items/domain/Tree.ts        |  77 ++
 .../infrastructure/CryptoJsNameDecrypt.ts     |  12 +
 .../AbsolutePathToRelativeConverter.ts        |   0
 .../application/AllWebdavItemsSearcher.ts     |   8 +-
 .../shared/application/EitherTransformer.ts   |   2 +-
 .../shared/application/LocalFileIdProvider.ts |   0
 .../application/PlatformPathConverter.ts      |   0
 .../RelativePathToAbsoluteConverter.ts        |   0
 .../WebdavUnknownItemTypeSearcher.ts          |   8 +-
 .../shared/domain/BucketEntry.ts              |   2 +-
 .../shared/domain/BucketEntryId.ts            |   4 +-
 .../virtual-drive}/shared/domain/Crypt.ts     |   4 +-
 .../shared/domain/DelayQueue.ts               |   0
 .../virtual-drive}/shared/domain/EventBus.ts  |   2 +-
 .../shared/domain/EventRepository.ts          |   2 +-
 .../shared/domain/MapObserver.ts              |   0
 .../virtual-drive}/shared/domain/Path.ts      |   4 +-
 .../infrastructure/DomainEventSubscribers.ts  |  18 +
 .../infrastructure/EnvironmentDownloader.ts   |   2 +-
 .../shared/infrastructure/EventRecorder.ts    |   2 +-
 .../infrastructure/InMemoryEventHistory.ts    |  13 +-
 .../shared/infrastructure/NodeJsEventBus.ts   |   2 +-
 .../thumbnails/domain/ThumbanailContentId.ts  |   0
 .../thumbnails/domain/Thumbnail.ts            |   4 +-
 .../thumbnails/domain/ThumbnailDownloader.ts  |   0
 .../EnvironmentThumbnailDownloader.ts         |   0
 .../BytesInBinaryToInternacionalSystem.ts     |   0
 .../DecrementDriveUsageOnFileDeleted.ts       |   6 +-
 .../FreeSpacePerEnvironmentCalculator.ts      |   0
 .../IncrementDriveUsageOnFileCreated.ts       |   6 +-
 .../application/UsedSpaceCalculator.ts        |   0
 .../application/UserUsageDecrementer.ts       |   0
 .../application/UserUsageIncrementer.ts       |   0
 .../userUsage/domain/UserUsage.ts             |   0
 .../userUsage/domain/UserUsageRepository.ts   |   0
 .../CachedHttpUserUsageRepository.ts          |   0
 .../infrastrucutre/dtos/UserUsageLimitDTO.ts  |   0
 src/main/analytics/backup-handlers.ts         |  84 ---
 src/main/app-info/AvaliableAppQuery.ts        |   3 -
 src/main/app-info/handlers.ts                 |  14 -
 src/main/app-info/service.ts                  |  18 -
 src/main/background-processes/backups.ts      | 298 --------
 src/main/background-processes/sync.ts         |  50 --
 .../types/BackupFatalError.ts                 |   7 -
 .../actions/backsups-error-actions.ts         |  32 -
 src/renderer/actions/types.ts                 |   9 -
 src/renderer/hooks/BackupStatus.tsx           |   5 -
 .../Settings/Backups/BackupsFolderList.tsx    | 253 -------
 .../Settings/Backups/BackupsPreferences.tsx   | 227 ------
 src/renderer/pages/Settings/Backups/index.tsx |  41 -
 src/renderer/pages/Widget/BackupsBanner.tsx   | 194 -----
 .../pages/Widget/BackupsErrorBanner.tsx       |  48 --
 src/renderer/utils/backups-progress.ts        |  11 -
 src/renderer/utils/query.ts                   |  18 -
 src/shared/types/Process.ts                   |   1 -
 src/workers/backups/backups.ts                | 149 ----
 src/workers/backups/index.ts                  | 249 -------
 src/workers/backups/process.ts                | 435 -----------
 src/workers/backups/test/backups.test.ts      | 191 -----
 src/workers/filesystems/domain/FileSystem.ts  |  92 ---
 src/workers/filesystems/domain/Transfer.ts    |   4 -
 src/workers/filesystems/local-filesystem.ts   | 362 ---------
 src/workers/filesystems/remote-filesystem.ts  | 698 ------------------
 .../test/__mocks__/FileSystemMock.ts          | 109 ---
 .../boundaryBridge/BoundaryBridgeContainer.ts |   9 -
 .../boundaryBridge/build.ts                   |  66 --
 .../contents/ContentsContainer.ts             |   9 -
 .../files/FilesContainer.ts                   |  29 -
 .../dependency-injection/files/builder.ts     | 123 ---
 .../folders/FoldersContainer.ts               |  33 -
 .../dependency-injection/folders/builder.ts   | 122 ---
 .../placeholders/PlaceholdersContainer.ts     |   7 -
 .../placeholders/builder.ts                   |  21 -
 .../shared/SharedContainer.ts                 |   9 -
 .../application/SyncPlaceholders.ts           |  44 --
 .../application/TreePlaceholderCreator.ts     |  43 --
 .../test/__mocks__/LocalFileWriterMock.ts     |  10 -
 .../test/__mocks__/LocationProviderMock.ts    |   7 -
 .../application/FileByPartialSearcher.ts      |  10 -
 .../modules/files/application/FileClearer.ts  |  10 -
 .../modules/files/application/FileSearcher.ts |  16 -
 .../LocalRepositoryRepositoryRefresher.ts     |  14 -
 .../files/domain/ManagedFileRepository.ts     |   7 -
 .../infrastructure/HttpFileRepository.ts      | 246 ------
 .../test/__mocks__/FileRepositoryMock.ts      |  61 --
 .../test/application/FileCreator.test.ts      | 123 ---
 .../test/application/FilePathUpdater.test.ts  |  53 --
 .../infrastructure/HttpFileRepository.test.ts |  87 ---
 .../folders/application/FolderClearer.ts      |  10 -
 .../folders/application/FolderSearcher.ts     |  14 -
 .../folders/domain/OfflineFolderRepository.ts |   8 -
 .../infrastructure/HttpFolderRepository.ts    | 226 ------
 .../InMemoryOfflineFolderRepository.ts        |  41 -
 .../test/__mocks__/FolderRepositoryMock.ts    |  65 --
 .../HttpFolderRepository.test.ts              |  50 --
 .../modules/items/application/Traverser.ts    | 187 -----
 .../placeholders/domain/CommonPlaceholder.ts  |   8 -
 .../placeholders/domain/PlaceholderCreator.ts |   7 -
 .../VirtualDrivePlaceholderCreator.ts         |  46 --
 .../test/__mock__/PlaceholderCreatorMock.ts   |  16 -
 .../shared/domain/OfflineActionsQueue.ts      |  10 -
 .../modules/shared/domain/WebdavItem.ts       |  21 -
 .../infrastructure/DomainEventSubscribers.ts  |  18 -
 {src/test => tests}/LanguagePicker.e2e.ts     |   0
 .../__mocks__/ContentFileDownloaderMock.ts    |   2 +-
 .../__mocks__/ContentFileUploaderMock.ts      |   4 +-
 .../contents/__mocks__/LocalFileWriterMock.ts |  10 +
 .../__mocks__/LocationProviderMock.ts         |   7 +
 .../contents}/__mocks__/ReadableHelloWorld.ts |   0
 .../RemoteFileContentsManagersFactoryMock.ts  |  10 +-
 .../DownloadStrategyFunctionMock.ts           |   0
 .../environment/UploadStrategyFunctionMock.ts |   0
 .../application/ContentsDownloader._test.ts   |  18 +-
 .../contents}/domain/ContentsIdMother.ts      |   3 +-
 .../contents}/domain/ContentsSizeMother.ts    |   2 +-
 .../contents}/domain/FileContentsMother.ts    |   2 +-
 .../EnvironmentContentFileDownloader.test.ts  |   4 +-
 .../EnvironmentContentFileUploader.test.ts    |   2 +-
 .../files/__mocks__/FileRepositoryMock.ts     |  30 +
 .../files/__mocks__/LocalFileSystemMock.ts    |  15 +
 .../files/__mocks__/RemoteFileSystemMock.ts   |  29 +
 .../files/application/FileCreator.test.ts     | 141 ++++
 .../files}/application/FileDeleter.test.ts    |  42 +-
 .../files/application/FilePathUpdater.test.ts | 120 +++
 .../virtual-drive/files}/domain/FileMother.ts |   7 +-
 .../files}/domain/FilePath.test.ts            |   2 +-
 .../files}/domain/FilePathMother.ts           |   4 +-
 .../files}/domain/FileSize.test.ts            |   2 +-
 .../files}/infrastructure/ServerFileMother.ts |   4 +-
 .../folders}/__mocks__/FolderFinderMock.ts    |   0
 .../__mocks__/FolderLocalFileSystemMock.ts    |  10 +
 .../__mocks__/FolderRemoteFileSystemMock.ts   |  26 +
 .../folders/__mocks__/FolderRepositoryMock.ts |  33 +
 .../application/FolderCreator.test.ts         |  61 +-
 .../application/FolderDeleter.test.ts         |  44 +-
 .../folders}/application/FolderMover.test.ts  |  23 +-
 .../SynchronizeOfflineModifications.test.ts   |  82 +-
 .../folders}/domain/FolderMother.ts           |  11 +-
 .../folders}/domain/FolderPath.test.ts        |   2 +-
 .../folders}/domain/OfflineFolderMother.ts    |   6 +-
 .../items}/application/Traverser.test.ts      | 117 +--
 .../items/infrastructure/FakeNameDecrypt.ts   |  13 +
 .../items}/persistance/ServerFolderMother.ts  |   4 +-
 .../shared}/__mock__/EventBusMock.ts          |   6 +-
 .../shared/__mock__/EventRepositoryMock.ts    |  14 +
 .../__mock__/IpcRendererSyncEngineMock.ts     |   7 +-
 .../AbsolutePathToRelativeConverter.test.ts   |   2 +-
 .../application/PlatformPathConverter.test.ts |   2 +-
 .../virtual-drive/shared}/domain/FakeCrypt.ts |   2 +-
 .../virtual-drive/shared}/domain/Path.test.ts |   2 +-
 ...BytesInBinaryToInternacionalSystem.test.ts |   2 +-
 .../fixtures/AccessResponse.json              |   0
 {src/test => tests}/fixtures/errors.ts        |  19 +-
 {src/test => tests}/issues.e2e.ts             |  23 +-
 .../main/thumbnails/fixtures/1000x1000.jpg    | Bin
 .../main/thumbnails/fixtures/result.png       | Bin
 .../main/thumbnails/fixtures/source.pdf       | Bin
 .../test => tests}/main/thumbnails/helpers.ts |   0
 .../main/thumbnails/resize-image.test.ts      |   8 +-
 {src/test => tests}/onboarding.e2e.ts         |   0
 {src/test => tests}/playwright.config.ts      |   0
 {src/test => tests}/selectors.ts              |   0
 {src/test => tests}/unauthorized.e2e.ts       |   0
 {src/test => tests}/utils.ts                  |   0
 tsconfig.json                                 |   7 +-
 599 files changed, 2800 insertions(+), 6452 deletions(-)
 rename src/{ => apps}/main/analytics/drive-handlers.ts (100%)
 rename src/{ => apps}/main/analytics/handlers.ts (65%)
 rename src/{ => apps}/main/analytics/rudderstack-client.ts (73%)
 rename src/{ => apps}/main/analytics/service.ts (99%)
 rename src/{ => apps}/main/analytics/user-handlers.ts (100%)
 rename src/{ => apps}/main/app-info/app-info.ts (76%)
 create mode 100644 src/apps/main/app-info/handlers.ts
 rename src/{ => apps}/main/auth/handlers.ts (96%)
 rename src/{ => apps}/main/auth/refresh-token.ts (100%)
 rename src/{ => apps}/main/auth/service.ts (96%)
 rename src/{ => apps}/main/auto-launch/handlers.ts (100%)
 rename src/{ => apps}/main/auto-launch/linux-desktop-entry.ts (94%)
 rename src/{ => apps}/main/auto-launch/service.ts (100%)
 rename src/{ => apps}/main/background-processes/process-issues.ts (98%)
 rename src/{ => apps}/main/background-processes/sync-engine.ts (98%)
 rename src/{ => apps}/main/bug-report/BugReportResult.ts (100%)
 rename src/{ => apps}/main/bug-report/handlers.ts (100%)
 rename src/{ => apps}/main/bug-report/service.ts (96%)
 rename src/{ => apps}/main/config.ts (100%)
 rename src/{ => apps}/main/config/handlers.ts (100%)
 rename src/{ => apps}/main/config/service.ts (100%)
 rename src/{ => apps}/main/database/adapters/base.ts (100%)
 rename src/{ => apps}/main/database/collections/DriveFileCollection.ts (100%)
 rename src/{ => apps}/main/database/collections/DriveFolderCollection.ts (100%)
 rename src/{ => apps}/main/database/data-source.ts (100%)
 rename src/{ => apps}/main/database/entities/DriveFile.ts (100%)
 rename src/{ => apps}/main/database/entities/DriveFolder.ts (100%)
 rename src/{ => apps}/main/device/handlers.ts (100%)
 rename src/{ => apps}/main/device/service.ts (100%)
 rename src/{ => apps}/main/event-bus.ts (100%)
 rename src/{ => apps}/main/fordwardToWindows.ts (98%)
 rename src/{ => apps}/main/ipcs/NoEvents.ts (100%)
 rename src/{ => apps}/main/ipcs/ipcMainSyncEngine.ts (100%)
 rename src/{ => apps}/main/ipcs/mainDrive.ts (100%)
 rename src/{ => apps}/main/ipcs/mainVirtualDrive.ts (100%)
 rename src/{ => apps}/main/logger.ts (100%)
 rename src/{ => apps}/main/main.ts (97%)
 rename src/{ => apps}/main/migration/handlers.ts (100%)
 rename src/{ => apps}/main/migration/service.ts (100%)
 rename src/{ => apps}/main/platform/DesktopPlatform.ts (100%)
 rename src/{ => apps}/main/platform/handlers.ts (100%)
 rename src/{ => apps}/main/preload.d.ts (71%)
 rename src/{ => apps}/main/preload.js (99%)
 rename src/{ => apps}/main/quit.ts (100%)
 rename src/{ => apps}/main/realtime.ts (100%)
 rename src/{ => apps}/main/remote-sync/RemoteSyncManager.test.ts (97%)
 rename src/{ => apps}/main/remote-sync/RemoteSyncManager.ts (100%)
 rename src/{ => apps}/main/remote-sync/handlers.ts (100%)
 rename src/{ => apps}/main/remote-sync/helpers.ts (100%)
 rename src/{ => apps}/main/thumbnails/application/create-and-upload-thumbnail.ts (100%)
 rename src/{ => apps}/main/thumbnails/application/extract-pdf-page.ts (100%)
 rename src/{ => apps}/main/thumbnails/application/obtain-image-to-thumbnail-it.ts (100%)
 rename src/{ => apps}/main/thumbnails/application/resize-image.ts (100%)
 rename src/{ => apps}/main/thumbnails/domain/ThumbnableExtension.ts (100%)
 rename src/{ => apps}/main/thumbnails/domain/ThumbnailProperties.ts (100%)
 rename src/{ => apps}/main/thumbnails/domain/ThumbnailUploader.ts (100%)
 rename src/{ => apps}/main/thumbnails/handlers/index.ts (100%)
 rename src/{ => apps}/main/thumbnails/handlers/remote-file-pull-completed.ts (100%)
 rename src/{ => apps}/main/thumbnails/infrastructure/EnvironmentAndStorageThumbnailUploader.ts (100%)
 rename src/{ => apps}/main/thumbnails/infrastructure/ThumbnailUploaderFactory.ts (100%)
 rename src/{ => apps}/main/token-scheduler/TokenScheduler.ts (100%)
 rename src/{ => apps}/main/token-scheduler/token-scheduler.test.ts (100%)
 rename src/{ => apps}/main/tray/handlers.ts (100%)
 rename src/{ => apps}/main/tray/tray.ts (97%)
 rename src/{ => apps}/main/types.ts (100%)
 rename src/{ => apps}/main/usage/Usage.ts (100%)
 rename src/{ => apps}/main/usage/handlers.ts (100%)
 rename src/{ => apps}/main/usage/service.ts (100%)
 rename src/{ => apps}/main/usage/serviceBuilder.ts (100%)
 rename src/{ => apps}/main/util.ts (100%)
 rename src/{ => apps}/main/virutal-root-folder/handlers.ts (100%)
 rename src/{ => apps}/main/virutal-root-folder/service.ts (100%)
 rename src/{ => apps}/main/windows/auth.ts (100%)
 rename src/{ => apps}/main/windows/feedback.ts (100%)
 rename src/{ => apps}/main/windows/index.ts (100%)
 rename src/{ => apps}/main/windows/migration.ts (100%)
 rename src/{ => apps}/main/windows/onboarding.ts (100%)
 rename src/{ => apps}/main/windows/process-issues.ts (100%)
 rename src/{ => apps}/main/windows/settings.ts (100%)
 rename src/{ => apps}/main/windows/widget.ts (100%)
 rename src/{ => apps}/renderer/App.css (100%)
 rename src/{ => apps}/renderer/App.tsx (100%)
 rename src/{ => apps}/renderer/actions/shared-actions.ts (100%)
 rename src/{ => apps}/renderer/actions/sync-error-actions.ts (100%)
 create mode 100644 src/apps/renderer/actions/types.ts
 rename src/{ => apps}/renderer/assets/error.svg (100%)
 rename src/{ => apps}/renderer/assets/file.svg (100%)
 rename src/{ => apps}/renderer/assets/folder.svg (100%)
 rename src/{ => apps}/renderer/assets/fonts/InstrumentSans/InstrumentSans-Bold.woff2 (100%)
 rename src/{ => apps}/renderer/assets/fonts/InstrumentSans/InstrumentSans-Medium.woff2 (100%)
 rename src/{ => apps}/renderer/assets/fonts/InstrumentSans/InstrumentSans-Regular.woff2 (100%)
 rename src/{ => apps}/renderer/assets/fonts/InstrumentSans/InstrumentSans-SemiBold.woff2 (100%)
 rename src/{ => apps}/renderer/assets/fonts/InstrumentSans/InstrumentSans[wdth,wght].woff2 (100%)
 rename src/{ => apps}/renderer/assets/fonts/InstrumentSans/OFL.txt (100%)
 rename src/{ => apps}/renderer/assets/fonts/InstrumentSans/font.css (100%)
 rename src/{ => apps}/renderer/assets/icons/audio.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/code.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/csv.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/default.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/excel.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/figma.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/folder.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/getIcon.tsx (100%)
 rename src/{ => apps}/renderer/assets/icons/illustrator.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/image.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/indesign.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/pdf.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/photoshop.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/powerpoint.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/ppt.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/sketch.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/txt.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/video.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/word.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/zip.svg (100%)
 rename src/{ => apps}/renderer/assets/illustrations/syncedStack-dark.png (100%)
 rename src/{ => apps}/renderer/assets/illustrations/syncedStack-light.png (100%)
 rename src/{ => apps}/renderer/assets/index.d.ts (100%)
 rename src/{ => apps}/renderer/assets/migration/upload-error.svg (100%)
 rename src/{ => apps}/renderer/assets/migration/widget.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/context-menu.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/finder/linux.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/finder/macos.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/finder/windows.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/folder-with-overlay-icons/offline/en.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/folder-with-overlay-icons/offline/es.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/folder-with-overlay-icons/offline/fr.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/folder-with-overlay-icons/online/en.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/folder-with-overlay-icons/online/es.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/folder-with-overlay-icons/online/fr.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/logo.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/mac-finder-widget.png (100%)
 rename src/{ => apps}/renderer/assets/onboarding/widget.png (100%)
 rename src/{ => apps}/renderer/assets/play.svg (100%)
 rename src/{ => apps}/renderer/assets/spinner.svg (100%)
 rename src/{ => apps}/renderer/assets/stop.svg (100%)
 rename src/{ => apps}/renderer/assets/success.svg (100%)
 rename src/{ => apps}/renderer/assets/warn.svg (100%)
 rename src/{ => apps}/renderer/components/Backups/BackupsFoldersSelector.tsx (97%)
 rename src/{ => apps}/renderer/components/Backups/FatalError.tsx (85%)
 rename src/{ => apps}/renderer/components/Button.tsx (100%)
 rename src/{ => apps}/renderer/components/Checkbox.tsx (100%)
 rename src/{ => apps}/renderer/components/FileWithOperation.tsx (100%)
 rename src/{ => apps}/renderer/components/PasswordInput.tsx (100%)
 rename src/{ => apps}/renderer/components/Select.tsx (100%)
 rename src/{ => apps}/renderer/components/TextArea.tsx (100%)
 rename src/{ => apps}/renderer/components/TextInput.tsx (100%)
 rename src/{ => apps}/renderer/components/WindowTopBar.tsx (100%)
 rename src/{ => apps}/renderer/context/DeviceContext.tsx (100%)
 rename src/{ => apps}/renderer/context/LocalContext.tsx (100%)
 rename src/{ => apps}/renderer/hooks/BackupFatalErrors.tsx (100%)
 rename src/{ => apps}/renderer/hooks/ClientPlatform.tsx (100%)
 rename src/{ => apps}/renderer/hooks/FatalErrorActions.ts (84%)
 rename src/{ => apps}/renderer/hooks/GeneralIssues.tsx (88%)
 rename src/{ => apps}/renderer/hooks/ProcessIssues.tsx (88%)
 rename src/{ => apps}/renderer/hooks/VirtualDriveStatus.tsx (92%)
 rename src/{ => apps}/renderer/hooks/useBackups.tsx (100%)
 rename src/{ => apps}/renderer/hooks/useConfig.tsx (100%)
 rename src/{ => apps}/renderer/hooks/useLanguage.tsx (100%)
 rename src/{ => apps}/renderer/hooks/useOnSyncRunning.tsx (77%)
 rename src/{ => apps}/renderer/hooks/useOnSyncStopped.tsx (100%)
 rename src/{ => apps}/renderer/hooks/useSyncInfoSubscriber.tsx (96%)
 rename src/{ => apps}/renderer/hooks/useSyncStatus.tsx (93%)
 rename src/{ => apps}/renderer/hooks/useSyncStopped.tsx (82%)
 rename src/{ => apps}/renderer/hooks/useUsage.tsx (94%)
 rename src/{ => apps}/renderer/index.ejs (100%)
 rename src/{ => apps}/renderer/index.tsx (100%)
 rename src/{ => apps}/renderer/localize/i18n.service.ts (84%)
 rename src/{ => apps}/renderer/localize/locales/en.json (100%)
 rename src/{ => apps}/renderer/localize/locales/es.json (100%)
 rename src/{ => apps}/renderer/localize/locales/fr.json (100%)
 rename src/{ => apps}/renderer/messages/backups/backups-actions-map.ts (86%)
 rename src/{ => apps}/renderer/messages/backups/backups-fatal-errors.ts (88%)
 rename src/{ => apps}/renderer/messages/general-error.ts (88%)
 rename src/{ => apps}/renderer/messages/process-error.ts (95%)
 rename src/{ => apps}/renderer/messages/process-fatal-error.ts (92%)
 rename src/{ => apps}/renderer/pages/Feedback/index.tsx (95%)
 rename src/{ => apps}/renderer/pages/Login/ErrorBanner.tsx (100%)
 rename src/{ => apps}/renderer/pages/Login/TwoFA.tsx (100%)
 rename src/{ => apps}/renderer/pages/Login/WarningBanner.tsx (100%)
 rename src/{ => apps}/renderer/pages/Login/index.tsx (96%)
 rename src/{ => apps}/renderer/pages/Login/service.ts (97%)
 rename src/{ => apps}/renderer/pages/Login/types.ts (100%)
 rename src/{ => apps}/renderer/pages/Migration/config.tsx (99%)
 rename src/{ => apps}/renderer/pages/Migration/helpers.tsx (99%)
 rename src/{ => apps}/renderer/pages/Migration/index.tsx (96%)
 rename src/{ => apps}/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx (84%)
 rename src/{ => apps}/renderer/pages/Migration/slides/MigrationFailedSlide.tsx (92%)
 rename src/{ => apps}/renderer/pages/Onboarding/config.tsx (98%)
 rename src/{ => apps}/renderer/pages/Onboarding/helpers.tsx (99%)
 rename src/{ => apps}/renderer/pages/Onboarding/index.tsx (95%)
 rename src/{ => apps}/renderer/pages/Onboarding/slides/AvailableOfflineSlide.tsx (91%)
 rename src/{ => apps}/renderer/pages/Onboarding/slides/AvailableOnlineSlide.tsx (91%)
 rename src/{ => apps}/renderer/pages/Onboarding/slides/BackupsSlide.tsx (92%)
 rename src/{ => apps}/renderer/pages/Onboarding/slides/ContextMenuSlide.tsx (93%)
 rename src/{ => apps}/renderer/pages/Onboarding/slides/FilesOrganizationSlide.tsx (92%)
 rename src/{ => apps}/renderer/pages/Onboarding/slides/OnboardingCompletedSlide.tsx (97%)
 rename src/{ => apps}/renderer/pages/Onboarding/slides/WelcomeSlide.tsx (91%)
 rename src/{ => apps}/renderer/pages/ProcessIssues/List.tsx (83%)
 rename src/{ => apps}/renderer/pages/ProcessIssues/ReportModal.tsx (94%)
 rename src/{ => apps}/renderer/pages/ProcessIssues/index.tsx (96%)
 rename src/{ => apps}/renderer/pages/Settings/Account/Usage.tsx (100%)
 rename src/{ => apps}/renderer/pages/Settings/Account/UserInfo.tsx (96%)
 rename src/{ => apps}/renderer/pages/Settings/Account/index.tsx (90%)
 rename src/{ => apps}/renderer/pages/Settings/General/AppInfo.tsx (96%)
 rename src/{ => apps}/renderer/pages/Settings/General/DeviceName.tsx (97%)
 rename src/{ => apps}/renderer/pages/Settings/General/LanguagePicker.tsx (96%)
 rename src/{ => apps}/renderer/pages/Settings/General/StartAutomatically.tsx (100%)
 rename src/{ => apps}/renderer/pages/Settings/General/ThemePicker.tsx (96%)
 rename src/{ => apps}/renderer/pages/Settings/General/index.tsx (100%)
 rename src/{ => apps}/renderer/pages/Settings/Header.tsx (100%)
 rename src/{ => apps}/renderer/pages/Settings/index.tsx (100%)
 rename src/{ => apps}/renderer/pages/Widget/AnimationWrapper.tsx (100%)
 rename src/{ => apps}/renderer/pages/Widget/Header.tsx (100%)
 rename src/{ => apps}/renderer/pages/Widget/Item.tsx (98%)
 rename src/{ => apps}/renderer/pages/Widget/NoInfoToShow.tsx (100%)
 rename src/{ => apps}/renderer/pages/Widget/SyncAction.tsx (91%)
 rename src/{ => apps}/renderer/pages/Widget/SyncErrorBanner.tsx (90%)
 rename src/{ => apps}/renderer/pages/Widget/SyncFailed.tsx (100%)
 rename src/{ => apps}/renderer/pages/Widget/SyncInfo.tsx (80%)
 rename src/{ => apps}/renderer/pages/Widget/VirtualDriveError.tsx (100%)
 rename src/{ => apps}/renderer/pages/Widget/index.tsx (90%)
 rename src/{ => apps}/renderer/utils/errors.ts (100%)
 rename src/{ => apps}/renderer/utils/http-request.ts (100%)
 rename src/{ => apps}/renderer/utils/path.ts (100%)
 create mode 100644 src/apps/renderer/utils/query.ts
 rename src/{ => apps}/renderer/utils/usage.ts (100%)
 rename src/{ => apps}/shared/FileTypes/FileTypes.ts (100%)
 rename src/{ => apps}/shared/HttpClient/Clients.ts (100%)
 rename src/{ => apps}/shared/HttpClient/HttpClient.ts (100%)
 rename src/{shared/HttpClient/backgroud-process-clients.ts => apps/shared/HttpClient/background-process-clients.ts} (88%)
 rename src/{ => apps}/shared/HttpClient/http-client.test.skip.ts (100%)
 rename src/{ => apps}/shared/HttpClient/main-process-client.ts (100%)
 rename src/{ => apps}/shared/HttpClient/responses/file-created.ts (100%)
 rename src/{ => apps}/shared/IPC/IPCs.ts (100%)
 rename src/{ => apps}/shared/IPC/events/drive.ts (100%)
 rename src/{ => apps}/shared/IPC/events/sync-engine.ts (94%)
 rename src/{ => apps}/shared/IPC/events/virtual-drive.ts (100%)
 rename src/{ => apps}/shared/ItemKind.ts (100%)
 rename src/{ => apps}/shared/Locale/DayJsLocales.ts (100%)
 rename src/{ => apps}/shared/Locale/Language.ts (100%)
 rename src/{ => apps}/shared/fs/PathTypeChecker .ts (100%)
 rename src/{ => apps}/shared/fs/ReadStreamToBuffer.ts (100%)
 rename src/{ => apps}/shared/fs/ensure-folder-exists.ts (100%)
 rename src/{ => apps}/shared/fs/write-readable-to-file.ts (100%)
 rename src/{workers => apps/shared}/types.ts (100%)
 rename src/{ => apps}/shared/types/Nullable.ts (100%)
 rename src/{ => apps}/shared/types/Primitives.ts (100%)
 create mode 100644 src/apps/shared/types/Process.ts
 rename src/{ => apps}/shared/types/Stopwatch.ts (100%)
 rename src/{ => apps}/shared/types/Theme.ts (100%)
 rename src/{ => apps}/shared/types/VirtualDriveStatus.ts (100%)
 rename src/{workers => apps}/sync-engine/BindingManager.ts (86%)
 rename src/{workers => apps}/sync-engine/callbacks-controllers/buildControllers.ts (96%)
 rename src/{workers => apps}/sync-engine/callbacks-controllers/controllers/AddController.ts (77%)
 rename src/{workers => apps}/sync-engine/callbacks-controllers/controllers/CallbackController.ts (63%)
 rename src/{workers => apps}/sync-engine/callbacks-controllers/controllers/DeleteController.ts (85%)
 rename src/{workers => apps}/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts (70%)
 rename src/{workers => apps}/sync-engine/callbacks-controllers/controllers/NotifyPlaceholderHydrationFinished.ts (66%)
 rename src/{workers => apps}/sync-engine/callbacks-controllers/controllers/RenameOrMoveController.ts (77%)
 rename src/{workers => apps}/sync-engine/callbacks-controllers/controllers/offline/OfflineRenameOrMoveController.ts (79%)
 rename src/{workers => apps}/sync-engine/callbacks-controllers/helpers/rawPathIsFolder.ts (100%)
 rename src/{workers => apps}/sync-engine/callbacks-controllers/middlewares/executeControllerWithFallback.ts (100%)
 rename src/{workers => apps}/sync-engine/dependency-injection/DependencyContainer.ts (86%)
 rename src/{workers => apps}/sync-engine/dependency-injection/DependencyContainerFactory.ts (80%)
 create mode 100644 src/apps/sync-engine/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/boundaryBridge/build.ts
 rename src/{workers => apps}/sync-engine/dependency-injection/common/clients.ts (71%)
 create mode 100644 src/apps/sync-engine/dependency-injection/common/crypt.ts
 rename src/{workers => apps}/sync-engine/dependency-injection/common/eventBus.ts (65%)
 rename src/{workers => apps}/sync-engine/dependency-injection/common/eventRepository.ts (63%)
 rename src/{workers => apps}/sync-engine/dependency-injection/common/localRootFolderPath.ts (88%)
 rename src/{workers => apps}/sync-engine/dependency-injection/common/mnemonic.ts (89%)
 create mode 100644 src/apps/sync-engine/dependency-injection/common/sdk.ts
 rename src/{workers => apps}/sync-engine/dependency-injection/common/traverser.ts (76%)
 rename src/{workers => apps}/sync-engine/dependency-injection/common/user.ts (79%)
 rename src/{workers => apps}/sync-engine/dependency-injection/common/virtualDrive.ts (100%)
 create mode 100644 src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts
 rename src/{workers => apps}/sync-engine/dependency-injection/contents/builder.ts (58%)
 create mode 100644 src/apps/sync-engine/dependency-injection/files/FilesContainer.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/files/builder.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/folders/builder.ts
 rename src/{workers => apps}/sync-engine/dependency-injection/items/ItemsContainer.ts (55%)
 rename src/{workers => apps}/sync-engine/dependency-injection/items/builder.ts (54%)
 create mode 100644 src/apps/sync-engine/dependency-injection/shared/SharedContainer.ts
 rename src/{workers => apps}/sync-engine/dependency-injection/shared/builder.ts (56%)
 rename src/{workers => apps}/sync-engine/index.ts (93%)
 rename src/{workers => apps}/sync-engine/ipcRendererSyncEngine.ts (58%)
 rename src/{workers => apps}/utils/date.ts (100%)
 rename src/{workers => apps}/utils/file-is-on-folder.ts (100%)
 rename src/{workers => apps}/utils/http-request.ts (91%)
 rename src/{workers => apps}/utils/icon.ts (70%)
 rename src/{workers => apps}/utils/is-online.ts (100%)
 rename src/{workers => apps}/utils/name-verification.ts (100%)
 rename src/{workers => apps}/utils/reporting.ts (91%)
 rename src/{workers => apps}/utils/test/file-is-on-folder.test.ts (100%)
 rename src/{workers => apps}/utils/test/name-verification.test.ts (100%)
 rename src/{workers => apps}/utils/test/sensible-files.json (100%)
 rename src/{workers => apps}/utils/types/Tuple.ts (100%)
 create mode 100644 src/context/desktop/app/domain/AppIssue.ts
 create mode 100644 src/context/desktop/sync/domain/SyncStatus.ts
 create mode 100644 src/context/desktop/sync/domain/SyncStoppedPayload.ts
 rename src/{workers/sync-engine/modules => context}/shared/domain/AggregateRoot.ts (76%)
 rename src/{workers/sync-engine/modules => context}/shared/domain/DomainEvent.ts (100%)
 rename src/{workers/sync-engine/modules/shared/domain/WebdavDomainEventSubscriber.ts => context/shared/domain/DomainEventSubscriber.ts} (67%)
 rename src/{workers/sync-engine/modules => context}/shared/domain/Either.ts (100%)
 rename src/{workers => context}/shared/domain/EnumValueObject.ts (100%)
 rename src/{workers => context}/shared/domain/InvalidArgumentError.ts (100%)
 rename src/{workers/filesystems => context/shared}/domain/ServerFile.ts (100%)
 rename src/{workers/filesystems => context/shared}/domain/ServerFolder.ts (100%)
 rename src/{workers => context}/shared/domain/ValueObject.ts (82%)
 rename src/{workers/utils => context/shared/infrastructure}/crypt.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/boundaryBridge/application/FileCreationOrchestrator.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/application/ContentsDownloader.ts (93%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/application/ContentsUploader.ts (97%)
 rename src/{workers/sync-engine/modules/placeholders => context/virtual-drive/contents}/application/NotifyMainProcessHydrationFinished.ts (83%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/application/ReadLocalFileContentsToBuffer.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/application/RetryContentsUploader.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/application/temporalFolderProvider.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/domain/ContentsId.ts (68%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/domain/ContentsManagersFactory.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/domain/ContentsSize.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/domain/LocalFileContents.ts (94%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/domain/LocalFileProvider.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/domain/LocalFileWriter.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/domain/RemoteFileContents.ts (84%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/domain/contentHandlers/ContentFileDownloader.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/domain/contentHandlers/ContentFileUploader.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/domain/events/ContentsDownloadedDomainEvent.ts (94%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/infrastructure/FSLocalFileProvider.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/infrastructure/FSLocalFileWriter.ts (80%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/infrastructure/download/EnvironmentContentFileDownloader.ts (96%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/contents/infrastructure/upload/EnvironmentContentFileUploader.ts (96%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/application/CreateFilePlaceholderOnDeletionFailed.ts (70%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/application/FileCreator.ts (74%)
 create mode 100644 src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/application/FileDeleter.ts (72%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/application/FileFinderByContentsId.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/application/FilePathUpdater.ts (79%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/application/FilePlaceholderCreatorFromContentsId.ts (64%)
 rename src/{workers/sync-engine/modules/boundaryBridge/application/UpdatePlaceholderFile.ts => context/virtual-drive/files/application/FilesPlaceholderUpdater.ts} (58%)
 create mode 100644 src/context/virtual-drive/files/application/FilesPlaceholdersCreator.ts
 create mode 100644 src/context/virtual-drive/files/application/RepositoryPopulator.ts
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/application/RetrieveAllFiles.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/application/SameFileWasMoved.ts (68%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/application/WebdavFileMimeTypeResolver.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/File.ts (76%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/FilePath.ts (100%)
 create mode 100644 src/context/virtual-drive/files/domain/FileRepository.ts
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/FileSize.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/FileStatus.ts (89%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/MimeTypesMap.ts (100%)
 create mode 100644 src/context/virtual-drive/files/domain/OfflineFile.ts
 rename src/{workers/sync-engine/modules/files/domain/FileRepository.ts => context/virtual-drive/files/domain/OldFileRepository.ts} (68%)
 rename src/{workers/sync-engine/modules/placeholders/domain/FilePlaceholderId.ts => context/virtual-drive/files/domain/PlaceholderId.ts} (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/errors/ActionNotPermittedError.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/errors/FileActionCannotModifyExtension.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/errors/FileActionOnlyCanAffectOneLevelError.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/errors/FileAlreadyExistsError.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/errors/FileCannotBeMovedToTheOriginalFolderError.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/errors/FileNameShouldBeEqualToOriginalError.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/errors/FileNameShouldDifferFromOriginalError.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/errors/FileNotFoundError.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/errors/UnknownFileActionError.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/events/FileCreatedDomainEvent.ts (91%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/events/FileDeletedDomainEvent.ts (89%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/events/FileMovedDomainEvent.ts (87%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/events/FileRenamedDomainEvent.ts (83%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/domain/events/OptimisticFileDeletionFailed.ts (82%)
 create mode 100644 src/context/virtual-drive/files/domain/file-systems/LocalFileSystem.ts
 create mode 100644 src/context/virtual-drive/files/domain/file-systems/RemoteFileSystem.ts
 create mode 100644 src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
 create mode 100644 src/context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem.ts
 create mode 100644 src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/infrastructure/dtos/AddFileDTO.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/infrastructure/dtos/UpdateFileNameDTO.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/files/infrastructure/dtos/UpdateFileParentDirDTO.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/AllParentFoldersStatusIsExists.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/FolderByPartialSearcher.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/FolderCreator.ts (67%)
 create mode 100644 src/context/virtual-drive/folders/application/FolderCreatorFromServerFolder.ts
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/FolderDeleter.ts (71%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/FolderFinder.ts (81%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/FolderMover.ts (74%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/FolderPathUpdater.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/FolderRenamer.ts (68%)
 create mode 100644 src/context/virtual-drive/folders/application/FolderRepositoryInitiator.ts
 create mode 100644 src/context/virtual-drive/folders/application/FoldersPlaceholderCreator.ts
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/Offline/OfflineFolderCreator.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/Offline/OfflineFolderMover.ts (88%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/Offline/OfflineFolderPathUpdater.ts (95%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/Offline/OfflineFolderRenamer.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/RetrieveAllFolders.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/SynchronizeOfflineModifications.ts (81%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/application/SynchronizeOfflineModificationsOnFolderCreated.ts (71%)
 rename src/{workers/sync-engine/modules/boundaryBridge => context/virtual-drive/folders}/application/UpdatePlaceholderFolder.ts (71%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/domain/Folder.ts (85%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/domain/FolderPath.ts (100%)
 rename src/{workers/sync-engine/modules/placeholders => context/virtual-drive/folders}/domain/FolderPlaceholderId.ts (100%)
 create mode 100644 src/context/virtual-drive/folders/domain/FolderRepository.ts
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/domain/FolderStatus.ts (88%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/domain/FolderUuid.ts (72%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/domain/ManagedFolderRepository.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/domain/OfflineFolder.ts (85%)
 create mode 100644 src/context/virtual-drive/folders/domain/OfflineFolderRepository.ts
 rename src/{workers/sync-engine/modules/folders/domain/FolderRepository.ts => context/virtual-drive/folders/domain/OldFolderRepository.ts} (69%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/domain/errors/ActionNotPermittedError.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/domain/errors/FolderNotFoundError.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/domain/events/FolderCreatedDomainEvent.ts (83%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/domain/events/FolderRenamedDomainEvent.ts (90%)
 create mode 100644 src/context/virtual-drive/folders/domain/file-systems/LocalFileSystem.ts
 create mode 100644 src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem.ts
 create mode 100644 src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
 create mode 100644 src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts
 create mode 100644 src/context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository.ts
 create mode 100644 src/context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem.ts
 create mode 100644 src/context/virtual-drive/folders/infrastructure/dtos/CreateFolderDTO.ts
 rename src/{workers/sync-engine/modules => context/virtual-drive}/folders/infrastructure/dtos/UpdateFolderNameDTO.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/items/application/FileCreatorFromServerFile.ts (85%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/items/application/FolderCreatorFromServerFolder.ts (83%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/items/application/ItemsSearcher.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/items/application/RemoteItemsGenerator.ts (90%)
 create mode 100644 src/context/virtual-drive/items/application/Traverser.ts
 rename src/{workers/sync-engine/modules => context/virtual-drive}/items/application/TreeBuilder.ts (58%)
 create mode 100644 src/context/virtual-drive/items/domain/FileNode.ts
 create mode 100644 src/context/virtual-drive/items/domain/FolderNode.ts
 rename src/{workers/sync-engine/modules => context/virtual-drive}/items/domain/ItemsIndexedByPath.ts (100%)
 create mode 100644 src/context/virtual-drive/items/domain/NameDecrypt.ts
 create mode 100644 src/context/virtual-drive/items/domain/Node.ts
 create mode 100644 src/context/virtual-drive/items/domain/Tree.ts
 create mode 100644 src/context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt.ts
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/application/AbsolutePathToRelativeConverter.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/application/AllWebdavItemsSearcher.ts (70%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/application/EitherTransformer.ts (82%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/application/LocalFileIdProvider.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/application/PlatformPathConverter.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/application/RelativePathToAbsoluteConverter.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/application/WebdavUnknownItemTypeSearcher.ts (62%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/domain/BucketEntry.ts (85%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/domain/BucketEntryId.ts (69%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/domain/Crypt.ts (86%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/domain/DelayQueue.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/domain/EventBus.ts (77%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/domain/EventRepository.ts (68%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/domain/MapObserver.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/domain/Path.ts (90%)
 create mode 100644 src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers.ts
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/infrastructure/EnvironmentDownloader.ts (96%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/infrastructure/EventRecorder.ts (90%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/infrastructure/InMemoryEventHistory.ts (66%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/shared/infrastructure/NodeJsEventBus.ts (90%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/thumbnails/domain/ThumbanailContentId.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/thumbnails/domain/Thumbnail.ts (87%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/thumbnails/domain/ThumbnailDownloader.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/thumbnails/infrastructrue/EnvironmentThumbnailDownloader.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/userUsage/application/BytesInBinaryToInternacionalSystem.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/userUsage/application/DecrementDriveUsageOnFileDeleted.ts (71%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/userUsage/application/FreeSpacePerEnvironmentCalculator.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/userUsage/application/IncrementDriveUsageOnFileCreated.ts (67%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/userUsage/application/UsedSpaceCalculator.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/userUsage/application/UserUsageDecrementer.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/userUsage/application/UserUsageIncrementer.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/userUsage/domain/UserUsage.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/userUsage/domain/UserUsageRepository.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/userUsage/infrastrucutre/CachedHttpUserUsageRepository.ts (100%)
 rename src/{workers/sync-engine/modules => context/virtual-drive}/userUsage/infrastrucutre/dtos/UserUsageLimitDTO.ts (100%)
 delete mode 100644 src/main/analytics/backup-handlers.ts
 delete mode 100644 src/main/app-info/AvaliableAppQuery.ts
 delete mode 100644 src/main/app-info/handlers.ts
 delete mode 100644 src/main/app-info/service.ts
 delete mode 100644 src/main/background-processes/backups.ts
 delete mode 100644 src/main/background-processes/sync.ts
 delete mode 100644 src/main/background-processes/types/BackupFatalError.ts
 delete mode 100644 src/renderer/actions/backsups-error-actions.ts
 delete mode 100644 src/renderer/actions/types.ts
 delete mode 100644 src/renderer/hooks/BackupStatus.tsx
 delete mode 100644 src/renderer/pages/Settings/Backups/BackupsFolderList.tsx
 delete mode 100644 src/renderer/pages/Settings/Backups/BackupsPreferences.tsx
 delete mode 100644 src/renderer/pages/Settings/Backups/index.tsx
 delete mode 100644 src/renderer/pages/Widget/BackupsBanner.tsx
 delete mode 100644 src/renderer/pages/Widget/BackupsErrorBanner.tsx
 delete mode 100644 src/renderer/utils/backups-progress.ts
 delete mode 100644 src/renderer/utils/query.ts
 delete mode 100644 src/shared/types/Process.ts
 delete mode 100644 src/workers/backups/backups.ts
 delete mode 100644 src/workers/backups/index.ts
 delete mode 100644 src/workers/backups/process.ts
 delete mode 100644 src/workers/backups/test/backups.test.ts
 delete mode 100644 src/workers/filesystems/domain/FileSystem.ts
 delete mode 100644 src/workers/filesystems/domain/Transfer.ts
 delete mode 100644 src/workers/filesystems/local-filesystem.ts
 delete mode 100644 src/workers/filesystems/remote-filesystem.ts
 delete mode 100644 src/workers/filesystems/test/__mocks__/FileSystemMock.ts
 delete mode 100644 src/workers/sync-engine/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts
 delete mode 100644 src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts
 delete mode 100644 src/workers/sync-engine/dependency-injection/contents/ContentsContainer.ts
 delete mode 100644 src/workers/sync-engine/dependency-injection/files/FilesContainer.ts
 delete mode 100644 src/workers/sync-engine/dependency-injection/files/builder.ts
 delete mode 100644 src/workers/sync-engine/dependency-injection/folders/FoldersContainer.ts
 delete mode 100644 src/workers/sync-engine/dependency-injection/folders/builder.ts
 delete mode 100644 src/workers/sync-engine/dependency-injection/placeholders/PlaceholdersContainer.ts
 delete mode 100644 src/workers/sync-engine/dependency-injection/placeholders/builder.ts
 delete mode 100644 src/workers/sync-engine/dependency-injection/shared/SharedContainer.ts
 delete mode 100644 src/workers/sync-engine/modules/boundaryBridge/application/SyncPlaceholders.ts
 delete mode 100644 src/workers/sync-engine/modules/boundaryBridge/application/TreePlaceholderCreator.ts
 delete mode 100644 src/workers/sync-engine/modules/contents/test/__mocks__/LocalFileWriterMock.ts
 delete mode 100644 src/workers/sync-engine/modules/contents/test/__mocks__/LocationProviderMock.ts
 delete mode 100644 src/workers/sync-engine/modules/files/application/FileByPartialSearcher.ts
 delete mode 100644 src/workers/sync-engine/modules/files/application/FileClearer.ts
 delete mode 100644 src/workers/sync-engine/modules/files/application/FileSearcher.ts
 delete mode 100644 src/workers/sync-engine/modules/files/application/LocalRepositoryRepositoryRefresher.ts
 delete mode 100644 src/workers/sync-engine/modules/files/domain/ManagedFileRepository.ts
 delete mode 100644 src/workers/sync-engine/modules/files/infrastructure/HttpFileRepository.ts
 delete mode 100644 src/workers/sync-engine/modules/files/test/__mocks__/FileRepositoryMock.ts
 delete mode 100644 src/workers/sync-engine/modules/files/test/application/FileCreator.test.ts
 delete mode 100644 src/workers/sync-engine/modules/files/test/application/FilePathUpdater.test.ts
 delete mode 100644 src/workers/sync-engine/modules/files/test/infrastructure/HttpFileRepository.test.ts
 delete mode 100644 src/workers/sync-engine/modules/folders/application/FolderClearer.ts
 delete mode 100644 src/workers/sync-engine/modules/folders/application/FolderSearcher.ts
 delete mode 100644 src/workers/sync-engine/modules/folders/domain/OfflineFolderRepository.ts
 delete mode 100644 src/workers/sync-engine/modules/folders/infrastructure/HttpFolderRepository.ts
 delete mode 100644 src/workers/sync-engine/modules/folders/infrastructure/InMemoryOfflineFolderRepository.ts
 delete mode 100644 src/workers/sync-engine/modules/folders/test/__mocks__/FolderRepositoryMock.ts
 delete mode 100644 src/workers/sync-engine/modules/folders/test/infrastructure/HttpFolderRepository.test.ts
 delete mode 100644 src/workers/sync-engine/modules/items/application/Traverser.ts
 delete mode 100644 src/workers/sync-engine/modules/placeholders/domain/CommonPlaceholder.ts
 delete mode 100644 src/workers/sync-engine/modules/placeholders/domain/PlaceholderCreator.ts
 delete mode 100644 src/workers/sync-engine/modules/placeholders/infrastructure/VirtualDrivePlaceholderCreator.ts
 delete mode 100644 src/workers/sync-engine/modules/placeholders/test/__mock__/PlaceholderCreatorMock.ts
 delete mode 100644 src/workers/sync-engine/modules/shared/domain/OfflineActionsQueue.ts
 delete mode 100644 src/workers/sync-engine/modules/shared/domain/WebdavItem.ts
 delete mode 100644 src/workers/sync-engine/modules/shared/infrastructure/DomainEventSubscribers.ts
 rename {src/test => tests}/LanguagePicker.e2e.ts (100%)
 rename {src/workers/sync-engine/modules/contents/test => tests/context/virtual-drive/contents}/__mocks__/ContentFileDownloaderMock.ts (85%)
 rename {src/workers/sync-engine/modules/contents/test => tests/context/virtual-drive/contents}/__mocks__/ContentFileUploaderMock.ts (76%)
 create mode 100644 tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
 create mode 100644 tests/context/virtual-drive/contents/__mocks__/LocationProviderMock.ts
 rename {src/workers/sync-engine/modules/contents/test => tests/context/virtual-drive/contents}/__mocks__/ReadableHelloWorld.ts (100%)
 rename {src/workers/sync-engine/modules/contents/test => tests/context/virtual-drive/contents}/__mocks__/RemoteFileContentsManagersFactoryMock.ts (53%)
 rename {src/workers/sync-engine/modules/contents/test => tests/context/virtual-drive/contents}/__mocks__/environment/DownloadStrategyFunctionMock.ts (100%)
 rename {src/workers/sync-engine/modules/contents/test => tests/context/virtual-drive/contents}/__mocks__/environment/UploadStrategyFunctionMock.ts (100%)
 rename src/workers/sync-engine/modules/contents/test/application/ContentsDownloader.test.ts => tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts (73%)
 rename {src/workers/sync-engine/modules/contents/test => tests/context/virtual-drive/contents}/domain/ContentsIdMother.ts (76%)
 rename {src/workers/sync-engine/modules/contents/test => tests/context/virtual-drive/contents}/domain/ContentsSizeMother.ts (71%)
 rename {src/workers/sync-engine/modules/contents/test => tests/context/virtual-drive/contents}/domain/FileContentsMother.ts (74%)
 rename {src/workers/sync-engine/modules/contents/test => tests/context/virtual-drive/contents}/infrastructure/download/EnvironmentContentFileDownloader.test.ts (91%)
 rename {src/workers/sync-engine/modules/contents/test => tests/context/virtual-drive/contents}/infrastructure/upload/EnvironmentContentFileUploader.test.ts (96%)
 create mode 100644 tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts
 create mode 100644 tests/context/virtual-drive/files/__mocks__/LocalFileSystemMock.ts
 create mode 100644 tests/context/virtual-drive/files/__mocks__/RemoteFileSystemMock.ts
 create mode 100644 tests/context/virtual-drive/files/application/FileCreator.test.ts
 rename {src/workers/sync-engine/modules/files/test => tests/context/virtual-drive/files}/application/FileDeleter.test.ts (53%)
 create mode 100644 tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
 rename {src/workers/sync-engine/modules/files/test => tests/context/virtual-drive/files}/domain/FileMother.ts (82%)
 rename {src/workers/sync-engine/modules/files/test => tests/context/virtual-drive/files}/domain/FilePath.test.ts (91%)
 rename {src/workers/sync-engine/modules/files/test => tests/context/virtual-drive/files}/domain/FilePathMother.ts (74%)
 rename {src/workers/sync-engine/modules/files/test => tests/context/virtual-drive/files}/domain/FileSize.test.ts (88%)
 rename {src/workers/sync-engine/modules/files/test => tests/context/virtual-drive/files}/infrastructure/ServerFileMother.ts (81%)
 rename {src/workers/sync-engine/modules/folders/test => tests/context/virtual-drive/folders}/__mocks__/FolderFinderMock.ts (100%)
 create mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderLocalFileSystemMock.ts
 create mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderRemoteFileSystemMock.ts
 create mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts
 rename {src/workers/sync-engine/modules/folders/test => tests/context/virtual-drive/folders}/application/FolderCreator.test.ts (50%)
 rename {src/workers/sync-engine/modules/folders/test => tests/context/virtual-drive/folders}/application/FolderDeleter.test.ts (58%)
 rename {src/workers/sync-engine/modules/folders/test => tests/context/virtual-drive/folders}/application/FolderMover.test.ts (61%)
 rename {src/workers/sync-engine/modules/folders/test => tests/context/virtual-drive/folders}/application/SynchronizeOfflineModifications.test.ts (53%)
 rename {src/workers/sync-engine/modules/folders/test => tests/context/virtual-drive/folders}/domain/FolderMother.ts (85%)
 rename {src/workers/sync-engine/modules/folders/test => tests/context/virtual-drive/folders}/domain/FolderPath.test.ts (75%)
 rename {src/workers/sync-engine/modules/folders/test => tests/context/virtual-drive/folders}/domain/OfflineFolderMother.ts (71%)
 rename {src/workers/sync-engine/modules/items/test => tests/context/virtual-drive/items}/application/Traverser.test.ts (69%)
 create mode 100644 tests/context/virtual-drive/items/infrastructure/FakeNameDecrypt.ts
 rename {src/workers/sync-engine/modules/items/test => tests/context/virtual-drive/items}/persistance/ServerFolderMother.ts (84%)
 rename {src/workers/sync-engine/modules/shared/test => tests/context/virtual-drive/shared}/__mock__/EventBusMock.ts (73%)
 create mode 100644 tests/context/virtual-drive/shared/__mock__/EventRepositoryMock.ts
 rename {src/workers/sync-engine/modules/shared/test => tests/context/virtual-drive/shared}/__mock__/IpcRendererSyncEngineMock.ts (83%)
 rename {src/workers/sync-engine/modules/shared/test => tests/context/virtual-drive/shared}/application/AbsolutePathToRelativeConverter.test.ts (71%)
 rename {src/workers/sync-engine/modules/shared/test => tests/context/virtual-drive/shared}/application/PlatformPathConverter.test.ts (80%)
 rename {src/workers/sync-engine/modules/shared/test => tests/context/virtual-drive/shared}/domain/FakeCrypt.ts (80%)
 rename {src/workers/sync-engine/modules/shared/test => tests/context/virtual-drive/shared}/domain/Path.test.ts (89%)
 rename {src/workers/sync-engine/modules/userUsage/test => tests/context/virtual-drive/user-usage}/application/BytesInBinaryToInternacionalSystem.test.ts (89%)
 rename {src/test => tests}/fixtures/AccessResponse.json (100%)
 rename {src/test => tests}/fixtures/errors.ts (68%)
 rename {src/test => tests}/issues.e2e.ts (94%)
 rename {src/test => tests}/main/thumbnails/fixtures/1000x1000.jpg (100%)
 rename {src/test => tests}/main/thumbnails/fixtures/result.png (100%)
 rename {src/test => tests}/main/thumbnails/fixtures/source.pdf (100%)
 rename {src/test => tests}/main/thumbnails/helpers.ts (100%)
 rename {src/test => tests}/main/thumbnails/resize-image.test.ts (84%)
 rename {src/test => tests}/onboarding.e2e.ts (100%)
 rename {src/test => tests}/playwright.config.ts (100%)
 rename {src/test => tests}/selectors.ts (100%)
 rename {src/test => tests}/unauthorized.e2e.ts (100%)
 rename {src/test => tests}/utils.ts (100%)

diff --git a/.erb/configs/webpack.paths.ts b/.erb/configs/webpack.paths.ts
index 3e55b485d..4de2a5a95 100644
--- a/.erb/configs/webpack.paths.ts
+++ b/.erb/configs/webpack.paths.ts
@@ -4,12 +4,12 @@ const rootPath = path.join(__dirname, '../..');
 
 const dllPath = path.join(__dirname, '../dll');
 
-const srcPath = path.join(rootPath, 'src');
+const srcPath = path.join(rootPath, 'src', 'apps');
 const srcMainPath = path.join(srcPath, 'main');
 const srcRendererPath = path.join(srcPath, 'renderer');
 const srcSyncPath = path.join(srcPath, 'workers', 'sync');
 const srcBackupsPath = path.join(srcPath, 'workers', 'backups');
-const srcSyncEnginePath = path.join(srcPath, 'workers', 'sync-engine');
+const srcSyncEnginePath = path.join(srcPath, 'sync-engine');
 
 const releasePath = path.join(rootPath, 'release');
 const appPath = path.join(releasePath, 'app');
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 75175e11c..cf8d99f13 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,15 +5,16 @@ on: [pull_request]
 jobs:
   test:
     name: 🧪 Lint and test
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
+          cache: 'yarn'
       - name: Create .npmrc file
         run: |
           echo "registry=https://registry.yarnpkg.com/" > .npmrc
@@ -28,8 +29,6 @@ jobs:
           install-command: yarn --ignore-scripts --frozen-lockfile
       - name: Lint
         run: yarn run lint
-      - name: Typescript check
-        run: yarn run type-check
       - name: Build processes
         run: yarn build:main && yarn build:renderer
       - name: Run test
diff --git a/package.json b/package.json
index a1a5c0e5f..66ad6cb43 100644
--- a/package.json
+++ b/package.json
@@ -8,10 +8,9 @@
     "url": "https://github.com/internxt/drive-desktop"
   },
   "scripts": {
-    "build": "concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:backups\" \"npm run build:sync-engine\"",
+    "build": "concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:sync-engine\"",
     "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
     "build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts",
-    "build:backups": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.backups.ts",
     "build:sync-engine": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync-engine.ts",
     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
     "lint": "cross-env NODE_ENV=development eslint . --ext .ts,.tsx",
@@ -19,11 +18,10 @@
     "package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never",
     "publish": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish always",
     "postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts && opencollective-postinstall",
-    "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:backups && npm run start:sync-engine && npm run start:renderer",
-    "start:main": "cross-env NODE_ENV=development electron -r ts-node/register/transpile-only ./src/main/main.ts",
+    "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:sync-engine && npm run start:renderer",
+    "start:main": "cross-env NODE_ENV=development electron -r ts-node/register/transpile-only ./src/apps/main/main.ts",
     "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
     "start:sync": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync.ts",
-    "start:backups": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.backups.ts",
     "start:sync-engine": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync-engine.ts",
     "test": "jest && playwright test --config=src/test",
     "test:unit": "jest --silent",
diff --git a/src/main/analytics/drive-handlers.ts b/src/apps/main/analytics/drive-handlers.ts
similarity index 100%
rename from src/main/analytics/drive-handlers.ts
rename to src/apps/main/analytics/drive-handlers.ts
diff --git a/src/main/analytics/handlers.ts b/src/apps/main/analytics/handlers.ts
similarity index 65%
rename from src/main/analytics/handlers.ts
rename to src/apps/main/analytics/handlers.ts
index 20ad76e7c..d0655aafe 100644
--- a/src/main/analytics/handlers.ts
+++ b/src/apps/main/analytics/handlers.ts
@@ -1,3 +1,2 @@
 import './user-handlers';
-import './backup-handlers';
 import './drive-handlers';
diff --git a/src/main/analytics/rudderstack-client.ts b/src/apps/main/analytics/rudderstack-client.ts
similarity index 73%
rename from src/main/analytics/rudderstack-client.ts
rename to src/apps/main/analytics/rudderstack-client.ts
index 9a324d532..d6cd52af8 100644
--- a/src/main/analytics/rudderstack-client.ts
+++ b/src/apps/main/analytics/rudderstack-client.ts
@@ -4,11 +4,11 @@ const WRITE_KEY = process.env.RUDDERSTACK_KEY;
 const DATA_PLANE_URL = process.env.RUDDERSTACK_DATA_PLANE_URL;
 
 if (!WRITE_KEY) {
-  throw Error('[CONFIG] Missing ANALITICS WRITE KEY');
+  throw Error('[CONFIG] Missing ANALYTICS WRITE KEY');
 }
 
 if (!DATA_PLANE_URL) {
-  throw Error('[CONFIG] Missing ANALITICS URL');
+  throw Error('[CONFIG] Missing ANALYTICS URL');
 }
 
 const client = new Analytics(WRITE_KEY, `${DATA_PLANE_URL}`);
diff --git a/src/main/analytics/service.ts b/src/apps/main/analytics/service.ts
similarity index 99%
rename from src/main/analytics/service.ts
rename to src/apps/main/analytics/service.ts
index 3ad509198..4cc906c6d 100644
--- a/src/main/analytics/service.ts
+++ b/src/apps/main/analytics/service.ts
@@ -1,4 +1,4 @@
-import packageJson from '../../../package.json';
+import packageJson from '../../../../package.json';
 import ConfigStore from '../config';
 import { client } from './rudderstack-client';
 import os from 'os';
diff --git a/src/main/analytics/user-handlers.ts b/src/apps/main/analytics/user-handlers.ts
similarity index 100%
rename from src/main/analytics/user-handlers.ts
rename to src/apps/main/analytics/user-handlers.ts
diff --git a/src/main/app-info/app-info.ts b/src/apps/main/app-info/app-info.ts
similarity index 76%
rename from src/main/app-info/app-info.ts
rename to src/apps/main/app-info/app-info.ts
index 64eb91053..d7fbf1a6f 100644
--- a/src/main/app-info/app-info.ts
+++ b/src/apps/main/app-info/app-info.ts
@@ -1,4 +1,4 @@
-import packageJson from '../../../package.json';
+import packageJson from '../../../../package.json';
 
 export type AppInfo = {
   name: 'drive-desktop';
diff --git a/src/apps/main/app-info/handlers.ts b/src/apps/main/app-info/handlers.ts
new file mode 100644
index 000000000..0f0b19fce
--- /dev/null
+++ b/src/apps/main/app-info/handlers.ts
@@ -0,0 +1,22 @@
+import { ipcMain, app } from 'electron';
+
+ipcMain.handle('get-path', (_, path) => {
+  const result = app.getPath(path);
+  return result;
+});
+
+ipcMain.handle('APP:TEMPORAL_FILES_FOLDER', () => {
+  return app.getPath('temp');
+});
+
+ipcMain.handle('APP:PREFERRED_LANGUAGE', (): Array<string> => {
+  const canObtainPreferredLanguage = Object.keys(app).includes(
+    'getPreferredSystemLanguage'
+  );
+
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  if (canObtainPreferredLanguage) return app.getPreferredSystemLanguage();
+
+  return ['en'];
+});
diff --git a/src/main/auth/handlers.ts b/src/apps/main/auth/handlers.ts
similarity index 96%
rename from src/main/auth/handlers.ts
rename to src/apps/main/auth/handlers.ts
index 42ffbd1a0..47e102e47 100644
--- a/src/main/auth/handlers.ts
+++ b/src/apps/main/auth/handlers.ts
@@ -43,6 +43,10 @@ ipcMain.handle('get-headers-for-new-api', () => getNewApiHeaders());
 
 ipcMain.handle('get-new-token', () => obtainToken('newToken'));
 
+ipcMain.handle('get-token', () => {
+  return obtainToken('bearerToken');
+});
+
 export function onUserUnauthorized() {
   eventBus.emit('USER_WAS_UNAUTHORIZED');
 
diff --git a/src/main/auth/refresh-token.ts b/src/apps/main/auth/refresh-token.ts
similarity index 100%
rename from src/main/auth/refresh-token.ts
rename to src/apps/main/auth/refresh-token.ts
diff --git a/src/main/auth/service.ts b/src/apps/main/auth/service.ts
similarity index 96%
rename from src/main/auth/service.ts
rename to src/apps/main/auth/service.ts
index 315c0958b..57c110a03 100644
--- a/src/main/auth/service.ts
+++ b/src/apps/main/auth/service.ts
@@ -1,15 +1,15 @@
 import { safeStorage } from 'electron';
 import Logger from 'electron-log';
 
-import packageConfig from '../../../package.json';
+import packageConfig from '../../../../package.json';
 import ConfigStore, { defaults, fieldsToSave } from '../config';
 import { User } from '../types';
 
 const TOKEN_ENCODING = 'latin1';
 
 const tokensKeys = ['bearerToken', 'newToken'] as const;
-type TokenKey = typeof tokensKeys[number];
-type EncryptedTokenKey = `${typeof tokensKeys[number]}Encrypted`;
+type TokenKey = (typeof tokensKeys)[number];
+type EncryptedTokenKey = `${(typeof tokensKeys)[number]}Encrypted`;
 
 export function encryptToken() {
   const bearerTokenEncrypted = ConfigStore.get('bearerTokenEncrypted');
diff --git a/src/main/auto-launch/handlers.ts b/src/apps/main/auto-launch/handlers.ts
similarity index 100%
rename from src/main/auto-launch/handlers.ts
rename to src/apps/main/auto-launch/handlers.ts
diff --git a/src/main/auto-launch/linux-desktop-entry.ts b/src/apps/main/auto-launch/linux-desktop-entry.ts
similarity index 94%
rename from src/main/auto-launch/linux-desktop-entry.ts
rename to src/apps/main/auto-launch/linux-desktop-entry.ts
index 223256409..afba1ab0e 100644
--- a/src/main/auto-launch/linux-desktop-entry.ts
+++ b/src/apps/main/auto-launch/linux-desktop-entry.ts
@@ -1,7 +1,7 @@
 import fs from 'fs';
 import os from 'os';
 
-import packageJson from '../../../package.json';
+import packageJson from '../../../../package.json';
 
 const fileName = `${packageJson.name}.desktop`;
 const desktopFilePath = `${os.homedir()}/.config/autostart`;
diff --git a/src/main/auto-launch/service.ts b/src/apps/main/auto-launch/service.ts
similarity index 100%
rename from src/main/auto-launch/service.ts
rename to src/apps/main/auto-launch/service.ts
diff --git a/src/main/background-processes/process-issues.ts b/src/apps/main/background-processes/process-issues.ts
similarity index 98%
rename from src/main/background-processes/process-issues.ts
rename to src/apps/main/background-processes/process-issues.ts
index cdec67929..7ac5006e2 100644
--- a/src/main/background-processes/process-issues.ts
+++ b/src/apps/main/background-processes/process-issues.ts
@@ -1,12 +1,12 @@
 import { ipcMain } from 'electron';
 
+import eventBus from '../event-bus';
+import { broadcastToWindows } from '../windows';
 import {
+  ProcessIssue,
   GeneralIssue,
   ProcessInfoUpdatePayload,
-  ProcessIssue,
-} from '../../workers/types';
-import eventBus from '../event-bus';
-import { broadcastToWindows } from '../windows';
+} from '../../shared/types';
 
 let processIssues: ProcessIssue[] = [];
 let generalIssues: GeneralIssue[] = [];
diff --git a/src/main/background-processes/sync-engine.ts b/src/apps/main/background-processes/sync-engine.ts
similarity index 98%
rename from src/main/background-processes/sync-engine.ts
rename to src/apps/main/background-processes/sync-engine.ts
index c5e4b8de7..0149fcbb3 100644
--- a/src/main/background-processes/sync-engine.ts
+++ b/src/apps/main/background-processes/sync-engine.ts
@@ -30,7 +30,7 @@ function spawnSyncEngineWorker() {
   worker
     .loadFile(
       process.env.NODE_ENV === 'development'
-        ? '../../release/app/dist/sync-engine/index.html'
+        ? '../../../release/app/dist/sync-engine/index.html'
         : `${path.join(__dirname, '..', 'sync-engine')}/index.html`
     )
     .then(() => {
diff --git a/src/main/bug-report/BugReportResult.ts b/src/apps/main/bug-report/BugReportResult.ts
similarity index 100%
rename from src/main/bug-report/BugReportResult.ts
rename to src/apps/main/bug-report/BugReportResult.ts
diff --git a/src/main/bug-report/handlers.ts b/src/apps/main/bug-report/handlers.ts
similarity index 100%
rename from src/main/bug-report/handlers.ts
rename to src/apps/main/bug-report/handlers.ts
diff --git a/src/main/bug-report/service.ts b/src/apps/main/bug-report/service.ts
similarity index 96%
rename from src/main/bug-report/service.ts
rename to src/apps/main/bug-report/service.ts
index 14fca69bd..be6a87c3e 100644
--- a/src/main/bug-report/service.ts
+++ b/src/apps/main/bug-report/service.ts
@@ -5,13 +5,14 @@ import { createReadStream } from 'fs';
 import fs from 'fs/promises';
 import path from 'path';
 
-import packageJson from '../../../package.json';
-import { ErrorDetails } from '../../workers/types';
+import packageJson from '../../../../package.json';
 import { obtainToken } from '../auth/service';
 import { BugReportResult } from './BugReportResult';
 import * as Sentry from '@sentry/electron/main';
 import { User } from '../types';
 import Logger from 'electron-log';
+import { ErrorDetails } from '../../shared/types';
+
 /**
  * Reports an error to Sentry from the main process
  *
diff --git a/src/main/config.ts b/src/apps/main/config.ts
similarity index 100%
rename from src/main/config.ts
rename to src/apps/main/config.ts
diff --git a/src/main/config/handlers.ts b/src/apps/main/config/handlers.ts
similarity index 100%
rename from src/main/config/handlers.ts
rename to src/apps/main/config/handlers.ts
diff --git a/src/main/config/service.ts b/src/apps/main/config/service.ts
similarity index 100%
rename from src/main/config/service.ts
rename to src/apps/main/config/service.ts
diff --git a/src/main/database/adapters/base.ts b/src/apps/main/database/adapters/base.ts
similarity index 100%
rename from src/main/database/adapters/base.ts
rename to src/apps/main/database/adapters/base.ts
diff --git a/src/main/database/collections/DriveFileCollection.ts b/src/apps/main/database/collections/DriveFileCollection.ts
similarity index 100%
rename from src/main/database/collections/DriveFileCollection.ts
rename to src/apps/main/database/collections/DriveFileCollection.ts
diff --git a/src/main/database/collections/DriveFolderCollection.ts b/src/apps/main/database/collections/DriveFolderCollection.ts
similarity index 100%
rename from src/main/database/collections/DriveFolderCollection.ts
rename to src/apps/main/database/collections/DriveFolderCollection.ts
diff --git a/src/main/database/data-source.ts b/src/apps/main/database/data-source.ts
similarity index 100%
rename from src/main/database/data-source.ts
rename to src/apps/main/database/data-source.ts
diff --git a/src/main/database/entities/DriveFile.ts b/src/apps/main/database/entities/DriveFile.ts
similarity index 100%
rename from src/main/database/entities/DriveFile.ts
rename to src/apps/main/database/entities/DriveFile.ts
diff --git a/src/main/database/entities/DriveFolder.ts b/src/apps/main/database/entities/DriveFolder.ts
similarity index 100%
rename from src/main/database/entities/DriveFolder.ts
rename to src/apps/main/database/entities/DriveFolder.ts
diff --git a/src/main/device/handlers.ts b/src/apps/main/device/handlers.ts
similarity index 100%
rename from src/main/device/handlers.ts
rename to src/apps/main/device/handlers.ts
diff --git a/src/main/device/service.ts b/src/apps/main/device/service.ts
similarity index 100%
rename from src/main/device/service.ts
rename to src/apps/main/device/service.ts
diff --git a/src/main/event-bus.ts b/src/apps/main/event-bus.ts
similarity index 100%
rename from src/main/event-bus.ts
rename to src/apps/main/event-bus.ts
diff --git a/src/main/fordwardToWindows.ts b/src/apps/main/fordwardToWindows.ts
similarity index 98%
rename from src/main/fordwardToWindows.ts
rename to src/apps/main/fordwardToWindows.ts
index a2d1461d6..b0cc9f986 100644
--- a/src/main/fordwardToWindows.ts
+++ b/src/apps/main/fordwardToWindows.ts
@@ -1,6 +1,6 @@
-import { FileErrorInfo } from 'shared/IPC/events/drive';
-import { ipcMainDrive } from './ipcs/mainDrive';
 import { broadcastToWindows } from './windows';
+import { ipcMainDrive } from './ipcs/mainDrive';
+import { FileErrorInfo } from '../shared/IPC/events/drive';
 
 ipcMainDrive.on('FILE_DELETED', (_, payload) => {
   const { nameWithExtension } = payload;
diff --git a/src/main/ipcs/NoEvents.ts b/src/apps/main/ipcs/NoEvents.ts
similarity index 100%
rename from src/main/ipcs/NoEvents.ts
rename to src/apps/main/ipcs/NoEvents.ts
diff --git a/src/main/ipcs/ipcMainSyncEngine.ts b/src/apps/main/ipcs/ipcMainSyncEngine.ts
similarity index 100%
rename from src/main/ipcs/ipcMainSyncEngine.ts
rename to src/apps/main/ipcs/ipcMainSyncEngine.ts
diff --git a/src/main/ipcs/mainDrive.ts b/src/apps/main/ipcs/mainDrive.ts
similarity index 100%
rename from src/main/ipcs/mainDrive.ts
rename to src/apps/main/ipcs/mainDrive.ts
index 58cdcdd87..ffd4169ff 100644
--- a/src/main/ipcs/mainDrive.ts
+++ b/src/apps/main/ipcs/mainDrive.ts
@@ -1,7 +1,7 @@
 import { ipcMain } from 'electron';
-import { DriveEvents } from '../../shared/IPC/events/drive';
-import { CustomIpc } from '../../shared/IPC/IPCs';
 import { NoEvents } from './NoEvents';
+import { CustomIpc } from '../../shared/IPC/IPCs';
+import { DriveEvents } from '../../shared/IPC/events/drive';
 
 export type IpcMainDrive = CustomIpc<NoEvents, DriveEvents>;
 
diff --git a/src/main/ipcs/mainVirtualDrive.ts b/src/apps/main/ipcs/mainVirtualDrive.ts
similarity index 100%
rename from src/main/ipcs/mainVirtualDrive.ts
rename to src/apps/main/ipcs/mainVirtualDrive.ts
diff --git a/src/main/logger.ts b/src/apps/main/logger.ts
similarity index 100%
rename from src/main/logger.ts
rename to src/apps/main/logger.ts
diff --git a/src/main/main.ts b/src/apps/main/main.ts
similarity index 97%
rename from src/main/main.ts
rename to src/apps/main/main.ts
index 7830a6089..29975eb81 100644
--- a/src/main/main.ts
+++ b/src/apps/main/main.ts
@@ -35,7 +35,7 @@ import './remote-sync/handlers';
 import { app, nativeTheme } from 'electron';
 import Logger from 'electron-log';
 import { autoUpdater } from 'electron-updater';
-import packageJson from '../../package.json';
+import packageJson from '../../../package.json';
 import eventBus from './event-bus';
 import * as Sentry from '@sentry/electron/main';
 import { AppDataSource } from './database/data-source';
@@ -50,9 +50,9 @@ import configStore from './config';
 import { getTray, setTrayStatus } from './tray/tray';
 import { openOnboardingWindow } from './windows/onboarding';
 import { reportError } from './bug-report/service';
-import { Theme } from 'shared/types/Theme';
 import { setCleanUpFunction } from './quit';
 import { stopSyncEngineWatcher } from './background-processes/sync-engine';
+import { Theme } from '../shared/types/Theme';
 
 Logger.log(`Running ${packageJson.version}`);
 
diff --git a/src/main/migration/handlers.ts b/src/apps/main/migration/handlers.ts
similarity index 100%
rename from src/main/migration/handlers.ts
rename to src/apps/main/migration/handlers.ts
diff --git a/src/main/migration/service.ts b/src/apps/main/migration/service.ts
similarity index 100%
rename from src/main/migration/service.ts
rename to src/apps/main/migration/service.ts
diff --git a/src/main/platform/DesktopPlatform.ts b/src/apps/main/platform/DesktopPlatform.ts
similarity index 100%
rename from src/main/platform/DesktopPlatform.ts
rename to src/apps/main/platform/DesktopPlatform.ts
diff --git a/src/main/platform/handlers.ts b/src/apps/main/platform/handlers.ts
similarity index 100%
rename from src/main/platform/handlers.ts
rename to src/apps/main/platform/handlers.ts
diff --git a/src/main/preload.d.ts b/src/apps/main/preload.d.ts
similarity index 71%
rename from src/main/preload.d.ts
rename to src/apps/main/preload.d.ts
index ce1be4c90..7168f9129 100644
--- a/src/main/preload.d.ts
+++ b/src/apps/main/preload.d.ts
@@ -1,7 +1,5 @@
 declare interface Window {
   electron: {
-    query: typeof import('./app-info/service').executeQuery;
-
     getConfigKey(key: import('./config/service').StoredValues): Promise<any>;
 
     listenToConfigKeyChange<T>(
@@ -13,6 +11,32 @@ declare interface Window {
 
     pathChanged(path: string): void;
 
+    getGeneralIssues: () => Promise<
+      import('../../apps/shared/types').GeneralIssue[]
+    >;
+
+    onGeneralIssuesChanged: (
+      func: (value: import('../../apps/shared/types').GeneralIssue[]) => void
+    ) => () => void;
+
+    onSyncStopped: (
+      func: (
+        value: import('../../context/desktop/sync/domain/SyncStoppedPayload').SyncStoppedPayload
+      ) => void
+    ) => () => void;
+
+    getProcessIssues(): Promise<import('apps/shared/types').ProcessIssue[]>;
+
+    onProcessIssuesChanged(
+      func: (value: import('apps/shared/types').ProcessIssue[]) => void
+    ): () => void;
+
+    onSyncInfoUpdate(
+      func: (
+        value: import('apps/shared/types').ProcessInfoUpdatePayload
+      ) => void
+    ): () => void;
+
     userIsUnauthorized(): void;
 
     userLoggedIn(
@@ -49,38 +73,9 @@ declare interface Window {
 
     stopSyncProcess(): void;
 
-    getSyncStatus(): Promise<
-      import('main/background-processes/sync').SyncStatus
-    >;
-
-    onSyncStatusChanged(
-      func: (value: import('main/background-processes/sync').SyncStatus) => void
-    ): () => void;
-
-    onSyncStopped(
-      func: (
-        value: import('main/background-processes/sync').SyncStoppedPayload
-      ) => void
-    ): () => void;
-
-    onSyncInfoUpdate(
-      func: (value: import('../workers/types').ProcessInfoUpdatePayload) => void
-    ): () => void;
-
     moveSyncFolderToDesktop(): Promise<
       typeof import('../main/migration/service').moveSyncFolderToDesktop
     >;
-    getProcessIssues(): Promise<import('../workers/types').ProcessIssue[]>;
-
-    onProcessIssuesChanged(
-      func: (value: import('../workers/types').ProcessIssue[]) => void
-    ): () => void;
-
-    getGeneralIssues(): Promise<import('../workers/types').GeneralIssue[]>;
-
-    onGeneralIssuesChanged(
-      func: (value: import('../workers/types').GeneralIssue[]) => void
-    ): () => void;
 
     openProcessIssuesWindow(): void;
 
@@ -106,16 +101,6 @@ declare interface Window {
 
     stopBackupsProcess(): void;
 
-    getBackupsStatus(): Promise<
-      import('main/background-processes/backups').BackupsStatus
-    >;
-
-    onBackupsStatusChanged(
-      func: (
-        value: import('main/background-processes/backups').BackupsStatus
-      ) => void
-    ): () => void;
-
     getVirtualDriveRoot(): Promise<string>;
 
     chooseSyncRootWithDialog: typeof import('./virutal-root-folder/service').chooseSyncRootWithDialog;
@@ -142,32 +127,8 @@ declare interface Window {
 
     getLastBackupTimestamp: () => Promise<number>;
 
-    getLastBackupExitReason: () => Promise<
-      import('../main/background-processes/backups').BackupExitReason | null
-    >;
-
-    onBackupProgress(
-      func: (
-        value: import('main/background-processes/backups').BackupProgress
-      ) => void
-    ): () => void;
-
-    getBackupFatalErrors(): Promise<
-      Array<
-        import('../main/background-processes/types/BackupFatalError').BackupFatalError
-      >
-    >;
-
     deleteBackupError(folderId: number): Promise<void>;
 
-    onBackupFatalErrorsChanged(
-      func: (
-        value: Array<
-          import('../main/background-processes/types/BackupFatalError').BackupFatalError
-        >
-      ) => void
-    ): () => void;
-
     changeBackupPath: typeof import('../main/device/service').changeBackupPath;
 
     getFolderPath: typeof import('../main/device/service').getPathFromDialog;
@@ -205,5 +166,6 @@ declare interface Window {
     retryVirtualDriveMount(): void;
     startRemoteSync: () => Promise<void>;
     openUrl: (url: string) => Promise<void>;
+    getPreferredAppLanguage: () => Promise<Array<string>>;
   };
 }
diff --git a/src/main/preload.js b/src/apps/main/preload.js
similarity index 99%
rename from src/main/preload.js
rename to src/apps/main/preload.js
index 70cb93ab0..e988efa87 100644
--- a/src/main/preload.js
+++ b/src/apps/main/preload.js
@@ -2,9 +2,6 @@ const { contextBridge, ipcRenderer } = require('electron');
 const path = require('path');
 
 contextBridge.exposeInMainWorld('electron', {
-  query(query) {
-    return ipcRenderer.invoke('execute-app-query', query);
-  },
   getConfigKey(key) {
     return ipcRenderer.invoke('get-config-key', key);
   },
@@ -296,5 +293,8 @@ contextBridge.exposeInMainWorld('electron', {
   openUrl: (url) => {
     ipcRenderer.invoke('open-url', url);
   },
+  getPreferredAppLanguage() {
+    return ipcRenderer.invoke('APP:PREFERRED_LANGUAGE');
+  },
   path,
 });
diff --git a/src/main/quit.ts b/src/apps/main/quit.ts
similarity index 100%
rename from src/main/quit.ts
rename to src/apps/main/quit.ts
diff --git a/src/main/realtime.ts b/src/apps/main/realtime.ts
similarity index 100%
rename from src/main/realtime.ts
rename to src/apps/main/realtime.ts
diff --git a/src/main/remote-sync/RemoteSyncManager.test.ts b/src/apps/main/remote-sync/RemoteSyncManager.test.ts
similarity index 97%
rename from src/main/remote-sync/RemoteSyncManager.test.ts
rename to src/apps/main/remote-sync/RemoteSyncManager.test.ts
index e6ac83436..6cce45eed 100644
--- a/src/main/remote-sync/RemoteSyncManager.test.ts
+++ b/src/apps/main/remote-sync/RemoteSyncManager.test.ts
@@ -6,13 +6,14 @@ jest.mock('@sentry/electron/main', () => ({
 jest.mock('electron');
 jest.mock('electron-store');
 jest.mock('axios');
-import { DatabaseCollectionAdapter } from 'main/database/adapters/base';
-import { DriveFile } from 'main/database/entities/DriveFile';
-import { DriveFolder } from 'main/database/entities/DriveFolder';
+
 import { RemoteSyncManager } from './RemoteSyncManager';
 import { RemoteSyncedFile, RemoteSyncedFolder } from './helpers';
 import * as uuid from 'uuid';
 import axios from 'axios';
+import { DatabaseCollectionAdapter } from '../database/adapters/base';
+import { DriveFile } from '../database/entities/DriveFile';
+import { DriveFolder } from '../database/entities/DriveFolder';
 
 const mockedAxios = axios as jest.Mocked<typeof axios>;
 
diff --git a/src/main/remote-sync/RemoteSyncManager.ts b/src/apps/main/remote-sync/RemoteSyncManager.ts
similarity index 100%
rename from src/main/remote-sync/RemoteSyncManager.ts
rename to src/apps/main/remote-sync/RemoteSyncManager.ts
diff --git a/src/main/remote-sync/handlers.ts b/src/apps/main/remote-sync/handlers.ts
similarity index 100%
rename from src/main/remote-sync/handlers.ts
rename to src/apps/main/remote-sync/handlers.ts
diff --git a/src/main/remote-sync/helpers.ts b/src/apps/main/remote-sync/helpers.ts
similarity index 100%
rename from src/main/remote-sync/helpers.ts
rename to src/apps/main/remote-sync/helpers.ts
diff --git a/src/main/thumbnails/application/create-and-upload-thumbnail.ts b/src/apps/main/thumbnails/application/create-and-upload-thumbnail.ts
similarity index 100%
rename from src/main/thumbnails/application/create-and-upload-thumbnail.ts
rename to src/apps/main/thumbnails/application/create-and-upload-thumbnail.ts
diff --git a/src/main/thumbnails/application/extract-pdf-page.ts b/src/apps/main/thumbnails/application/extract-pdf-page.ts
similarity index 100%
rename from src/main/thumbnails/application/extract-pdf-page.ts
rename to src/apps/main/thumbnails/application/extract-pdf-page.ts
diff --git a/src/main/thumbnails/application/obtain-image-to-thumbnail-it.ts b/src/apps/main/thumbnails/application/obtain-image-to-thumbnail-it.ts
similarity index 100%
rename from src/main/thumbnails/application/obtain-image-to-thumbnail-it.ts
rename to src/apps/main/thumbnails/application/obtain-image-to-thumbnail-it.ts
diff --git a/src/main/thumbnails/application/resize-image.ts b/src/apps/main/thumbnails/application/resize-image.ts
similarity index 100%
rename from src/main/thumbnails/application/resize-image.ts
rename to src/apps/main/thumbnails/application/resize-image.ts
diff --git a/src/main/thumbnails/domain/ThumbnableExtension.ts b/src/apps/main/thumbnails/domain/ThumbnableExtension.ts
similarity index 100%
rename from src/main/thumbnails/domain/ThumbnableExtension.ts
rename to src/apps/main/thumbnails/domain/ThumbnableExtension.ts
diff --git a/src/main/thumbnails/domain/ThumbnailProperties.ts b/src/apps/main/thumbnails/domain/ThumbnailProperties.ts
similarity index 100%
rename from src/main/thumbnails/domain/ThumbnailProperties.ts
rename to src/apps/main/thumbnails/domain/ThumbnailProperties.ts
diff --git a/src/main/thumbnails/domain/ThumbnailUploader.ts b/src/apps/main/thumbnails/domain/ThumbnailUploader.ts
similarity index 100%
rename from src/main/thumbnails/domain/ThumbnailUploader.ts
rename to src/apps/main/thumbnails/domain/ThumbnailUploader.ts
diff --git a/src/main/thumbnails/handlers/index.ts b/src/apps/main/thumbnails/handlers/index.ts
similarity index 100%
rename from src/main/thumbnails/handlers/index.ts
rename to src/apps/main/thumbnails/handlers/index.ts
diff --git a/src/main/thumbnails/handlers/remote-file-pull-completed.ts b/src/apps/main/thumbnails/handlers/remote-file-pull-completed.ts
similarity index 100%
rename from src/main/thumbnails/handlers/remote-file-pull-completed.ts
rename to src/apps/main/thumbnails/handlers/remote-file-pull-completed.ts
diff --git a/src/main/thumbnails/infrastructure/EnvironmentAndStorageThumbnailUploader.ts b/src/apps/main/thumbnails/infrastructure/EnvironmentAndStorageThumbnailUploader.ts
similarity index 100%
rename from src/main/thumbnails/infrastructure/EnvironmentAndStorageThumbnailUploader.ts
rename to src/apps/main/thumbnails/infrastructure/EnvironmentAndStorageThumbnailUploader.ts
diff --git a/src/main/thumbnails/infrastructure/ThumbnailUploaderFactory.ts b/src/apps/main/thumbnails/infrastructure/ThumbnailUploaderFactory.ts
similarity index 100%
rename from src/main/thumbnails/infrastructure/ThumbnailUploaderFactory.ts
rename to src/apps/main/thumbnails/infrastructure/ThumbnailUploaderFactory.ts
diff --git a/src/main/token-scheduler/TokenScheduler.ts b/src/apps/main/token-scheduler/TokenScheduler.ts
similarity index 100%
rename from src/main/token-scheduler/TokenScheduler.ts
rename to src/apps/main/token-scheduler/TokenScheduler.ts
diff --git a/src/main/token-scheduler/token-scheduler.test.ts b/src/apps/main/token-scheduler/token-scheduler.test.ts
similarity index 100%
rename from src/main/token-scheduler/token-scheduler.test.ts
rename to src/apps/main/token-scheduler/token-scheduler.test.ts
diff --git a/src/main/tray/handlers.ts b/src/apps/main/tray/handlers.ts
similarity index 100%
rename from src/main/tray/handlers.ts
rename to src/apps/main/tray/handlers.ts
diff --git a/src/main/tray/tray.ts b/src/apps/main/tray/tray.ts
similarity index 97%
rename from src/main/tray/tray.ts
rename to src/apps/main/tray/tray.ts
index 98e97107b..7104e5298 100644
--- a/src/main/tray/tray.ts
+++ b/src/apps/main/tray/tray.ts
@@ -1,6 +1,6 @@
 import { app, Menu, nativeImage, Tray } from 'electron';
 import path from 'path';
-import PackageJson from '../../../package.json';
+import PackageJson from '../../../../package.json';
 import eventBus from '../event-bus';
 import {
   getOrCreateWidged,
@@ -119,7 +119,7 @@ export const setTrayStatus = (status: TrayMenuState) => {
 export function setupTrayIcon() {
   const RESOURCES_PATH = app.isPackaged
     ? path.join(process.resourcesPath, 'assets')
-    : path.join(__dirname, '../../../assets');
+    : path.join(__dirname, '../../../../assets');
 
   const iconsPath = path.join(RESOURCES_PATH, 'tray');
 
diff --git a/src/main/types.ts b/src/apps/main/types.ts
similarity index 100%
rename from src/main/types.ts
rename to src/apps/main/types.ts
diff --git a/src/main/usage/Usage.ts b/src/apps/main/usage/Usage.ts
similarity index 100%
rename from src/main/usage/Usage.ts
rename to src/apps/main/usage/Usage.ts
diff --git a/src/main/usage/handlers.ts b/src/apps/main/usage/handlers.ts
similarity index 100%
rename from src/main/usage/handlers.ts
rename to src/apps/main/usage/handlers.ts
diff --git a/src/main/usage/service.ts b/src/apps/main/usage/service.ts
similarity index 100%
rename from src/main/usage/service.ts
rename to src/apps/main/usage/service.ts
diff --git a/src/main/usage/serviceBuilder.ts b/src/apps/main/usage/serviceBuilder.ts
similarity index 100%
rename from src/main/usage/serviceBuilder.ts
rename to src/apps/main/usage/serviceBuilder.ts
diff --git a/src/main/util.ts b/src/apps/main/util.ts
similarity index 100%
rename from src/main/util.ts
rename to src/apps/main/util.ts
diff --git a/src/main/virutal-root-folder/handlers.ts b/src/apps/main/virutal-root-folder/handlers.ts
similarity index 100%
rename from src/main/virutal-root-folder/handlers.ts
rename to src/apps/main/virutal-root-folder/handlers.ts
diff --git a/src/main/virutal-root-folder/service.ts b/src/apps/main/virutal-root-folder/service.ts
similarity index 100%
rename from src/main/virutal-root-folder/service.ts
rename to src/apps/main/virutal-root-folder/service.ts
diff --git a/src/main/windows/auth.ts b/src/apps/main/windows/auth.ts
similarity index 100%
rename from src/main/windows/auth.ts
rename to src/apps/main/windows/auth.ts
diff --git a/src/main/windows/feedback.ts b/src/apps/main/windows/feedback.ts
similarity index 100%
rename from src/main/windows/feedback.ts
rename to src/apps/main/windows/feedback.ts
diff --git a/src/main/windows/index.ts b/src/apps/main/windows/index.ts
similarity index 100%
rename from src/main/windows/index.ts
rename to src/apps/main/windows/index.ts
diff --git a/src/main/windows/migration.ts b/src/apps/main/windows/migration.ts
similarity index 100%
rename from src/main/windows/migration.ts
rename to src/apps/main/windows/migration.ts
diff --git a/src/main/windows/onboarding.ts b/src/apps/main/windows/onboarding.ts
similarity index 100%
rename from src/main/windows/onboarding.ts
rename to src/apps/main/windows/onboarding.ts
diff --git a/src/main/windows/process-issues.ts b/src/apps/main/windows/process-issues.ts
similarity index 100%
rename from src/main/windows/process-issues.ts
rename to src/apps/main/windows/process-issues.ts
diff --git a/src/main/windows/settings.ts b/src/apps/main/windows/settings.ts
similarity index 100%
rename from src/main/windows/settings.ts
rename to src/apps/main/windows/settings.ts
diff --git a/src/main/windows/widget.ts b/src/apps/main/windows/widget.ts
similarity index 100%
rename from src/main/windows/widget.ts
rename to src/apps/main/windows/widget.ts
diff --git a/src/renderer/App.css b/src/apps/renderer/App.css
similarity index 100%
rename from src/renderer/App.css
rename to src/apps/renderer/App.css
diff --git a/src/renderer/App.tsx b/src/apps/renderer/App.tsx
similarity index 100%
rename from src/renderer/App.tsx
rename to src/apps/renderer/App.tsx
diff --git a/src/renderer/actions/shared-actions.ts b/src/apps/renderer/actions/shared-actions.ts
similarity index 100%
rename from src/renderer/actions/shared-actions.ts
rename to src/apps/renderer/actions/shared-actions.ts
diff --git a/src/renderer/actions/sync-error-actions.ts b/src/apps/renderer/actions/sync-error-actions.ts
similarity index 100%
rename from src/renderer/actions/sync-error-actions.ts
rename to src/apps/renderer/actions/sync-error-actions.ts
diff --git a/src/apps/renderer/actions/types.ts b/src/apps/renderer/actions/types.ts
new file mode 100644
index 000000000..3bb177c6e
--- /dev/null
+++ b/src/apps/renderer/actions/types.ts
@@ -0,0 +1,8 @@
+import { ProcessFatalErrorName } from '../../shared/types';
+
+export interface Action {
+  name: string;
+  func: (() => void) | ((error: undefined) => Promise<void>);
+}
+
+export type FatalErrorActionMap = Record<ProcessFatalErrorName, Action>;
diff --git a/src/renderer/assets/error.svg b/src/apps/renderer/assets/error.svg
similarity index 100%
rename from src/renderer/assets/error.svg
rename to src/apps/renderer/assets/error.svg
diff --git a/src/renderer/assets/file.svg b/src/apps/renderer/assets/file.svg
similarity index 100%
rename from src/renderer/assets/file.svg
rename to src/apps/renderer/assets/file.svg
diff --git a/src/renderer/assets/folder.svg b/src/apps/renderer/assets/folder.svg
similarity index 100%
rename from src/renderer/assets/folder.svg
rename to src/apps/renderer/assets/folder.svg
diff --git a/src/renderer/assets/fonts/InstrumentSans/InstrumentSans-Bold.woff2 b/src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-Bold.woff2
similarity index 100%
rename from src/renderer/assets/fonts/InstrumentSans/InstrumentSans-Bold.woff2
rename to src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-Bold.woff2
diff --git a/src/renderer/assets/fonts/InstrumentSans/InstrumentSans-Medium.woff2 b/src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-Medium.woff2
similarity index 100%
rename from src/renderer/assets/fonts/InstrumentSans/InstrumentSans-Medium.woff2
rename to src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-Medium.woff2
diff --git a/src/renderer/assets/fonts/InstrumentSans/InstrumentSans-Regular.woff2 b/src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-Regular.woff2
similarity index 100%
rename from src/renderer/assets/fonts/InstrumentSans/InstrumentSans-Regular.woff2
rename to src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-Regular.woff2
diff --git a/src/renderer/assets/fonts/InstrumentSans/InstrumentSans-SemiBold.woff2 b/src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-SemiBold.woff2
similarity index 100%
rename from src/renderer/assets/fonts/InstrumentSans/InstrumentSans-SemiBold.woff2
rename to src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-SemiBold.woff2
diff --git a/src/renderer/assets/fonts/InstrumentSans/InstrumentSans[wdth,wght].woff2 b/src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans[wdth,wght].woff2
similarity index 100%
rename from src/renderer/assets/fonts/InstrumentSans/InstrumentSans[wdth,wght].woff2
rename to src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans[wdth,wght].woff2
diff --git a/src/renderer/assets/fonts/InstrumentSans/OFL.txt b/src/apps/renderer/assets/fonts/InstrumentSans/OFL.txt
similarity index 100%
rename from src/renderer/assets/fonts/InstrumentSans/OFL.txt
rename to src/apps/renderer/assets/fonts/InstrumentSans/OFL.txt
diff --git a/src/renderer/assets/fonts/InstrumentSans/font.css b/src/apps/renderer/assets/fonts/InstrumentSans/font.css
similarity index 100%
rename from src/renderer/assets/fonts/InstrumentSans/font.css
rename to src/apps/renderer/assets/fonts/InstrumentSans/font.css
diff --git a/src/renderer/assets/icons/audio.svg b/src/apps/renderer/assets/icons/audio.svg
similarity index 100%
rename from src/renderer/assets/icons/audio.svg
rename to src/apps/renderer/assets/icons/audio.svg
diff --git a/src/renderer/assets/icons/code.svg b/src/apps/renderer/assets/icons/code.svg
similarity index 100%
rename from src/renderer/assets/icons/code.svg
rename to src/apps/renderer/assets/icons/code.svg
diff --git a/src/renderer/assets/icons/csv.svg b/src/apps/renderer/assets/icons/csv.svg
similarity index 100%
rename from src/renderer/assets/icons/csv.svg
rename to src/apps/renderer/assets/icons/csv.svg
diff --git a/src/renderer/assets/icons/default.svg b/src/apps/renderer/assets/icons/default.svg
similarity index 100%
rename from src/renderer/assets/icons/default.svg
rename to src/apps/renderer/assets/icons/default.svg
diff --git a/src/renderer/assets/icons/excel.svg b/src/apps/renderer/assets/icons/excel.svg
similarity index 100%
rename from src/renderer/assets/icons/excel.svg
rename to src/apps/renderer/assets/icons/excel.svg
diff --git a/src/renderer/assets/icons/figma.svg b/src/apps/renderer/assets/icons/figma.svg
similarity index 100%
rename from src/renderer/assets/icons/figma.svg
rename to src/apps/renderer/assets/icons/figma.svg
diff --git a/src/renderer/assets/icons/folder.svg b/src/apps/renderer/assets/icons/folder.svg
similarity index 100%
rename from src/renderer/assets/icons/folder.svg
rename to src/apps/renderer/assets/icons/folder.svg
diff --git a/src/renderer/assets/icons/getIcon.tsx b/src/apps/renderer/assets/icons/getIcon.tsx
similarity index 100%
rename from src/renderer/assets/icons/getIcon.tsx
rename to src/apps/renderer/assets/icons/getIcon.tsx
diff --git a/src/renderer/assets/icons/illustrator.svg b/src/apps/renderer/assets/icons/illustrator.svg
similarity index 100%
rename from src/renderer/assets/icons/illustrator.svg
rename to src/apps/renderer/assets/icons/illustrator.svg
diff --git a/src/renderer/assets/icons/image.svg b/src/apps/renderer/assets/icons/image.svg
similarity index 100%
rename from src/renderer/assets/icons/image.svg
rename to src/apps/renderer/assets/icons/image.svg
diff --git a/src/renderer/assets/icons/indesign.svg b/src/apps/renderer/assets/icons/indesign.svg
similarity index 100%
rename from src/renderer/assets/icons/indesign.svg
rename to src/apps/renderer/assets/icons/indesign.svg
diff --git a/src/renderer/assets/icons/pdf.svg b/src/apps/renderer/assets/icons/pdf.svg
similarity index 100%
rename from src/renderer/assets/icons/pdf.svg
rename to src/apps/renderer/assets/icons/pdf.svg
diff --git a/src/renderer/assets/icons/photoshop.svg b/src/apps/renderer/assets/icons/photoshop.svg
similarity index 100%
rename from src/renderer/assets/icons/photoshop.svg
rename to src/apps/renderer/assets/icons/photoshop.svg
diff --git a/src/renderer/assets/icons/powerpoint.svg b/src/apps/renderer/assets/icons/powerpoint.svg
similarity index 100%
rename from src/renderer/assets/icons/powerpoint.svg
rename to src/apps/renderer/assets/icons/powerpoint.svg
diff --git a/src/renderer/assets/icons/ppt.svg b/src/apps/renderer/assets/icons/ppt.svg
similarity index 100%
rename from src/renderer/assets/icons/ppt.svg
rename to src/apps/renderer/assets/icons/ppt.svg
diff --git a/src/renderer/assets/icons/sketch.svg b/src/apps/renderer/assets/icons/sketch.svg
similarity index 100%
rename from src/renderer/assets/icons/sketch.svg
rename to src/apps/renderer/assets/icons/sketch.svg
diff --git a/src/renderer/assets/icons/txt.svg b/src/apps/renderer/assets/icons/txt.svg
similarity index 100%
rename from src/renderer/assets/icons/txt.svg
rename to src/apps/renderer/assets/icons/txt.svg
diff --git a/src/renderer/assets/icons/video.svg b/src/apps/renderer/assets/icons/video.svg
similarity index 100%
rename from src/renderer/assets/icons/video.svg
rename to src/apps/renderer/assets/icons/video.svg
diff --git a/src/renderer/assets/icons/word.svg b/src/apps/renderer/assets/icons/word.svg
similarity index 100%
rename from src/renderer/assets/icons/word.svg
rename to src/apps/renderer/assets/icons/word.svg
diff --git a/src/renderer/assets/icons/zip.svg b/src/apps/renderer/assets/icons/zip.svg
similarity index 100%
rename from src/renderer/assets/icons/zip.svg
rename to src/apps/renderer/assets/icons/zip.svg
diff --git a/src/renderer/assets/illustrations/syncedStack-dark.png b/src/apps/renderer/assets/illustrations/syncedStack-dark.png
similarity index 100%
rename from src/renderer/assets/illustrations/syncedStack-dark.png
rename to src/apps/renderer/assets/illustrations/syncedStack-dark.png
diff --git a/src/renderer/assets/illustrations/syncedStack-light.png b/src/apps/renderer/assets/illustrations/syncedStack-light.png
similarity index 100%
rename from src/renderer/assets/illustrations/syncedStack-light.png
rename to src/apps/renderer/assets/illustrations/syncedStack-light.png
diff --git a/src/renderer/assets/index.d.ts b/src/apps/renderer/assets/index.d.ts
similarity index 100%
rename from src/renderer/assets/index.d.ts
rename to src/apps/renderer/assets/index.d.ts
diff --git a/src/renderer/assets/migration/upload-error.svg b/src/apps/renderer/assets/migration/upload-error.svg
similarity index 100%
rename from src/renderer/assets/migration/upload-error.svg
rename to src/apps/renderer/assets/migration/upload-error.svg
diff --git a/src/renderer/assets/migration/widget.svg b/src/apps/renderer/assets/migration/widget.svg
similarity index 100%
rename from src/renderer/assets/migration/widget.svg
rename to src/apps/renderer/assets/migration/widget.svg
diff --git a/src/renderer/assets/onboarding/context-menu.svg b/src/apps/renderer/assets/onboarding/context-menu.svg
similarity index 100%
rename from src/renderer/assets/onboarding/context-menu.svg
rename to src/apps/renderer/assets/onboarding/context-menu.svg
diff --git a/src/renderer/assets/onboarding/finder/linux.svg b/src/apps/renderer/assets/onboarding/finder/linux.svg
similarity index 100%
rename from src/renderer/assets/onboarding/finder/linux.svg
rename to src/apps/renderer/assets/onboarding/finder/linux.svg
diff --git a/src/renderer/assets/onboarding/finder/macos.svg b/src/apps/renderer/assets/onboarding/finder/macos.svg
similarity index 100%
rename from src/renderer/assets/onboarding/finder/macos.svg
rename to src/apps/renderer/assets/onboarding/finder/macos.svg
diff --git a/src/renderer/assets/onboarding/finder/windows.svg b/src/apps/renderer/assets/onboarding/finder/windows.svg
similarity index 100%
rename from src/renderer/assets/onboarding/finder/windows.svg
rename to src/apps/renderer/assets/onboarding/finder/windows.svg
diff --git a/src/renderer/assets/onboarding/folder-with-overlay-icons/offline/en.svg b/src/apps/renderer/assets/onboarding/folder-with-overlay-icons/offline/en.svg
similarity index 100%
rename from src/renderer/assets/onboarding/folder-with-overlay-icons/offline/en.svg
rename to src/apps/renderer/assets/onboarding/folder-with-overlay-icons/offline/en.svg
diff --git a/src/renderer/assets/onboarding/folder-with-overlay-icons/offline/es.svg b/src/apps/renderer/assets/onboarding/folder-with-overlay-icons/offline/es.svg
similarity index 100%
rename from src/renderer/assets/onboarding/folder-with-overlay-icons/offline/es.svg
rename to src/apps/renderer/assets/onboarding/folder-with-overlay-icons/offline/es.svg
diff --git a/src/renderer/assets/onboarding/folder-with-overlay-icons/offline/fr.svg b/src/apps/renderer/assets/onboarding/folder-with-overlay-icons/offline/fr.svg
similarity index 100%
rename from src/renderer/assets/onboarding/folder-with-overlay-icons/offline/fr.svg
rename to src/apps/renderer/assets/onboarding/folder-with-overlay-icons/offline/fr.svg
diff --git a/src/renderer/assets/onboarding/folder-with-overlay-icons/online/en.svg b/src/apps/renderer/assets/onboarding/folder-with-overlay-icons/online/en.svg
similarity index 100%
rename from src/renderer/assets/onboarding/folder-with-overlay-icons/online/en.svg
rename to src/apps/renderer/assets/onboarding/folder-with-overlay-icons/online/en.svg
diff --git a/src/renderer/assets/onboarding/folder-with-overlay-icons/online/es.svg b/src/apps/renderer/assets/onboarding/folder-with-overlay-icons/online/es.svg
similarity index 100%
rename from src/renderer/assets/onboarding/folder-with-overlay-icons/online/es.svg
rename to src/apps/renderer/assets/onboarding/folder-with-overlay-icons/online/es.svg
diff --git a/src/renderer/assets/onboarding/folder-with-overlay-icons/online/fr.svg b/src/apps/renderer/assets/onboarding/folder-with-overlay-icons/online/fr.svg
similarity index 100%
rename from src/renderer/assets/onboarding/folder-with-overlay-icons/online/fr.svg
rename to src/apps/renderer/assets/onboarding/folder-with-overlay-icons/online/fr.svg
diff --git a/src/renderer/assets/onboarding/logo.svg b/src/apps/renderer/assets/onboarding/logo.svg
similarity index 100%
rename from src/renderer/assets/onboarding/logo.svg
rename to src/apps/renderer/assets/onboarding/logo.svg
diff --git a/src/renderer/assets/onboarding/mac-finder-widget.png b/src/apps/renderer/assets/onboarding/mac-finder-widget.png
similarity index 100%
rename from src/renderer/assets/onboarding/mac-finder-widget.png
rename to src/apps/renderer/assets/onboarding/mac-finder-widget.png
diff --git a/src/renderer/assets/onboarding/widget.png b/src/apps/renderer/assets/onboarding/widget.png
similarity index 100%
rename from src/renderer/assets/onboarding/widget.png
rename to src/apps/renderer/assets/onboarding/widget.png
diff --git a/src/renderer/assets/play.svg b/src/apps/renderer/assets/play.svg
similarity index 100%
rename from src/renderer/assets/play.svg
rename to src/apps/renderer/assets/play.svg
diff --git a/src/renderer/assets/spinner.svg b/src/apps/renderer/assets/spinner.svg
similarity index 100%
rename from src/renderer/assets/spinner.svg
rename to src/apps/renderer/assets/spinner.svg
diff --git a/src/renderer/assets/stop.svg b/src/apps/renderer/assets/stop.svg
similarity index 100%
rename from src/renderer/assets/stop.svg
rename to src/apps/renderer/assets/stop.svg
diff --git a/src/renderer/assets/success.svg b/src/apps/renderer/assets/success.svg
similarity index 100%
rename from src/renderer/assets/success.svg
rename to src/apps/renderer/assets/success.svg
diff --git a/src/renderer/assets/warn.svg b/src/apps/renderer/assets/warn.svg
similarity index 100%
rename from src/renderer/assets/warn.svg
rename to src/apps/renderer/assets/warn.svg
diff --git a/src/renderer/components/Backups/BackupsFoldersSelector.tsx b/src/apps/renderer/components/Backups/BackupsFoldersSelector.tsx
similarity index 97%
rename from src/renderer/components/Backups/BackupsFoldersSelector.tsx
rename to src/apps/renderer/components/Backups/BackupsFoldersSelector.tsx
index 7ab385e8b..07d2e3838 100644
--- a/src/renderer/components/Backups/BackupsFoldersSelector.tsx
+++ b/src/apps/renderer/components/Backups/BackupsFoldersSelector.tsx
@@ -1,10 +1,8 @@
 import React, { useState } from 'react';
 import FolderIcon from '../../assets/folder.svg';
-
 import Button from '../Button';
 import { UilMinus, UilPlus } from '@iconscout/react-unicons';
-import { useTranslationContext } from 'renderer/context/LocalContext';
-import { reportError } from 'renderer/utils/errors';
+import { useTranslationContext } from '../../context/LocalContext';
 
 export type BackupFolder = {
   path: string;
diff --git a/src/renderer/components/Backups/FatalError.tsx b/src/apps/renderer/components/Backups/FatalError.tsx
similarity index 85%
rename from src/renderer/components/Backups/FatalError.tsx
rename to src/apps/renderer/components/Backups/FatalError.tsx
index ace51606f..887ca9084 100644
--- a/src/renderer/components/Backups/FatalError.tsx
+++ b/src/apps/renderer/components/Backups/FatalError.tsx
@@ -1,9 +1,8 @@
-import { useTranslationContext } from 'renderer/context/LocalContext';
-
-import { ProcessFatalErrorName } from '../../../workers/types';
+import { ProcessFatalErrorName } from '../../../shared/types';
 import ErrorIcon from '../../assets/error.svg';
+import { useTranslationContext } from '../../context/LocalContext';
 import messages from '../../messages/process-fatal-error';
-import Button from 'renderer/components/Button';
+import Button from '../Button';
 
 export function FatalError({
   errorName,
diff --git a/src/renderer/components/Button.tsx b/src/apps/renderer/components/Button.tsx
similarity index 100%
rename from src/renderer/components/Button.tsx
rename to src/apps/renderer/components/Button.tsx
diff --git a/src/renderer/components/Checkbox.tsx b/src/apps/renderer/components/Checkbox.tsx
similarity index 100%
rename from src/renderer/components/Checkbox.tsx
rename to src/apps/renderer/components/Checkbox.tsx
diff --git a/src/renderer/components/FileWithOperation.tsx b/src/apps/renderer/components/FileWithOperation.tsx
similarity index 100%
rename from src/renderer/components/FileWithOperation.tsx
rename to src/apps/renderer/components/FileWithOperation.tsx
diff --git a/src/renderer/components/PasswordInput.tsx b/src/apps/renderer/components/PasswordInput.tsx
similarity index 100%
rename from src/renderer/components/PasswordInput.tsx
rename to src/apps/renderer/components/PasswordInput.tsx
diff --git a/src/renderer/components/Select.tsx b/src/apps/renderer/components/Select.tsx
similarity index 100%
rename from src/renderer/components/Select.tsx
rename to src/apps/renderer/components/Select.tsx
diff --git a/src/renderer/components/TextArea.tsx b/src/apps/renderer/components/TextArea.tsx
similarity index 100%
rename from src/renderer/components/TextArea.tsx
rename to src/apps/renderer/components/TextArea.tsx
diff --git a/src/renderer/components/TextInput.tsx b/src/apps/renderer/components/TextInput.tsx
similarity index 100%
rename from src/renderer/components/TextInput.tsx
rename to src/apps/renderer/components/TextInput.tsx
diff --git a/src/renderer/components/WindowTopBar.tsx b/src/apps/renderer/components/WindowTopBar.tsx
similarity index 100%
rename from src/renderer/components/WindowTopBar.tsx
rename to src/apps/renderer/components/WindowTopBar.tsx
diff --git a/src/renderer/context/DeviceContext.tsx b/src/apps/renderer/context/DeviceContext.tsx
similarity index 100%
rename from src/renderer/context/DeviceContext.tsx
rename to src/apps/renderer/context/DeviceContext.tsx
diff --git a/src/renderer/context/LocalContext.tsx b/src/apps/renderer/context/LocalContext.tsx
similarity index 100%
rename from src/renderer/context/LocalContext.tsx
rename to src/apps/renderer/context/LocalContext.tsx
diff --git a/src/renderer/hooks/BackupFatalErrors.tsx b/src/apps/renderer/hooks/BackupFatalErrors.tsx
similarity index 100%
rename from src/renderer/hooks/BackupFatalErrors.tsx
rename to src/apps/renderer/hooks/BackupFatalErrors.tsx
diff --git a/src/renderer/hooks/ClientPlatform.tsx b/src/apps/renderer/hooks/ClientPlatform.tsx
similarity index 100%
rename from src/renderer/hooks/ClientPlatform.tsx
rename to src/apps/renderer/hooks/ClientPlatform.tsx
diff --git a/src/renderer/hooks/FatalErrorActions.ts b/src/apps/renderer/hooks/FatalErrorActions.ts
similarity index 84%
rename from src/renderer/hooks/FatalErrorActions.ts
rename to src/apps/renderer/hooks/FatalErrorActions.ts
index 58bfdacf5..405c61472 100644
--- a/src/renderer/hooks/FatalErrorActions.ts
+++ b/src/apps/renderer/hooks/FatalErrorActions.ts
@@ -1,13 +1,11 @@
 import { useEffect, useState } from 'react';
 
 import { Process } from '../../shared/types/Process';
-import { backupsErrorActions } from '../actions/backsups-error-actions';
 import { syncErrorActions } from '../actions/sync-error-actions';
 import { FatalErrorActionMap } from '../actions/types';
 
 const actionsMap: Record<Process, FatalErrorActionMap> = {
   SYNC: syncErrorActions,
-  BACKUPS: backupsErrorActions,
 };
 
 export default function useFatalErrorActions(
diff --git a/src/renderer/hooks/GeneralIssues.tsx b/src/apps/renderer/hooks/GeneralIssues.tsx
similarity index 88%
rename from src/renderer/hooks/GeneralIssues.tsx
rename to src/apps/renderer/hooks/GeneralIssues.tsx
index 84b1e1cff..986445c6b 100644
--- a/src/renderer/hooks/GeneralIssues.tsx
+++ b/src/apps/renderer/hooks/GeneralIssues.tsx
@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react';
-
-import { GeneralIssue } from '../../workers/types';
+import { GeneralIssue } from '../../shared/types';
 
 export default function useGeneralIssues() {
   const [generalIssues, setGeneralIssues] = useState<GeneralIssue[]>([]);
diff --git a/src/renderer/hooks/ProcessIssues.tsx b/src/apps/renderer/hooks/ProcessIssues.tsx
similarity index 88%
rename from src/renderer/hooks/ProcessIssues.tsx
rename to src/apps/renderer/hooks/ProcessIssues.tsx
index 70e4f03c4..581fcacb5 100644
--- a/src/renderer/hooks/ProcessIssues.tsx
+++ b/src/apps/renderer/hooks/ProcessIssues.tsx
@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react';
-
-import { ProcessIssue } from '../../workers/types';
+import { ProcessIssue } from '../../shared/types';
 
 export default function useProcessIssues() {
   const [processIssues, setProcessIssues] = useState<ProcessIssue[]>([]);
diff --git a/src/renderer/hooks/VirtualDriveStatus.tsx b/src/apps/renderer/hooks/VirtualDriveStatus.tsx
similarity index 92%
rename from src/renderer/hooks/VirtualDriveStatus.tsx
rename to src/apps/renderer/hooks/VirtualDriveStatus.tsx
index 3a69d5b10..6acd47a5d 100644
--- a/src/renderer/hooks/VirtualDriveStatus.tsx
+++ b/src/apps/renderer/hooks/VirtualDriveStatus.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { reportError } from 'renderer/utils/errors';
+import { reportError } from '../utils/errors';
 import { VirtualDriveStatus } from '../../shared/types/VirtualDriveStatus';
 
 export default function useVirtualDriveStatus() {
diff --git a/src/renderer/hooks/useBackups.tsx b/src/apps/renderer/hooks/useBackups.tsx
similarity index 100%
rename from src/renderer/hooks/useBackups.tsx
rename to src/apps/renderer/hooks/useBackups.tsx
diff --git a/src/renderer/hooks/useConfig.tsx b/src/apps/renderer/hooks/useConfig.tsx
similarity index 100%
rename from src/renderer/hooks/useConfig.tsx
rename to src/apps/renderer/hooks/useConfig.tsx
diff --git a/src/renderer/hooks/useLanguage.tsx b/src/apps/renderer/hooks/useLanguage.tsx
similarity index 100%
rename from src/renderer/hooks/useLanguage.tsx
rename to src/apps/renderer/hooks/useLanguage.tsx
diff --git a/src/renderer/hooks/useOnSyncRunning.tsx b/src/apps/renderer/hooks/useOnSyncRunning.tsx
similarity index 77%
rename from src/renderer/hooks/useOnSyncRunning.tsx
rename to src/apps/renderer/hooks/useOnSyncRunning.tsx
index c6c86df56..288d1743b 100644
--- a/src/renderer/hooks/useOnSyncRunning.tsx
+++ b/src/apps/renderer/hooks/useOnSyncRunning.tsx
@@ -1,4 +1,4 @@
-import { SyncStatus } from 'main/background-processes/sync';
+import { SyncStatus } from '../../../context/desktop/sync/domain/SyncStatus';
 import useSyncStatus from './useSyncStatus';
 
 export function useOnSyncRunning(fn: () => void) {
diff --git a/src/renderer/hooks/useOnSyncStopped.tsx b/src/apps/renderer/hooks/useOnSyncStopped.tsx
similarity index 100%
rename from src/renderer/hooks/useOnSyncStopped.tsx
rename to src/apps/renderer/hooks/useOnSyncStopped.tsx
diff --git a/src/renderer/hooks/useSyncInfoSubscriber.tsx b/src/apps/renderer/hooks/useSyncInfoSubscriber.tsx
similarity index 96%
rename from src/renderer/hooks/useSyncInfoSubscriber.tsx
rename to src/apps/renderer/hooks/useSyncInfoSubscriber.tsx
index e1b521dd3..d8b2049ee 100644
--- a/src/renderer/hooks/useSyncInfoSubscriber.tsx
+++ b/src/apps/renderer/hooks/useSyncInfoSubscriber.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { ProcessInfoUpdatePayload } from '../../workers/types';
+import { ProcessInfoUpdatePayload } from '../../shared/types';
 
 export function useSyncInfoSubscriber() {
   const [processInfoUpdatedPayload, setProcessInfoUpdatedPayload] = useState<
diff --git a/src/renderer/hooks/useSyncStatus.tsx b/src/apps/renderer/hooks/useSyncStatus.tsx
similarity index 93%
rename from src/renderer/hooks/useSyncStatus.tsx
rename to src/apps/renderer/hooks/useSyncStatus.tsx
index 84c90c31f..1775900ee 100644
--- a/src/renderer/hooks/useSyncStatus.tsx
+++ b/src/apps/renderer/hooks/useSyncStatus.tsx
@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react';
-
-import { SyncStatus } from '../../main/background-processes/sync';
+import { SyncStatus } from '../../../context/desktop/sync/domain/SyncStatus';
 
 export default function useSyncStatus(
   onChange?: (curentState: SyncStatus) => void
diff --git a/src/renderer/hooks/useSyncStopped.tsx b/src/apps/renderer/hooks/useSyncStopped.tsx
similarity index 82%
rename from src/renderer/hooks/useSyncStopped.tsx
rename to src/apps/renderer/hooks/useSyncStopped.tsx
index 98ad00c58..09acb92f4 100644
--- a/src/renderer/hooks/useSyncStopped.tsx
+++ b/src/apps/renderer/hooks/useSyncStopped.tsx
@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react';
-
-import { SyncStoppedPayload } from '../../main/background-processes/sync';
+import { SyncStoppedPayload } from '../../../context/desktop/sync/domain/SyncStoppedPayload';
 
 export default function useSyncStopped(): [
   SyncStoppedPayload | null,
diff --git a/src/renderer/hooks/useUsage.tsx b/src/apps/renderer/hooks/useUsage.tsx
similarity index 94%
rename from src/renderer/hooks/useUsage.tsx
rename to src/apps/renderer/hooks/useUsage.tsx
index 233c0a6bb..2ab83a2d8 100644
--- a/src/renderer/hooks/useUsage.tsx
+++ b/src/apps/renderer/hooks/useUsage.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Usage } from '../../main/usage/usage';
+import { Usage } from '../../main/usage/Usage';
 
 export default function useUsage() {
   const [usage, setUsage] = useState<Usage>();
diff --git a/src/renderer/index.ejs b/src/apps/renderer/index.ejs
similarity index 100%
rename from src/renderer/index.ejs
rename to src/apps/renderer/index.ejs
diff --git a/src/renderer/index.tsx b/src/apps/renderer/index.tsx
similarity index 100%
rename from src/renderer/index.tsx
rename to src/apps/renderer/index.tsx
diff --git a/src/renderer/localize/i18n.service.ts b/src/apps/renderer/localize/i18n.service.ts
similarity index 84%
rename from src/renderer/localize/i18n.service.ts
rename to src/apps/renderer/localize/i18n.service.ts
index 6bb2de5e6..549c1c98a 100644
--- a/src/renderer/localize/i18n.service.ts
+++ b/src/apps/renderer/localize/i18n.service.ts
@@ -1,14 +1,13 @@
 import dayjs from 'dayjs';
 import i18next from 'i18next';
 import { initReactI18next } from 'react-i18next';
-import { getConfigKey, queryApp } from 'renderer/utils/query';
-
 import DayJsLocales from '../../shared/Locale/DayJsLocales';
 import {
   DEFAULT_LANGUAGE,
-  isLanguage,
   Language,
+  isLanguage,
 } from '../../shared/Locale/Language';
+import { getConfigKey } from '../utils/query';
 
 const languageDetection = (callback: (lang: Language | undefined) => void) => {
   const run = async () => {
@@ -20,10 +19,11 @@ const languageDetection = (callback: (lang: Language | undefined) => void) => {
       return;
     }
 
-    const systemLangs = await queryApp('getPreferredSystemLanguages');
-    const parsed = systemLangs.map((l) => l.split('-')[0]);
+    const systemLangs = await window.electron.getPreferredAppLanguage();
+    const parsed = systemLangs.map((l: string) => l.split('-')[0]);
 
-    const preferedLanguageAvailable = parsed.find(isLanguage);
+    const preferedLanguageAvailable =
+      (parsed.find(isLanguage) as Language) || undefined;
 
     const language = preferedLanguageAvailable || DEFAULT_LANGUAGE;
 
diff --git a/src/renderer/localize/locales/en.json b/src/apps/renderer/localize/locales/en.json
similarity index 100%
rename from src/renderer/localize/locales/en.json
rename to src/apps/renderer/localize/locales/en.json
diff --git a/src/renderer/localize/locales/es.json b/src/apps/renderer/localize/locales/es.json
similarity index 100%
rename from src/renderer/localize/locales/es.json
rename to src/apps/renderer/localize/locales/es.json
diff --git a/src/renderer/localize/locales/fr.json b/src/apps/renderer/localize/locales/fr.json
similarity index 100%
rename from src/renderer/localize/locales/fr.json
rename to src/apps/renderer/localize/locales/fr.json
diff --git a/src/renderer/messages/backups/backups-actions-map.ts b/src/apps/renderer/messages/backups/backups-actions-map.ts
similarity index 86%
rename from src/renderer/messages/backups/backups-actions-map.ts
rename to src/apps/renderer/messages/backups/backups-actions-map.ts
index f0841532d..54c98dd93 100644
--- a/src/renderer/messages/backups/backups-actions-map.ts
+++ b/src/apps/renderer/messages/backups/backups-actions-map.ts
@@ -1,4 +1,4 @@
-import { ProcessFatalErrorName } from '../../../workers/types';
+import { ProcessFatalErrorName } from '../../../shared/types';
 
 export type FaltalErrorAction = { name: string; fn: () => void };
 
diff --git a/src/renderer/messages/backups/backups-fatal-errors.ts b/src/apps/renderer/messages/backups/backups-fatal-errors.ts
similarity index 88%
rename from src/renderer/messages/backups/backups-fatal-errors.ts
rename to src/apps/renderer/messages/backups/backups-fatal-errors.ts
index 74789118e..ba0a0e946 100644
--- a/src/renderer/messages/backups/backups-fatal-errors.ts
+++ b/src/apps/renderer/messages/backups/backups-fatal-errors.ts
@@ -1,4 +1,4 @@
-import { ProcessFatalErrorName } from '../../../workers/types';
+import { ProcessFatalErrorName } from '../../../shared/types';
 import processFatalErrors from '../process-fatal-error';
 
 const messages: Partial<Record<ProcessFatalErrorName, string>> = {
diff --git a/src/renderer/messages/general-error.ts b/src/apps/renderer/messages/general-error.ts
similarity index 88%
rename from src/renderer/messages/general-error.ts
rename to src/apps/renderer/messages/general-error.ts
index 946cba500..d0e98fec8 100644
--- a/src/renderer/messages/general-error.ts
+++ b/src/apps/renderer/messages/general-error.ts
@@ -1,4 +1,4 @@
-import { GeneralErrorName } from '../../workers/types';
+import { GeneralErrorName } from '../../shared/types';
 
 type GeneralErrorMessages = Record<GeneralErrorName, string>;
 
diff --git a/src/renderer/messages/process-error.ts b/src/apps/renderer/messages/process-error.ts
similarity index 95%
rename from src/renderer/messages/process-error.ts
rename to src/apps/renderer/messages/process-error.ts
index d3c0b267e..90b76900b 100644
--- a/src/renderer/messages/process-error.ts
+++ b/src/apps/renderer/messages/process-error.ts
@@ -1,4 +1,4 @@
-import { ProcessErrorName } from '../../workers/types';
+import { ProcessErrorName } from '../../shared/types';
 
 type ProcessErrorMessages = Record<ProcessErrorName, string>;
 
diff --git a/src/renderer/messages/process-fatal-error.ts b/src/apps/renderer/messages/process-fatal-error.ts
similarity index 92%
rename from src/renderer/messages/process-fatal-error.ts
rename to src/apps/renderer/messages/process-fatal-error.ts
index fe23c3349..06b493ec8 100644
--- a/src/renderer/messages/process-fatal-error.ts
+++ b/src/apps/renderer/messages/process-fatal-error.ts
@@ -1,4 +1,4 @@
-import { ProcessFatalErrorName } from '../../workers/types';
+import { ProcessFatalErrorName } from '../../shared/types';
 
 const messages: Record<ProcessFatalErrorName, string> = {
   NO_INTERNET: 'issues.error-messages.no-internet',
diff --git a/src/renderer/pages/Feedback/index.tsx b/src/apps/renderer/pages/Feedback/index.tsx
similarity index 95%
rename from src/renderer/pages/Feedback/index.tsx
rename to src/apps/renderer/pages/Feedback/index.tsx
index 0e918cf8d..45070821f 100644
--- a/src/renderer/pages/Feedback/index.tsx
+++ b/src/apps/renderer/pages/Feedback/index.tsx
@@ -1,10 +1,10 @@
 import { useState } from 'react';
 import Button from '../../components/Button';
 import { useTranslationContext } from '../../context/LocalContext';
-import { reportError } from 'renderer/utils/errors';
 import { ChatsCircle } from 'phosphor-react';
-import WindowTopBar from 'renderer/components/WindowTopBar';
-import TextArea from 'renderer/components/TextArea';
+import WindowTopBar from '../../components/WindowTopBar';
+import TextArea from '../../components/TextArea';
+import { reportError } from '../../utils/errors';
 
 const CHARACTERS_LIMIT = 1000;
 export default function Feedback() {
diff --git a/src/renderer/pages/Login/ErrorBanner.tsx b/src/apps/renderer/pages/Login/ErrorBanner.tsx
similarity index 100%
rename from src/renderer/pages/Login/ErrorBanner.tsx
rename to src/apps/renderer/pages/Login/ErrorBanner.tsx
diff --git a/src/renderer/pages/Login/TwoFA.tsx b/src/apps/renderer/pages/Login/TwoFA.tsx
similarity index 100%
rename from src/renderer/pages/Login/TwoFA.tsx
rename to src/apps/renderer/pages/Login/TwoFA.tsx
diff --git a/src/renderer/pages/Login/WarningBanner.tsx b/src/apps/renderer/pages/Login/WarningBanner.tsx
similarity index 100%
rename from src/renderer/pages/Login/WarningBanner.tsx
rename to src/apps/renderer/pages/Login/WarningBanner.tsx
diff --git a/src/renderer/pages/Login/index.tsx b/src/apps/renderer/pages/Login/index.tsx
similarity index 96%
rename from src/renderer/pages/Login/index.tsx
rename to src/apps/renderer/pages/Login/index.tsx
index 4afe0e1cf..f2eef050e 100644
--- a/src/renderer/pages/Login/index.tsx
+++ b/src/apps/renderer/pages/Login/index.tsx
@@ -1,15 +1,15 @@
 import { useEffect, useRef, useState } from 'react';
-import packageJson from '../../../../package.json';
+import packageJson from '../../../../../package.json';
 import { useTranslationContext } from '../../context/LocalContext';
 import ErrorBanner from './ErrorBanner';
 import { accessRequest, hashPassword, loginRequest } from './service';
 import TwoFA from './TwoFA';
 import { LoginState } from './types';
 import WarningBanner from './WarningBanner';
-import TextInput from 'renderer/components/TextInput';
-import PasswordInput from 'renderer/components/PasswordInput';
-import WindowTopBar from 'renderer/components/WindowTopBar';
-import Button from 'renderer/components/Button';
+import Button from '../../components/Button';
+import PasswordInput from '../../components/PasswordInput';
+import TextInput from '../../components/TextInput';
+import WindowTopBar from '../../components/WindowTopBar';
 
 const TOWFA_ERROR_MESSAGE = 'Wrong 2-factor auth code';
 
diff --git a/src/renderer/pages/Login/service.ts b/src/apps/renderer/pages/Login/service.ts
similarity index 97%
rename from src/renderer/pages/Login/service.ts
rename to src/apps/renderer/pages/Login/service.ts
index 4be5d9774..7ea74ab21 100644
--- a/src/renderer/pages/Login/service.ts
+++ b/src/apps/renderer/pages/Login/service.ts
@@ -1,6 +1,6 @@
 import CryptoJS from 'crypto-js';
 
-import packageConfig from '../../../../package.json';
+import packageConfig from '../../../../../package.json';
 import { User } from '../../../main/types';
 
 export function hashPassword(password: string, sKey: string): string {
diff --git a/src/renderer/pages/Login/types.ts b/src/apps/renderer/pages/Login/types.ts
similarity index 100%
rename from src/renderer/pages/Login/types.ts
rename to src/apps/renderer/pages/Login/types.ts
diff --git a/src/renderer/pages/Migration/config.tsx b/src/apps/renderer/pages/Migration/config.tsx
similarity index 99%
rename from src/renderer/pages/Migration/config.tsx
rename to src/apps/renderer/pages/Migration/config.tsx
index 85b346856..f31a68a33 100644
--- a/src/renderer/pages/Migration/config.tsx
+++ b/src/apps/renderer/pages/Migration/config.tsx
@@ -1,6 +1,4 @@
-import { useTranslationContext } from 'renderer/context/LocalContext';
 import { MigrationSlide, UploadSuccessAnimation } from './helpers';
-import Button from 'renderer/components/Button';
 import {
   SideImageAnimation,
   SideTextAnimation,
@@ -18,6 +16,8 @@ import { DeleteOldDriveFolderSlide } from './slides/DeleteOldDriveFolderSlide';
 import { AvailableOnlineSlide } from '../Onboarding/slides/AvailableOnlineSlide';
 import { ContextMenuSlide } from '../Onboarding/slides/ContextMenuSlide';
 import { AvailableOfflineSlide } from '../Onboarding/slides/AvailableOfflineSlide';
+import { useTranslationContext } from '../../context/LocalContext';
+import Button from '../../components/Button';
 
 export const SLIDES: MigrationSlide[] = [
   {
diff --git a/src/renderer/pages/Migration/helpers.tsx b/src/apps/renderer/pages/Migration/helpers.tsx
similarity index 99%
rename from src/renderer/pages/Migration/helpers.tsx
rename to src/apps/renderer/pages/Migration/helpers.tsx
index 4cb8c2663..d4b73270f 100644
--- a/src/renderer/pages/Migration/helpers.tsx
+++ b/src/apps/renderer/pages/Migration/helpers.tsx
@@ -1,4 +1,4 @@
-import { LocalContextProps } from 'renderer/context/LocalContext';
+import { LocalContextProps } from '../../context/LocalContext';
 
 export type MigrationSlideProps = {
   onGoNextSlide: () => void;
diff --git a/src/renderer/pages/Migration/index.tsx b/src/apps/renderer/pages/Migration/index.tsx
similarity index 96%
rename from src/renderer/pages/Migration/index.tsx
rename to src/apps/renderer/pages/Migration/index.tsx
index 2a49a0a41..5afb9e4e7 100644
--- a/src/renderer/pages/Migration/index.tsx
+++ b/src/apps/renderer/pages/Migration/index.tsx
@@ -1,10 +1,9 @@
 import { useMemo, useState } from 'react';
 import { SLIDES } from './config';
-
-import { useTranslationContext } from 'renderer/context/LocalContext';
 import { MigrationSlideProps } from './helpers';
-import { reportError } from 'renderer/utils/errors';
-import useClientPlatform from 'renderer/hooks/ClientPlatform';
+import { useTranslationContext } from '../../context/LocalContext';
+import useClientPlatform from '../../hooks/ClientPlatform';
+import { reportError } from '../../utils/errors';
 
 const totalSlides = SLIDES.length - 3;
 
diff --git a/src/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx b/src/apps/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx
similarity index 84%
rename from src/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx
rename to src/apps/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx
index 088420c0c..20f67591f 100644
--- a/src/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx
+++ b/src/apps/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx
@@ -1,15 +1,16 @@
 import React from 'react';
 import { MigrationSlideProps } from '../helpers';
-import {
-  SideTextAnimation,
-  getPlatformPhraseTranslationKey,
-} from 'renderer/pages/Onboarding/helpers';
+import { SideTextAnimation } from '../../Onboarding/helpers';
 
 export type DeleteOldDriveFolderSlideProps = MigrationSlideProps;
 
 export const DeleteOldDriveFolderSlide: React.FC<
   DeleteOldDriveFolderSlideProps
 > = (props) => {
+  function getPlatformPhraseTranslationKey(_platform: string): any {
+    throw new Error('Function not implemented.');
+  }
+
   return (
     <div className="flex h-full w-full">
       <SideTextAnimation display>
diff --git a/src/renderer/pages/Migration/slides/MigrationFailedSlide.tsx b/src/apps/renderer/pages/Migration/slides/MigrationFailedSlide.tsx
similarity index 92%
rename from src/renderer/pages/Migration/slides/MigrationFailedSlide.tsx
rename to src/apps/renderer/pages/Migration/slides/MigrationFailedSlide.tsx
index 61776a681..993a6b606 100644
--- a/src/renderer/pages/Migration/slides/MigrationFailedSlide.tsx
+++ b/src/apps/renderer/pages/Migration/slides/MigrationFailedSlide.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { MigrationSlideProps } from '../helpers';
-import { SideTextAnimation } from 'renderer/pages/Onboarding/helpers';
 import { XCircle } from 'phosphor-react';
-import Button from 'renderer/components/Button';
+import { SideTextAnimation } from '../../Onboarding/helpers';
+import Button from '../../../components/Button';
 
 export type MigrationFailedSlideProps = MigrationSlideProps;
 
diff --git a/src/renderer/pages/Onboarding/config.tsx b/src/apps/renderer/pages/Onboarding/config.tsx
similarity index 98%
rename from src/renderer/pages/Onboarding/config.tsx
rename to src/apps/renderer/pages/Onboarding/config.tsx
index d03603e97..b5e46a356 100644
--- a/src/renderer/pages/Onboarding/config.tsx
+++ b/src/apps/renderer/pages/Onboarding/config.tsx
@@ -6,7 +6,6 @@ import { ContextMenuSlide } from './slides/ContextMenuSlide';
 import { WelcomeSlide } from './slides/WelcomeSlide';
 import { FilesOrganizationSlide } from './slides/FilesOrganizationSlide';
 
-import { useTranslationContext } from 'renderer/context/LocalContext';
 import {
   // BackupsSVG,
   OnboardingSlide,
@@ -16,10 +15,11 @@ import {
   getOfflineImageSvg,
   getOnlineImageSvg,
 } from './helpers';
-import Button from 'renderer/components/Button';
 
 import ContextMenuSvg from '../../assets/onboarding/context-menu.svg';
 import { OnboardingCompletedSlide } from './slides/OnboardingCompletedSlide';
+import Button from '../../components/Button';
+import { useTranslationContext } from '../../context/LocalContext';
 export const SLIDES: OnboardingSlide[] = [
   {
     name: 'Welcome Slide',
diff --git a/src/renderer/pages/Onboarding/helpers.tsx b/src/apps/renderer/pages/Onboarding/helpers.tsx
similarity index 99%
rename from src/renderer/pages/Onboarding/helpers.tsx
rename to src/apps/renderer/pages/Onboarding/helpers.tsx
index 3c0c95623..f5860eb98 100644
--- a/src/renderer/pages/Onboarding/helpers.tsx
+++ b/src/apps/renderer/pages/Onboarding/helpers.tsx
@@ -13,7 +13,7 @@ import AvailableOfflineImageFrench from '../../assets/onboarding/folder-with-ove
 import MacOSFinderImage from '../../assets/onboarding/finder/macos.svg';
 import LinuxFinderImage from '../../assets/onboarding/finder/linux.svg';
 import WindowsFinderImage from '../../assets/onboarding/finder/windows.svg';
-import { BackupFolder } from 'renderer/components/Backups/BackupsFoldersSelector';
+import { BackupFolder } from '../../components/Backups/BackupsFoldersSelector';
 
 export type OnboardingSlideProps = {
   onGoNextSlide: () => void;
diff --git a/src/renderer/pages/Onboarding/index.tsx b/src/apps/renderer/pages/Onboarding/index.tsx
similarity index 95%
rename from src/renderer/pages/Onboarding/index.tsx
rename to src/apps/renderer/pages/Onboarding/index.tsx
index 4f77355a4..6b2d50918 100644
--- a/src/renderer/pages/Onboarding/index.tsx
+++ b/src/apps/renderer/pages/Onboarding/index.tsx
@@ -3,9 +3,8 @@ import { SLIDES } from './config';
 import {
   BackupFolder,
   BackupsFoldersSelector,
-} from 'renderer/components/Backups/BackupsFoldersSelector';
-import { reportError } from 'renderer/utils/errors';
-import useClientPlatform from 'renderer/hooks/ClientPlatform';
+} from '../../components/Backups/BackupsFoldersSelector';
+import useClientPlatform from '../../hooks/ClientPlatform';
 
 // Slide 1 is welcome slide, last slide is summary, doesn't count
 const totalSlides = SLIDES.length - 2;
diff --git a/src/renderer/pages/Onboarding/slides/AvailableOfflineSlide.tsx b/src/apps/renderer/pages/Onboarding/slides/AvailableOfflineSlide.tsx
similarity index 91%
rename from src/renderer/pages/Onboarding/slides/AvailableOfflineSlide.tsx
rename to src/apps/renderer/pages/Onboarding/slides/AvailableOfflineSlide.tsx
index 10c189e80..edab94808 100644
--- a/src/renderer/pages/Onboarding/slides/AvailableOfflineSlide.tsx
+++ b/src/apps/renderer/pages/Onboarding/slides/AvailableOfflineSlide.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { useTranslationContext } from 'renderer/context/LocalContext';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export const AvailableOfflineSlide: React.FC = () => {
   const { translate } = useTranslationContext();
diff --git a/src/renderer/pages/Onboarding/slides/AvailableOnlineSlide.tsx b/src/apps/renderer/pages/Onboarding/slides/AvailableOnlineSlide.tsx
similarity index 91%
rename from src/renderer/pages/Onboarding/slides/AvailableOnlineSlide.tsx
rename to src/apps/renderer/pages/Onboarding/slides/AvailableOnlineSlide.tsx
index aa1eee8d7..7d884fc16 100644
--- a/src/renderer/pages/Onboarding/slides/AvailableOnlineSlide.tsx
+++ b/src/apps/renderer/pages/Onboarding/slides/AvailableOnlineSlide.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-
-import { useTranslationContext } from 'renderer/context/LocalContext';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export const AvailableOnlineSlide: React.FC = () => {
   const { translate } = useTranslationContext();
diff --git a/src/renderer/pages/Onboarding/slides/BackupsSlide.tsx b/src/apps/renderer/pages/Onboarding/slides/BackupsSlide.tsx
similarity index 92%
rename from src/renderer/pages/Onboarding/slides/BackupsSlide.tsx
rename to src/apps/renderer/pages/Onboarding/slides/BackupsSlide.tsx
index 6e0b4fc1e..c3e90ceba 100644
--- a/src/renderer/pages/Onboarding/slides/BackupsSlide.tsx
+++ b/src/apps/renderer/pages/Onboarding/slides/BackupsSlide.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { OnboardingSlideProps } from '../helpers';
-import { useTranslationContext } from 'renderer/context/LocalContext';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export type BackupsSlideProps = OnboardingSlideProps;
 
diff --git a/src/renderer/pages/Onboarding/slides/ContextMenuSlide.tsx b/src/apps/renderer/pages/Onboarding/slides/ContextMenuSlide.tsx
similarity index 93%
rename from src/renderer/pages/Onboarding/slides/ContextMenuSlide.tsx
rename to src/apps/renderer/pages/Onboarding/slides/ContextMenuSlide.tsx
index 82e3651d1..e5ca770e0 100644
--- a/src/renderer/pages/Onboarding/slides/ContextMenuSlide.tsx
+++ b/src/apps/renderer/pages/Onboarding/slides/ContextMenuSlide.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-
-import { useTranslationContext } from 'renderer/context/LocalContext';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export const ContextMenuSlide: React.FC = () => {
   const { translate } = useTranslationContext();
diff --git a/src/renderer/pages/Onboarding/slides/FilesOrganizationSlide.tsx b/src/apps/renderer/pages/Onboarding/slides/FilesOrganizationSlide.tsx
similarity index 92%
rename from src/renderer/pages/Onboarding/slides/FilesOrganizationSlide.tsx
rename to src/apps/renderer/pages/Onboarding/slides/FilesOrganizationSlide.tsx
index 27ae0547a..5b957d94d 100644
--- a/src/renderer/pages/Onboarding/slides/FilesOrganizationSlide.tsx
+++ b/src/apps/renderer/pages/Onboarding/slides/FilesOrganizationSlide.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { useTranslationContext } from 'renderer/context/LocalContext';
 import { OnboardingSlideProps, getPlatformName } from '../helpers';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export type FilesOrganizationSlideProps = OnboardingSlideProps;
 
diff --git a/src/renderer/pages/Onboarding/slides/OnboardingCompletedSlide.tsx b/src/apps/renderer/pages/Onboarding/slides/OnboardingCompletedSlide.tsx
similarity index 97%
rename from src/renderer/pages/Onboarding/slides/OnboardingCompletedSlide.tsx
rename to src/apps/renderer/pages/Onboarding/slides/OnboardingCompletedSlide.tsx
index 6a990c3d1..c4cf2e0fb 100644
--- a/src/renderer/pages/Onboarding/slides/OnboardingCompletedSlide.tsx
+++ b/src/apps/renderer/pages/Onboarding/slides/OnboardingCompletedSlide.tsx
@@ -1,10 +1,10 @@
 import { CheckCircle } from 'phosphor-react';
 import React from 'react';
-import { useTranslationContext } from 'renderer/context/LocalContext';
 import {
   OnboardingSlideProps,
   getPlatformPhraseTranslationKey,
 } from '../helpers';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export type OnboardingCompletedSlideProps = OnboardingSlideProps;
 
diff --git a/src/renderer/pages/Onboarding/slides/WelcomeSlide.tsx b/src/apps/renderer/pages/Onboarding/slides/WelcomeSlide.tsx
similarity index 91%
rename from src/renderer/pages/Onboarding/slides/WelcomeSlide.tsx
rename to src/apps/renderer/pages/Onboarding/slides/WelcomeSlide.tsx
index 949c9818e..25bfbacc9 100644
--- a/src/renderer/pages/Onboarding/slides/WelcomeSlide.tsx
+++ b/src/apps/renderer/pages/Onboarding/slides/WelcomeSlide.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { useTranslationContext } from 'renderer/context/LocalContext';
 import { OnboardingSlideProps } from '../helpers';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export type WelcomeSlideProps = OnboardingSlideProps;
 
diff --git a/src/renderer/pages/ProcessIssues/List.tsx b/src/apps/renderer/pages/ProcessIssues/List.tsx
similarity index 83%
rename from src/renderer/pages/ProcessIssues/List.tsx
rename to src/apps/renderer/pages/ProcessIssues/List.tsx
index d037a3b2b..a6887aade 100644
--- a/src/renderer/pages/ProcessIssues/List.tsx
+++ b/src/apps/renderer/pages/ProcessIssues/List.tsx
@@ -1,46 +1,31 @@
 import { CaretDown } from '@phosphor-icons/react';
 import { AnimatePresence, motion } from 'framer-motion';
 import { useState } from 'react';
-import { useTranslationContext } from 'renderer/context/LocalContext';
-
-import { BackupFatalError } from '../../../main/background-processes/types/BackupFatalError';
-import {
-  GeneralErrorName,
-  GeneralIssue,
-  ProcessErrorName,
-  ProcessIssue,
-} from '../../../workers/types';
-import { Action } from '../../actions/types';
 import FileIcon from '../../assets/file.svg';
 import Spinner from '../../assets/spinner.svg';
 import WarnIcon from '../../assets/warn.svg';
-import useFatalErrorActions from '../../hooks/FatalErrorActions';
 import { generalErrors } from '../../messages/general-error';
 import { shortMessages } from '../../messages/process-error';
 import { getBaseName } from '../../utils/path';
-import { FatalError } from '../../components/Backups/FatalError';
+import {
+  GeneralIssue,
+  ProcessIssue,
+  ProcessErrorName,
+  GeneralErrorName,
+} from '../../../shared/types';
+import { useTranslationContext } from '../../context/LocalContext';
 
 export default function ProcessIssuesList({
   selectedTab,
   processIssues,
-  backupFatalErrors,
-  showBackupFatalErrors,
   onClickOnErrorInfo,
   generalIssues,
 }: {
   generalIssues: GeneralIssue[];
   processIssues: ProcessIssue[];
-  backupFatalErrors: BackupFatalError[];
-  showBackupFatalErrors: boolean;
   selectedTab: 'SYNC' | 'BACKUPS' | 'GENERAL';
   onClickOnErrorInfo: (errorClicked: Pick<ProcessIssue, 'errorName'>) => void;
 }) {
-  const { translate } = useTranslationContext();
-  const [isLoading, setIsLoading] = useState(false);
-  const fatalErrorActionMap = useFatalErrorActions(
-    showBackupFatalErrors ? 'BACKUPS' : 'SYNC'
-  );
-
   const [selectedErrorName, setSelectedErrorName] = useState<
     ProcessErrorName | GeneralErrorName | null
   >(null);
@@ -90,21 +75,12 @@ export default function ProcessIssuesList({
     ));
   };
 
-  const actionWrapper =
-    (action: Action) => async (error: BackupFatalError | undefined) => {
-      setIsLoading(true);
-      await action.func(error);
-      setIsLoading(false);
-    };
-
   const issuesIsEmpty = () => {
     switch (selectedTab) {
       case 'GENERAL':
         return generalIssues.length === 0;
       case 'SYNC':
         return processIssues.length === 0;
-      case 'BACKUPS':
-        return backupFatalErrors.length === 0;
       default:
         return true;
     }
@@ -112,23 +88,10 @@ export default function ProcessIssuesList({
 
   return (
     <ul className="relative m-5 mt-2 flex flex-1 flex-col divide-y divide-gray-5 overflow-y-auto rounded-lg border border-gray-20 bg-surface shadow-sm">
-      {showBackupFatalErrors &&
-        backupFatalErrors.map((error) => (
-          <FatalError
-            key={error.folderId}
-            errorName={error.errorName}
-            path={error.path}
-            showIcon={true}
-            actionName={translate(fatalErrorActionMap[error.errorName].name)}
-            onActionClick={() =>
-              actionWrapper(fatalErrorActionMap[error.errorName])(error)
-            }
-          />
-        ))}
       {renderItems()}
 
       {issuesIsEmpty() ? <Empty /> : null}
-      {isLoading && (
+      {false && (
         <div className="absolute flex h-full w-full items-center justify-center bg-surface/75">
           <Spinner className="h-5 w-5 animate-spin text-gray-100" />
         </div>
diff --git a/src/renderer/pages/ProcessIssues/ReportModal.tsx b/src/apps/renderer/pages/ProcessIssues/ReportModal.tsx
similarity index 94%
rename from src/renderer/pages/ProcessIssues/ReportModal.tsx
rename to src/apps/renderer/pages/ProcessIssues/ReportModal.tsx
index 7f539825d..f2bd9d7cc 100644
--- a/src/renderer/pages/ProcessIssues/ReportModal.tsx
+++ b/src/apps/renderer/pages/ProcessIssues/ReportModal.tsx
@@ -1,12 +1,11 @@
 import { Dialog, Transition } from '@headlessui/react';
 import { Fragment, useState } from 'react';
-import { useTranslationContext } from 'renderer/context/LocalContext';
-
-import { ErrorDetails, ProcessIssue } from '../../../workers/types';
-import { longMessages, shortMessages } from '../../messages/process-error';
-import Button from 'renderer/components/Button';
-import TextArea from 'renderer/components/TextArea';
-import Checkbox from 'renderer/components/Checkbox';
+import { ProcessIssue, ErrorDetails } from '../../../shared/types';
+import Button from '../../components/Button';
+import Checkbox from '../../components/Checkbox';
+import TextArea from '../../components/TextArea';
+import { useTranslationContext } from '../../context/LocalContext';
+import { shortMessages, longMessages } from '../../messages/general-error';
 
 const posibleErrorStates = ['ERROR', 'TOO_MANY_REPORTS'] as const;
 type ErrorReportRequestState = (typeof posibleErrorStates)[number];
diff --git a/src/renderer/pages/ProcessIssues/index.tsx b/src/apps/renderer/pages/ProcessIssues/index.tsx
similarity index 96%
rename from src/renderer/pages/ProcessIssues/index.tsx
rename to src/apps/renderer/pages/ProcessIssues/index.tsx
index 2ae3e1b57..c145787ad 100644
--- a/src/renderer/pages/ProcessIssues/index.tsx
+++ b/src/apps/renderer/pages/ProcessIssues/index.tsx
@@ -1,7 +1,5 @@
 import { motion } from 'framer-motion';
 import { useEffect, useState } from 'react';
-
-import { ProcessIssue } from '../../../workers/types';
 import WindowTopBar from '../../components/WindowTopBar';
 import { useTranslationContext } from '../../context/LocalContext';
 import useBackupFatalErrors from '../../hooks/BackupFatalErrors';
@@ -9,6 +7,7 @@ import useGeneralIssues from '../../hooks/GeneralIssues';
 import useProcessIssues from '../../hooks/ProcessIssues';
 import ProcessIssuesList from './List';
 import { ReportModal } from './ReportModal';
+import { ProcessIssue } from '../../../shared/types';
 
 type Section = 'SYNC' | 'GENERAL';
 
@@ -54,8 +53,6 @@ export default function ProcessIssues() {
 
       <ProcessIssuesList
         selectedTab={activeSection}
-        showBackupFatalErrors={false}
-        backupFatalErrors={backupFatalErrors}
         generalIssues={generalIssues}
         processIssues={processIssuesFilteredByActiveSection}
         onClickOnErrorInfo={setReportData}
diff --git a/src/renderer/pages/Settings/Account/Usage.tsx b/src/apps/renderer/pages/Settings/Account/Usage.tsx
similarity index 100%
rename from src/renderer/pages/Settings/Account/Usage.tsx
rename to src/apps/renderer/pages/Settings/Account/Usage.tsx
diff --git a/src/renderer/pages/Settings/Account/UserInfo.tsx b/src/apps/renderer/pages/Settings/Account/UserInfo.tsx
similarity index 96%
rename from src/renderer/pages/Settings/Account/UserInfo.tsx
rename to src/apps/renderer/pages/Settings/Account/UserInfo.tsx
index 38cb9b122..c2d33e64c 100644
--- a/src/renderer/pages/Settings/Account/UserInfo.tsx
+++ b/src/apps/renderer/pages/Settings/Account/UserInfo.tsx
@@ -1,4 +1,4 @@
-import { User } from 'main/types';
+import { User } from '../../../../main/types';
 import Button from '../../../components/Button';
 import { useTranslationContext } from '../../../context/LocalContext';
 
diff --git a/src/renderer/pages/Settings/Account/index.tsx b/src/apps/renderer/pages/Settings/Account/index.tsx
similarity index 90%
rename from src/renderer/pages/Settings/Account/index.tsx
rename to src/apps/renderer/pages/Settings/Account/index.tsx
index 30251b055..c82123aac 100644
--- a/src/renderer/pages/Settings/Account/index.tsx
+++ b/src/apps/renderer/pages/Settings/Account/index.tsx
@@ -1,11 +1,10 @@
 import { useEffect, useState } from 'react';
-import Button from 'renderer/components/Button';
 import { User } from '../../../../main/types';
 import Spinner from '../../../assets/spinner.svg';
 import useUsage from '../../../hooks/useUsage';
 import Usage from './Usage';
 import UserInfo from './UserInfo';
-import { useTranslationContext } from 'renderer/context/LocalContext';
+import Button from '../../../components/Button';
 
 export default function AccountSection({ active }: { active: boolean }) {
   const { translate } = useTranslationContext();
@@ -44,3 +43,6 @@ export default function AccountSection({ active }: { active: boolean }) {
     </div>
   );
 }
+function useTranslationContext(): { translate: any } {
+  throw new Error('Function not implemented.');
+}
diff --git a/src/renderer/pages/Settings/General/AppInfo.tsx b/src/apps/renderer/pages/Settings/General/AppInfo.tsx
similarity index 96%
rename from src/renderer/pages/Settings/General/AppInfo.tsx
rename to src/apps/renderer/pages/Settings/General/AppInfo.tsx
index 64793ef6a..8e9295a16 100644
--- a/src/renderer/pages/Settings/General/AppInfo.tsx
+++ b/src/apps/renderer/pages/Settings/General/AppInfo.tsx
@@ -1,4 +1,4 @@
-import packageJson from '../../../../../package.json';
+import packageJson from '../../../../../../package.json';
 import { useTranslationContext } from '../../../context/LocalContext';
 
 export default function AppInfo() {
diff --git a/src/renderer/pages/Settings/General/DeviceName.tsx b/src/apps/renderer/pages/Settings/General/DeviceName.tsx
similarity index 97%
rename from src/renderer/pages/Settings/General/DeviceName.tsx
rename to src/apps/renderer/pages/Settings/General/DeviceName.tsx
index b64db7951..9744b604d 100644
--- a/src/renderer/pages/Settings/General/DeviceName.tsx
+++ b/src/apps/renderer/pages/Settings/General/DeviceName.tsx
@@ -1,9 +1,9 @@
 import { useContext, useEffect, useState } from 'react';
-import Button from 'renderer/components/Button';
-import TextInput from 'renderer/components/TextInput';
 import Spinner from '../../../assets/spinner.svg';
 import { DeviceContext } from '../../../context/DeviceContext';
 import { useTranslationContext } from '../../../context/LocalContext';
+import Button from '../../../components/Button';
+import TextInput from '../../../components/TextInput';
 
 export default function DeviceName({
   onChangeView,
diff --git a/src/renderer/pages/Settings/General/LanguagePicker.tsx b/src/apps/renderer/pages/Settings/General/LanguagePicker.tsx
similarity index 96%
rename from src/renderer/pages/Settings/General/LanguagePicker.tsx
rename to src/apps/renderer/pages/Settings/General/LanguagePicker.tsx
index 1ba8eaf8e..31ddb2b97 100644
--- a/src/renderer/pages/Settings/General/LanguagePicker.tsx
+++ b/src/apps/renderer/pages/Settings/General/LanguagePicker.tsx
@@ -3,7 +3,7 @@ import i18next from 'i18next';
 import { useEffect, useState } from 'react';
 import DayJsLocales from '../../../../shared/Locale/DayJsLocales';
 import { DEFAULT_LANGUAGE, Language } from '../../../../shared/Locale/Language';
-import Select, { SelectOptionsType } from 'renderer/components/Select';
+import Select, { SelectOptionsType } from '../../../components/Select';
 import { useTranslationContext } from '../../../context/LocalContext';
 import useConfig from '../../../hooks/useConfig';
 
diff --git a/src/renderer/pages/Settings/General/StartAutomatically.tsx b/src/apps/renderer/pages/Settings/General/StartAutomatically.tsx
similarity index 100%
rename from src/renderer/pages/Settings/General/StartAutomatically.tsx
rename to src/apps/renderer/pages/Settings/General/StartAutomatically.tsx
diff --git a/src/renderer/pages/Settings/General/ThemePicker.tsx b/src/apps/renderer/pages/Settings/General/ThemePicker.tsx
similarity index 96%
rename from src/renderer/pages/Settings/General/ThemePicker.tsx
rename to src/apps/renderer/pages/Settings/General/ThemePicker.tsx
index eaece24fd..e0f10a4d1 100644
--- a/src/renderer/pages/Settings/General/ThemePicker.tsx
+++ b/src/apps/renderer/pages/Settings/General/ThemePicker.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { DEFAULT_THEME, Theme } from '../../../../shared/types/Theme';
-import Select, { SelectOptionsType } from 'renderer/components/Select';
+import Select, { SelectOptionsType } from '../../../components/Select';
 import { useTranslationContext } from '../../../context/LocalContext';
 import useConfig from '../../../hooks/useConfig';
 
diff --git a/src/renderer/pages/Settings/General/index.tsx b/src/apps/renderer/pages/Settings/General/index.tsx
similarity index 100%
rename from src/renderer/pages/Settings/General/index.tsx
rename to src/apps/renderer/pages/Settings/General/index.tsx
diff --git a/src/renderer/pages/Settings/Header.tsx b/src/apps/renderer/pages/Settings/Header.tsx
similarity index 100%
rename from src/renderer/pages/Settings/Header.tsx
rename to src/apps/renderer/pages/Settings/Header.tsx
diff --git a/src/renderer/pages/Settings/index.tsx b/src/apps/renderer/pages/Settings/index.tsx
similarity index 100%
rename from src/renderer/pages/Settings/index.tsx
rename to src/apps/renderer/pages/Settings/index.tsx
diff --git a/src/renderer/pages/Widget/AnimationWrapper.tsx b/src/apps/renderer/pages/Widget/AnimationWrapper.tsx
similarity index 100%
rename from src/renderer/pages/Widget/AnimationWrapper.tsx
rename to src/apps/renderer/pages/Widget/AnimationWrapper.tsx
diff --git a/src/renderer/pages/Widget/Header.tsx b/src/apps/renderer/pages/Widget/Header.tsx
similarity index 100%
rename from src/renderer/pages/Widget/Header.tsx
rename to src/apps/renderer/pages/Widget/Header.tsx
diff --git a/src/renderer/pages/Widget/Item.tsx b/src/apps/renderer/pages/Widget/Item.tsx
similarity index 98%
rename from src/renderer/pages/Widget/Item.tsx
rename to src/apps/renderer/pages/Widget/Item.tsx
index 8fc801e2d..5bd6f9ab8 100644
--- a/src/renderer/pages/Widget/Item.tsx
+++ b/src/apps/renderer/pages/Widget/Item.tsx
@@ -1,13 +1,13 @@
 import { Check, WarningCircle } from '@phosphor-icons/react';
 import { CircularProgressbar, buildStyles } from 'react-circular-progressbar';
-import { fileIcon } from 'renderer/assets/icons/getIcon';
-import {
-  ProcessErrorName,
-  ProcessInfoUpdatePayload,
-} from '../../../workers/types';
 import { useTranslationContext } from '../../context/LocalContext';
 import { shortMessages } from '../../messages/process-error';
 import { getBaseName, getExtension } from '../../utils/path';
+import {
+  ProcessInfoUpdatePayload,
+  ProcessErrorName,
+} from '../../../shared/types';
+import { fileIcon } from '../../assets/icons/getIcon';
 
 export function Item({
   name,
diff --git a/src/renderer/pages/Widget/NoInfoToShow.tsx b/src/apps/renderer/pages/Widget/NoInfoToShow.tsx
similarity index 100%
rename from src/renderer/pages/Widget/NoInfoToShow.tsx
rename to src/apps/renderer/pages/Widget/NoInfoToShow.tsx
diff --git a/src/renderer/pages/Widget/SyncAction.tsx b/src/apps/renderer/pages/Widget/SyncAction.tsx
similarity index 91%
rename from src/renderer/pages/Widget/SyncAction.tsx
rename to src/apps/renderer/pages/Widget/SyncAction.tsx
index 3da8de1bf..0baf69085 100644
--- a/src/renderer/pages/Widget/SyncAction.tsx
+++ b/src/apps/renderer/pages/Widget/SyncAction.tsx
@@ -1,13 +1,12 @@
-import { useEffect, useState } from 'react';
-
-import { useTranslationContext } from '../../context/LocalContext';
 import { CheckCircle, XCircle } from '@phosphor-icons/react';
+import { useEffect, useState } from 'react';
+import { SyncStatus } from '../../../../context/desktop/sync/domain/SyncStatus';
 import Spinner from '../../assets/spinner.svg';
-import { SyncStatus } from '../../../main/background-processes/sync';
-import useUsage from 'renderer/hooks/useUsage';
-import Button from 'renderer/components/Button';
-import useVirtualDriveStatus from 'renderer/hooks/VirtualDriveStatus';
-import useSyncStatus from 'renderer/hooks/useSyncStatus';
+import Button from '../../components/Button';
+import { useTranslationContext } from '../../context/LocalContext';
+import useVirtualDriveStatus from '../../hooks/VirtualDriveStatus';
+import useSyncStatus from '../../hooks/useSyncStatus';
+import useUsage from '../../hooks/useUsage';
 
 export default function SyncAction(props: { syncStatus: SyncStatus }) {
   const { translate } = useTranslationContext();
diff --git a/src/renderer/pages/Widget/SyncErrorBanner.tsx b/src/apps/renderer/pages/Widget/SyncErrorBanner.tsx
similarity index 90%
rename from src/renderer/pages/Widget/SyncErrorBanner.tsx
rename to src/apps/renderer/pages/Widget/SyncErrorBanner.tsx
index 6d0e0864d..2e668580c 100644
--- a/src/renderer/pages/Widget/SyncErrorBanner.tsx
+++ b/src/apps/renderer/pages/Widget/SyncErrorBanner.tsx
@@ -1,5 +1,5 @@
-import { SyncStatus } from '../../../main/background-processes/sync';
-import { ProcessFatalErrorName } from '../../../workers/types';
+import { SyncStatus } from '../../../../context/desktop/sync/domain/SyncStatus';
+import { ProcessFatalErrorName } from '../../../shared/types';
 import Error from '../../assets/error.svg';
 import Warn from '../../assets/warn.svg';
 import { useTranslationContext } from '../../context/LocalContext';
@@ -50,10 +50,7 @@ export default function SyncErrorBanner() {
   useSyncStatus(onSyncStatusChanged);
 
   const severity: 'FATAL' | 'WARN' = 'FATAL' as 'FATAL' | 'WARN';
-  const show =
-    stopReason !== null &&
-    stopReason?.reason !== 'EXIT' &&
-    stopReason?.reason !== 'STOPPED_BY_USER';
+  const show = stopReason !== null && stopReason?.reason !== 'STOPPED_BY_USER';
 
   const Icon = severity === 'FATAL' ? Error : Warn;
 
diff --git a/src/renderer/pages/Widget/SyncFailed.tsx b/src/apps/renderer/pages/Widget/SyncFailed.tsx
similarity index 100%
rename from src/renderer/pages/Widget/SyncFailed.tsx
rename to src/apps/renderer/pages/Widget/SyncFailed.tsx
diff --git a/src/renderer/pages/Widget/SyncInfo.tsx b/src/apps/renderer/pages/Widget/SyncInfo.tsx
similarity index 80%
rename from src/renderer/pages/Widget/SyncInfo.tsx
rename to src/apps/renderer/pages/Widget/SyncInfo.tsx
index e3bd31cfa..15216c1c5 100644
--- a/src/renderer/pages/Widget/SyncInfo.tsx
+++ b/src/apps/renderer/pages/Widget/SyncInfo.tsx
@@ -1,10 +1,10 @@
 import { AnimatePresence } from 'framer-motion';
-import { useOnSyncRunning } from 'renderer/hooks/useOnSyncRunning';
-import { useOnSyncStopped } from 'renderer/hooks/useOnSyncStopped';
-import { useSyncInfoSubscriber } from 'renderer/hooks/useSyncInfoSubscriber';
-import { NoInfoToShow } from './NoInfoToShow';
-import { Item } from './Item';
+import { useOnSyncRunning } from '../../hooks/useOnSyncRunning';
+import { useOnSyncStopped } from '../../hooks/useOnSyncStopped';
+import { useSyncInfoSubscriber } from '../../hooks/useSyncInfoSubscriber';
 import { AnimationWrapper } from './AnimationWrapper';
+import { Item } from './Item';
+import { NoInfoToShow } from './NoInfoToShow';
 
 export default function SyncInfo() {
   const { processInfoUpdatedPayload, clearItems, removeOnProgressItems } =
diff --git a/src/renderer/pages/Widget/VirtualDriveError.tsx b/src/apps/renderer/pages/Widget/VirtualDriveError.tsx
similarity index 100%
rename from src/renderer/pages/Widget/VirtualDriveError.tsx
rename to src/apps/renderer/pages/Widget/VirtualDriveError.tsx
diff --git a/src/renderer/pages/Widget/index.tsx b/src/apps/renderer/pages/Widget/index.tsx
similarity index 90%
rename from src/renderer/pages/Widget/index.tsx
rename to src/apps/renderer/pages/Widget/index.tsx
index 7ff4fb8dc..edc2d44bd 100644
--- a/src/renderer/pages/Widget/index.tsx
+++ b/src/apps/renderer/pages/Widget/index.tsx
@@ -1,4 +1,3 @@
-import BackupsFatalErrorBanner from './BackupsErrorBanner';
 import Header from './Header';
 import SyncAction from './SyncAction';
 import SyncErrorBanner from './SyncErrorBanner';
@@ -28,7 +27,6 @@ export default function Widget() {
     <div className="flex h-screen flex-col overflow-hidden">
       <Header />
       <SyncErrorBanner />
-      <BackupsFatalErrorBanner />
       {displayErrorInWidget ? renderWidgetError() : <SyncInfo />}
       <SyncAction syncStatus={syncStatus} />
     </div>
diff --git a/src/renderer/utils/errors.ts b/src/apps/renderer/utils/errors.ts
similarity index 100%
rename from src/renderer/utils/errors.ts
rename to src/apps/renderer/utils/errors.ts
diff --git a/src/renderer/utils/http-request.ts b/src/apps/renderer/utils/http-request.ts
similarity index 100%
rename from src/renderer/utils/http-request.ts
rename to src/apps/renderer/utils/http-request.ts
diff --git a/src/renderer/utils/path.ts b/src/apps/renderer/utils/path.ts
similarity index 100%
rename from src/renderer/utils/path.ts
rename to src/apps/renderer/utils/path.ts
diff --git a/src/apps/renderer/utils/query.ts b/src/apps/renderer/utils/query.ts
new file mode 100644
index 000000000..042305758
--- /dev/null
+++ b/src/apps/renderer/utils/query.ts
@@ -0,0 +1,5 @@
+import { StoredValues } from '../../main/config/service';
+
+export async function getConfigKey(key: StoredValues) {
+  return window.electron.getConfigKey(key);
+}
diff --git a/src/renderer/utils/usage.ts b/src/apps/renderer/utils/usage.ts
similarity index 100%
rename from src/renderer/utils/usage.ts
rename to src/apps/renderer/utils/usage.ts
diff --git a/src/shared/FileTypes/FileTypes.ts b/src/apps/shared/FileTypes/FileTypes.ts
similarity index 100%
rename from src/shared/FileTypes/FileTypes.ts
rename to src/apps/shared/FileTypes/FileTypes.ts
diff --git a/src/shared/HttpClient/Clients.ts b/src/apps/shared/HttpClient/Clients.ts
similarity index 100%
rename from src/shared/HttpClient/Clients.ts
rename to src/apps/shared/HttpClient/Clients.ts
diff --git a/src/shared/HttpClient/HttpClient.ts b/src/apps/shared/HttpClient/HttpClient.ts
similarity index 100%
rename from src/shared/HttpClient/HttpClient.ts
rename to src/apps/shared/HttpClient/HttpClient.ts
diff --git a/src/shared/HttpClient/backgroud-process-clients.ts b/src/apps/shared/HttpClient/background-process-clients.ts
similarity index 88%
rename from src/shared/HttpClient/backgroud-process-clients.ts
rename to src/apps/shared/HttpClient/background-process-clients.ts
index 6631c78b2..29d893bb8 100644
--- a/src/shared/HttpClient/backgroud-process-clients.ts
+++ b/src/apps/shared/HttpClient/background-process-clients.ts
@@ -3,7 +3,8 @@ import { ipcRenderer } from 'electron';
 import { AuthorizedClients } from './Clients';
 import { AuthorizedHttpClient } from './HttpClient';
 
-const onUserUnauthorized = () => ipcRenderer.emit('user-is-unauthorized');
+export const onUserUnauthorized = () =>
+  ipcRenderer.emit('user-is-unauthorized');
 
 const driveHeadersProvider = () => ipcRenderer.invoke('get-headers');
 const newDriveHeadersProvider = () =>
diff --git a/src/shared/HttpClient/http-client.test.skip.ts b/src/apps/shared/HttpClient/http-client.test.skip.ts
similarity index 100%
rename from src/shared/HttpClient/http-client.test.skip.ts
rename to src/apps/shared/HttpClient/http-client.test.skip.ts
diff --git a/src/shared/HttpClient/main-process-client.ts b/src/apps/shared/HttpClient/main-process-client.ts
similarity index 100%
rename from src/shared/HttpClient/main-process-client.ts
rename to src/apps/shared/HttpClient/main-process-client.ts
diff --git a/src/shared/HttpClient/responses/file-created.ts b/src/apps/shared/HttpClient/responses/file-created.ts
similarity index 100%
rename from src/shared/HttpClient/responses/file-created.ts
rename to src/apps/shared/HttpClient/responses/file-created.ts
diff --git a/src/shared/IPC/IPCs.ts b/src/apps/shared/IPC/IPCs.ts
similarity index 100%
rename from src/shared/IPC/IPCs.ts
rename to src/apps/shared/IPC/IPCs.ts
diff --git a/src/shared/IPC/events/drive.ts b/src/apps/shared/IPC/events/drive.ts
similarity index 100%
rename from src/shared/IPC/events/drive.ts
rename to src/apps/shared/IPC/events/drive.ts
diff --git a/src/shared/IPC/events/sync-engine.ts b/src/apps/shared/IPC/events/sync-engine.ts
similarity index 94%
rename from src/shared/IPC/events/sync-engine.ts
rename to src/apps/shared/IPC/events/sync-engine.ts
index 04f767903..bf09401ed 100644
--- a/src/shared/IPC/events/sync-engine.ts
+++ b/src/apps/shared/IPC/events/sync-engine.ts
@@ -1,6 +1,6 @@
-import { DriveFile } from 'main/database/entities/DriveFile';
-import { DriveFolder } from 'main/database/entities/DriveFolder';
-import { ProcessInfoUpdatePayload } from 'workers/types';
+import { DriveFile } from '../../../main/database/entities/DriveFile';
+import { DriveFolder } from '../../../main/database/entities/DriveFolder';
+import { ProcessInfoUpdatePayload } from '../../types';
 
 const trackedEvents = [
   'delete',
diff --git a/src/shared/IPC/events/virtual-drive.ts b/src/apps/shared/IPC/events/virtual-drive.ts
similarity index 100%
rename from src/shared/IPC/events/virtual-drive.ts
rename to src/apps/shared/IPC/events/virtual-drive.ts
diff --git a/src/shared/ItemKind.ts b/src/apps/shared/ItemKind.ts
similarity index 100%
rename from src/shared/ItemKind.ts
rename to src/apps/shared/ItemKind.ts
diff --git a/src/shared/Locale/DayJsLocales.ts b/src/apps/shared/Locale/DayJsLocales.ts
similarity index 100%
rename from src/shared/Locale/DayJsLocales.ts
rename to src/apps/shared/Locale/DayJsLocales.ts
diff --git a/src/shared/Locale/Language.ts b/src/apps/shared/Locale/Language.ts
similarity index 100%
rename from src/shared/Locale/Language.ts
rename to src/apps/shared/Locale/Language.ts
diff --git a/src/shared/fs/PathTypeChecker .ts b/src/apps/shared/fs/PathTypeChecker .ts
similarity index 100%
rename from src/shared/fs/PathTypeChecker .ts
rename to src/apps/shared/fs/PathTypeChecker .ts
diff --git a/src/shared/fs/ReadStreamToBuffer.ts b/src/apps/shared/fs/ReadStreamToBuffer.ts
similarity index 100%
rename from src/shared/fs/ReadStreamToBuffer.ts
rename to src/apps/shared/fs/ReadStreamToBuffer.ts
diff --git a/src/shared/fs/ensure-folder-exists.ts b/src/apps/shared/fs/ensure-folder-exists.ts
similarity index 100%
rename from src/shared/fs/ensure-folder-exists.ts
rename to src/apps/shared/fs/ensure-folder-exists.ts
diff --git a/src/shared/fs/write-readable-to-file.ts b/src/apps/shared/fs/write-readable-to-file.ts
similarity index 100%
rename from src/shared/fs/write-readable-to-file.ts
rename to src/apps/shared/fs/write-readable-to-file.ts
diff --git a/src/workers/types.ts b/src/apps/shared/types.ts
similarity index 100%
rename from src/workers/types.ts
rename to src/apps/shared/types.ts
diff --git a/src/shared/types/Nullable.ts b/src/apps/shared/types/Nullable.ts
similarity index 100%
rename from src/shared/types/Nullable.ts
rename to src/apps/shared/types/Nullable.ts
diff --git a/src/shared/types/Primitives.ts b/src/apps/shared/types/Primitives.ts
similarity index 100%
rename from src/shared/types/Primitives.ts
rename to src/apps/shared/types/Primitives.ts
diff --git a/src/apps/shared/types/Process.ts b/src/apps/shared/types/Process.ts
new file mode 100644
index 000000000..b20b29b3f
--- /dev/null
+++ b/src/apps/shared/types/Process.ts
@@ -0,0 +1 @@
+export type Process = 'SYNC';
diff --git a/src/shared/types/Stopwatch.ts b/src/apps/shared/types/Stopwatch.ts
similarity index 100%
rename from src/shared/types/Stopwatch.ts
rename to src/apps/shared/types/Stopwatch.ts
diff --git a/src/shared/types/Theme.ts b/src/apps/shared/types/Theme.ts
similarity index 100%
rename from src/shared/types/Theme.ts
rename to src/apps/shared/types/Theme.ts
diff --git a/src/shared/types/VirtualDriveStatus.ts b/src/apps/shared/types/VirtualDriveStatus.ts
similarity index 100%
rename from src/shared/types/VirtualDriveStatus.ts
rename to src/apps/shared/types/VirtualDriveStatus.ts
diff --git a/src/workers/sync-engine/BindingManager.ts b/src/apps/sync-engine/BindingManager.ts
similarity index 86%
rename from src/workers/sync-engine/BindingManager.ts
rename to src/apps/sync-engine/BindingManager.ts
index 7d41f0f44..2274a94aa 100644
--- a/src/workers/sync-engine/BindingManager.ts
+++ b/src/apps/sync-engine/BindingManager.ts
@@ -1,13 +1,13 @@
 import Logger from 'electron-log';
-import { DependencyContainer } from './dependency-injection/DependencyContainer';
-import { buildControllers } from './callbacks-controllers/buildControllers';
+import * as fs from 'fs';
 import { VirtualDrive } from 'virtual-drive/dist';
+import { FilePlaceholderId } from '../../context/virtual-drive/files/domain/PlaceholderId';
+import { ItemsSearcher } from '../../context/virtual-drive/items/application/ItemsSearcher';
+import { PlatformPathConverter } from '../../context/virtual-drive/shared/application/PlatformPathConverter';
+import { buildControllers } from './callbacks-controllers/buildControllers';
 import { executeControllerWithFallback } from './callbacks-controllers/middlewares/executeControllerWithFallback';
-import { FilePlaceholderId } from './modules/placeholders/domain/FilePlaceholderId';
+import { DependencyContainer } from './dependency-injection/DependencyContainer';
 import { ipcRendererSyncEngine } from './ipcRendererSyncEngine';
-import { PlatformPathConverter } from './modules/shared/application/PlatformPathConverter';
-import { ItemsSearcher } from './modules/items/application/ItemsSearcher';
-import * as fs from 'fs';
 
 export type CallbackDownload = (
   success: boolean,
@@ -24,6 +24,16 @@ export class BindingsManager {
     }
   ) {}
 
+  async load(): Promise<void> {
+    const tree = await this.container.existingItemsTreeBuilder.run();
+
+    await this.container.repositoryPopulator.run(tree.files);
+    await this.container.filesPlaceholderCreator.run(tree.files);
+
+    await this.container.folderRepositoryInitiator.run(tree.folders);
+    await this.container.foldersPlaceholderCreator.run(tree.folders);
+  }
+
   async start(version: string, providerId: string) {
     await this.stop();
 
@@ -171,6 +181,8 @@ export class BindingsManager {
     );
 
     await this.container.virtualDrive.connectSyncRoot();
+
+    await this.load();
   }
 
   watch() {
@@ -193,7 +205,7 @@ export class BindingsManager {
     const items = [...files, ...folders];
 
     const win32AbsolutePaths = items.map((item) => {
-      const posixRelativePath = item.path.value;
+      const posixRelativePath = item.path;
       // este path es relativo al root y en formato posix
 
       const win32RelativePaths =
@@ -235,4 +247,17 @@ export class BindingsManager {
       }
     });
   }
+
+  async update() {
+    Logger.info('[SYNC ENGINE]: Updating placeholders');
+
+    try {
+      const tree = await this.container.existingItemsTreeBuilder.run();
+
+      await this.container.filesPlaceholderUpdater.run(tree.files);
+      await this.container.folderPlaceholderUpdater.run(tree.folders);
+    } catch (error) {
+      Logger.error('[SYNC ENGINE] ', error);
+    }
+  }
 }
diff --git a/src/workers/sync-engine/callbacks-controllers/buildControllers.ts b/src/apps/sync-engine/callbacks-controllers/buildControllers.ts
similarity index 96%
rename from src/workers/sync-engine/callbacks-controllers/buildControllers.ts
rename to src/apps/sync-engine/callbacks-controllers/buildControllers.ts
index ac4f00f74..1f749a02d 100644
--- a/src/workers/sync-engine/callbacks-controllers/buildControllers.ts
+++ b/src/apps/sync-engine/callbacks-controllers/buildControllers.ts
@@ -28,8 +28,7 @@ export function buildControllers(container: DependencyContainer) {
 
   const downloadFileController = new DownloadFileController(
     container.fileFinderByContentsId,
-    container.contentsDownloader,
-    container.localRepositoryRefresher
+    container.contentsDownloader
   );
 
   const offlineRenameOrMoveController = new OfflineRenameOrMoveController(
diff --git a/src/workers/sync-engine/callbacks-controllers/controllers/AddController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
similarity index 77%
rename from src/workers/sync-engine/callbacks-controllers/controllers/AddController.ts
rename to src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
index 8342a84bc..6530dbbeb 100644
--- a/src/workers/sync-engine/callbacks-controllers/controllers/AddController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
@@ -1,15 +1,15 @@
 import Logger from 'electron-log';
+import { FileCreationOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
+import { createFilePlaceholderId } from '../../../../context/virtual-drive/files/domain/PlaceholderId';
+import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
+import { OfflineFolderCreator } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
+import { createFolderPlaceholderId } from '../../../../context/virtual-drive/folders/domain/FolderPlaceholderId';
+import { OfflineFolder } from '../../../../context/virtual-drive/folders/domain/OfflineFolder';
+import { AbsolutePathToRelativeConverter } from '../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
+import { PlatformPathConverter } from '../../../../context/virtual-drive/shared/application/PlatformPathConverter';
+import { MapObserver } from '../../../../context/virtual-drive/shared/domain/MapObserver';
+import { PathTypeChecker } from '../../../shared/fs/PathTypeChecker ';
 import { CallbackController } from './CallbackController';
-import { FolderCreator } from '../../modules/folders/application/FolderCreator';
-import { MapObserver } from '../../modules/shared/domain/MapObserver';
-import { FileCreationOrchestrator } from '../../modules/boundaryBridge/application/FileCreationOrchestrator';
-import { OfflineFolderCreator } from '../../modules/folders/application/Offline/OfflineFolderCreator';
-import { OfflineFolder } from '../../modules/folders/domain/OfflineFolder';
-import { createFilePlaceholderId } from '../../modules/placeholders/domain/FilePlaceholderId';
-import { createFolderPlaceholderId } from '../../modules/placeholders/domain/FolderPlaceholderId';
-import { PlatformPathConverter } from '../../modules/shared/application/PlatformPathConverter';
-import { AbsolutePathToRelativeConverter } from '../../modules/shared/application/AbsolutePathToRelativeConverter';
-import { PathTypeChecker } from '../../../../shared/fs/PathTypeChecker ';
 
 type FileCreationQueue = Map<
   string,
diff --git a/src/workers/sync-engine/callbacks-controllers/controllers/CallbackController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/CallbackController.ts
similarity index 63%
rename from src/workers/sync-engine/callbacks-controllers/controllers/CallbackController.ts
rename to src/apps/sync-engine/callbacks-controllers/controllers/CallbackController.ts
index ec654d257..ce680154b 100644
--- a/src/workers/sync-engine/callbacks-controllers/controllers/CallbackController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/CallbackController.ts
@@ -1,22 +1,27 @@
-import { trimPlaceholderId } from '../../modules/placeholders/domain/CommonPlaceholder';
 import {
   FilePlaceholderId,
   isFilePlaceholderId,
-} from '../../modules/placeholders/domain/FilePlaceholderId';
+} from '../../../../context/virtual-drive/files/domain/PlaceholderId';
 import {
   FolderPlaceholderId,
   isFolderPlaceholderId,
-} from '../../modules/placeholders/domain/FolderPlaceholderId';
+} from '../../../../context/virtual-drive/folders/domain/FolderPlaceholderId';
 
 export abstract class CallbackController {
   protected trim(id: string): string {
-    return trimPlaceholderId(id);
+    return id
+      .replace(
+        // eslint-disable-next-line no-control-regex
+        /[\x00-\x1F\x7F-\x9F]/g,
+        ''
+      )
+      .normalize();
   }
 
   protected isFilePlaceholder(id: string): id is FilePlaceholderId {
     // make sure the id is trimmed before comparing
     // if it was already trimmed should not change its length
-    const trimmed = trimPlaceholderId(id);
+    const trimmed = this.trim(id);
 
     return isFilePlaceholderId(trimmed);
   }
@@ -24,7 +29,7 @@ export abstract class CallbackController {
   protected isFolderPlaceholder(id: string): id is FolderPlaceholderId {
     // make sure the id is trimmed before comparing
     // if it was already trimmed should not change its length
-    const trimmed = trimPlaceholderId(id);
+    const trimmed = this.trim(id);
 
     return isFolderPlaceholderId(trimmed);
   }
diff --git a/src/workers/sync-engine/callbacks-controllers/controllers/DeleteController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/DeleteController.ts
similarity index 85%
rename from src/workers/sync-engine/callbacks-controllers/controllers/DeleteController.ts
rename to src/apps/sync-engine/callbacks-controllers/controllers/DeleteController.ts
index 29eb6d1d0..65ee7fa18 100644
--- a/src/workers/sync-engine/callbacks-controllers/controllers/DeleteController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/DeleteController.ts
@@ -1,7 +1,7 @@
-import { FolderDeleter } from 'workers/sync-engine/modules/folders/application/FolderDeleter';
-import { FileDeleter } from '../../modules/files/application/FileDeleter';
+import { FileDeleter } from '../../../../context/virtual-drive/files/application/FileDeleter';
+import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
+import { DelayQueue } from '../../../../context/virtual-drive/shared/domain/DelayQueue';
 import { CallbackController } from './CallbackController';
-import { DelayQueue } from 'workers/sync-engine/modules/shared/domain/DelayQueue';
 import Logger from 'electron-log';
 
 export class DeleteController extends CallbackController {
diff --git a/src/workers/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts
similarity index 70%
rename from src/workers/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts
rename to src/apps/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts
index 6d15ba769..6e5b8bfbc 100644
--- a/src/workers/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts
@@ -1,16 +1,14 @@
-import { FilePlaceholderId } from '../../modules/placeholders/domain/FilePlaceholderId';
-import { ContentsDownloader } from '../../modules/contents/application/ContentsDownloader';
-import { FileFinderByContentsId } from '../../modules/files/application/FileFinderByContentsId';
-import { LocalRepositoryRepositoryRefresher } from '../../modules/files/application/LocalRepositoryRepositoryRefresher';
-import { CallbackController } from './CallbackController';
 import Logger from 'electron-log';
+import { ContentsDownloader } from '../../../../context/virtual-drive/contents/application/ContentsDownloader';
+import { FileFinderByContentsId } from '../../../../context/virtual-drive/files/application/FileFinderByContentsId';
+import { FilePlaceholderId } from '../../../../context/virtual-drive/files/domain/PlaceholderId';
 import { CallbackDownload } from '../../BindingManager';
+import { CallbackController } from './CallbackController';
 
 export class DownloadFileController extends CallbackController {
   constructor(
     private readonly fileFinder: FileFinderByContentsId,
-    private readonly downloader: ContentsDownloader,
-    private readonly localRepositoryRefresher: LocalRepositoryRepositoryRefresher
+    private readonly downloader: ContentsDownloader
   ) {
     super();
   }
@@ -39,7 +37,6 @@ export class DownloadFileController extends CallbackController {
         'Error downloading a file, going to refresh and retry: ',
         error
       );
-      await this.localRepositoryRefresher.run();
 
       return await new Promise((resolve, reject) => {
         setTimeout(async () => {
diff --git a/src/workers/sync-engine/callbacks-controllers/controllers/NotifyPlaceholderHydrationFinished.ts b/src/apps/sync-engine/callbacks-controllers/controllers/NotifyPlaceholderHydrationFinished.ts
similarity index 66%
rename from src/workers/sync-engine/callbacks-controllers/controllers/NotifyPlaceholderHydrationFinished.ts
rename to src/apps/sync-engine/callbacks-controllers/controllers/NotifyPlaceholderHydrationFinished.ts
index 40028d751..50afcc7e6 100644
--- a/src/workers/sync-engine/callbacks-controllers/controllers/NotifyPlaceholderHydrationFinished.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/NotifyPlaceholderHydrationFinished.ts
@@ -1,5 +1,5 @@
-import { NotifyMainProcessHydrationFinished } from '../../modules/placeholders/application/NotifyMainProcessHydrationFinished';
-import { FilePlaceholderId } from '../../modules/placeholders/domain/FilePlaceholderId';
+import { NotifyMainProcessHydrationFinished } from '../../../../context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished';
+import { FilePlaceholderId } from '../../../../context/virtual-drive/files/domain/PlaceholderId';
 import { CallbackController } from './CallbackController';
 
 export class NotifyPlaceholderHydrationFinished extends CallbackController {
diff --git a/src/workers/sync-engine/callbacks-controllers/controllers/RenameOrMoveController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/RenameOrMoveController.ts
similarity index 77%
rename from src/workers/sync-engine/callbacks-controllers/controllers/RenameOrMoveController.ts
rename to src/apps/sync-engine/callbacks-controllers/controllers/RenameOrMoveController.ts
index bfd2ce97e..082e50146 100644
--- a/src/workers/sync-engine/callbacks-controllers/controllers/RenameOrMoveController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/RenameOrMoveController.ts
@@ -1,10 +1,10 @@
-import { FolderPathUpdater } from '../../modules/folders/application/FolderPathUpdater';
-import { FilePathUpdater } from '../../modules/files/application/FilePathUpdater';
+import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
+import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
+import { AbsolutePathToRelativeConverter } from '../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
+import { PlatformPathConverter } from '../../../../context/virtual-drive/shared/application/PlatformPathConverter';
 import { CallbackController } from './CallbackController';
 import { DeleteController } from './DeleteController';
 import Logger from 'electron-log';
-import { AbsolutePathToRelativeConverter } from 'workers/sync-engine/modules/shared/application/AbsolutePathToRelativeConverter';
-import { PlatformPathConverter } from 'workers/sync-engine/modules/shared/application/PlatformPathConverter';
 
 export class RenameOrMoveController extends CallbackController {
   constructor(
diff --git a/src/workers/sync-engine/callbacks-controllers/controllers/offline/OfflineRenameOrMoveController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/offline/OfflineRenameOrMoveController.ts
similarity index 79%
rename from src/workers/sync-engine/callbacks-controllers/controllers/offline/OfflineRenameOrMoveController.ts
rename to src/apps/sync-engine/callbacks-controllers/controllers/offline/OfflineRenameOrMoveController.ts
index f983a8e3e..6d758c5fd 100644
--- a/src/workers/sync-engine/callbacks-controllers/controllers/offline/OfflineRenameOrMoveController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/offline/OfflineRenameOrMoveController.ts
@@ -1,7 +1,7 @@
 import Logger from 'electron-log';
-import { OfflineFolderPathUpdater } from '../../../modules/folders/application/Offline/OfflineFolderPathUpdater';
-import { AbsolutePathToRelativeConverter } from '../../../modules/shared/application/AbsolutePathToRelativeConverter';
-import { PlatformPathConverter } from '../../../modules/shared/application/PlatformPathConverter';
+import { OfflineFolderPathUpdater } from '../../../../../context/virtual-drive/folders/application/Offline/OfflineFolderPathUpdater';
+import { AbsolutePathToRelativeConverter } from '../../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
+import { PlatformPathConverter } from '../../../../../context/virtual-drive/shared/application/PlatformPathConverter';
 import { CallbackController } from '../CallbackController';
 
 export class OfflineRenameOrMoveController extends CallbackController {
diff --git a/src/workers/sync-engine/callbacks-controllers/helpers/rawPathIsFolder.ts b/src/apps/sync-engine/callbacks-controllers/helpers/rawPathIsFolder.ts
similarity index 100%
rename from src/workers/sync-engine/callbacks-controllers/helpers/rawPathIsFolder.ts
rename to src/apps/sync-engine/callbacks-controllers/helpers/rawPathIsFolder.ts
diff --git a/src/workers/sync-engine/callbacks-controllers/middlewares/executeControllerWithFallback.ts b/src/apps/sync-engine/callbacks-controllers/middlewares/executeControllerWithFallback.ts
similarity index 100%
rename from src/workers/sync-engine/callbacks-controllers/middlewares/executeControllerWithFallback.ts
rename to src/apps/sync-engine/callbacks-controllers/middlewares/executeControllerWithFallback.ts
diff --git a/src/workers/sync-engine/dependency-injection/DependencyContainer.ts b/src/apps/sync-engine/dependency-injection/DependencyContainer.ts
similarity index 86%
rename from src/workers/sync-engine/dependency-injection/DependencyContainer.ts
rename to src/apps/sync-engine/dependency-injection/DependencyContainer.ts
index 10b52ea8f..ebd6870b5 100644
--- a/src/workers/sync-engine/dependency-injection/DependencyContainer.ts
+++ b/src/apps/sync-engine/dependency-injection/DependencyContainer.ts
@@ -4,7 +4,6 @@ import { ContentsContainer } from './contents/ContentsContainer';
 import { FilesContainer } from './files/FilesContainer';
 import { FoldersContainer } from './folders/FoldersContainer';
 import { ItemsContainer } from './items/ItemsContainer';
-import { PlaceholderContainer } from './placeholders/PlaceholdersContainer';
 import { BoundaryBridgeContainer } from './boundaryBridge/BoundaryBridgeContainer';
 import { SharedContainer } from './shared/SharedContainer';
 
@@ -13,7 +12,6 @@ export interface DependencyContainer
     ContentsContainer,
     FilesContainer,
     FoldersContainer,
-    PlaceholderContainer,
     SharedContainer,
     BoundaryBridgeContainer {
   virtualDrive: VirtualDrive;
diff --git a/src/workers/sync-engine/dependency-injection/DependencyContainerFactory.ts b/src/apps/sync-engine/dependency-injection/DependencyContainerFactory.ts
similarity index 80%
rename from src/workers/sync-engine/dependency-injection/DependencyContainerFactory.ts
rename to src/apps/sync-engine/dependency-injection/DependencyContainerFactory.ts
index 716207047..657e3e1c2 100644
--- a/src/workers/sync-engine/dependency-injection/DependencyContainerFactory.ts
+++ b/src/apps/sync-engine/dependency-injection/DependencyContainerFactory.ts
@@ -1,14 +1,13 @@
-import { getUser } from 'main/auth/service';
-import { DomainEventSubscribers } from '../modules/shared/infrastructure/DomainEventSubscribers';
+import { DomainEventSubscribers } from '../../../context/virtual-drive/shared/infrastructure/DomainEventSubscribers';
+import { getUser } from '../../main/auth/service';
 import { DependencyContainer } from './DependencyContainer';
+import { buildBoundaryBridgeContainer } from './boundaryBridge/build';
 import { DependencyInjectionEventBus } from './common/eventBus';
+import { DependencyInjectionVirtualDrive } from './common/virtualDrive';
 import { buildContentsContainer } from './contents/builder';
 import { buildFilesContainer } from './files/builder';
 import { buildFoldersContainer } from './folders/builder';
 import { buildItemsContainer } from './items/builder';
-import { DependencyInjectionVirtualDrive } from './common/virtualDrive';
-import { buildPlaceholdersContainer } from './placeholders/builder';
-import { buildBoundaryBridgeContainer } from './boundaryBridge/build';
 import { buildSharedContainer } from './shared/builder';
 
 export class DependencyContainerFactory {
@@ -42,21 +41,15 @@ export class DependencyContainerFactory {
 
     const sharedContainer = buildSharedContainer();
     const itemsContainer = buildItemsContainer();
-    const placeholderContainer = buildPlaceholdersContainer();
     const contentsContainer = await buildContentsContainer(sharedContainer);
-    const foldersContainer = await buildFoldersContainer(placeholderContainer);
+    const foldersContainer = await buildFoldersContainer(sharedContainer);
     const { container: filesContainer } = await buildFilesContainer(
       foldersContainer,
-      placeholderContainer,
       sharedContainer
     );
     const boundaryBridgeContainer = buildBoundaryBridgeContainer(
       contentsContainer,
-      filesContainer,
-      foldersContainer,
-      itemsContainer,
-      placeholderContainer,
-      sharedContainer
+      filesContainer
     );
 
     const container = {
@@ -64,7 +57,6 @@ export class DependencyContainerFactory {
       ...contentsContainer,
       ...filesContainer,
       ...foldersContainer,
-      ...placeholderContainer,
       ...sharedContainer,
       ...boundaryBridgeContainer,
 
diff --git a/src/apps/sync-engine/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts b/src/apps/sync-engine/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts
new file mode 100644
index 000000000..a885d570f
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts
@@ -0,0 +1,5 @@
+import { FileCreationOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
+
+export interface BoundaryBridgeContainer {
+  fileCreationOrchestrator: FileCreationOrchestrator;
+}
diff --git a/src/apps/sync-engine/dependency-injection/boundaryBridge/build.ts b/src/apps/sync-engine/dependency-injection/boundaryBridge/build.ts
new file mode 100644
index 000000000..bb065d7e1
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/boundaryBridge/build.ts
@@ -0,0 +1,19 @@
+import { BoundaryBridgeContainer } from './BoundaryBridgeContainer';
+import { ContentsContainer } from '../contents/ContentsContainer';
+import { FilesContainer } from '../files/FilesContainer';
+import { FileCreationOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
+
+export function buildBoundaryBridgeContainer(
+  contentsContainer: ContentsContainer,
+  filesContainer: FilesContainer
+): BoundaryBridgeContainer {
+  const fileCreationOrchestrator = new FileCreationOrchestrator(
+    contentsContainer.contentsUploader,
+    filesContainer.fileCreator,
+    filesContainer.sameFileWasMoved
+  );
+
+  return {
+    fileCreationOrchestrator,
+  };
+}
diff --git a/src/workers/sync-engine/dependency-injection/common/clients.ts b/src/apps/sync-engine/dependency-injection/common/clients.ts
similarity index 71%
rename from src/workers/sync-engine/dependency-injection/common/clients.ts
rename to src/apps/sync-engine/dependency-injection/common/clients.ts
index 24795f730..61d2b7f88 100644
--- a/src/workers/sync-engine/dependency-injection/common/clients.ts
+++ b/src/apps/sync-engine/dependency-injection/common/clients.ts
@@ -1,5 +1,5 @@
-import { AuthorizedClients } from 'shared/HttpClient/Clients';
-import { getClients } from 'shared/HttpClient/backgroud-process-clients';
+import { AuthorizedClients } from '../../../shared/HttpClient/Clients';
+import { getClients } from '../../../shared/HttpClient/background-process-clients';
 
 export class DependencyInjectionHttpClientsProvider {
   private static clients: AuthorizedClients;
diff --git a/src/apps/sync-engine/dependency-injection/common/crypt.ts b/src/apps/sync-engine/dependency-injection/common/crypt.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/workers/sync-engine/dependency-injection/common/eventBus.ts b/src/apps/sync-engine/dependency-injection/common/eventBus.ts
similarity index 65%
rename from src/workers/sync-engine/dependency-injection/common/eventBus.ts
rename to src/apps/sync-engine/dependency-injection/common/eventBus.ts
index 39f4f39d2..4958886ca 100644
--- a/src/workers/sync-engine/dependency-injection/common/eventBus.ts
+++ b/src/apps/sync-engine/dependency-injection/common/eventBus.ts
@@ -1,6 +1,6 @@
-import { EventRecorder } from '../../modules/shared/infrastructure/EventRecorder';
-import { EventBus } from '../../modules/shared/domain/EventBus';
-import { NodeJsEventBus } from '../../modules/shared/infrastructure/NodeJsEventBus';
+import { EventBus } from '../../../../context/virtual-drive/shared/domain/EventBus';
+import { EventRecorder } from '../../../../context/virtual-drive/shared/infrastructure/EventRecorder';
+import { NodeJsEventBus } from '../../../../context/virtual-drive/shared/infrastructure/NodeJsEventBus';
 import { DependencyInjectionEventRepository } from './eventRepository';
 
 export class DependencyInjectionEventBus {
diff --git a/src/workers/sync-engine/dependency-injection/common/eventRepository.ts b/src/apps/sync-engine/dependency-injection/common/eventRepository.ts
similarity index 63%
rename from src/workers/sync-engine/dependency-injection/common/eventRepository.ts
rename to src/apps/sync-engine/dependency-injection/common/eventRepository.ts
index ebb12437c..485237051 100644
--- a/src/workers/sync-engine/dependency-injection/common/eventRepository.ts
+++ b/src/apps/sync-engine/dependency-injection/common/eventRepository.ts
@@ -1,5 +1,5 @@
-import { EventRepository } from 'workers/sync-engine/modules/shared/domain/EventRepository';
-import { InMemoryEventRepository } from 'workers/sync-engine/modules/shared/infrastructure/InMemoryEventHistory';
+import { EventRepository } from '../../../../context/virtual-drive/shared/domain/EventRepository';
+import { InMemoryEventRepository } from '../../../../context/virtual-drive/shared/infrastructure/InMemoryEventHistory';
 
 export class DependencyInjectionEventRepository {
   private static history: EventRepository;
diff --git a/src/workers/sync-engine/dependency-injection/common/localRootFolderPath.ts b/src/apps/sync-engine/dependency-injection/common/localRootFolderPath.ts
similarity index 88%
rename from src/workers/sync-engine/dependency-injection/common/localRootFolderPath.ts
rename to src/apps/sync-engine/dependency-injection/common/localRootFolderPath.ts
index ee8a1bb95..c8f34a324 100644
--- a/src/workers/sync-engine/dependency-injection/common/localRootFolderPath.ts
+++ b/src/apps/sync-engine/dependency-injection/common/localRootFolderPath.ts
@@ -1,4 +1,4 @@
-import configStore from 'main/config';
+import configStore from '../../../main/config';
 
 export class DependencyInjectionLocalRootFolderPath {
   private static path: string;
diff --git a/src/workers/sync-engine/dependency-injection/common/mnemonic.ts b/src/apps/sync-engine/dependency-injection/common/mnemonic.ts
similarity index 89%
rename from src/workers/sync-engine/dependency-injection/common/mnemonic.ts
rename to src/apps/sync-engine/dependency-injection/common/mnemonic.ts
index 22741e0d1..24100430b 100644
--- a/src/workers/sync-engine/dependency-injection/common/mnemonic.ts
+++ b/src/apps/sync-engine/dependency-injection/common/mnemonic.ts
@@ -1,4 +1,4 @@
-import configStore from '../../../../main/config';
+import configStore from '../../../main/config';
 
 export class DependencyInjectionMnemonicProvider {
   private static _: string;
diff --git a/src/apps/sync-engine/dependency-injection/common/sdk.ts b/src/apps/sync-engine/dependency-injection/common/sdk.ts
new file mode 100644
index 000000000..84437b858
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/common/sdk.ts
@@ -0,0 +1,35 @@
+import { Storage } from '@internxt/sdk/dist/drive/storage';
+import { ipcRenderer } from 'electron';
+import { onUserUnauthorized } from '../../../shared/HttpClient/background-process-clients';
+import packageJson from '../../../../../package.json';
+
+export class DependencyInjectionStorageSdk {
+  private static sdk: Storage;
+
+  static async get(): Promise<any> {
+    if (DependencyInjectionStorageSdk.sdk) {
+      return DependencyInjectionStorageSdk.sdk;
+    }
+
+    const url = `${process.env.API_URL}/api`;
+    const { name: clientName, version: clientVersion } = packageJson;
+
+    const token = await ipcRenderer.invoke('get-token');
+
+    const sdk = Storage.client(
+      url,
+      {
+        clientName,
+        clientVersion,
+      },
+      {
+        token,
+        unauthorizedCallback: onUserUnauthorized,
+      }
+    );
+
+    DependencyInjectionStorageSdk.sdk = sdk;
+
+    return DependencyInjectionStorageSdk.sdk;
+  }
+}
diff --git a/src/workers/sync-engine/dependency-injection/common/traverser.ts b/src/apps/sync-engine/dependency-injection/common/traverser.ts
similarity index 76%
rename from src/workers/sync-engine/dependency-injection/common/traverser.ts
rename to src/apps/sync-engine/dependency-injection/common/traverser.ts
index 06ce0d299..b25de6491 100644
--- a/src/workers/sync-engine/dependency-injection/common/traverser.ts
+++ b/src/apps/sync-engine/dependency-injection/common/traverser.ts
@@ -1,5 +1,5 @@
-import { Traverser } from 'workers/sync-engine/modules/items/application/Traverser';
-import crypt from '../../../utils/crypt';
+import crypt from '../../../../context/shared/infrastructure/crypt';
+import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
 import { DependencyInjectionUserProvider } from './user';
 
 export class DependencyInjectionTraverserProvider {
diff --git a/src/workers/sync-engine/dependency-injection/common/user.ts b/src/apps/sync-engine/dependency-injection/common/user.ts
similarity index 79%
rename from src/workers/sync-engine/dependency-injection/common/user.ts
rename to src/apps/sync-engine/dependency-injection/common/user.ts
index 0dae46002..fddca6487 100644
--- a/src/workers/sync-engine/dependency-injection/common/user.ts
+++ b/src/apps/sync-engine/dependency-injection/common/user.ts
@@ -1,5 +1,5 @@
-import { User } from '../../../../main/types';
-import { getUser } from '../../../../main/auth/service';
+import { getUser } from '../../../main/auth/service';
+import { User } from '../../../main/types';
 
 export class DependencyInjectionUserProvider {
   private static _user: User;
diff --git a/src/workers/sync-engine/dependency-injection/common/virtualDrive.ts b/src/apps/sync-engine/dependency-injection/common/virtualDrive.ts
similarity index 100%
rename from src/workers/sync-engine/dependency-injection/common/virtualDrive.ts
rename to src/apps/sync-engine/dependency-injection/common/virtualDrive.ts
diff --git a/src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts b/src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts
new file mode 100644
index 000000000..047842c5d
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts
@@ -0,0 +1,11 @@
+import { ContentsDownloader } from '../../../../context/virtual-drive/contents/application/ContentsDownloader';
+import { NotifyMainProcessHydrationFinished } from '../../../../context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished';
+import { RetryContentsUploader } from '../../../../context/virtual-drive/contents/application/RetryContentsUploader';
+import { TemporalFolderProvider } from '../../../../context/virtual-drive/contents/application/temporalFolderProvider';
+
+export interface ContentsContainer {
+  contentsUploader: RetryContentsUploader;
+  contentsDownloader: ContentsDownloader;
+  temporalFolderProvider: TemporalFolderProvider;
+  notifyMainProcessHydrationFinished: NotifyMainProcessHydrationFinished;
+}
diff --git a/src/workers/sync-engine/dependency-injection/contents/builder.ts b/src/apps/sync-engine/dependency-injection/contents/builder.ts
similarity index 58%
rename from src/workers/sync-engine/dependency-injection/contents/builder.ts
rename to src/apps/sync-engine/dependency-injection/contents/builder.ts
index cb0a818ea..e001458a3 100644
--- a/src/workers/sync-engine/dependency-injection/contents/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/contents/builder.ts
@@ -1,17 +1,19 @@
 import { Environment } from '@internxt/inxt-js';
-import { RetryContentsUploader } from '../../modules/contents/application/RetryContentsUploader';
-import { FSLocalFileWriter } from '../../modules/contents/infrastructure/FSLocalFileWriter';
-import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
-import { ContentsDownloader } from '../../modules/contents/application/ContentsDownloader';
-import { ContentsUploader } from '../../modules/contents/application/ContentsUploader';
-import { temporalFolderProvider } from '../../modules/contents/application/temporalFolderProvider';
-import { EnvironmentRemoteFileContentsManagersFactory } from '../../modules/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
-import { FSLocalFileProvider } from '../../modules/contents/infrastructure/FSLocalFileProvider';
 import { DependencyInjectionMnemonicProvider } from '../common/mnemonic';
 import { DependencyInjectionUserProvider } from '../common/user';
 import { SharedContainer } from '../shared/SharedContainer';
 import { ContentsContainer } from './ContentsContainer';
 import { DependencyInjectionEventBus } from '../common/eventBus';
+import { DependencyInjectionEventRepository } from '../common/eventRepository';
+import { ContentsDownloader } from '../../../../context/virtual-drive/contents/application/ContentsDownloader';
+import { ContentsUploader } from '../../../../context/virtual-drive/contents/application/ContentsUploader';
+import { NotifyMainProcessHydrationFinished } from '../../../../context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished';
+import { RetryContentsUploader } from '../../../../context/virtual-drive/contents/application/RetryContentsUploader';
+import { temporalFolderProvider } from '../../../../context/virtual-drive/contents/application/temporalFolderProvider';
+import { EnvironmentRemoteFileContentsManagersFactory } from '../../../../context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
+import { FSLocalFileProvider } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileProvider';
+import { FSLocalFileWriter } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileWriter';
+import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
 
 export async function buildContentsContainer(
   sharedContainer: SharedContainer
@@ -19,6 +21,7 @@ export async function buildContentsContainer(
   const user = DependencyInjectionUserProvider.get();
   const mnemonic = DependencyInjectionMnemonicProvider.get();
   const { bus: eventBus } = DependencyInjectionEventBus;
+  const eventRepository = DependencyInjectionEventRepository.get();
 
   const environment = new Environment({
     bridgeUrl: process.env.BRIDGE_URL,
@@ -50,9 +53,16 @@ export async function buildContentsContainer(
     eventBus
   );
 
+  const notifyMainProcessHydrationFinished =
+    new NotifyMainProcessHydrationFinished(
+      eventRepository,
+      ipcRendererSyncEngine
+    );
+
   return {
     contentsUploader: retryContentsUploader,
     contentsDownloader,
     temporalFolderProvider,
+    notifyMainProcessHydrationFinished,
   };
 }
diff --git a/src/apps/sync-engine/dependency-injection/files/FilesContainer.ts b/src/apps/sync-engine/dependency-injection/files/FilesContainer.ts
new file mode 100644
index 000000000..5ba634247
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/files/FilesContainer.ts
@@ -0,0 +1,25 @@
+import { CreateFilePlaceholderOnDeletionFailed } from '../../../../context/virtual-drive/files/application/CreateFilePlaceholderOnDeletionFailed';
+import { FileCreator } from '../../../../context/virtual-drive/files/application/FileCreator';
+import { FileDeleter } from '../../../../context/virtual-drive/files/application/FileDeleter';
+import { FileFinderByContentsId } from '../../../../context/virtual-drive/files/application/FileFinderByContentsId';
+import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
+import { FilePlaceholderCreatorFromContentsId } from '../../../../context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId';
+import { FilesPlaceholderUpdater } from '../../../../context/virtual-drive/files/application/FilesPlaceholderUpdater';
+import { FilesPlaceholderCreator } from '../../../../context/virtual-drive/files/application/FilesPlaceholdersCreator';
+import { RepositoryPopulator } from '../../../../context/virtual-drive/files/application/RepositoryPopulator';
+import { RetrieveAllFiles } from '../../../../context/virtual-drive/files/application/RetrieveAllFiles';
+import { SameFileWasMoved } from '../../../../context/virtual-drive/files/application/SameFileWasMoved';
+
+export interface FilesContainer {
+  fileFinderByContentsId: FileFinderByContentsId;
+  fileDeleter: FileDeleter;
+  filePathUpdater: FilePathUpdater;
+  fileCreator: FileCreator;
+  filePlaceholderCreatorFromContentsId: FilePlaceholderCreatorFromContentsId;
+  createFilePlaceholderOnDeletionFailed: CreateFilePlaceholderOnDeletionFailed;
+  sameFileWasMoved: SameFileWasMoved;
+  retrieveAllFiles: RetrieveAllFiles;
+  repositoryPopulator: RepositoryPopulator;
+  filesPlaceholderCreator: FilesPlaceholderCreator;
+  filesPlaceholderUpdater: FilesPlaceholderUpdater;
+}
diff --git a/src/apps/sync-engine/dependency-injection/files/builder.ts b/src/apps/sync-engine/dependency-injection/files/builder.ts
new file mode 100644
index 000000000..94969cb85
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/files/builder.ts
@@ -0,0 +1,126 @@
+import crypt from '../../../../context/shared/infrastructure/crypt';
+import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
+import { DependencyInjectionEventBus } from '../common/eventBus';
+import { DependencyInjectionEventRepository } from '../common/eventRepository';
+import { DependencyInjectionUserProvider } from '../common/user';
+import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
+import { FoldersContainer } from '../folders/FoldersContainer';
+import { SharedContainer } from '../shared/SharedContainer';
+import { FilesContainer } from './FilesContainer';
+import { DependencyInjectionStorageSdk } from '../common/sdk';
+import { CreateFilePlaceholderOnDeletionFailed } from '../../../../context/virtual-drive/files/application/CreateFilePlaceholderOnDeletionFailed';
+import { FileCreator } from '../../../../context/virtual-drive/files/application/FileCreator';
+import { FileDeleter } from '../../../../context/virtual-drive/files/application/FileDeleter';
+import { FileFinderByContentsId } from '../../../../context/virtual-drive/files/application/FileFinderByContentsId';
+import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
+import { FilePlaceholderCreatorFromContentsId } from '../../../../context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId';
+import { FilesPlaceholderUpdater } from '../../../../context/virtual-drive/files/application/FilesPlaceholderUpdater';
+import { FilesPlaceholderCreator } from '../../../../context/virtual-drive/files/application/FilesPlaceholdersCreator';
+import { RepositoryPopulator } from '../../../../context/virtual-drive/files/application/RepositoryPopulator';
+import { RetrieveAllFiles } from '../../../../context/virtual-drive/files/application/RetrieveAllFiles';
+import { SameFileWasMoved } from '../../../../context/virtual-drive/files/application/SameFileWasMoved';
+import { InMemoryFileRepository } from '../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
+import { SDKRemoteFileSystem } from '../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
+import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem';
+import { LocalFileIdProvider } from '../../../../context/virtual-drive/shared/application/LocalFileIdProvider';
+
+export async function buildFilesContainer(
+  folderContainer: FoldersContainer,
+  sharedContainer: SharedContainer
+): Promise<{
+  container: FilesContainer;
+  subscribers: any;
+}> {
+  const user = DependencyInjectionUserProvider.get();
+  const { bus: eventBus } = DependencyInjectionEventBus;
+  const eventHistory = DependencyInjectionEventRepository.get();
+  const { virtualDrive } = DependencyInjectionVirtualDrive;
+  const sdk = await DependencyInjectionStorageSdk.get();
+
+  const remoteFileSystem = new SDKRemoteFileSystem(sdk, crypt, user.bucket);
+  const localFileSystem = new NodeWinLocalFileSystem(
+    virtualDrive,
+    sharedContainer.relativePathToAbsoluteConverter
+  );
+
+  const repository = new InMemoryFileRepository();
+
+  const fileFinderByContentsId = new FileFinderByContentsId(repository);
+
+  const fileDeleter = new FileDeleter(
+    remoteFileSystem,
+    localFileSystem,
+    repository,
+    folderContainer.allParentFoldersStatusIsExists,
+    ipcRendererSyncEngine
+  );
+
+  const sameFileWasMoved = new SameFileWasMoved(
+    repository,
+    localFileSystem,
+    eventHistory
+  );
+
+  const filePathUpdater = new FilePathUpdater(
+    remoteFileSystem,
+    localFileSystem,
+    repository,
+    fileFinderByContentsId,
+    folderContainer.folderFinder,
+    ipcRendererSyncEngine,
+    eventBus
+  );
+
+  const fileCreator = new FileCreator(
+    remoteFileSystem,
+    repository,
+    folderContainer.folderFinder,
+    fileDeleter,
+    eventBus,
+    ipcRendererSyncEngine
+  );
+
+  const filePlaceholderCreatorFromContentsId =
+    new FilePlaceholderCreatorFromContentsId(
+      fileFinderByContentsId,
+      localFileSystem
+    );
+
+  const createFilePlaceholderOnDeletionFailed =
+    new CreateFilePlaceholderOnDeletionFailed(
+      filePlaceholderCreatorFromContentsId
+    );
+
+  const repositoryPopulator = new RepositoryPopulator(repository);
+
+  const filesPlaceholderCreator = new FilesPlaceholderCreator(localFileSystem);
+
+  const localFileIdProvider = new LocalFileIdProvider(
+    sharedContainer.relativePathToAbsoluteConverter
+  );
+
+  const filesPlaceholderUpdater = new FilesPlaceholderUpdater(
+    repository,
+    localFileSystem,
+    sharedContainer.relativePathToAbsoluteConverter,
+    localFileIdProvider,
+    eventHistory
+  );
+
+  const container: FilesContainer = {
+    fileFinderByContentsId,
+    fileDeleter,
+    filePathUpdater,
+    fileCreator,
+    filePlaceholderCreatorFromContentsId: filePlaceholderCreatorFromContentsId,
+    createFilePlaceholderOnDeletionFailed:
+      createFilePlaceholderOnDeletionFailed,
+    sameFileWasMoved,
+    retrieveAllFiles: new RetrieveAllFiles(repository),
+    repositoryPopulator: repositoryPopulator,
+    filesPlaceholderCreator,
+    filesPlaceholderUpdater,
+  };
+
+  return { container, subscribers: [] };
+}
diff --git a/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts b/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
new file mode 100644
index 000000000..bcb774e3d
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
@@ -0,0 +1,33 @@
+import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
+import { FolderByPartialSearcher } from '../../../../context/virtual-drive/folders/application/FolderByPartialSearcher';
+import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
+import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
+import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
+import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
+import { FolderRepositoryInitiator } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
+import { FoldersPlaceholderCreator } from '../../../../context/virtual-drive/folders/application/FoldersPlaceholderCreator';
+import { OfflineFolderCreator } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
+import { OfflineFolderPathUpdater } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderPathUpdater';
+import { RetrieveAllFolders } from '../../../../context/virtual-drive/folders/application/RetrieveAllFolders';
+import { SynchronizeOfflineModifications } from '../../../../context/virtual-drive/folders/application/SynchronizeOfflineModifications';
+import { SynchronizeOfflineModificationsOnFolderCreated } from '../../../../context/virtual-drive/folders/application/SynchronizeOfflineModificationsOnFolderCreated';
+import { FolderPlaceholderUpdater } from '../../../../context/virtual-drive/folders/application/UpdatePlaceholderFolder';
+
+export interface FoldersContainer {
+  folderCreator: FolderCreator;
+  folderFinder: FolderFinder;
+  folderDeleter: FolderDeleter;
+  allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
+  folderPathUpdater: FolderPathUpdater;
+  folderByPartialSearcher: FolderByPartialSearcher;
+  synchronizeOfflineModificationsOnFolderCreated: SynchronizeOfflineModificationsOnFolderCreated;
+  offline: {
+    folderCreator: OfflineFolderCreator;
+    folderPathUpdater: OfflineFolderPathUpdater;
+    synchronizeOfflineModifications: SynchronizeOfflineModifications;
+  };
+  retrieveAllFolders: RetrieveAllFolders;
+  folderRepositoryInitiator: FolderRepositoryInitiator;
+  folderPlaceholderUpdater: FolderPlaceholderUpdater;
+  foldersPlaceholderCreator: FoldersPlaceholderCreator;
+}
diff --git a/src/apps/sync-engine/dependency-injection/folders/builder.ts b/src/apps/sync-engine/dependency-injection/folders/builder.ts
new file mode 100644
index 000000000..b40d16044
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/folders/builder.ts
@@ -0,0 +1,145 @@
+import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem';
+import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
+import { FolderByPartialSearcher } from '../../../../context/virtual-drive/folders/application/FolderByPartialSearcher';
+import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
+import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
+import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
+import { FolderMover } from '../../../../context/virtual-drive/folders/application/FolderMover';
+import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
+import { FolderRenamer } from '../../../../context/virtual-drive/folders/application/FolderRenamer';
+import { FolderRepositoryInitiator } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
+import { FoldersPlaceholderCreator } from '../../../../context/virtual-drive/folders/application/FoldersPlaceholderCreator';
+import { OfflineFolderCreator } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
+import { OfflineFolderMover } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderMover';
+import { OfflineFolderPathUpdater } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderPathUpdater';
+import { OfflineFolderRenamer } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderRenamer';
+import { RetrieveAllFolders } from '../../../../context/virtual-drive/folders/application/RetrieveAllFolders';
+import { SynchronizeOfflineModifications } from '../../../../context/virtual-drive/folders/application/SynchronizeOfflineModifications';
+import { SynchronizeOfflineModificationsOnFolderCreated } from '../../../../context/virtual-drive/folders/application/SynchronizeOfflineModificationsOnFolderCreated';
+import { FolderPlaceholderUpdater } from '../../../../context/virtual-drive/folders/application/UpdatePlaceholderFolder';
+import { HttpRemoteFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
+import { InMemoryFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
+import { InMemoryOfflineFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository';
+import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
+import { DependencyInjectionHttpClientsProvider } from '../common/clients';
+import { DependencyInjectionEventBus } from '../common/eventBus';
+import { DependencyInjectionEventRepository } from '../common/eventRepository';
+import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
+import { SharedContainer } from '../shared/SharedContainer';
+import { FoldersContainer } from './FoldersContainer';
+
+export async function buildFoldersContainer(
+  shredContainer: SharedContainer
+): Promise<FoldersContainer> {
+  const clients = DependencyInjectionHttpClientsProvider.get();
+  const eventBus = DependencyInjectionEventBus.bus;
+  const { virtualDrive } = DependencyInjectionVirtualDrive;
+  const eventRepository = DependencyInjectionEventRepository.get();
+
+  const repository = new InMemoryFolderRepository();
+
+  const localFileSystem = new NodeWinLocalFileSystem(virtualDrive);
+  const remoteFileSystem = new HttpRemoteFileSystem(
+    clients.drive,
+    clients.newDrive
+  );
+
+  const folderFinder = new FolderFinder(repository);
+
+  const allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
+    repository
+  );
+
+  const folderDeleter = new FolderDeleter(
+    repository,
+    remoteFileSystem,
+    localFileSystem,
+    allParentFoldersStatusIsExists
+  );
+
+  const folderCreator = new FolderCreator(
+    repository,
+    remoteFileSystem,
+    ipcRendererSyncEngine,
+    eventBus
+  );
+
+  const folderMover = new FolderMover(
+    repository,
+    remoteFileSystem,
+    folderFinder
+  );
+  const folderRenamer = new FolderRenamer(
+    repository,
+    remoteFileSystem,
+    ipcRendererSyncEngine
+  );
+
+  const folderByPartialSearcher = new FolderByPartialSearcher(repository);
+
+  const folderPathUpdater = new FolderPathUpdater(
+    repository,
+    folderMover,
+    folderRenamer
+  );
+
+  const offlineRepository = new InMemoryOfflineFolderRepository();
+  const offlineFolderCreator = new OfflineFolderCreator(
+    folderFinder,
+    offlineRepository,
+    repository
+  );
+
+  const offlineFolderMover = new OfflineFolderMover(
+    offlineRepository,
+    folderFinder
+  );
+  const offlineFolderRenamer = new OfflineFolderRenamer(offlineRepository);
+  const offlineFolderPathUpdater = new OfflineFolderPathUpdater(
+    offlineRepository,
+    offlineFolderMover,
+    offlineFolderRenamer
+  );
+  const synchronizeOfflineModifications = new SynchronizeOfflineModifications(
+    offlineRepository,
+    repository,
+    folderRenamer,
+    eventRepository
+  );
+
+  const synchronizeOfflineModificationsOnFolderCreated =
+    new SynchronizeOfflineModificationsOnFolderCreated(
+      synchronizeOfflineModifications
+    );
+
+  const folderRepositoryInitiator = new FolderRepositoryInitiator(repository);
+
+  const foldersPlaceholderCreator = new FoldersPlaceholderCreator(
+    localFileSystem
+  );
+
+  const folderPlaceholderUpdater = new FolderPlaceholderUpdater(
+    repository,
+    localFileSystem,
+    shredContainer.relativePathToAbsoluteConverter
+  );
+
+  return {
+    folderCreator,
+    folderFinder,
+    folderDeleter,
+    allParentFoldersStatusIsExists: allParentFoldersStatusIsExists,
+    folderPathUpdater,
+    folderByPartialSearcher,
+    synchronizeOfflineModificationsOnFolderCreated,
+    offline: {
+      folderCreator: offlineFolderCreator,
+      folderPathUpdater: offlineFolderPathUpdater,
+      synchronizeOfflineModifications,
+    },
+    retrieveAllFolders: new RetrieveAllFolders(repository),
+    folderRepositoryInitiator,
+    foldersPlaceholderCreator,
+    folderPlaceholderUpdater,
+  };
+}
diff --git a/src/workers/sync-engine/dependency-injection/items/ItemsContainer.ts b/src/apps/sync-engine/dependency-injection/items/ItemsContainer.ts
similarity index 55%
rename from src/workers/sync-engine/dependency-injection/items/ItemsContainer.ts
rename to src/apps/sync-engine/dependency-injection/items/ItemsContainer.ts
index 6302698cd..973ce57ca 100644
--- a/src/workers/sync-engine/dependency-injection/items/ItemsContainer.ts
+++ b/src/apps/sync-engine/dependency-injection/items/ItemsContainer.ts
@@ -1,4 +1,4 @@
-import { TreeBuilder } from '../../modules/items/application/TreeBuilder';
+import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
 
 export interface ItemsContainer {
   existingItemsTreeBuilder: TreeBuilder;
diff --git a/src/workers/sync-engine/dependency-injection/items/builder.ts b/src/apps/sync-engine/dependency-injection/items/builder.ts
similarity index 54%
rename from src/workers/sync-engine/dependency-injection/items/builder.ts
rename to src/apps/sync-engine/dependency-injection/items/builder.ts
index ca08247bb..c6f66a759 100644
--- a/src/workers/sync-engine/dependency-injection/items/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/items/builder.ts
@@ -1,10 +1,10 @@
-import { TreeBuilder } from '../../modules/items/application/TreeBuilder';
-import { ItemsContainer } from './ItemsContainer';
+import { RemoteItemsGenerator } from '../../../../context/virtual-drive/items/application/RemoteItemsGenerator';
+import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
+import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
+import { CryptoJsNameDecrypt } from '../../../../context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt';
+import { getUser } from '../../../main/auth/service';
 import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
-import { RemoteItemsGenerator } from '../../modules/items/application/RemoteItemsGenerator';
-import { getUser } from '../../../../main/auth/service';
-import crypt from '../../../utils/crypt';
-import { Traverser } from 'workers/sync-engine/modules/items/application/Traverser';
+import { ItemsContainer } from './ItemsContainer';
 
 export function buildItemsContainer(): ItemsContainer {
   const user = getUser();
@@ -15,12 +15,16 @@ export function buildItemsContainer(): ItemsContainer {
 
   const remoteItemsGenerator = new RemoteItemsGenerator(ipcRendererSyncEngine);
 
+  const nameDecryptor = new CryptoJsNameDecrypt();
+
   const existingItemsTraverser = Traverser.existingItems(
-    crypt,
+    nameDecryptor,
+    user.root_folder_id
+  );
+  const allStatusesTraverser = Traverser.allItems(
+    nameDecryptor,
     user.root_folder_id
   );
-  const allStatusesTraverser = Traverser.allItems(crypt, user.root_folder_id);
-
   const treeBuilder = new TreeBuilder(
     remoteItemsGenerator,
     existingItemsTraverser
diff --git a/src/apps/sync-engine/dependency-injection/shared/SharedContainer.ts b/src/apps/sync-engine/dependency-injection/shared/SharedContainer.ts
new file mode 100644
index 000000000..1649eceac
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/shared/SharedContainer.ts
@@ -0,0 +1,7 @@
+import { AbsolutePathToRelativeConverter } from '../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
+import { RelativePathToAbsoluteConverter } from '../../../../context/virtual-drive/shared/application/RelativePathToAbsoluteConverter';
+
+export interface SharedContainer {
+  absolutePathToRelativeConverter: AbsolutePathToRelativeConverter;
+  relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter;
+}
diff --git a/src/workers/sync-engine/dependency-injection/shared/builder.ts b/src/apps/sync-engine/dependency-injection/shared/builder.ts
similarity index 56%
rename from src/workers/sync-engine/dependency-injection/shared/builder.ts
rename to src/apps/sync-engine/dependency-injection/shared/builder.ts
index c3c17af49..b7b086734 100644
--- a/src/workers/sync-engine/dependency-injection/shared/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/shared/builder.ts
@@ -1,8 +1,7 @@
-import { AbsolutePathToRelativeConverter } from '../../modules/shared/application/AbsolutePathToRelativeConverter';
-import { SharedContainer } from './SharedContainer';
+import { AbsolutePathToRelativeConverter } from '../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
+import { RelativePathToAbsoluteConverter } from '../../../../context/virtual-drive/shared/application/RelativePathToAbsoluteConverter';
 import { DependencyInjectionLocalRootFolderPath } from '../common/localRootFolderPath';
-import { RelativePathToAbsoluteConverter } from '../../modules/shared/application/RelativePathToAbsoluteConverter';
-import { LocalFileIdProvider } from '../../modules/shared/application/LocalFileIdProvider';
+import { SharedContainer } from './SharedContainer';
 
 export function buildSharedContainer(): SharedContainer {
   const localRootFolderPath = DependencyInjectionLocalRootFolderPath.get();
@@ -14,13 +13,8 @@ export function buildSharedContainer(): SharedContainer {
     localRootFolderPath
   );
 
-  const localFileIdProvider = new LocalFileIdProvider(
-    relativePathToAbsoluteConverter
-  );
-
   return {
     absolutePathToRelativeConverter,
     relativePathToAbsoluteConverter,
-    localFileIdProvider,
   };
 }
diff --git a/src/workers/sync-engine/index.ts b/src/apps/sync-engine/index.ts
similarity index 93%
rename from src/workers/sync-engine/index.ts
rename to src/apps/sync-engine/index.ts
index 6e87ef80a..bc2b6ce25 100644
--- a/src/workers/sync-engine/index.ts
+++ b/src/apps/sync-engine/index.ts
@@ -4,7 +4,6 @@ import { DependencyContainerFactory } from './dependency-injection/DependencyCon
 import packageJson from '../../../package.json';
 import { BindingsManager } from './BindingManager';
 import fs from 'fs/promises';
-import { iconPath } from 'workers/utils/icon';
 
 async function ensureTheFolderExist(path: string) {
   try {
@@ -29,7 +28,7 @@ async function setUp() {
 
   const bindings = new BindingsManager(container, {
     root: virtualDrivePath,
-    icon: iconPath,
+    icon: '',
   });
 
   ipcRenderer.on('STOP_SYNC_ENGINE_PROCESS', async (event) => {
@@ -45,7 +44,7 @@ async function setUp() {
   ipcRenderer.on('UPDATE_SYNC_ENGINE_PROCESS', async () => {
     Logger.info('[SYNC ENGINE] Updating sync engine');
 
-    await container.syncPlaceholders.run();
+    await bindings.update();
 
     Logger.info('[SYNC ENGINE] sync engine updated successfully');
   });
@@ -71,8 +70,6 @@ async function setUp() {
     '{E9D7EB38-B229-5DC5-9396-017C449D59CD}'
   );
 
-  await container.treePlaceholderCreator.run();
-
   bindings.watch();
 }
 
diff --git a/src/workers/sync-engine/ipcRendererSyncEngine.ts b/src/apps/sync-engine/ipcRendererSyncEngine.ts
similarity index 58%
rename from src/workers/sync-engine/ipcRendererSyncEngine.ts
rename to src/apps/sync-engine/ipcRendererSyncEngine.ts
index bb89dbd70..4aca87223 100644
--- a/src/workers/sync-engine/ipcRendererSyncEngine.ts
+++ b/src/apps/sync-engine/ipcRendererSyncEngine.ts
@@ -1,6 +1,6 @@
+import { CustomIpc } from '../shared/IPC/IPCs';
+import { FromProcess, FromMain } from '../shared/IPC/events/sync-engine';
 import { ipcRenderer } from 'electron';
-import { FromProcess, FromMain } from '../../shared/IPC/events/sync-engine';
-import { CustomIpc } from '../../shared/IPC/IPCs';
 
 export type SyncEngineIpc = CustomIpc<FromProcess, FromMain>;
 
diff --git a/src/workers/utils/date.ts b/src/apps/utils/date.ts
similarity index 100%
rename from src/workers/utils/date.ts
rename to src/apps/utils/date.ts
diff --git a/src/workers/utils/file-is-on-folder.ts b/src/apps/utils/file-is-on-folder.ts
similarity index 100%
rename from src/workers/utils/file-is-on-folder.ts
rename to src/apps/utils/file-is-on-folder.ts
diff --git a/src/workers/utils/http-request.ts b/src/apps/utils/http-request.ts
similarity index 91%
rename from src/workers/utils/http-request.ts
rename to src/apps/utils/http-request.ts
index 4184d0ad8..63ca52239 100644
--- a/src/workers/utils/http-request.ts
+++ b/src/apps/utils/http-request.ts
@@ -1,7 +1,7 @@
 import { ipcRenderer } from 'electron';
 import Logger from 'electron-log';
 
-import configStore from '../../main/config';
+import configStore from '../../apps/main/config';
 
 const userIsUnauthorized = () => {
   Logger.warn('[AUTH] Request unauthorized');
diff --git a/src/workers/utils/icon.ts b/src/apps/utils/icon.ts
similarity index 70%
rename from src/workers/utils/icon.ts
rename to src/apps/utils/icon.ts
index c98b9cf47..c45ba2c2b 100644
--- a/src/workers/utils/icon.ts
+++ b/src/apps/utils/icon.ts
@@ -2,5 +2,5 @@ import path from 'path';
 
 export const iconPath =
   process.env.NODE_ENV === 'development'
-    ? path.join(__dirname, '../../../../assets', 'icon.ico')
+    ? path.join(__dirname, '../../../../../assets', 'icon.ico')
     : path.join(process.resourcesPath, 'assets', 'icon.ico');
diff --git a/src/workers/utils/is-online.ts b/src/apps/utils/is-online.ts
similarity index 100%
rename from src/workers/utils/is-online.ts
rename to src/apps/utils/is-online.ts
diff --git a/src/workers/utils/name-verification.ts b/src/apps/utils/name-verification.ts
similarity index 100%
rename from src/workers/utils/name-verification.ts
rename to src/apps/utils/name-verification.ts
diff --git a/src/workers/utils/reporting.ts b/src/apps/utils/reporting.ts
similarity index 91%
rename from src/workers/utils/reporting.ts
rename to src/apps/utils/reporting.ts
index 25bbbe4eb..b0ae28f83 100644
--- a/src/workers/utils/reporting.ts
+++ b/src/apps/utils/reporting.ts
@@ -1,4 +1,4 @@
-import { ErrorDetails } from '../types';
+import { ErrorDetails } from '../shared/types';
 
 export function createErrorDetails(
   originalError: any,
diff --git a/src/workers/utils/test/file-is-on-folder.test.ts b/src/apps/utils/test/file-is-on-folder.test.ts
similarity index 100%
rename from src/workers/utils/test/file-is-on-folder.test.ts
rename to src/apps/utils/test/file-is-on-folder.test.ts
diff --git a/src/workers/utils/test/name-verification.test.ts b/src/apps/utils/test/name-verification.test.ts
similarity index 100%
rename from src/workers/utils/test/name-verification.test.ts
rename to src/apps/utils/test/name-verification.test.ts
diff --git a/src/workers/utils/test/sensible-files.json b/src/apps/utils/test/sensible-files.json
similarity index 100%
rename from src/workers/utils/test/sensible-files.json
rename to src/apps/utils/test/sensible-files.json
diff --git a/src/workers/utils/types/Tuple.ts b/src/apps/utils/types/Tuple.ts
similarity index 100%
rename from src/workers/utils/types/Tuple.ts
rename to src/apps/utils/types/Tuple.ts
diff --git a/src/context/desktop/app/domain/AppIssue.ts b/src/context/desktop/app/domain/AppIssue.ts
new file mode 100644
index 000000000..4b6407508
--- /dev/null
+++ b/src/context/desktop/app/domain/AppIssue.ts
@@ -0,0 +1,10 @@
+export type AppIssue = {
+  action: 'GET_DEVICE_NAME_ERROR';
+  errorName: 'UNKNOWN_DEVICE_NAME';
+  process: 'GENERAL';
+  errorDetails: {
+    name: string;
+    messages: string;
+    stack: string;
+  };
+};
diff --git a/src/context/desktop/sync/domain/SyncStatus.ts b/src/context/desktop/sync/domain/SyncStatus.ts
new file mode 100644
index 000000000..b76562463
--- /dev/null
+++ b/src/context/desktop/sync/domain/SyncStatus.ts
@@ -0,0 +1 @@
+export type SyncStatus = 'STANDBY' | 'RUNNING' | 'FAILED';
diff --git a/src/context/desktop/sync/domain/SyncStoppedPayload.ts b/src/context/desktop/sync/domain/SyncStoppedPayload.ts
new file mode 100644
index 000000000..6e4155556
--- /dev/null
+++ b/src/context/desktop/sync/domain/SyncStoppedPayload.ts
@@ -0,0 +1,8 @@
+import { ProcessFatalErrorName } from '../../../../apps/shared/types';
+
+export type SyncStoppedPayload =
+  | { reason: 'STOPPED_BY_USER' }
+  | {
+      reason: 'FATAL_ERROR';
+      errorName: ProcessFatalErrorName;
+    };
diff --git a/src/workers/sync-engine/modules/shared/domain/AggregateRoot.ts b/src/context/shared/domain/AggregateRoot.ts
similarity index 76%
rename from src/workers/sync-engine/modules/shared/domain/AggregateRoot.ts
rename to src/context/shared/domain/AggregateRoot.ts
index 08bf11309..5293e60bf 100644
--- a/src/workers/sync-engine/modules/shared/domain/AggregateRoot.ts
+++ b/src/context/shared/domain/AggregateRoot.ts
@@ -1,4 +1,4 @@
-import { Primitives } from '../../../../../shared/types/Primitives';
+import { Primitives } from './ValueObject';
 import { DomainEvent } from './DomainEvent';
 
 export abstract class AggregateRoot {
@@ -19,5 +19,5 @@ export abstract class AggregateRoot {
     this.domainEvents.push(event);
   }
 
-  abstract toPrimitives(): Record<string, Primitives>;
+  abstract attributes(): Record<string, Primitives>;
 }
diff --git a/src/workers/sync-engine/modules/shared/domain/DomainEvent.ts b/src/context/shared/domain/DomainEvent.ts
similarity index 100%
rename from src/workers/sync-engine/modules/shared/domain/DomainEvent.ts
rename to src/context/shared/domain/DomainEvent.ts
diff --git a/src/workers/sync-engine/modules/shared/domain/WebdavDomainEventSubscriber.ts b/src/context/shared/domain/DomainEventSubscriber.ts
similarity index 67%
rename from src/workers/sync-engine/modules/shared/domain/WebdavDomainEventSubscriber.ts
rename to src/context/shared/domain/DomainEventSubscriber.ts
index 406b52cfb..37d2a878c 100644
--- a/src/workers/sync-engine/modules/shared/domain/WebdavDomainEventSubscriber.ts
+++ b/src/context/shared/domain/DomainEventSubscriber.ts
@@ -1,6 +1,6 @@
 import { DomainEventClass, DomainEvent } from './DomainEvent';
 
-export interface WebdavDomainEventSubscriber<T extends DomainEvent> {
+export interface DomainEventSubscriber<T extends DomainEvent> {
   subscribedTo(): Array<DomainEventClass>;
   on(domainEvent: T): Promise<void>;
 }
diff --git a/src/workers/sync-engine/modules/shared/domain/Either.ts b/src/context/shared/domain/Either.ts
similarity index 100%
rename from src/workers/sync-engine/modules/shared/domain/Either.ts
rename to src/context/shared/domain/Either.ts
diff --git a/src/workers/shared/domain/EnumValueObject.ts b/src/context/shared/domain/EnumValueObject.ts
similarity index 100%
rename from src/workers/shared/domain/EnumValueObject.ts
rename to src/context/shared/domain/EnumValueObject.ts
diff --git a/src/workers/shared/domain/InvalidArgumentError.ts b/src/context/shared/domain/InvalidArgumentError.ts
similarity index 100%
rename from src/workers/shared/domain/InvalidArgumentError.ts
rename to src/context/shared/domain/InvalidArgumentError.ts
diff --git a/src/workers/filesystems/domain/ServerFile.ts b/src/context/shared/domain/ServerFile.ts
similarity index 100%
rename from src/workers/filesystems/domain/ServerFile.ts
rename to src/context/shared/domain/ServerFile.ts
diff --git a/src/workers/filesystems/domain/ServerFolder.ts b/src/context/shared/domain/ServerFolder.ts
similarity index 100%
rename from src/workers/filesystems/domain/ServerFolder.ts
rename to src/context/shared/domain/ServerFolder.ts
diff --git a/src/workers/shared/domain/ValueObject.ts b/src/context/shared/domain/ValueObject.ts
similarity index 82%
rename from src/workers/shared/domain/ValueObject.ts
rename to src/context/shared/domain/ValueObject.ts
index 154b5051e..d1908baba 100644
--- a/src/workers/shared/domain/ValueObject.ts
+++ b/src/context/shared/domain/ValueObject.ts
@@ -1,6 +1,6 @@
 import { InvalidArgumentError } from './InvalidArgumentError';
 
-export type Primitives = string | number | boolean | Date;
+export type Primitives = string | number | boolean | Date | undefined;
 
 export abstract class ValueObject<T extends Primitives> {
   readonly value: T;
@@ -22,8 +22,4 @@ export abstract class ValueObject<T extends Primitives> {
       other.value === this.value
     );
   }
-
-  toString(): string {
-    return this.value.toString();
-  }
 }
diff --git a/src/workers/utils/crypt.ts b/src/context/shared/infrastructure/crypt.ts
similarity index 100%
rename from src/workers/utils/crypt.ts
rename to src/context/shared/infrastructure/crypt.ts
diff --git a/src/workers/sync-engine/modules/boundaryBridge/application/FileCreationOrchestrator.ts b/src/context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator.ts
similarity index 100%
rename from src/workers/sync-engine/modules/boundaryBridge/application/FileCreationOrchestrator.ts
rename to src/context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator.ts
diff --git a/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
similarity index 93%
rename from src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts
rename to src/context/virtual-drive/contents/application/ContentsDownloader.ts
index 85dd361c6..a9cc1cfd5 100644
--- a/src/workers/sync-engine/modules/contents/application/ContentsDownloader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
@@ -1,16 +1,16 @@
-import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
-import { SyncEngineIpc } from '../../../ipcRendererSyncEngine';
-import { ContentFileDownloader } from '../domain/contentHandlers/ContentFileDownloader';
+import Logger from 'electron-log';
+import path from 'path';
+import { Readable } from 'stream';
+import { ensureFolderExists } from '../../../../apps/shared/fs/ensure-folder-exists';
+import { CallbackDownload } from '../../../../apps/sync-engine/BindingManager';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 import { File } from '../../files/domain/File';
+import { EventBus } from '../../shared/domain/EventBus';
+import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
 import { LocalFileContents } from '../domain/LocalFileContents';
 import { LocalFileWriter } from '../domain/LocalFileWriter';
-import { ensureFolderExists } from '../../../../../shared/fs/ensure-folder-exists';
-import path from 'path';
-import { CallbackDownload } from '../../../BindingManager';
+import { ContentFileDownloader } from '../domain/contentHandlers/ContentFileDownloader';
 import { TemporalFolderProvider } from './temporalFolderProvider';
-import { EventBus } from '../../shared/domain/EventBus';
-import Logger from 'electron-log';
-import { Readable } from 'stream';
 
 export class ContentsDownloader {
   private readableDownloader: Readable | null;
diff --git a/src/workers/sync-engine/modules/contents/application/ContentsUploader.ts b/src/context/virtual-drive/contents/application/ContentsUploader.ts
similarity index 97%
rename from src/workers/sync-engine/modules/contents/application/ContentsUploader.ts
rename to src/context/virtual-drive/contents/application/ContentsUploader.ts
index 86cf88f26..3bd65c842 100644
--- a/src/workers/sync-engine/modules/contents/application/ContentsUploader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsUploader.ts
@@ -1,4 +1,3 @@
-import { SyncEngineIpc } from 'workers/sync-engine/ipcRendererSyncEngine';
 import { ContentFileUploader } from '../domain/contentHandlers/ContentFileUploader';
 import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
 import { LocalContentsProvider } from '../domain/LocalFileProvider';
@@ -6,6 +5,7 @@ import { RemoteFileContents } from '../domain/RemoteFileContents';
 import { LocalFileContents } from '../domain/LocalFileContents';
 import { PlatformPathConverter } from '../../shared/application/PlatformPathConverter';
 import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 
 export class ContentsUploader {
   constructor(
diff --git a/src/workers/sync-engine/modules/placeholders/application/NotifyMainProcessHydrationFinished.ts b/src/context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished.ts
similarity index 83%
rename from src/workers/sync-engine/modules/placeholders/application/NotifyMainProcessHydrationFinished.ts
rename to src/context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished.ts
index 0b58b8498..faff126b9 100644
--- a/src/workers/sync-engine/modules/placeholders/application/NotifyMainProcessHydrationFinished.ts
+++ b/src/context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished.ts
@@ -1,6 +1,6 @@
-import { SyncEngineIpc } from '../../../ipcRendererSyncEngine';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 import { EventRepository } from '../../shared/domain/EventRepository';
-import { ContentsDownloadedDomainEvent } from '../../contents/domain/events/ContentsDownloadedDomainEvent';
+import { ContentsDownloadedDomainEvent } from '../domain/events/ContentsDownloadedDomainEvent';
 import Logger from 'electron-log';
 
 export class NotifyMainProcessHydrationFinished {
diff --git a/src/workers/sync-engine/modules/contents/application/ReadLocalFileContentsToBuffer.ts b/src/context/virtual-drive/contents/application/ReadLocalFileContentsToBuffer.ts
similarity index 100%
rename from src/workers/sync-engine/modules/contents/application/ReadLocalFileContentsToBuffer.ts
rename to src/context/virtual-drive/contents/application/ReadLocalFileContentsToBuffer.ts
diff --git a/src/workers/sync-engine/modules/contents/application/RetryContentsUploader.ts b/src/context/virtual-drive/contents/application/RetryContentsUploader.ts
similarity index 100%
rename from src/workers/sync-engine/modules/contents/application/RetryContentsUploader.ts
rename to src/context/virtual-drive/contents/application/RetryContentsUploader.ts
diff --git a/src/workers/sync-engine/modules/contents/application/temporalFolderProvider.ts b/src/context/virtual-drive/contents/application/temporalFolderProvider.ts
similarity index 100%
rename from src/workers/sync-engine/modules/contents/application/temporalFolderProvider.ts
rename to src/context/virtual-drive/contents/application/temporalFolderProvider.ts
diff --git a/src/workers/sync-engine/modules/contents/domain/ContentsId.ts b/src/context/virtual-drive/contents/domain/ContentsId.ts
similarity index 68%
rename from src/workers/sync-engine/modules/contents/domain/ContentsId.ts
rename to src/context/virtual-drive/contents/domain/ContentsId.ts
index 9a7904471..607a9b52b 100644
--- a/src/workers/sync-engine/modules/contents/domain/ContentsId.ts
+++ b/src/context/virtual-drive/contents/domain/ContentsId.ts
@@ -1,5 +1,5 @@
-import { ValueObject } from '../../../../shared/domain/ValueObject';
-import { InvalidArgumentError } from '../../../../shared/domain/InvalidArgumentError';
+import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { ValueObject } from '../../../shared/domain/ValueObject';
 
 export class ContentsId extends ValueObject<string> {
   static readonly VALID_LENGTH = 24;
diff --git a/src/workers/sync-engine/modules/contents/domain/ContentsManagersFactory.ts b/src/context/virtual-drive/contents/domain/ContentsManagersFactory.ts
similarity index 100%
rename from src/workers/sync-engine/modules/contents/domain/ContentsManagersFactory.ts
rename to src/context/virtual-drive/contents/domain/ContentsManagersFactory.ts
diff --git a/src/workers/sync-engine/modules/contents/domain/ContentsSize.ts b/src/context/virtual-drive/contents/domain/ContentsSize.ts
similarity index 100%
rename from src/workers/sync-engine/modules/contents/domain/ContentsSize.ts
rename to src/context/virtual-drive/contents/domain/ContentsSize.ts
diff --git a/src/workers/sync-engine/modules/contents/domain/LocalFileContents.ts b/src/context/virtual-drive/contents/domain/LocalFileContents.ts
similarity index 94%
rename from src/workers/sync-engine/modules/contents/domain/LocalFileContents.ts
rename to src/context/virtual-drive/contents/domain/LocalFileContents.ts
index cd1b4b986..95a5c24ea 100644
--- a/src/workers/sync-engine/modules/contents/domain/LocalFileContents.ts
+++ b/src/context/virtual-drive/contents/domain/LocalFileContents.ts
@@ -1,5 +1,5 @@
 import { Readable } from 'stream';
-import { AggregateRoot } from '../../shared/domain/AggregateRoot';
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
 import { ContentsSize } from './ContentsSize';
 import { ContentsDownloadedDomainEvent } from './events/ContentsDownloadedDomainEvent';
 import { File } from '../../files/domain/File';
@@ -85,7 +85,7 @@ export class LocalFileContents extends AggregateRoot {
     return remoteContents;
   }
 
-  toPrimitives(): Omit<LocalFileContentsAttributes, 'contents'> {
+  attributes(): Omit<LocalFileContentsAttributes, 'contents'> {
     return {
       name: this.name,
       extension: this.extension,
diff --git a/src/workers/sync-engine/modules/contents/domain/LocalFileProvider.ts b/src/context/virtual-drive/contents/domain/LocalFileProvider.ts
similarity index 100%
rename from src/workers/sync-engine/modules/contents/domain/LocalFileProvider.ts
rename to src/context/virtual-drive/contents/domain/LocalFileProvider.ts
diff --git a/src/workers/sync-engine/modules/contents/domain/LocalFileWriter.ts b/src/context/virtual-drive/contents/domain/LocalFileWriter.ts
similarity index 100%
rename from src/workers/sync-engine/modules/contents/domain/LocalFileWriter.ts
rename to src/context/virtual-drive/contents/domain/LocalFileWriter.ts
diff --git a/src/workers/sync-engine/modules/contents/domain/RemoteFileContents.ts b/src/context/virtual-drive/contents/domain/RemoteFileContents.ts
similarity index 84%
rename from src/workers/sync-engine/modules/contents/domain/RemoteFileContents.ts
rename to src/context/virtual-drive/contents/domain/RemoteFileContents.ts
index ce75e268b..e48baa6a8 100644
--- a/src/workers/sync-engine/modules/contents/domain/RemoteFileContents.ts
+++ b/src/context/virtual-drive/contents/domain/RemoteFileContents.ts
@@ -1,5 +1,4 @@
-import { Primitives } from 'shared/types/Primitives';
-import { AggregateRoot } from '../../shared/domain/AggregateRoot';
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
 import { ContentsId } from './ContentsId';
 import { ContentsSize } from './ContentsSize';
 
@@ -35,7 +34,7 @@ export class RemoteFileContents extends AggregateRoot {
     );
   }
 
-  toPrimitives(): Record<string, Primitives> {
+  attributes() {
     return {
       contentsId: this.id,
       size: this.size,
diff --git a/src/workers/sync-engine/modules/contents/domain/contentHandlers/ContentFileDownloader.ts b/src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader.ts
similarity index 100%
rename from src/workers/sync-engine/modules/contents/domain/contentHandlers/ContentFileDownloader.ts
rename to src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader.ts
diff --git a/src/workers/sync-engine/modules/contents/domain/contentHandlers/ContentFileUploader.ts b/src/context/virtual-drive/contents/domain/contentHandlers/ContentFileUploader.ts
similarity index 100%
rename from src/workers/sync-engine/modules/contents/domain/contentHandlers/ContentFileUploader.ts
rename to src/context/virtual-drive/contents/domain/contentHandlers/ContentFileUploader.ts
diff --git a/src/workers/sync-engine/modules/contents/domain/events/ContentsDownloadedDomainEvent.ts b/src/context/virtual-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts
similarity index 94%
rename from src/workers/sync-engine/modules/contents/domain/events/ContentsDownloadedDomainEvent.ts
rename to src/context/virtual-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts
index fd1d7381c..7b15bfba5 100644
--- a/src/workers/sync-engine/modules/contents/domain/events/ContentsDownloadedDomainEvent.ts
+++ b/src/context/virtual-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from '../../../shared/domain/DomainEvent';
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
 
 export class ContentsDownloadedDomainEvent extends DomainEvent {
   static readonly EVENT_NAME: 'contents.downloaded';
diff --git a/src/workers/sync-engine/modules/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts b/src/context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
similarity index 100%
rename from src/workers/sync-engine/modules/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
rename to src/context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
diff --git a/src/workers/sync-engine/modules/contents/infrastructure/FSLocalFileProvider.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileProvider.ts
similarity index 100%
rename from src/workers/sync-engine/modules/contents/infrastructure/FSLocalFileProvider.ts
rename to src/context/virtual-drive/contents/infrastructure/FSLocalFileProvider.ts
diff --git a/src/workers/sync-engine/modules/contents/infrastructure/FSLocalFileWriter.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
similarity index 80%
rename from src/workers/sync-engine/modules/contents/infrastructure/FSLocalFileWriter.ts
rename to src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
index 34ccc1137..812f1d4b1 100644
--- a/src/workers/sync-engine/modules/contents/infrastructure/FSLocalFileWriter.ts
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
@@ -1,8 +1,8 @@
+import { ensureFolderExists } from '../../../../apps/shared/fs/ensure-folder-exists';
+import { WriteReadableToFile } from '../../../../apps/shared/fs/write-readable-to-file';
 import { LocalFileContents } from '../domain/LocalFileContents';
 import { LocalFileWriter } from '../domain/LocalFileWriter';
 import path from 'path';
-import { ensureFolderExists } from '../../../../../shared/fs/ensure-folder-exists';
-import { WriteReadableToFile } from '../../../../../shared/fs/write-readable-to-file';
 
 export type LocationProvider = () => Promise<string>;
 
diff --git a/src/workers/sync-engine/modules/contents/infrastructure/download/EnvironmentContentFileDownloader.ts b/src/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
similarity index 96%
rename from src/workers/sync-engine/modules/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
rename to src/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
index 84ee41f95..5744672bd 100644
--- a/src/workers/sync-engine/modules/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
+++ b/src/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
@@ -1,5 +1,4 @@
 import { DownloadStrategyFunction } from '@internxt/inxt-js/build/lib/core/download/strategy';
-import { Stopwatch } from '../../../../../../shared/types/Stopwatch';
 import { EventEmitter, Readable } from 'stream';
 import {
   ContentFileDownloader,
@@ -8,6 +7,7 @@ import {
 import { File } from '../../../files/domain/File';
 import { DownloadOneShardStrategy } from '@internxt/inxt-js/build/lib/core';
 import { ActionState } from '@internxt/inxt-js/build/api';
+import { Stopwatch } from '../../../../../apps/shared/types/Stopwatch';
 
 export class EnvironmentContentFileDownloader implements ContentFileDownloader {
   private eventEmitter: EventEmitter;
diff --git a/src/workers/sync-engine/modules/contents/infrastructure/upload/EnvironmentContentFileUploader.ts b/src/context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader.ts
similarity index 96%
rename from src/workers/sync-engine/modules/contents/infrastructure/upload/EnvironmentContentFileUploader.ts
rename to src/context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader.ts
index 434d916d3..36b6dd933 100644
--- a/src/workers/sync-engine/modules/contents/infrastructure/upload/EnvironmentContentFileUploader.ts
+++ b/src/context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader.ts
@@ -4,8 +4,8 @@ import {
   ContentFileUploader,
   FileUploadEvents,
 } from '../../domain/contentHandlers/ContentFileUploader';
-import { Stopwatch } from '../../../../../../shared/types/Stopwatch';
 import { ContentsId } from '../../domain/ContentsId';
+import { Stopwatch } from '../../../../../apps/shared/types/Stopwatch';
 
 export class EnvironmentContentFileUploader implements ContentFileUploader {
   private eventEmitter: EventEmitter;
diff --git a/src/workers/sync-engine/modules/files/application/CreateFilePlaceholderOnDeletionFailed.ts b/src/context/virtual-drive/files/application/CreateFilePlaceholderOnDeletionFailed.ts
similarity index 70%
rename from src/workers/sync-engine/modules/files/application/CreateFilePlaceholderOnDeletionFailed.ts
rename to src/context/virtual-drive/files/application/CreateFilePlaceholderOnDeletionFailed.ts
index d434dee54..02f123d5b 100644
--- a/src/workers/sync-engine/modules/files/application/CreateFilePlaceholderOnDeletionFailed.ts
+++ b/src/context/virtual-drive/files/application/CreateFilePlaceholderOnDeletionFailed.ts
@@ -1,10 +1,10 @@
-import { DomainEventClass } from '../../shared/domain/DomainEvent';
-import { WebdavDomainEventSubscriber } from '../../shared/domain/WebdavDomainEventSubscriber';
+import { DomainEventClass } from '../../../shared/domain/DomainEvent';
+import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
 import { OptimisticFileDeletionFailed } from '../domain/events/OptimisticFileDeletionFailed';
 import { FilePlaceholderCreatorFromContentsId } from './FilePlaceholderCreatorFromContentsId';
 
 export class CreateFilePlaceholderOnDeletionFailed
-  implements WebdavDomainEventSubscriber<OptimisticFileDeletionFailed>
+  implements DomainEventSubscriber<OptimisticFileDeletionFailed>
 {
   constructor(private readonly creator: FilePlaceholderCreatorFromContentsId) {}
 
diff --git a/src/workers/sync-engine/modules/files/application/FileCreator.ts b/src/context/virtual-drive/files/application/FileCreator.ts
similarity index 74%
rename from src/workers/sync-engine/modules/files/application/FileCreator.ts
rename to src/context/virtual-drive/files/application/FileCreator.ts
index 5aaf3d0a6..9515a6fbd 100644
--- a/src/workers/sync-engine/modules/files/application/FileCreator.ts
+++ b/src/context/virtual-drive/files/application/FileCreator.ts
@@ -1,16 +1,19 @@
 import { FolderFinder } from '../../folders/application/FolderFinder';
 import { FilePath } from '../domain/FilePath';
 import { File } from '../domain/File';
-import { FileRepository } from '../domain/FileRepository';
 import { FileSize } from '../domain/FileSize';
 import { EventBus } from '../../shared/domain/EventBus';
 import { RemoteFileContents } from '../../contents/domain/RemoteFileContents';
 import { FileDeleter } from './FileDeleter';
 import { PlatformPathConverter } from '../../shared/application/PlatformPathConverter';
-import { SyncEngineIpc } from '../../../ipcRendererSyncEngine';
+import { FileRepository } from '../domain/FileRepository';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { OfflineFile } from '../domain/OfflineFile';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 
 export class FileCreator {
   constructor(
+    private readonly remote: RemoteFileSystem,
     private readonly repository: FileRepository,
     private readonly folderFinder: FolderFinder,
     private readonly fileDeleter: FileDeleter,
@@ -25,18 +28,21 @@ export class FileCreator {
       });
 
       if (existingFile) {
-        await this.fileDeleter.act(existingFile);
+        await this.fileDeleter.run(existingFile.contentsId);
       }
 
       const size = new FileSize(contents.size);
 
       const folder = this.folderFinder.findFromFilePath(filePath);
 
-      const file = File.create(contents.id, folder, size, filePath);
+      const offline = OfflineFile.create(contents.id, folder, size, filePath);
+
+      const persistedAttributes = await this.remote.persist(offline);
+      const file = File.from(persistedAttributes);
 
       await this.repository.add(file);
 
-      await this.eventBus.publish(file.pullDomainEvents());
+      await this.eventBus.publish(offline.pullDomainEvents());
       this.ipc.send('FILE_CREATED', {
         name: file.name,
         extension: file.type,
diff --git a/src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts b/src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts
new file mode 100644
index 000000000..454a71441
--- /dev/null
+++ b/src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts
@@ -0,0 +1,18 @@
+import { ServerFile } from '../../../shared/domain/ServerFile';
+import { File } from '../domain/File';
+
+export function createFileFromServerFile(
+  server: ServerFile,
+  relativePath: string
+): File {
+  return File.from({
+    folderId: server.folderId,
+    contentsId: server.fileId,
+    modificationTime: server.modificationTime,
+    size: server.size,
+    createdAt: server.createdAt,
+    updatedAt: server.updatedAt,
+    path: relativePath,
+    status: server.status,
+  });
+}
diff --git a/src/workers/sync-engine/modules/files/application/FileDeleter.ts b/src/context/virtual-drive/files/application/FileDeleter.ts
similarity index 72%
rename from src/workers/sync-engine/modules/files/application/FileDeleter.ts
rename to src/context/virtual-drive/files/application/FileDeleter.ts
index 9fbbd9a50..59a32e25b 100644
--- a/src/workers/sync-engine/modules/files/application/FileDeleter.ts
+++ b/src/context/virtual-drive/files/application/FileDeleter.ts
@@ -1,32 +1,30 @@
 import Logger from 'electron-log';
-import { SyncEngineIpc } from '../../../ipcRendererSyncEngine';
 import { AllParentFoldersStatusIsExists } from '../../folders/application/AllParentFoldersStatusIsExists';
-import { FileRepository } from '../domain/FileRepository';
 import { FileStatuses } from '../domain/FileStatus';
-import { PlaceholderCreator } from '../../placeholders/domain/PlaceholderCreator';
 import { File } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 
 export class FileDeleter {
   constructor(
+    private readonly remote: RemoteFileSystem,
+    private readonly local: LocalFileSystem,
     private readonly repository: FileRepository,
     private readonly allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists,
-    private readonly placeholderCreator: PlaceholderCreator,
     private readonly ipc: SyncEngineIpc
   ) {}
 
-  async run(contentsId: string): Promise<void> {
+  async run(contentsId: File['contentsId']): Promise<void> {
     const file = this.repository.searchByPartial({ contentsId });
 
     if (!file) {
       return;
     }
 
-    await this.act(file);
-  }
-
-  async act(file: File) {
     if (file.status.is(FileStatuses.TRASHED)) {
-      Logger.warn(`File ${file.path.value} is already trashed. Will ignore...`);
+      Logger.warn(`File ${file.path} is already trashed. Will ignore...`);
       return;
     }
 
@@ -36,7 +34,7 @@ export class FileDeleter {
 
     if (!allParentsExists) {
       Logger.warn(
-        `Skipped file deletion for ${file.path.value}. A folder in a higher level is already marked as trashed`
+        `Skipped file deletion for ${file.path}. A folder in a higher level is already marked as trashed`
       );
       return;
     }
@@ -51,7 +49,8 @@ export class FileDeleter {
     try {
       file.trash();
 
-      await this.repository.delete(file);
+      await this.remote.trash(file.contentsId);
+      await this.repository.delete(file.contentsId);
 
       this.ipc.send('FILE_DELETED', {
         name: file.name,
@@ -82,7 +81,7 @@ export class FileDeleter {
         process: 'SYNC',
       });
 
-      this.placeholderCreator.file(file);
+      this.local.createPlaceHolder(file);
     }
   }
 }
diff --git a/src/workers/sync-engine/modules/files/application/FileFinderByContentsId.ts b/src/context/virtual-drive/files/application/FileFinderByContentsId.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/application/FileFinderByContentsId.ts
rename to src/context/virtual-drive/files/application/FileFinderByContentsId.ts
index 4c24e5d0c..e4eb8271d 100644
--- a/src/workers/sync-engine/modules/files/application/FileFinderByContentsId.ts
+++ b/src/context/virtual-drive/files/application/FileFinderByContentsId.ts
@@ -1,6 +1,6 @@
-import { FileRepository } from '../domain/FileRepository';
 import { FileNotFoundError } from '../domain/errors/FileNotFoundError';
 import { File } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
 
 export class FileFinderByContentsId {
   constructor(private readonly repository: FileRepository) {}
diff --git a/src/workers/sync-engine/modules/files/application/FilePathUpdater.ts b/src/context/virtual-drive/files/application/FilePathUpdater.ts
similarity index 79%
rename from src/workers/sync-engine/modules/files/application/FilePathUpdater.ts
rename to src/context/virtual-drive/files/application/FilePathUpdater.ts
index 192f39b3f..06896bed7 100644
--- a/src/workers/sync-engine/modules/files/application/FilePathUpdater.ts
+++ b/src/context/virtual-drive/files/application/FilePathUpdater.ts
@@ -2,43 +2,46 @@ import { ActionNotPermittedError } from '../domain/errors/ActionNotPermittedErro
 import { FileAlreadyExistsError } from '../domain/errors/FileAlreadyExistsError';
 import { FilePath } from '../domain/FilePath';
 import { File } from '../domain/File';
-import { FileRepository } from '../domain/FileRepository';
 import { FolderFinder } from '../../folders/application/FolderFinder';
 import { FileFinderByContentsId } from './FileFinderByContentsId';
-import { SyncEngineIpc } from '../../../ipcRendererSyncEngine';
-import { LocalFileIdProvider } from '../../shared/application/LocalFileIdProvider';
 import { EventBus } from '../../shared/domain/EventBus';
+import { FileRepository } from '../domain/FileRepository';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 
 export class FilePathUpdater {
   constructor(
+    private readonly remote: RemoteFileSystem,
+    private readonly local: LocalFileSystem,
     private readonly repository: FileRepository,
     private readonly fileFinderByContentsId: FileFinderByContentsId,
     private readonly folderFinder: FolderFinder,
     private readonly ipc: SyncEngineIpc,
-    private readonly localFileIdProvider: LocalFileIdProvider,
     private readonly eventBus: EventBus
   ) {}
 
   private async rename(file: File, path: FilePath) {
     file.rename(path);
 
-    await this.repository.updateName(file);
+    await this.remote.rename(file);
+    await this.repository.update(file);
 
     const events = file.pullDomainEvents();
     this.eventBus.publish(events);
   }
 
   private async move(file: File, destination: FilePath) {
-    const trackerId = await this.localFileIdProvider.run(file.path.value);
+    const trackerId = await this.local.getLocalFileId(file);
 
     const destinationFolder = this.folderFinder.run(destination.dirname());
 
     file.moveTo(destinationFolder, trackerId);
 
-    await this.repository.updateParentDir(file);
+    await this.remote.move(file);
+    await this.repository.update(file);
 
     const events = file.pullDomainEvents();
-
     this.eventBus.publish(events);
   }
 
@@ -54,7 +57,9 @@ export class FilePathUpdater {
       return;
     }
 
-    const destinationFile = this.repository.search(destination);
+    const destinationFile = this.repository.searchByPartial({
+      path: destination.value,
+    });
 
     if (destinationFile) {
       this.ipc.send('FILE_RENAME_ERROR', {
diff --git a/src/workers/sync-engine/modules/files/application/FilePlaceholderCreatorFromContentsId.ts b/src/context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId.ts
similarity index 64%
rename from src/workers/sync-engine/modules/files/application/FilePlaceholderCreatorFromContentsId.ts
rename to src/context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId.ts
index 88668e5a3..691aa35d0 100644
--- a/src/workers/sync-engine/modules/files/application/FilePlaceholderCreatorFromContentsId.ts
+++ b/src/context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId.ts
@@ -1,16 +1,16 @@
-import { PlaceholderCreator } from '../../placeholders/domain/PlaceholderCreator';
 import { File } from '../domain/File';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
 import { FileFinderByContentsId } from './FileFinderByContentsId';
 
 export class FilePlaceholderCreatorFromContentsId {
   constructor(
     private readonly finder: FileFinderByContentsId,
-    private readonly placeholderCreator: PlaceholderCreator
+    private readonly local: LocalFileSystem
   ) {}
 
   run(contentsId: File['contentsId']) {
     const file = this.finder.run(contentsId);
 
-    this.placeholderCreator.file(file);
+    this.local.createPlaceHolder(file);
   }
 }
diff --git a/src/workers/sync-engine/modules/boundaryBridge/application/UpdatePlaceholderFile.ts b/src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts
similarity index 58%
rename from src/workers/sync-engine/modules/boundaryBridge/application/UpdatePlaceholderFile.ts
rename to src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts
index 248f42abd..7e0623758 100644
--- a/src/workers/sync-engine/modules/boundaryBridge/application/UpdatePlaceholderFile.ts
+++ b/src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts
@@ -1,21 +1,19 @@
-import { File } from '../../files/domain/File';
-import fs from 'fs/promises';
-import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
-import { FileByPartialSearcher } from '../../files/application/FileByPartialSearcher';
-import { ManagedFileRepository } from '../../files/domain/ManagedFileRepository';
-import { PlaceholderCreator } from '../../placeholders/domain/PlaceholderCreator';
 import Logger from 'electron-log';
-import { FileMovedDomainEvent } from '../../files/domain/events/FileMovedDomainEvent';
+import fs from 'fs/promises';
 import { LocalFileIdProvider } from '../../shared/application/LocalFileIdProvider';
-import { FileRenamedDomainEvent } from '../../files/domain/events/FileRenamedDomainEvent';
+import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
 import { EventRepository } from '../../shared/domain/EventRepository';
-import { FileStatuses } from '../../files/domain/FileStatus';
+import { File } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+import { FileStatuses } from '../domain/FileStatus';
+import { FileMovedDomainEvent } from '../domain/events/FileMovedDomainEvent';
+import { FileRenamedDomainEvent } from '../domain/events/FileRenamedDomainEvent';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
 
-export class UpdatePlaceholderFile {
+export class FilesPlaceholderUpdater {
   constructor(
-    private readonly fileByPartialSearcher: FileByPartialSearcher,
-    private readonly managedFileRepository: ManagedFileRepository,
-    private readonly virtualDrivePlaceholderCreator: PlaceholderCreator,
+    private readonly repository: FileRepository,
+    private readonly localFileSystem: LocalFileSystem,
     private readonly relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter,
     private readonly localFileIdProvider: LocalFileIdProvider,
     private readonly eventHistory: EventRepository
@@ -28,23 +26,23 @@ export class UpdatePlaceholderFile {
     return localExists && (remoteIsTrashed || remoteIsDeleted);
   }
 
-  async run(remote: File): Promise<void> {
-    const local = this.fileByPartialSearcher.run({
+  private async update(remote: File): Promise<void> {
+    const local = this.repository.searchByPartial({
       contentsId: remote.contentsId,
     });
 
     if (!local) {
       if (remote.status.is(FileStatuses.EXISTS)) {
-        Logger.debug('Creating file placeholder: ', remote.path.value);
-        await this.managedFileRepository.insert(remote);
-        this.virtualDrivePlaceholderCreator.file(remote);
+        Logger.debug('Creating file placeholder: ', remote.path);
+        await this.repository.add(remote);
+        await this.localFileSystem.createPlaceHolder(remote);
       }
       return;
     }
 
-    if (local.path.value !== remote.path.value) {
-      Logger.debug('Updating file placeholder: ', remote.path.value);
-      const trackerId = await this.localFileIdProvider.run(local.path.value);
+    if (local.path !== remote.path) {
+      Logger.debug('Updating file placeholder: ', remote.path);
+      const trackerId = await this.localFileIdProvider.run(local.path);
       if (remote.name !== local.name) {
         const event = new FileRenamedDomainEvent({
           aggregateId: remote.contentsId,
@@ -59,17 +57,17 @@ export class UpdatePlaceholderFile {
         this.eventHistory.store(event);
       }
 
-      await this.managedFileRepository.overwrite(local, remote);
+      await this.repository.update(remote);
 
       try {
-        await fs.stat(remote.path.value);
+        await fs.stat(remote.path);
         // Do nothing
       } catch {
         const win32AbsolutePath = this.relativePathToAbsoluteConverter.run(
-          local.path.value
+          local.path
         );
         const newWin32AbsolutePath = this.relativePathToAbsoluteConverter.run(
-          remote.path.value
+          remote.path
         );
         await fs.rename(win32AbsolutePath, newWin32AbsolutePath);
       }
@@ -77,10 +75,15 @@ export class UpdatePlaceholderFile {
 
     if (this.hasToBeDeleted(local, remote)) {
       const win32AbsolutePath = this.relativePathToAbsoluteConverter.run(
-        local.path.value
+        local.path
       );
       await fs.unlink(win32AbsolutePath);
-      return;
     }
   }
+
+  async run(remotes: Array<File>): Promise<void> {
+    const updatePromises = remotes.map((remote) => this.update(remote));
+
+    await Promise.all(updatePromises);
+  }
 }
diff --git a/src/context/virtual-drive/files/application/FilesPlaceholdersCreator.ts b/src/context/virtual-drive/files/application/FilesPlaceholdersCreator.ts
new file mode 100644
index 000000000..79d5a6210
--- /dev/null
+++ b/src/context/virtual-drive/files/application/FilesPlaceholdersCreator.ts
@@ -0,0 +1,14 @@
+import { File } from '../domain/File';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+
+export class FilesPlaceholderCreator {
+  constructor(private readonly local: LocalFileSystem) {}
+
+  async run(files: Array<File>): Promise<void> {
+    const creationPromises = files.map((file) =>
+      this.local.createPlaceHolder(file)
+    );
+
+    await Promise.all(creationPromises);
+  }
+}
diff --git a/src/context/virtual-drive/files/application/RepositoryPopulator.ts b/src/context/virtual-drive/files/application/RepositoryPopulator.ts
new file mode 100644
index 000000000..711666c74
--- /dev/null
+++ b/src/context/virtual-drive/files/application/RepositoryPopulator.ts
@@ -0,0 +1,12 @@
+import { File } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+
+export class RepositoryPopulator {
+  constructor(private readonly repository: FileRepository) {}
+
+  async run(files: Array<File>): Promise<void> {
+    const addPromises = files.map((file: File) => this.repository.add(file));
+
+    await Promise.all(addPromises);
+  }
+}
diff --git a/src/workers/sync-engine/modules/files/application/RetrieveAllFiles.ts b/src/context/virtual-drive/files/application/RetrieveAllFiles.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/application/RetrieveAllFiles.ts
rename to src/context/virtual-drive/files/application/RetrieveAllFiles.ts
diff --git a/src/workers/sync-engine/modules/files/application/SameFileWasMoved.ts b/src/context/virtual-drive/files/application/SameFileWasMoved.ts
similarity index 68%
rename from src/workers/sync-engine/modules/files/application/SameFileWasMoved.ts
rename to src/context/virtual-drive/files/application/SameFileWasMoved.ts
index 264284319..334e8d6e4 100644
--- a/src/workers/sync-engine/modules/files/application/SameFileWasMoved.ts
+++ b/src/context/virtual-drive/files/application/SameFileWasMoved.ts
@@ -1,22 +1,22 @@
-import { LocalFileIdProvider } from '../../shared/application/LocalFileIdProvider';
 import { EventRepository } from '../../shared/domain/EventRepository';
 import { FilePath } from '../domain/FilePath';
+import { FileRepository } from '../domain/FileRepository';
 import { FileMovedDomainEvent } from '../domain/events/FileMovedDomainEvent';
-import { FileByPartialSearcher } from './FileByPartialSearcher';
 import Logger from 'electron-log';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
 
 // TODO: find a better name
 type WasMovedResult = { result: false } | { result: true; contentsId: string };
 
 export class SameFileWasMoved {
   constructor(
-    private readonly fileByPartialSearcher: FileByPartialSearcher,
-    private readonly localFileIdProvider: LocalFileIdProvider,
+    private readonly repository: FileRepository,
+    private readonly localFileSystem: LocalFileSystem,
     private readonly eventHistory: EventRepository
   ) {}
 
   async run(path: FilePath): Promise<WasMovedResult> {
-    const fileInDestination = this.fileByPartialSearcher.run({
+    const fileInDestination = this.repository.searchByPartial({
       path: path.value,
     });
 
@@ -38,7 +38,15 @@ export class SameFileWasMoved {
       return { result: false };
     }
 
-    const trackerId = await this.localFileIdProvider.run(path.value);
+    const file = this.repository.searchByPartial({
+      contentsId: movedEvent.aggregateId,
+    });
+
+    if (!file) {
+      return { result: false };
+    }
+
+    const trackerId = await this.localFileSystem.getLocalFileId(file);
 
     if (trackerId !== movedEvent.toPrimitives().trackerId) {
       return { result: false };
diff --git a/src/workers/sync-engine/modules/files/application/WebdavFileMimeTypeResolver.ts b/src/context/virtual-drive/files/application/WebdavFileMimeTypeResolver.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/application/WebdavFileMimeTypeResolver.ts
rename to src/context/virtual-drive/files/application/WebdavFileMimeTypeResolver.ts
diff --git a/src/workers/sync-engine/modules/files/domain/File.ts b/src/context/virtual-drive/files/domain/File.ts
similarity index 76%
rename from src/workers/sync-engine/modules/files/domain/File.ts
rename to src/context/virtual-drive/files/domain/File.ts
index 2a5b3bd00..e8f831024 100644
--- a/src/workers/sync-engine/modules/files/domain/File.ts
+++ b/src/context/virtual-drive/files/domain/File.ts
@@ -1,4 +1,4 @@
-import { AggregateRoot } from '../../shared/domain/AggregateRoot';
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
 import { Folder } from '../../folders/domain/Folder';
 import { FilePath } from './FilePath';
 import { FileSize } from './FileSize';
@@ -12,6 +12,7 @@ import { FileStatus, FileStatuses } from './FileStatus';
 import { ContentsId } from '../../contents/domain/ContentsId';
 import { FileMovedDomainEvent } from './events/FileMovedDomainEvent';
 import { FileRenamedDomainEvent } from './events/FileRenamedDomainEvent';
+import { FilePlaceholderId, createFilePlaceholderId } from './PlaceholderId';
 
 export type FileAttributes = {
   contentsId: string;
@@ -45,8 +46,8 @@ export class File extends AggregateRoot {
     return this._folderId;
   }
 
-  public get path() {
-    return this._path;
+  public get path(): string {
+    return this._path.value;
   }
 
   public get type() {
@@ -73,6 +74,10 @@ export class File extends AggregateRoot {
     return this._status;
   }
 
+  public get placeholderId(): FilePlaceholderId {
+    return createFilePlaceholderId(this.contentsId);
+  }
+
   static from(attributes: FileAttributes): File {
     return new File(
       new ContentsId(attributes.contentsId),
@@ -126,11 +131,11 @@ export class File extends AggregateRoot {
 
   moveTo(folder: Folder, trackerId: string): void {
     if (this.folderId === folder.id) {
-      throw new FileCannotBeMovedToTheOriginalFolderError(this.path.value);
+      throw new FileCannotBeMovedToTheOriginalFolderError(this.path);
     }
 
     this._folderId = folder.id;
-    this._path = this._path.changeFolder(folder.path.value);
+    this._path = this._path.changeFolder(folder.path);
 
     this.record(
       new FileMovedDomainEvent({
@@ -178,65 +183,13 @@ export class File extends AggregateRoot {
     return this._status.is(status);
   }
 
-  update(
-    attributes: Partial<
-      Pick<
-        FileAttributes,
-        | 'path'
-        | 'createdAt'
-        | 'updatedAt'
-        | 'contentsId'
-        | 'folderId'
-        | 'status'
-      >
-    >
-  ) {
-    if (attributes.path) {
-      this._path = new FilePath(attributes.path);
-    }
-
-    if (attributes.createdAt) {
-      this.createdAt = new Date(attributes.createdAt);
-    }
-
-    if (attributes.updatedAt) {
-      this.updatedAt = new Date(attributes.updatedAt);
-    }
-
-    if (attributes.contentsId) {
-      this._contentsId = new ContentsId(attributes.contentsId);
-    }
-
-    if (attributes.folderId) {
-      this._folderId = attributes.folderId;
-    }
-
-    if (attributes.status) {
-      this._status = FileStatus.fromValue(attributes.status);
-    }
-
-    return this;
-  }
-
-  toPrimitives(): Omit<FileAttributes, 'modificationTime'> {
-    return {
-      contentsId: this.contentsId,
-      folderId: this.folderId,
-      path: this._path.value,
-      size: this._size.value,
-      createdAt: this.createdAt.toISOString(),
-      updatedAt: this.updatedAt.toISOString(),
-      status: this.status.value,
-    };
-  }
-
   attributes(): FileAttributes {
     return {
       contentsId: this.contentsId,
       folderId: this.folderId,
       createdAt: this.createdAt.toISOString(),
-      path: this._path.value,
-      size: this._size.value,
+      path: this.path,
+      size: this.size,
       updatedAt: this.updatedAt.toISOString(),
       status: this.status.value,
       modificationTime: this.updatedAt.toISOString(),
diff --git a/src/workers/sync-engine/modules/files/domain/FilePath.ts b/src/context/virtual-drive/files/domain/FilePath.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/domain/FilePath.ts
rename to src/context/virtual-drive/files/domain/FilePath.ts
diff --git a/src/context/virtual-drive/files/domain/FileRepository.ts b/src/context/virtual-drive/files/domain/FileRepository.ts
new file mode 100644
index 000000000..db12ab343
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/FileRepository.ts
@@ -0,0 +1,13 @@
+import { File, FileAttributes } from './File';
+
+export interface FileRepository {
+  all(): Promise<Array<File>>;
+
+  searchByPartial(partial: Partial<FileAttributes>): File | undefined;
+
+  delete(id: File['contentsId']): Promise<void>;
+
+  add(file: File): Promise<void>;
+
+  update(file: File): Promise<void>;
+}
diff --git a/src/workers/sync-engine/modules/files/domain/FileSize.ts b/src/context/virtual-drive/files/domain/FileSize.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/domain/FileSize.ts
rename to src/context/virtual-drive/files/domain/FileSize.ts
diff --git a/src/workers/sync-engine/modules/files/domain/FileStatus.ts b/src/context/virtual-drive/files/domain/FileStatus.ts
similarity index 89%
rename from src/workers/sync-engine/modules/files/domain/FileStatus.ts
rename to src/context/virtual-drive/files/domain/FileStatus.ts
index afd549ee7..66070c4a1 100644
--- a/src/workers/sync-engine/modules/files/domain/FileStatus.ts
+++ b/src/context/virtual-drive/files/domain/FileStatus.ts
@@ -1,5 +1,5 @@
-import { InvalidArgumentError } from '../../../../shared/domain/InvalidArgumentError';
-import { EnumValueObject } from '../../../../shared/domain/EnumValueObject';
+import { EnumValueObject } from '../../../shared/domain/EnumValueObject';
+import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
 import { ActionNotPermittedError } from './errors/ActionNotPermittedError';
 
 export enum FileStatuses {
diff --git a/src/workers/sync-engine/modules/files/domain/MimeTypesMap.ts b/src/context/virtual-drive/files/domain/MimeTypesMap.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/domain/MimeTypesMap.ts
rename to src/context/virtual-drive/files/domain/MimeTypesMap.ts
diff --git a/src/context/virtual-drive/files/domain/OfflineFile.ts b/src/context/virtual-drive/files/domain/OfflineFile.ts
new file mode 100644
index 000000000..4aeeaca82
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/OfflineFile.ts
@@ -0,0 +1,110 @@
+import { ContentsId } from '../../contents/domain/ContentsId';
+import { Folder } from '../../folders/domain/Folder';
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
+import { FilePath } from './FilePath';
+import { FileSize } from './FileSize';
+import { FileCreatedDomainEvent } from './events/FileCreatedDomainEvent';
+
+export type OfflineFileAttributes = {
+  contentsId: string;
+  folderId: number;
+  path: string;
+  size: number;
+};
+
+export class OfflineFile extends AggregateRoot {
+  private constructor(
+    private _contentsId: ContentsId,
+    private _folderId: number,
+    private _path: FilePath,
+    private readonly _size: FileSize
+  ) {
+    super();
+  }
+
+  public get contentsId() {
+    return this._contentsId.value;
+  }
+
+  public get folderId() {
+    return this._folderId;
+  }
+
+  public get path(): string {
+    return this._path.value;
+  }
+
+  public get type() {
+    return this._path.extension();
+  }
+
+  public get name() {
+    return this._path.name();
+  }
+
+  public get nameWithExtension() {
+    return this._path.nameWithExtension();
+  }
+
+  public get dirname() {
+    return this._path.dirname();
+  }
+
+  public get size(): number {
+    return this._size.value;
+  }
+
+  static from(attributes: OfflineFileAttributes): OfflineFile {
+    return new OfflineFile(
+      new ContentsId(attributes.contentsId),
+      attributes.folderId,
+      new FilePath(attributes.path),
+      new FileSize(attributes.size)
+    );
+  }
+
+  static create(
+    contentsId: string,
+    folder: Folder,
+    size: FileSize,
+    path: FilePath
+  ): OfflineFile {
+    const file = new OfflineFile(
+      new ContentsId(contentsId),
+      folder.id,
+      path,
+      size
+    );
+
+    file.record(
+      new FileCreatedDomainEvent({
+        aggregateId: contentsId,
+        size: file.size,
+        type: path.extension(),
+      })
+    );
+
+    return file;
+  }
+
+  hasParent(id: number): boolean {
+    return this.folderId === id;
+  }
+
+  isFolder(): this is Folder {
+    return false;
+  }
+
+  isFile(): this is File {
+    return true;
+  }
+
+  attributes(): OfflineFileAttributes {
+    return {
+      contentsId: this.contentsId,
+      folderId: this.folderId,
+      path: this._path.value,
+      size: this._size.value,
+    };
+  }
+}
diff --git a/src/workers/sync-engine/modules/files/domain/FileRepository.ts b/src/context/virtual-drive/files/domain/OldFileRepository.ts
similarity index 68%
rename from src/workers/sync-engine/modules/files/domain/FileRepository.ts
rename to src/context/virtual-drive/files/domain/OldFileRepository.ts
index 537c0df57..ed8c81f2f 100644
--- a/src/workers/sync-engine/modules/files/domain/FileRepository.ts
+++ b/src/context/virtual-drive/files/domain/OldFileRepository.ts
@@ -1,12 +1,11 @@
 import { File, FileAttributes } from './File';
-import { Nullable } from '../../../../../shared/types/Nullable';
 import { FolderAttributes } from '../../folders/domain/Folder';
 import { FilePath } from './FilePath';
 
-export interface FileRepository {
-  search(pathLike: FilePath): Nullable<File>;
+export interface OldFileRepository {
+  search(pathLike: FilePath): File | undefined;
 
-  searchByPartial(partial: Partial<FileAttributes>): Nullable<File>;
+  searchByPartial(partial: Partial<FileAttributes>): File | undefined;
 
   delete(file: File): Promise<void>;
 
diff --git a/src/workers/sync-engine/modules/placeholders/domain/FilePlaceholderId.ts b/src/context/virtual-drive/files/domain/PlaceholderId.ts
similarity index 100%
rename from src/workers/sync-engine/modules/placeholders/domain/FilePlaceholderId.ts
rename to src/context/virtual-drive/files/domain/PlaceholderId.ts
diff --git a/src/workers/sync-engine/modules/files/domain/errors/ActionNotPermittedError.ts b/src/context/virtual-drive/files/domain/errors/ActionNotPermittedError.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/domain/errors/ActionNotPermittedError.ts
rename to src/context/virtual-drive/files/domain/errors/ActionNotPermittedError.ts
diff --git a/src/workers/sync-engine/modules/files/domain/errors/FileActionCannotModifyExtension.ts b/src/context/virtual-drive/files/domain/errors/FileActionCannotModifyExtension.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/domain/errors/FileActionCannotModifyExtension.ts
rename to src/context/virtual-drive/files/domain/errors/FileActionCannotModifyExtension.ts
diff --git a/src/workers/sync-engine/modules/files/domain/errors/FileActionOnlyCanAffectOneLevelError.ts b/src/context/virtual-drive/files/domain/errors/FileActionOnlyCanAffectOneLevelError.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/domain/errors/FileActionOnlyCanAffectOneLevelError.ts
rename to src/context/virtual-drive/files/domain/errors/FileActionOnlyCanAffectOneLevelError.ts
diff --git a/src/workers/sync-engine/modules/files/domain/errors/FileAlreadyExistsError.ts b/src/context/virtual-drive/files/domain/errors/FileAlreadyExistsError.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/domain/errors/FileAlreadyExistsError.ts
rename to src/context/virtual-drive/files/domain/errors/FileAlreadyExistsError.ts
diff --git a/src/workers/sync-engine/modules/files/domain/errors/FileCannotBeMovedToTheOriginalFolderError.ts b/src/context/virtual-drive/files/domain/errors/FileCannotBeMovedToTheOriginalFolderError.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/domain/errors/FileCannotBeMovedToTheOriginalFolderError.ts
rename to src/context/virtual-drive/files/domain/errors/FileCannotBeMovedToTheOriginalFolderError.ts
diff --git a/src/workers/sync-engine/modules/files/domain/errors/FileNameShouldBeEqualToOriginalError.ts b/src/context/virtual-drive/files/domain/errors/FileNameShouldBeEqualToOriginalError.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/domain/errors/FileNameShouldBeEqualToOriginalError.ts
rename to src/context/virtual-drive/files/domain/errors/FileNameShouldBeEqualToOriginalError.ts
diff --git a/src/workers/sync-engine/modules/files/domain/errors/FileNameShouldDifferFromOriginalError.ts b/src/context/virtual-drive/files/domain/errors/FileNameShouldDifferFromOriginalError.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/domain/errors/FileNameShouldDifferFromOriginalError.ts
rename to src/context/virtual-drive/files/domain/errors/FileNameShouldDifferFromOriginalError.ts
diff --git a/src/workers/sync-engine/modules/files/domain/errors/FileNotFoundError.ts b/src/context/virtual-drive/files/domain/errors/FileNotFoundError.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/domain/errors/FileNotFoundError.ts
rename to src/context/virtual-drive/files/domain/errors/FileNotFoundError.ts
diff --git a/src/workers/sync-engine/modules/files/domain/errors/UnknownFileActionError.ts b/src/context/virtual-drive/files/domain/errors/UnknownFileActionError.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/domain/errors/UnknownFileActionError.ts
rename to src/context/virtual-drive/files/domain/errors/UnknownFileActionError.ts
diff --git a/src/workers/sync-engine/modules/files/domain/events/FileCreatedDomainEvent.ts b/src/context/virtual-drive/files/domain/events/FileCreatedDomainEvent.ts
similarity index 91%
rename from src/workers/sync-engine/modules/files/domain/events/FileCreatedDomainEvent.ts
rename to src/context/virtual-drive/files/domain/events/FileCreatedDomainEvent.ts
index 69ab883ef..c52845306 100644
--- a/src/workers/sync-engine/modules/files/domain/events/FileCreatedDomainEvent.ts
+++ b/src/context/virtual-drive/files/domain/events/FileCreatedDomainEvent.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from '../../../shared/domain/DomainEvent';
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
 
 export type CreatedWebdavFileDomainEventAttributes = {
   readonly size: number;
diff --git a/src/workers/sync-engine/modules/files/domain/events/FileDeletedDomainEvent.ts b/src/context/virtual-drive/files/domain/events/FileDeletedDomainEvent.ts
similarity index 89%
rename from src/workers/sync-engine/modules/files/domain/events/FileDeletedDomainEvent.ts
rename to src/context/virtual-drive/files/domain/events/FileDeletedDomainEvent.ts
index d05cd5269..1530b04b1 100644
--- a/src/workers/sync-engine/modules/files/domain/events/FileDeletedDomainEvent.ts
+++ b/src/context/virtual-drive/files/domain/events/FileDeletedDomainEvent.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from '../../../shared/domain/DomainEvent';
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
 
 type DeleteWebdavFileDomainEventAttributes = {
   readonly size: number;
diff --git a/src/workers/sync-engine/modules/files/domain/events/FileMovedDomainEvent.ts b/src/context/virtual-drive/files/domain/events/FileMovedDomainEvent.ts
similarity index 87%
rename from src/workers/sync-engine/modules/files/domain/events/FileMovedDomainEvent.ts
rename to src/context/virtual-drive/files/domain/events/FileMovedDomainEvent.ts
index be9c3380e..5a4c76afe 100644
--- a/src/workers/sync-engine/modules/files/domain/events/FileMovedDomainEvent.ts
+++ b/src/context/virtual-drive/files/domain/events/FileMovedDomainEvent.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from '../../../shared/domain/DomainEvent';
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
 
 export class FileMovedDomainEvent extends DomainEvent {
   static readonly EVENT_NAME = 'file.moved';
diff --git a/src/workers/sync-engine/modules/files/domain/events/FileRenamedDomainEvent.ts b/src/context/virtual-drive/files/domain/events/FileRenamedDomainEvent.ts
similarity index 83%
rename from src/workers/sync-engine/modules/files/domain/events/FileRenamedDomainEvent.ts
rename to src/context/virtual-drive/files/domain/events/FileRenamedDomainEvent.ts
index 42e545c52..7e77db845 100644
--- a/src/workers/sync-engine/modules/files/domain/events/FileRenamedDomainEvent.ts
+++ b/src/context/virtual-drive/files/domain/events/FileRenamedDomainEvent.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from '../../../shared/domain/DomainEvent';
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
 
 export class FileRenamedDomainEvent extends DomainEvent {
   static readonly EVENT_NAME = 'file.renamed';
diff --git a/src/workers/sync-engine/modules/files/domain/events/OptimisticFileDeletionFailed.ts b/src/context/virtual-drive/files/domain/events/OptimisticFileDeletionFailed.ts
similarity index 82%
rename from src/workers/sync-engine/modules/files/domain/events/OptimisticFileDeletionFailed.ts
rename to src/context/virtual-drive/files/domain/events/OptimisticFileDeletionFailed.ts
index 41ccd25f4..da9259ddc 100644
--- a/src/workers/sync-engine/modules/files/domain/events/OptimisticFileDeletionFailed.ts
+++ b/src/context/virtual-drive/files/domain/events/OptimisticFileDeletionFailed.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from '../../../../modules/shared/domain/DomainEvent';
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
 
 export class OptimisticFileDeletionFailed extends DomainEvent {
   static readonly EVENT_NAME = 'file.deletion.failed';
diff --git a/src/context/virtual-drive/files/domain/file-systems/LocalFileSystem.ts b/src/context/virtual-drive/files/domain/file-systems/LocalFileSystem.ts
new file mode 100644
index 000000000..acdddbb1d
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/file-systems/LocalFileSystem.ts
@@ -0,0 +1,7 @@
+import { File } from '../File';
+
+export interface LocalFileSystem {
+  createPlaceHolder(file: File): Promise<void>;
+
+  getLocalFileId(file: File): Promise<`${string}-${string}`>;
+}
diff --git a/src/context/virtual-drive/files/domain/file-systems/RemoteFileSystem.ts b/src/context/virtual-drive/files/domain/file-systems/RemoteFileSystem.ts
new file mode 100644
index 000000000..9573f252c
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/file-systems/RemoteFileSystem.ts
@@ -0,0 +1,12 @@
+import { File, FileAttributes } from '../File';
+import { OfflineFile } from '../OfflineFile';
+
+export interface RemoteFileSystem {
+  persist(offline: OfflineFile): Promise<FileAttributes>;
+
+  trash(contentsId: File['contentsId']): Promise<void>;
+
+  move(file: File): Promise<void>;
+
+  rename(file: File): Promise<void>;
+}
diff --git a/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts b/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
new file mode 100644
index 000000000..cc7623820
--- /dev/null
+++ b/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
@@ -0,0 +1,63 @@
+import { File, FileAttributes } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+
+export class InMemoryFileRepository implements FileRepository {
+  private files: Map<string, FileAttributes>;
+
+  private get values(): Array<FileAttributes> {
+    return Array.from(this.files.values());
+  }
+
+  constructor() {
+    this.files = new Map();
+  }
+
+  public all(): Promise<Array<File>> {
+    const files = [...this.files.values()].map((attributes) =>
+      File.from(attributes)
+    );
+    return Promise.resolve(files);
+  }
+
+  searchByPartial(partial: Partial<FileAttributes>): File | undefined {
+    const keys = Object.keys(partial) as Array<keyof Partial<FileAttributes>>;
+
+    const file = this.values.find((attributes) => {
+      return keys.every((key: keyof FileAttributes) => {
+        if (key === 'contentsId') {
+          return (
+            attributes[key].normalize() == (partial[key] as string).normalize()
+          );
+        }
+
+        return attributes[key] == partial[key];
+      });
+    });
+
+    if (file) {
+      return File.from(file);
+    }
+
+    return undefined;
+  }
+
+  async delete(id: File['contentsId']): Promise<void> {
+    const deleted = this.files.delete(id);
+
+    if (!deleted) {
+      throw new Error('File not found');
+    }
+  }
+
+  async add(file: File): Promise<void> {
+    this.files.set(file.contentsId, file.attributes());
+  }
+
+  async update(file: File): Promise<void> {
+    if (!this.files.has(file.contentsId)) {
+      throw new Error('File not found');
+    }
+
+    return this.add(file);
+  }
+}
diff --git a/src/context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem.ts b/src/context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem.ts
new file mode 100644
index 000000000..49e7e5cf1
--- /dev/null
+++ b/src/context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem.ts
@@ -0,0 +1,37 @@
+import { VirtualDrive } from 'virtual-drive/dist';
+import { FileStatuses } from '../../files/domain/FileStatus';
+import { File } from '../domain/File';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
+import fs from 'fs/promises';
+
+export class NodeWinLocalFileSystem implements LocalFileSystem {
+  constructor(
+    private readonly virtualDrive: VirtualDrive,
+    private readonly relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter
+  ) {}
+
+  async getLocalFileId(file: File): Promise<`${string}-${string}`> {
+    const win32AbsolutePath = this.relativePathToAbsoluteConverter.run(
+      file.path
+    );
+
+    const { ino, dev } = await fs.stat(win32AbsolutePath);
+
+    return `${dev}-${ino}`;
+  }
+
+  async createPlaceHolder(file: File): Promise<void> {
+    if (!file.hasStatus(FileStatuses.EXISTS)) {
+      return;
+    }
+
+    this.virtualDrive.createFileByPath(
+      file.path,
+      file.placeholderId,
+      file.size,
+      file.createdAt.getTime(),
+      file.updatedAt.getTime()
+    );
+  }
+}
diff --git a/src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts b/src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts
new file mode 100644
index 000000000..d0b85607a
--- /dev/null
+++ b/src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts
@@ -0,0 +1,77 @@
+import { Storage } from '@internxt/sdk/dist/drive/storage';
+import { EncryptionVersion } from '@internxt/sdk/dist/drive/storage/types';
+import { Crypt } from '../../shared/domain/Crypt';
+import { File, FileAttributes } from '../domain/File';
+import { FileStatuses } from '../domain/FileStatus';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { OfflineFile } from '../domain/OfflineFile';
+import * as uuid from 'uuid';
+
+export class SDKRemoteFileSystem implements RemoteFileSystem {
+  constructor(
+    private readonly sdk: Storage,
+    private readonly crypt: Crypt,
+    private readonly bucket: string
+  ) {}
+
+  async persist(offline: OfflineFile): Promise<FileAttributes> {
+    const encryptedName = this.crypt.encryptName(
+      offline.name,
+      offline.folderId.toString()
+    );
+
+    if (!encryptedName) {
+      throw new Error('Failed to encrypt name');
+    }
+
+    const data = await this.sdk.createFileEntry({
+      id: offline.contentsId,
+      type: offline.type,
+      size: offline.size,
+      name: encryptedName,
+      plain_name: offline.name,
+      bucket: this.bucket,
+      folder_id: offline.folderId,
+      encrypt_version: EncryptionVersion.Aes03,
+    });
+
+    return {
+      ...data,
+      contentsId: data.fileId,
+      modificationTime: data.updatedAt,
+      path: offline.path,
+      status: FileStatuses.EXISTS,
+    };
+  }
+
+  async trash(contentsId: string): Promise<void> {
+    await this.sdk.addItemsToTrash({
+      items: [
+        {
+          type: 'file',
+          id: contentsId,
+        },
+      ],
+    });
+  }
+
+  async rename(file: File): Promise<void> {
+    await this.sdk.updateFile({
+      fileId: file.contentsId,
+      bucketId: this.bucket,
+      destinationPath: uuid.v4(),
+      metadata: {
+        itemName: file.name,
+      },
+    });
+  }
+
+  async move(file: File): Promise<void> {
+    await this.sdk.moveFile({
+      fileId: file.contentsId,
+      destination: file.folderId,
+      destinationPath: uuid.v4(),
+      bucketId: this.bucket,
+    });
+  }
+}
diff --git a/src/workers/sync-engine/modules/files/infrastructure/dtos/AddFileDTO.ts b/src/context/virtual-drive/files/infrastructure/dtos/AddFileDTO.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/infrastructure/dtos/AddFileDTO.ts
rename to src/context/virtual-drive/files/infrastructure/dtos/AddFileDTO.ts
diff --git a/src/workers/sync-engine/modules/files/infrastructure/dtos/UpdateFileNameDTO.ts b/src/context/virtual-drive/files/infrastructure/dtos/UpdateFileNameDTO.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/infrastructure/dtos/UpdateFileNameDTO.ts
rename to src/context/virtual-drive/files/infrastructure/dtos/UpdateFileNameDTO.ts
diff --git a/src/workers/sync-engine/modules/files/infrastructure/dtos/UpdateFileParentDirDTO.ts b/src/context/virtual-drive/files/infrastructure/dtos/UpdateFileParentDirDTO.ts
similarity index 100%
rename from src/workers/sync-engine/modules/files/infrastructure/dtos/UpdateFileParentDirDTO.ts
rename to src/context/virtual-drive/files/infrastructure/dtos/UpdateFileParentDirDTO.ts
diff --git a/src/workers/sync-engine/modules/folders/application/AllParentFoldersStatusIsExists.ts b/src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists.ts
similarity index 100%
rename from src/workers/sync-engine/modules/folders/application/AllParentFoldersStatusIsExists.ts
rename to src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists.ts
diff --git a/src/workers/sync-engine/modules/folders/application/FolderByPartialSearcher.ts b/src/context/virtual-drive/folders/application/FolderByPartialSearcher.ts
similarity index 100%
rename from src/workers/sync-engine/modules/folders/application/FolderByPartialSearcher.ts
rename to src/context/virtual-drive/folders/application/FolderByPartialSearcher.ts
diff --git a/src/workers/sync-engine/modules/folders/application/FolderCreator.ts b/src/context/virtual-drive/folders/application/FolderCreator.ts
similarity index 67%
rename from src/workers/sync-engine/modules/folders/application/FolderCreator.ts
rename to src/context/virtual-drive/folders/application/FolderCreator.ts
index a4b21e8ea..6b09c3eea 100644
--- a/src/workers/sync-engine/modules/folders/application/FolderCreator.ts
+++ b/src/context/virtual-drive/folders/application/FolderCreator.ts
@@ -1,14 +1,14 @@
-import { SyncEngineIpc } from '../../../ipcRendererSyncEngine';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 import { EventBus } from '../../shared/domain/EventBus';
 import { Folder } from '../domain/Folder';
 import { FolderRepository } from '../domain/FolderRepository';
 import { OfflineFolder } from '../domain/OfflineFolder';
-import { FolderFinder } from './FolderFinder';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 
 export class FolderCreator {
   constructor(
     private readonly repository: FolderRepository,
-    private readonly folderFinder: FolderFinder,
+    private readonly remote: RemoteFileSystem,
     private readonly ipc: SyncEngineIpc,
     private readonly eventBus: EventBus
   ) {}
@@ -18,13 +18,11 @@ export class FolderCreator {
       name: offlineFolder.name,
     });
 
-    const parent = this.folderFinder.run(offlineFolder.dirname);
+    const attributes = await this.remote.persist(offlineFolder);
 
-    const folder = await this.repository.create(
-      offlineFolder.path,
-      parent.id,
-      offlineFolder.uuid
-    );
+    const folder = Folder.create(attributes);
+
+    await this.repository.add(folder);
 
     const events = folder.pullDomainEvents();
     this.eventBus.publish(events);
diff --git a/src/context/virtual-drive/folders/application/FolderCreatorFromServerFolder.ts b/src/context/virtual-drive/folders/application/FolderCreatorFromServerFolder.ts
new file mode 100644
index 000000000..b24150cc5
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FolderCreatorFromServerFolder.ts
@@ -0,0 +1,19 @@
+import { ServerFolder } from '../../../shared/domain/ServerFolder';
+import { Folder } from '../domain/Folder';
+
+export function createFolderFromServerFolder(
+  server: ServerFolder,
+  relativePath: string
+): Folder {
+  const path = relativePath.replaceAll('//', '/');
+
+  return Folder.from({
+    id: server.id,
+    uuid: server.uuid,
+    parentId: server.parentId as number,
+    updatedAt: server.updatedAt,
+    createdAt: server.createdAt,
+    path: path,
+    status: server.status,
+  });
+}
diff --git a/src/workers/sync-engine/modules/folders/application/FolderDeleter.ts b/src/context/virtual-drive/folders/application/FolderDeleter.ts
similarity index 71%
rename from src/workers/sync-engine/modules/folders/application/FolderDeleter.ts
rename to src/context/virtual-drive/folders/application/FolderDeleter.ts
index 4631d6f33..03348721d 100644
--- a/src/workers/sync-engine/modules/folders/application/FolderDeleter.ts
+++ b/src/context/virtual-drive/folders/application/FolderDeleter.ts
@@ -1,16 +1,18 @@
 import Logger from 'electron-log';
 import { Folder } from '../domain/Folder';
-import { FolderRepository } from '../domain/FolderRepository';
 import { ActionNotPermittedError } from '../domain/errors/ActionNotPermittedError';
 import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
 import { AllParentFoldersStatusIsExists } from './AllParentFoldersStatusIsExists';
-import { PlaceholderCreator } from '../../placeholders/domain/PlaceholderCreator';
+import { FolderRepository } from '../domain/FolderRepository';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
 
 export class FolderDeleter {
   constructor(
     private readonly repository: FolderRepository,
-    private readonly allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists,
-    private readonly placeholderCreator: PlaceholderCreator
+    private readonly remote: RemoteFileSystem,
+    private readonly local: LocalFileSystem,
+    private readonly allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists
   ) {}
 
   async run(uuid: Folder['uuid']): Promise<void> {
@@ -32,17 +34,19 @@ export class FolderDeleter {
 
       if (!allParentsExists) {
         Logger.warn(
-          `Skipped folder deletion for ${folder.path.value}. A folder in a higher level is already marked as trashed`
+          `Skipped folder deletion for ${folder.path}. A folder in a higher level is already marked as trashed`
         );
         return;
       }
 
       folder.trash();
-      await this.repository.trash(folder);
+
+      await this.remote.trash(folder.id);
+      await this.repository.delete(folder.id);
     } catch (error: unknown) {
       Logger.error(`Error deleting the folder ${folder.name}: `, error);
 
-      this.placeholderCreator.folder(folder);
+      this.local.createPlaceHolder(folder);
     }
   }
 }
diff --git a/src/workers/sync-engine/modules/folders/application/FolderFinder.ts b/src/context/virtual-drive/folders/application/FolderFinder.ts
similarity index 81%
rename from src/workers/sync-engine/modules/folders/application/FolderFinder.ts
rename to src/context/virtual-drive/folders/application/FolderFinder.ts
index 10862bf9c..8f50d9b46 100644
--- a/src/workers/sync-engine/modules/folders/application/FolderFinder.ts
+++ b/src/context/virtual-drive/folders/application/FolderFinder.ts
@@ -7,7 +7,7 @@ export class FolderFinder {
   constructor(private readonly repository: FolderRepository) {}
 
   run(path: string): Folder {
-    const folder = this.repository.search(path);
+    const folder = this.repository.searchByPartial({ path });
 
     if (!folder) {
       throw new FolderNotFoundError(path);
@@ -17,7 +17,7 @@ export class FolderFinder {
   }
 
   findFromFilePath(path: FilePath): Folder {
-    const folder = this.repository.search(path.dirname());
+    const folder = this.repository.searchByPartial({ path: path.dirname() });
 
     if (!folder) {
       throw new FolderNotFoundError(path.dirname());
diff --git a/src/workers/sync-engine/modules/folders/application/FolderMover.ts b/src/context/virtual-drive/folders/application/FolderMover.ts
similarity index 74%
rename from src/workers/sync-engine/modules/folders/application/FolderMover.ts
rename to src/context/virtual-drive/folders/application/FolderMover.ts
index 3791cfa41..f185e9fd8 100644
--- a/src/workers/sync-engine/modules/folders/application/FolderMover.ts
+++ b/src/context/virtual-drive/folders/application/FolderMover.ts
@@ -1,23 +1,28 @@
 import { ActionNotPermittedError } from '../domain/errors/ActionNotPermittedError';
 import { FolderPath } from '../domain/FolderPath';
 import { Folder } from '../domain/Folder';
-import { FolderRepository } from '../domain/FolderRepository';
 import { FolderFinder } from './FolderFinder';
+import { FolderRepository } from '../domain/FolderRepository';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 
 export class FolderMover {
   constructor(
     private readonly repository: FolderRepository,
+    private readonly remote: RemoteFileSystem,
     private readonly folderFinder: FolderFinder
   ) {}
 
   private async move(folder: Folder, parentFolder: Folder) {
     folder.moveTo(parentFolder);
 
-    await this.repository.updateParentDir(folder);
+    await this.remote.move(folder);
+    await this.repository.update(folder);
   }
 
   async run(folder: Folder, destination: FolderPath): Promise<void> {
-    const resultFolder = this.repository.search(destination.value);
+    const resultFolder = this.repository.searchByPartial({
+      path: destination.value,
+    });
 
     const shouldBeMerge = resultFolder !== undefined;
 
diff --git a/src/workers/sync-engine/modules/folders/application/FolderPathUpdater.ts b/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
similarity index 100%
rename from src/workers/sync-engine/modules/folders/application/FolderPathUpdater.ts
rename to src/context/virtual-drive/folders/application/FolderPathUpdater.ts
index ad70efb43..f80062723 100644
--- a/src/workers/sync-engine/modules/folders/application/FolderPathUpdater.ts
+++ b/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
@@ -1,11 +1,11 @@
+import Logger from 'electron-log';
 import { Folder } from '../domain/Folder';
+import { FolderPath } from '../domain/FolderPath';
 import { FolderRepository } from '../domain/FolderRepository';
-import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
 import { ActionNotPermittedError } from '../domain/errors/ActionNotPermittedError';
+import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
 import { FolderMover } from './FolderMover';
 import { FolderRenamer } from './FolderRenamer';
-import { FolderPath } from '../domain/FolderPath';
-import Logger from 'electron-log';
 
 export class FolderPathUpdater {
   constructor(
diff --git a/src/workers/sync-engine/modules/folders/application/FolderRenamer.ts b/src/context/virtual-drive/folders/application/FolderRenamer.ts
similarity index 68%
rename from src/workers/sync-engine/modules/folders/application/FolderRenamer.ts
rename to src/context/virtual-drive/folders/application/FolderRenamer.ts
index c401c7b8c..8304e025c 100644
--- a/src/workers/sync-engine/modules/folders/application/FolderRenamer.ts
+++ b/src/context/virtual-drive/folders/application/FolderRenamer.ts
@@ -1,11 +1,13 @@
-import { SyncEngineIpc } from '../../../ipcRendererSyncEngine';
 import { FolderPath } from '../domain/FolderPath';
 import { Folder } from '../domain/Folder';
 import { FolderRepository } from '../domain/FolderRepository';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 
 export class FolderRenamer {
   constructor(
     private readonly repository: FolderRepository,
+    private readonly remote: RemoteFileSystem,
     private readonly ipc: SyncEngineIpc
   ) {}
 
@@ -17,7 +19,8 @@ export class FolderRenamer {
 
     folder.rename(destination);
 
-    await this.repository.updateName(folder);
+    await this.remote.rename(folder);
+    await this.repository.update(folder);
 
     this.ipc.send('FOLDER_RENAMED', {
       oldName: folder.name,
diff --git a/src/context/virtual-drive/folders/application/FolderRepositoryInitiator.ts b/src/context/virtual-drive/folders/application/FolderRepositoryInitiator.ts
new file mode 100644
index 000000000..edf162185
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FolderRepositoryInitiator.ts
@@ -0,0 +1,14 @@
+import { Folder } from '../domain/Folder';
+import { FolderRepository } from '../domain/FolderRepository';
+
+export class FolderRepositoryInitiator {
+  constructor(private readonly repository: FolderRepository) {}
+
+  async run(folders: Array<Folder>): Promise<void> {
+    const addPromises = folders.map((folder: Folder) =>
+      this.repository.add(folder)
+    );
+
+    await Promise.all(addPromises);
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/FoldersPlaceholderCreator.ts b/src/context/virtual-drive/folders/application/FoldersPlaceholderCreator.ts
new file mode 100644
index 000000000..62bbf1fb5
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FoldersPlaceholderCreator.ts
@@ -0,0 +1,14 @@
+import { Folder } from '../domain/Folder';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+
+export class FoldersPlaceholderCreator {
+  constructor(private readonly local: LocalFileSystem) {}
+
+  async run(folders: Array<Folder>): Promise<void> {
+    const createPromises = folders.map((folder) =>
+      this.local.createPlaceHolder(folder)
+    );
+
+    await Promise.all(createPromises);
+  }
+}
diff --git a/src/workers/sync-engine/modules/folders/application/Offline/OfflineFolderCreator.ts b/src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts
similarity index 100%
rename from src/workers/sync-engine/modules/folders/application/Offline/OfflineFolderCreator.ts
rename to src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts
index 2a73034aa..30650be19 100644
--- a/src/workers/sync-engine/modules/folders/application/Offline/OfflineFolderCreator.ts
+++ b/src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts
@@ -1,8 +1,8 @@
 import { FolderPath } from '../../domain/FolderPath';
-import { FolderRepository } from '../../domain/FolderRepository';
 import { OfflineFolder } from '../../domain/OfflineFolder';
 import { OfflineFolderRepository } from '../../domain/OfflineFolderRepository';
 import { FolderFinder } from '../FolderFinder';
+import { FolderRepository } from '../../domain/FolderRepository';
 
 export class OfflineFolderCreator {
   constructor(
diff --git a/src/workers/sync-engine/modules/folders/application/Offline/OfflineFolderMover.ts b/src/context/virtual-drive/folders/application/Offline/OfflineFolderMover.ts
similarity index 88%
rename from src/workers/sync-engine/modules/folders/application/Offline/OfflineFolderMover.ts
rename to src/context/virtual-drive/folders/application/Offline/OfflineFolderMover.ts
index 53358d73d..21694eeeb 100644
--- a/src/workers/sync-engine/modules/folders/application/Offline/OfflineFolderMover.ts
+++ b/src/context/virtual-drive/folders/application/Offline/OfflineFolderMover.ts
@@ -11,9 +11,10 @@ export class OfflineFolderMover {
   ) {}
 
   async run(folder: OfflineFolder, destination: FolderPath) {
-    const resultFolder = this.offlineFolderRepository.getByPath(
-      destination.value
-    );
+    const resultFolder = this.offlineFolderRepository.searchByPartial({
+      path: destination.value,
+    });
+
     const shouldBeMerge = resultFolder !== undefined;
 
     if (shouldBeMerge) {
diff --git a/src/workers/sync-engine/modules/folders/application/Offline/OfflineFolderPathUpdater.ts b/src/context/virtual-drive/folders/application/Offline/OfflineFolderPathUpdater.ts
similarity index 95%
rename from src/workers/sync-engine/modules/folders/application/Offline/OfflineFolderPathUpdater.ts
rename to src/context/virtual-drive/folders/application/Offline/OfflineFolderPathUpdater.ts
index 8e2b24503..480312755 100644
--- a/src/workers/sync-engine/modules/folders/application/Offline/OfflineFolderPathUpdater.ts
+++ b/src/context/virtual-drive/folders/application/Offline/OfflineFolderPathUpdater.ts
@@ -14,7 +14,7 @@ export class OfflineFolderPathUpdater {
   ) {}
 
   async run(uuid: OfflineFolder['uuid'], posixRelativePath: string) {
-    const folder = this.offlineFoldersRepository.getByUuid(uuid);
+    const folder = this.offlineFoldersRepository.searchByPartial({ uuid });
 
     if (!folder) {
       throw new Error(`Folder ${uuid} not found in offline folders`);
diff --git a/src/workers/sync-engine/modules/folders/application/Offline/OfflineFolderRenamer.ts b/src/context/virtual-drive/folders/application/Offline/OfflineFolderRenamer.ts
similarity index 100%
rename from src/workers/sync-engine/modules/folders/application/Offline/OfflineFolderRenamer.ts
rename to src/context/virtual-drive/folders/application/Offline/OfflineFolderRenamer.ts
diff --git a/src/workers/sync-engine/modules/folders/application/RetrieveAllFolders.ts b/src/context/virtual-drive/folders/application/RetrieveAllFolders.ts
similarity index 100%
rename from src/workers/sync-engine/modules/folders/application/RetrieveAllFolders.ts
rename to src/context/virtual-drive/folders/application/RetrieveAllFolders.ts
diff --git a/src/workers/sync-engine/modules/folders/application/SynchronizeOfflineModifications.ts b/src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts
similarity index 81%
rename from src/workers/sync-engine/modules/folders/application/SynchronizeOfflineModifications.ts
rename to src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts
index 39f6229c0..3f6a24fb0 100644
--- a/src/workers/sync-engine/modules/folders/application/SynchronizeOfflineModifications.ts
+++ b/src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts
@@ -1,29 +1,31 @@
 import { Folder } from '../domain/Folder';
-import { FolderRepository } from '../domain/FolderRepository';
 import { OfflineFolderRepository } from '../domain/OfflineFolderRepository';
 import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
 import { FolderRenamedDomainEvent } from '../domain/events/FolderRenamedDomainEvent';
 import { FolderRenamer } from './FolderRenamer';
 import Logger from 'electron-log';
+import { FolderRepository } from '../domain/FolderRepository';
+import { EventRepository } from '../../shared/domain/EventRepository';
 
 export class SynchronizeOfflineModifications {
   constructor(
     private readonly offlineRepository: OfflineFolderRepository,
     private readonly repository: FolderRepository,
-    private readonly renamer: FolderRenamer
+    private readonly renamer: FolderRenamer,
+    private readonly eventsRepository: EventRepository
   ) {}
 
   async run(uuid: Folder['uuid']) {
     Logger.debug('Synchronize potential offline changes for folder: ', uuid);
 
-    const offlineFolder = this.offlineRepository.getByUuid(uuid);
+    const offlineFolder = this.offlineRepository.searchByPartial({ uuid });
 
     if (!offlineFolder) {
       Logger.debug(`There is no offline folder with ${uuid}`);
       return;
     }
 
-    const events = offlineFolder.pullDomainEvents();
+    const events = await this.eventsRepository.search(uuid);
 
     for (const event of events) {
       if (event.eventName !== FolderRenamedDomainEvent.EVENT_NAME) {
@@ -38,7 +40,7 @@ export class SynchronizeOfflineModifications {
         throw new FolderNotFoundError(uuid);
       }
 
-      if (rename.previousPath !== folder.path.value) {
+      if (rename.previousPath !== folder.path) {
         continue;
       }
 
diff --git a/src/workers/sync-engine/modules/folders/application/SynchronizeOfflineModificationsOnFolderCreated.ts b/src/context/virtual-drive/folders/application/SynchronizeOfflineModificationsOnFolderCreated.ts
similarity index 71%
rename from src/workers/sync-engine/modules/folders/application/SynchronizeOfflineModificationsOnFolderCreated.ts
rename to src/context/virtual-drive/folders/application/SynchronizeOfflineModificationsOnFolderCreated.ts
index 86a2bed45..78abd9b4d 100644
--- a/src/workers/sync-engine/modules/folders/application/SynchronizeOfflineModificationsOnFolderCreated.ts
+++ b/src/context/virtual-drive/folders/application/SynchronizeOfflineModificationsOnFolderCreated.ts
@@ -1,10 +1,10 @@
-import { DomainEventClass } from '../../shared/domain/DomainEvent';
-import { WebdavDomainEventSubscriber } from '../../shared/domain/WebdavDomainEventSubscriber';
+import { DomainEventClass } from '../../../shared/domain/DomainEvent';
+import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
 import { FolderCreatedDomainEvent } from '../domain/events/FolderCreatedDomainEvent';
 import { SynchronizeOfflineModifications } from './SynchronizeOfflineModifications';
 
 export class SynchronizeOfflineModificationsOnFolderCreated
-  implements WebdavDomainEventSubscriber<FolderCreatedDomainEvent>
+  implements DomainEventSubscriber<FolderCreatedDomainEvent>
 {
   constructor(
     private readonly synchronizeOfflineModifications: SynchronizeOfflineModifications
diff --git a/src/workers/sync-engine/modules/boundaryBridge/application/UpdatePlaceholderFolder.ts b/src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts
similarity index 71%
rename from src/workers/sync-engine/modules/boundaryBridge/application/UpdatePlaceholderFolder.ts
rename to src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts
index 926de2095..1a6a22618 100644
--- a/src/workers/sync-engine/modules/boundaryBridge/application/UpdatePlaceholderFolder.ts
+++ b/src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts
@@ -1,18 +1,16 @@
 import { promises as fs, constants as FsConstants } from 'fs';
-import { FolderByPartialSearcher } from '../../folders/application/FolderByPartialSearcher';
-import { Folder } from '../../folders/domain/Folder';
-import { ManagedFolderRepository } from '../../folders/domain/ManagedFolderRepository';
-import { PlaceholderCreator } from '../../placeholders/domain/PlaceholderCreator';
+import { Folder } from '../domain/Folder';
 import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
 import Logger from 'electron-log';
 import path from 'path';
-import { FolderStatuses } from '../../folders/domain/FolderStatus';
+import { FolderStatuses } from '../domain/FolderStatus';
+import { FolderRepository } from '../domain/FolderRepository';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
 
-export class UpdatePlaceholderFolder {
+export class FolderPlaceholderUpdater {
   constructor(
-    private readonly folderByPartialSearcher: FolderByPartialSearcher,
-    private readonly managedFolderRepository: ManagedFolderRepository,
-    private readonly virtualDrivePlaceholderCreator: PlaceholderCreator,
+    private readonly repository: FolderRepository,
+    private readonly local: LocalFileSystem,
     private readonly relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter
   ) {}
 
@@ -58,6 +56,7 @@ export class UpdatePlaceholderFolder {
       return false;
     }
   }
+
   private canWrite(win32AbsolutePath: string) {
     try {
       fs.access(win32AbsolutePath, FsConstants.R_OK | FsConstants.W_OK);
@@ -74,43 +73,41 @@ export class UpdatePlaceholderFolder {
     return localExists && (remoteIsTrashed || remoteIsDeleted);
   }
 
-  async run(remote: Folder): Promise<void> {
-    if (remote.path.value === path.posix.sep) {
+  private async update(remote: Folder): Promise<void> {
+    if (remote.path === path.posix.sep) {
       return;
     }
 
-    const local = this.folderByPartialSearcher.run({
+    const local = this.repository.searchByPartial({
       uuid: remote.uuid,
     });
 
     if (!local) {
       if (remote.status.is(FolderStatuses.EXISTS)) {
-        Logger.debug('Creating folder placeholder: ', remote.path.value);
-        await this.managedFolderRepository.insert(remote);
-        this.virtualDrivePlaceholderCreator.folder(remote);
+        Logger.debug('Creating folder placeholder: ', remote.path);
+        await this.repository.add(remote);
+        this.local.createPlaceHolder(remote);
       }
       return;
     }
 
     if (remote.name !== local.name || remote.parentId !== local.parentId) {
-      Logger.debug('Updating folder placeholder: ', remote.path.value);
-      await this.managedFolderRepository.overwrite(local, remote);
+      Logger.debug('Updating folder placeholder: ', remote.path);
+      await this.repository.update(remote);
 
       try {
-        const stat = await fs.stat(remote.path.value);
+        const stat = await fs.stat(remote.path);
         Logger.debug('Placeholder already exists: ', stat);
         // Do nothing
       } catch {
         const win32AbsolutePath = this.relativePathToAbsoluteConverter.run(
-          local.path.value
+          local.path
         );
 
         const canBeWritten = this.canWrite(win32AbsolutePath);
 
         if (!canBeWritten) {
-          Logger.warn(
-            `Cannot modify the folder placeholder ${local.path.value}`
-          );
+          Logger.warn(`Cannot modify the folder placeholder ${local.path}`);
           return;
         }
 
@@ -118,7 +115,7 @@ export class UpdatePlaceholderFolder {
           const exists = await this.folderExists(win32AbsolutePath);
           if (exists) {
             const newWin32AbsolutePath =
-              this.relativePathToAbsoluteConverter.run(remote.path.value);
+              this.relativePathToAbsoluteConverter.run(remote.path);
             await this.renameFolderRecursive(
               win32AbsolutePath,
               newWin32AbsolutePath
@@ -132,10 +129,16 @@ export class UpdatePlaceholderFolder {
 
     if (this.hasToBeDeleted(local, remote)) {
       const win32AbsolutePath = this.relativePathToAbsoluteConverter.run(
-        local.path.value
+        local.path
       );
       await fs.rm(win32AbsolutePath, { recursive: true });
       return;
     }
   }
+
+  async run(remotes: Array<Folder>): Promise<void> {
+    const updatePromises = remotes.map((remote) => this.update(remote));
+
+    await Promise.all(updatePromises);
+  }
 }
diff --git a/src/workers/sync-engine/modules/folders/domain/Folder.ts b/src/context/virtual-drive/folders/domain/Folder.ts
similarity index 85%
rename from src/workers/sync-engine/modules/folders/domain/Folder.ts
rename to src/context/virtual-drive/folders/domain/Folder.ts
index 84cb6e2b5..bc916a2cd 100644
--- a/src/workers/sync-engine/modules/folders/domain/Folder.ts
+++ b/src/context/virtual-drive/folders/domain/Folder.ts
@@ -1,10 +1,10 @@
-import { Primitives } from 'shared/types/Primitives';
-import { AggregateRoot } from '../../shared/domain/AggregateRoot';
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
 import { FolderPath } from './FolderPath';
 import { FolderStatus, FolderStatuses } from './FolderStatus';
 import { FolderUuid } from './FolderUuid';
 import { FolderCreatedDomainEvent } from './events/FolderCreatedDomainEvent';
 import { FolderRenamedDomainEvent } from './events/FolderRenamedDomainEvent';
+import { createFolderPlaceholderId } from './FolderPlaceholderId';
 
 export type FolderAttributes = {
   id: number;
@@ -33,8 +33,8 @@ export class Folder extends AggregateRoot {
     return this._uuid.value;
   }
 
-  public get path() {
-    return this._path;
+  public get path(): string {
+    return this._path.value;
   }
 
   public get name() {
@@ -58,6 +58,10 @@ export class Folder extends AggregateRoot {
     return 0;
   }
 
+  public get placeholderId() {
+    return createFolderPlaceholderId(this.uuid);
+  }
+
   public update(attributes: Partial<FolderAttributes>) {
     if (attributes.path) {
       this._path = new FolderPath(attributes.path);
@@ -126,7 +130,7 @@ export class Folder extends AggregateRoot {
       throw new Error('Cannot move a folder to its current folder');
     }
 
-    this._path = this._path.changeFolder(folder.path.value);
+    this._path = this._path.changeFolder(folder.path);
     this._parentId = folder.id;
 
     //TODO: record moved event
@@ -168,26 +172,16 @@ export class Folder extends AggregateRoot {
     return false;
   }
 
-  hasStatus(status: FolderStatuses): boolean {
-    return this._status.value === status;
+  isRoot(): boolean {
+    return !this._parentId;
   }
 
-  toPrimitives(): Record<string, Primitives> {
-    const attributes: FolderAttributes = {
-      id: this.id,
-      uuid: this.uuid,
-      parentId: this._parentId || 0,
-      path: this._path.value,
-      updatedAt: this.updatedAt.toISOString(),
-      createdAt: this.createdAt.toISOString(),
-      status: this.status.value,
-    };
-
-    return attributes;
+  hasStatus(status: FolderStatuses): boolean {
+    return this._status.value === status;
   }
 
-  attributes(): FolderAttributes {
-    const attributes: FolderAttributes = {
+  attributes() {
+    return {
       id: this.id,
       uuid: this.uuid,
       parentId: this._parentId || 0,
@@ -196,8 +190,6 @@ export class Folder extends AggregateRoot {
       createdAt: this.createdAt.toISOString(),
       status: this.status.value,
     };
-
-    return attributes;
   }
 }
 
diff --git a/src/workers/sync-engine/modules/folders/domain/FolderPath.ts b/src/context/virtual-drive/folders/domain/FolderPath.ts
similarity index 100%
rename from src/workers/sync-engine/modules/folders/domain/FolderPath.ts
rename to src/context/virtual-drive/folders/domain/FolderPath.ts
diff --git a/src/workers/sync-engine/modules/placeholders/domain/FolderPlaceholderId.ts b/src/context/virtual-drive/folders/domain/FolderPlaceholderId.ts
similarity index 100%
rename from src/workers/sync-engine/modules/placeholders/domain/FolderPlaceholderId.ts
rename to src/context/virtual-drive/folders/domain/FolderPlaceholderId.ts
diff --git a/src/context/virtual-drive/folders/domain/FolderRepository.ts b/src/context/virtual-drive/folders/domain/FolderRepository.ts
new file mode 100644
index 000000000..a13870a3d
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/FolderRepository.ts
@@ -0,0 +1,13 @@
+import { Folder, FolderAttributes } from './Folder';
+
+export interface FolderRepository {
+  all(): Promise<Array<Folder>>;
+
+  searchByPartial(partial: Partial<FolderAttributes>): Folder | undefined;
+
+  add(folder: Folder): Promise<void>;
+
+  delete(id: Folder['id']): Promise<void>;
+
+  update(folder: Folder): Promise<void>;
+}
diff --git a/src/workers/sync-engine/modules/folders/domain/FolderStatus.ts b/src/context/virtual-drive/folders/domain/FolderStatus.ts
similarity index 88%
rename from src/workers/sync-engine/modules/folders/domain/FolderStatus.ts
rename to src/context/virtual-drive/folders/domain/FolderStatus.ts
index 208430443..e14364dba 100644
--- a/src/workers/sync-engine/modules/folders/domain/FolderStatus.ts
+++ b/src/context/virtual-drive/folders/domain/FolderStatus.ts
@@ -1,5 +1,5 @@
-import { InvalidArgumentError } from '../../../../shared/domain/InvalidArgumentError';
-import { EnumValueObject } from '../../../../shared/domain/EnumValueObject';
+import { EnumValueObject } from '../../../shared/domain/EnumValueObject';
+import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
 import { ActionNotPermittedError } from './errors/ActionNotPermittedError';
 
 export enum FolderStatuses {
diff --git a/src/workers/sync-engine/modules/folders/domain/FolderUuid.ts b/src/context/virtual-drive/folders/domain/FolderUuid.ts
similarity index 72%
rename from src/workers/sync-engine/modules/folders/domain/FolderUuid.ts
rename to src/context/virtual-drive/folders/domain/FolderUuid.ts
index ae27f9838..01538a9ad 100644
--- a/src/workers/sync-engine/modules/folders/domain/FolderUuid.ts
+++ b/src/context/virtual-drive/folders/domain/FolderUuid.ts
@@ -1,6 +1,6 @@
 import * as uuid from 'uuid';
-import { InvalidArgumentError } from '../../../../shared/domain/InvalidArgumentError';
-import { ValueObject } from '../../../../shared/domain/ValueObject';
+import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { ValueObject } from '../../../shared/domain/ValueObject';
 
 export class FolderUuid extends ValueObject<string> {
   constructor(value: string) {
diff --git a/src/workers/sync-engine/modules/folders/domain/ManagedFolderRepository.ts b/src/context/virtual-drive/folders/domain/ManagedFolderRepository.ts
similarity index 100%
rename from src/workers/sync-engine/modules/folders/domain/ManagedFolderRepository.ts
rename to src/context/virtual-drive/folders/domain/ManagedFolderRepository.ts
diff --git a/src/workers/sync-engine/modules/folders/domain/OfflineFolder.ts b/src/context/virtual-drive/folders/domain/OfflineFolder.ts
similarity index 85%
rename from src/workers/sync-engine/modules/folders/domain/OfflineFolder.ts
rename to src/context/virtual-drive/folders/domain/OfflineFolder.ts
index e558fc2e1..4ff81e1e7 100644
--- a/src/workers/sync-engine/modules/folders/domain/OfflineFolder.ts
+++ b/src/context/virtual-drive/folders/domain/OfflineFolder.ts
@@ -1,5 +1,4 @@
-import { Primitives } from 'shared/types/Primitives';
-import { AggregateRoot } from '../../shared/domain/AggregateRoot';
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
 import { FolderPath } from './FolderPath';
 import { FolderStatus, FolderStatuses } from './FolderStatus';
 import { FolderUuid } from './FolderUuid';
@@ -112,19 +111,6 @@ export class OfflineFolder extends AggregateRoot {
     return this._status.value === status;
   }
 
-  toPrimitives(): Record<string, Primitives> {
-    const attributes: OfflineFolderAttributes = {
-      uuid: this.uuid,
-      parentId: this._parentId,
-      path: this._path.value,
-      updatedAt: this.updatedAt.toISOString(),
-      createdAt: this.createdAt.toISOString(),
-      status: this.status.value,
-    };
-
-    return attributes;
-  }
-
   attributes(): OfflineFolderAttributes {
     const attributes: OfflineFolderAttributes = {
       uuid: this.uuid,
diff --git a/src/context/virtual-drive/folders/domain/OfflineFolderRepository.ts b/src/context/virtual-drive/folders/domain/OfflineFolderRepository.ts
new file mode 100644
index 000000000..6b253498c
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/OfflineFolderRepository.ts
@@ -0,0 +1,9 @@
+import { OfflineFolder, OfflineFolderAttributes } from './OfflineFolder';
+
+export interface OfflineFolderRepository {
+  searchByPartial(
+    partial: Partial<OfflineFolderAttributes>
+  ): OfflineFolder | undefined;
+  update(folder: OfflineFolder): void;
+  remove(folder: OfflineFolder): void;
+}
diff --git a/src/workers/sync-engine/modules/folders/domain/FolderRepository.ts b/src/context/virtual-drive/folders/domain/OldFolderRepository.ts
similarity index 69%
rename from src/workers/sync-engine/modules/folders/domain/FolderRepository.ts
rename to src/context/virtual-drive/folders/domain/OldFolderRepository.ts
index 2c2c74175..1563e2499 100644
--- a/src/workers/sync-engine/modules/folders/domain/FolderRepository.ts
+++ b/src/context/virtual-drive/folders/domain/OldFolderRepository.ts
@@ -1,13 +1,12 @@
 import { Folder, FolderAttributes } from './Folder';
-import { Nullable } from '../../../../../shared/types/Nullable';
 import { FolderPath } from './FolderPath';
 
-export interface FolderRepository {
+export interface OldFolderRepository {
   all(): Promise<Array<Folder>>;
 
-  search(path: string): Nullable<Folder>;
+  search(path: string): Folder | undefined;
 
-  searchByPartial(partial: Partial<FolderAttributes>): Nullable<Folder>;
+  searchByPartial(partial: Partial<FolderAttributes>): Folder | undefined;
 
   create(
     name: FolderPath,
diff --git a/src/workers/sync-engine/modules/folders/domain/errors/ActionNotPermittedError.ts b/src/context/virtual-drive/folders/domain/errors/ActionNotPermittedError.ts
similarity index 100%
rename from src/workers/sync-engine/modules/folders/domain/errors/ActionNotPermittedError.ts
rename to src/context/virtual-drive/folders/domain/errors/ActionNotPermittedError.ts
diff --git a/src/workers/sync-engine/modules/folders/domain/errors/FolderNotFoundError.ts b/src/context/virtual-drive/folders/domain/errors/FolderNotFoundError.ts
similarity index 100%
rename from src/workers/sync-engine/modules/folders/domain/errors/FolderNotFoundError.ts
rename to src/context/virtual-drive/folders/domain/errors/FolderNotFoundError.ts
diff --git a/src/workers/sync-engine/modules/folders/domain/events/FolderCreatedDomainEvent.ts b/src/context/virtual-drive/folders/domain/events/FolderCreatedDomainEvent.ts
similarity index 83%
rename from src/workers/sync-engine/modules/folders/domain/events/FolderCreatedDomainEvent.ts
rename to src/context/virtual-drive/folders/domain/events/FolderCreatedDomainEvent.ts
index 3a534b03c..e6445781b 100644
--- a/src/workers/sync-engine/modules/folders/domain/events/FolderCreatedDomainEvent.ts
+++ b/src/context/virtual-drive/folders/domain/events/FolderCreatedDomainEvent.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from '../../../shared/domain/DomainEvent';
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
 
 export class FolderCreatedDomainEvent extends DomainEvent {
   static readonly EVENT_NAME = 'folder.created';
diff --git a/src/workers/sync-engine/modules/folders/domain/events/FolderRenamedDomainEvent.ts b/src/context/virtual-drive/folders/domain/events/FolderRenamedDomainEvent.ts
similarity index 90%
rename from src/workers/sync-engine/modules/folders/domain/events/FolderRenamedDomainEvent.ts
rename to src/context/virtual-drive/folders/domain/events/FolderRenamedDomainEvent.ts
index deafd9f48..69cfe385f 100644
--- a/src/workers/sync-engine/modules/folders/domain/events/FolderRenamedDomainEvent.ts
+++ b/src/context/virtual-drive/folders/domain/events/FolderRenamedDomainEvent.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from '../../../shared/domain/DomainEvent';
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
 
 export class FolderRenamedDomainEvent extends DomainEvent {
   static readonly EVENT_NAME = 'folder.renamed';
diff --git a/src/context/virtual-drive/folders/domain/file-systems/LocalFileSystem.ts b/src/context/virtual-drive/folders/domain/file-systems/LocalFileSystem.ts
new file mode 100644
index 000000000..b16434a46
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/file-systems/LocalFileSystem.ts
@@ -0,0 +1,5 @@
+import { Folder } from '../Folder';
+
+export interface LocalFileSystem {
+  createPlaceHolder(folder: Folder): Promise<void>;
+}
diff --git a/src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem.ts b/src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem.ts
new file mode 100644
index 000000000..109e1c62f
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem.ts
@@ -0,0 +1,12 @@
+import { Folder, FolderAttributes } from '../Folder';
+import { OfflineFolder } from '../OfflineFolder';
+
+export interface RemoteFileSystem {
+  persist(offline: OfflineFolder): Promise<FolderAttributes>;
+
+  trash(id: Folder['id']): Promise<void>;
+
+  move(folder: Folder): Promise<void>;
+
+  rename(folder: Folder): Promise<void>;
+}
diff --git a/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
new file mode 100644
index 000000000..fa86fe46c
--- /dev/null
+++ b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
@@ -0,0 +1,104 @@
+import { Axios } from 'axios';
+import Logger from 'electron-log';
+import * as uuid from 'uuid';
+import { Folder, FolderAttributes } from '../domain/Folder';
+import { FolderStatuses } from '../domain/FolderStatus';
+import { UpdateFolderNameDTO } from './dtos/UpdateFolderNameDTO';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { OfflineFolder } from '../domain/OfflineFolder';
+import { ServerFolder } from '../../../shared/domain/ServerFolder';
+import { CreateFolderDTO } from './dtos/CreateFolderDTO';
+
+export class HttpRemoteFileSystem implements RemoteFileSystem {
+  public folders: Record<string, Folder> = {};
+
+  constructor(
+    private readonly driveClient: Axios,
+    private readonly trashClient: Axios
+  ) {}
+
+  async persist(offline: OfflineFolder): Promise<FolderAttributes> {
+    if (!offline.name) {
+      throw new Error('Bad folder name');
+    }
+
+    const body: CreateFolderDTO = {
+      folderName: offline.name,
+      parentFolderId: offline.parentId,
+      uuid: offline.uuid,
+    };
+
+    const response = await this.driveClient.post(
+      `${process.env.API_URL}/api/storage/folder`,
+      body
+    );
+
+    if (response.status !== 201) {
+      throw new Error('Folder creation failed');
+    }
+
+    const serverFolder = response.data as ServerFolder | null;
+
+    if (!serverFolder) {
+      throw new Error('Folder creation failed, no data returned');
+    }
+
+    return {
+      id: serverFolder.id,
+      uuid: serverFolder.uuid,
+      parentId: serverFolder.parentId,
+      updatedAt: serverFolder.updatedAt,
+      createdAt: serverFolder.createdAt,
+      path: offline.path.value,
+      status: FolderStatuses.EXISTS,
+    };
+  }
+
+  async trash(id: Folder['id']): Promise<void> {
+    const result = await this.trashClient.post(
+      `${process.env.NEW_DRIVE_URL}/drive/storage/trash/add`,
+      {
+        items: [{ type: 'folder', id }],
+      }
+    );
+
+    if (result.status !== 200) {
+      Logger.error(
+        '[FOLDER FILE SYSTEM] Folder deletion failed with status: ',
+        result.status,
+        result.statusText
+      );
+
+      throw new Error('Error when deleting folder');
+    }
+  }
+
+  async rename(folder: Folder): Promise<void> {
+    const url = `${process.env.API_URL}/api/storage/folder/${folder.id}/meta`;
+
+    const body: UpdateFolderNameDTO = {
+      metadata: { itemName: folder.name },
+      relativePath: uuid.v4(),
+    };
+
+    const res = await this.driveClient.post(url, body);
+
+    if (res.status !== 200) {
+      throw new Error(
+        `[FOLDER FILE SYSTEM] Error updating item metadata: ${res.status}`
+      );
+    }
+  }
+
+  async move(folder: Folder): Promise<void> {
+    const url = `${process.env.API_URL}/api/storage/move/folder`;
+
+    const body = { destination: folder.parentId, folderId: folder.id };
+
+    const res = await this.driveClient.post(url, body);
+
+    if (res.status !== 200) {
+      throw new Error(`[FOLDER FILE SYSTEM] Error moving item: ${res.status}`);
+    }
+  }
+}
diff --git a/src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts b/src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts
new file mode 100644
index 000000000..6c02495e5
--- /dev/null
+++ b/src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts
@@ -0,0 +1,58 @@
+import { Folder, FolderAttributes } from '../domain/Folder';
+import { FolderRepository } from '../domain/FolderRepository';
+
+export class InMemoryFolderRepository implements FolderRepository {
+  private folders: Map<Folder['id'], FolderAttributes>;
+
+  constructor() {
+    this.folders = new Map();
+  }
+
+  private get values(): Array<FolderAttributes> {
+    return Array.from(this.folders.values());
+  }
+
+  all(): Promise<Folder[]> {
+    const folders = [...this.folders.values()].map((attributes) =>
+      Folder.from(attributes)
+    );
+
+    return Promise.resolve(folders);
+  }
+
+  searchByPartial(partial: Partial<FolderAttributes>): Folder | undefined {
+    const keys = Object.keys(partial) as Array<keyof Partial<FolderAttributes>>;
+
+    const folder = this.values.find((attributes) => {
+      return keys.every(
+        (key: keyof FolderAttributes) => attributes[key] === partial[key]
+      );
+    });
+
+    if (folder) {
+      return Folder.from(folder);
+    }
+
+    return undefined;
+  }
+
+  async add(folder: Folder): Promise<void> {
+    this.folders.set(folder.id, folder.attributes());
+  }
+
+  async delete(id: number): Promise<void> {
+    const deleted = this.folders.delete(id);
+
+    if (!deleted) {
+      throw new Error('Folder not found');
+    }
+  }
+
+  async update(folder: Folder): Promise<void> {
+    if (!this.folders.has(folder.id)) {
+      throw new Error('Folder not found');
+    }
+
+    return this.add(folder);
+  }
+}
diff --git a/src/context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository.ts b/src/context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository.ts
new file mode 100644
index 000000000..474b19e5b
--- /dev/null
+++ b/src/context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository.ts
@@ -0,0 +1,47 @@
+import {
+  OfflineFolder,
+  OfflineFolderAttributes,
+} from '../domain/OfflineFolder';
+import { OfflineFolderRepository } from '../domain/OfflineFolderRepository';
+
+export class InMemoryOfflineFolderRepository
+  implements OfflineFolderRepository
+{
+  private foldersByUuid: Record<
+    OfflineFolder['uuid'],
+    OfflineFolderAttributes
+  > = {};
+
+  private get values(): Array<OfflineFolderAttributes> {
+    return Object.values(this.foldersByUuid);
+  }
+
+  searchByPartial(
+    partial: Partial<OfflineFolderAttributes>
+  ): OfflineFolder | undefined {
+    const keys = Object.keys(partial) as Array<
+      keyof Partial<OfflineFolderAttributes>
+    >;
+
+    const folderAttributes = this.values.find((attributes) =>
+      keys.every(
+        (key: keyof Partial<OfflineFolderAttributes>) =>
+          attributes[key] === partial[key]
+      )
+    );
+
+    if (!folderAttributes) {
+      return undefined;
+    }
+
+    return OfflineFolder.from(folderAttributes);
+  }
+
+  update(folder: OfflineFolder): void {
+    this.foldersByUuid[folder.uuid] = folder.attributes();
+  }
+
+  remove(folder: OfflineFolder): void {
+    delete this.foldersByUuid[folder.uuid];
+  }
+}
diff --git a/src/context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem.ts b/src/context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem.ts
new file mode 100644
index 000000000..1c1a2d5b2
--- /dev/null
+++ b/src/context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem.ts
@@ -0,0 +1,24 @@
+import { VirtualDrive } from 'virtual-drive/dist';
+import { Folder } from '../domain/Folder';
+import { FolderStatuses } from '../domain/FolderStatus';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+
+export class NodeWinLocalFileSystem implements LocalFileSystem {
+  constructor(private readonly virtualDrive: VirtualDrive) {}
+
+  async createPlaceHolder(folder: Folder): Promise<void> {
+    if (!folder.hasStatus(FolderStatuses.EXISTS)) {
+      return;
+    }
+
+    const folderPath = `${folder.path}/`;
+
+    this.virtualDrive.createFolderByPath(
+      folderPath,
+      folder.placeholderId,
+      0,
+      folder.createdAt.getTime(),
+      folder.updatedAt.getTime()
+    );
+  }
+}
diff --git a/src/context/virtual-drive/folders/infrastructure/dtos/CreateFolderDTO.ts b/src/context/virtual-drive/folders/infrastructure/dtos/CreateFolderDTO.ts
new file mode 100644
index 000000000..b40526c3c
--- /dev/null
+++ b/src/context/virtual-drive/folders/infrastructure/dtos/CreateFolderDTO.ts
@@ -0,0 +1,5 @@
+export interface CreateFolderDTO {
+  folderName: string;
+  parentFolderId: number;
+  uuid?: string;
+}
diff --git a/src/workers/sync-engine/modules/folders/infrastructure/dtos/UpdateFolderNameDTO.ts b/src/context/virtual-drive/folders/infrastructure/dtos/UpdateFolderNameDTO.ts
similarity index 100%
rename from src/workers/sync-engine/modules/folders/infrastructure/dtos/UpdateFolderNameDTO.ts
rename to src/context/virtual-drive/folders/infrastructure/dtos/UpdateFolderNameDTO.ts
diff --git a/src/workers/sync-engine/modules/items/application/FileCreatorFromServerFile.ts b/src/context/virtual-drive/items/application/FileCreatorFromServerFile.ts
similarity index 85%
rename from src/workers/sync-engine/modules/items/application/FileCreatorFromServerFile.ts
rename to src/context/virtual-drive/items/application/FileCreatorFromServerFile.ts
index 8e301e17d..75dfcb3d2 100644
--- a/src/workers/sync-engine/modules/items/application/FileCreatorFromServerFile.ts
+++ b/src/context/virtual-drive/items/application/FileCreatorFromServerFile.ts
@@ -1,4 +1,4 @@
-import { ServerFile } from '../../../../filesystems/domain/ServerFile';
+import { ServerFile } from '../../../shared/domain/ServerFile';
 import { File } from '../../files/domain/File';
 
 export function createFileFromServerFile(
diff --git a/src/workers/sync-engine/modules/items/application/FolderCreatorFromServerFolder.ts b/src/context/virtual-drive/items/application/FolderCreatorFromServerFolder.ts
similarity index 83%
rename from src/workers/sync-engine/modules/items/application/FolderCreatorFromServerFolder.ts
rename to src/context/virtual-drive/items/application/FolderCreatorFromServerFolder.ts
index a0afd4ed5..e1816c7b1 100644
--- a/src/workers/sync-engine/modules/items/application/FolderCreatorFromServerFolder.ts
+++ b/src/context/virtual-drive/items/application/FolderCreatorFromServerFolder.ts
@@ -1,5 +1,5 @@
+import { ServerFolder } from '../../../shared/domain/ServerFolder';
 import { Folder } from '../../folders/domain/Folder';
-import { ServerFolder } from '../../../../filesystems/domain/ServerFolder';
 
 export function createFolderFromServerFolder(
   server: ServerFolder,
diff --git a/src/workers/sync-engine/modules/items/application/ItemsSearcher.ts b/src/context/virtual-drive/items/application/ItemsSearcher.ts
similarity index 100%
rename from src/workers/sync-engine/modules/items/application/ItemsSearcher.ts
rename to src/context/virtual-drive/items/application/ItemsSearcher.ts
diff --git a/src/workers/sync-engine/modules/items/application/RemoteItemsGenerator.ts b/src/context/virtual-drive/items/application/RemoteItemsGenerator.ts
similarity index 90%
rename from src/workers/sync-engine/modules/items/application/RemoteItemsGenerator.ts
rename to src/context/virtual-drive/items/application/RemoteItemsGenerator.ts
index a1243819f..fb09c825e 100644
--- a/src/workers/sync-engine/modules/items/application/RemoteItemsGenerator.ts
+++ b/src/context/virtual-drive/items/application/RemoteItemsGenerator.ts
@@ -1,15 +1,16 @@
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 import {
   ServerFile,
   ServerFileStatus,
-} from '../../../../filesystems/domain/ServerFile';
+} from '../../../shared/domain/ServerFile';
 import {
   ServerFolder,
   ServerFolderStatus,
-} from '../../../../filesystems/domain/ServerFolder';
-import { SyncEngineIpc } from '../../../ipcRendererSyncEngine';
+} from '../../../shared/domain/ServerFolder';
 
 export class RemoteItemsGenerator {
   constructor(private readonly ipc: SyncEngineIpc) {}
+
   async getAll(): Promise<{ files: ServerFile[]; folders: ServerFolder[] }> {
     const updatedRemoteItems = await this.ipc.invoke(
       'GET_UPDATED_REMOTE_ITEMS'
diff --git a/src/context/virtual-drive/items/application/Traverser.ts b/src/context/virtual-drive/items/application/Traverser.ts
new file mode 100644
index 000000000..53c964a71
--- /dev/null
+++ b/src/context/virtual-drive/items/application/Traverser.ts
@@ -0,0 +1,154 @@
+import Logger from 'electron-log';
+import {
+  FolderStatus,
+  FolderStatuses,
+} from '../../folders/domain/FolderStatus';
+import { Folder } from '../../folders/domain/Folder';
+import { EitherTransformer } from '../../shared/application/EitherTransformer';
+import { createFileFromServerFile } from '../../files/application/FileCreatorFromServerFile';
+import { createFolderFromServerFolder } from '../../folders/application/FolderCreatorFromServerFolder';
+import { NameDecrypt } from '../domain/NameDecrypt';
+import { Tree } from '../domain/Tree';
+import {
+  ServerFile,
+  ServerFileStatus,
+} from '../../../shared/domain/ServerFile';
+import {
+  ServerFolder,
+  ServerFolderStatus,
+} from '../../../shared/domain/ServerFolder';
+
+type Items = {
+  files: Array<ServerFile>;
+  folders: Array<ServerFolder>;
+};
+
+export class Traverser {
+  constructor(
+    private readonly decrypt: NameDecrypt,
+    private readonly baseFolderId: number,
+    private readonly fileStatusesToFilter: Array<ServerFileStatus>,
+    private readonly folderStatusesToFilter: Array<ServerFolderStatus>
+  ) {}
+
+  static existingItems(decrypt: NameDecrypt, baseFolderId: number): Traverser {
+    return new Traverser(
+      decrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS],
+      [ServerFolderStatus.EXISTS]
+    );
+  }
+
+  static allItems(decrypt: NameDecrypt, baseFolderId: number): Traverser {
+    return new Traverser(decrypt, baseFolderId, [], []);
+  }
+
+  private createRootFolder(): Folder {
+    const rootFolderUuid = '43711926-15c2-5ebf-8c24-5099fa9af3c3';
+
+    return Folder.from({
+      id: this.baseFolderId,
+      uuid: rootFolderUuid,
+      parentId: null,
+      updatedAt: new Date().toISOString(),
+      createdAt: new Date().toISOString(),
+      path: '/',
+      status: FolderStatus.Exists.value,
+    });
+  }
+
+  private traverse(tree: Tree, items: Items, currentFolder: Folder) {
+    if (!items) return;
+
+    const filesInThisFolder = items.files.filter(
+      (file) => file.folderId === currentFolder.id
+    );
+
+    const foldersInThisFolder = items.folders.filter((folder) => {
+      return folder.parentId === currentFolder.id;
+    });
+
+    filesInThisFolder.forEach((file) => {
+      if (!this.fileStatusesToFilter.includes(file.status)) {
+        return;
+      }
+
+      const decryptedName = this.decrypt.decryptName(
+        file.name,
+        file.folderId.toString(),
+        file.encrypt_version
+      );
+      const extensionToAdd = file.type ? `.${file.type}` : '';
+
+      const relativeFilePath =
+        `${currentFolder.path}/${decryptedName}${extensionToAdd}`.replaceAll(
+          '//',
+          '/'
+        );
+
+      EitherTransformer.handleWithEither(() =>
+        createFileFromServerFile(file, relativeFilePath)
+      ).fold(
+        (error) => {
+          Logger.warn(
+            `[Traverser] File with path ${relativeFilePath} could not be created: `,
+            error
+          );
+        },
+        (file) => {
+          tree.addFile(currentFolder, file);
+        }
+      );
+    });
+
+    foldersInThisFolder.forEach((serverFolder: ServerFolder) => {
+      const plainName =
+        serverFolder.plain_name ||
+        this.decrypt.decryptName(
+          serverFolder.name,
+          (serverFolder.parentId as number).toString(),
+          '03-aes'
+        ) ||
+        serverFolder.name;
+
+      const name = `${currentFolder.path}/${plainName}`;
+
+      if (!this.folderStatusesToFilter.includes(serverFolder.status)) {
+        return;
+      }
+
+      EitherTransformer.handleWithEither(() =>
+        createFolderFromServerFolder(serverFolder, name)
+      ).fold(
+        (error) => {
+          Logger.warn(
+            `[Traverser] Folder with path ${name} could not be created: `,
+            error
+          );
+        },
+        (folder) => {
+          tree.addFolder(currentFolder, folder);
+
+          if (folder.hasStatus(FolderStatuses.EXISTS)) {
+            // The folders and the files inside trashed or deleted folders
+            // will have the status "EXISTS", to avoid filtering witch folders and files
+            // are in a deleted or trashed folder they not included on the collection.
+            // We cannot perform any action on them either way
+            this.traverse(tree, items, folder);
+          }
+        }
+      );
+    });
+  }
+
+  public run(items: Items): Tree {
+    const rootFolder = this.createRootFolder();
+
+    const tree = new Tree(rootFolder);
+
+    this.traverse(tree, items, rootFolder);
+
+    return tree;
+  }
+}
diff --git a/src/workers/sync-engine/modules/items/application/TreeBuilder.ts b/src/context/virtual-drive/items/application/TreeBuilder.ts
similarity index 58%
rename from src/workers/sync-engine/modules/items/application/TreeBuilder.ts
rename to src/context/virtual-drive/items/application/TreeBuilder.ts
index 2bbbb160e..75c1da182 100644
--- a/src/workers/sync-engine/modules/items/application/TreeBuilder.ts
+++ b/src/context/virtual-drive/items/application/TreeBuilder.ts
@@ -1,5 +1,4 @@
-import { File } from '../../files/domain/File';
-import { Folder } from '../../folders/domain/Folder';
+import { Tree } from '../domain/Tree';
 import { RemoteItemsGenerator } from './RemoteItemsGenerator';
 import { Traverser } from './Traverser';
 
@@ -9,11 +8,9 @@ export class TreeBuilder {
     private readonly traverser: Traverser
   ) {}
 
-  async run(): Promise<Array<File | Folder>> {
+  async run(): Promise<Tree> {
     const items = await this.remoteItemsGenerator.getAll();
 
-    this.traverser.reset();
-
-    return Object.values(this.traverser.run(items));
+    return this.traverser.run(items);
   }
 }
diff --git a/src/context/virtual-drive/items/domain/FileNode.ts b/src/context/virtual-drive/items/domain/FileNode.ts
new file mode 100644
index 000000000..b49b14b8d
--- /dev/null
+++ b/src/context/virtual-drive/items/domain/FileNode.ts
@@ -0,0 +1,22 @@
+import { File } from '../../files/domain/File';
+import { FolderNode } from './FolderNode';
+
+export class FileNode {
+  private constructor(public readonly file: File) {}
+
+  static from(file: File): FileNode {
+    return new FileNode(file);
+  }
+
+  public get id(): string {
+    return this.file.path;
+  }
+
+  public isFile(): this is FileNode {
+    return true;
+  }
+
+  public isFolder(): this is FolderNode {
+    return false;
+  }
+}
diff --git a/src/context/virtual-drive/items/domain/FolderNode.ts b/src/context/virtual-drive/items/domain/FolderNode.ts
new file mode 100644
index 000000000..0efeaf2c7
--- /dev/null
+++ b/src/context/virtual-drive/items/domain/FolderNode.ts
@@ -0,0 +1,33 @@
+import { Folder } from '../../folders/domain/Folder';
+import { FileNode } from './FileNode';
+import { Node } from './Node';
+export class FolderNode {
+  private constructor(
+    public readonly folder: Folder,
+    private childern: Map<string, Node>
+  ) {}
+
+  static from(folder: Folder): FolderNode {
+    return new FolderNode(folder, new Map());
+  }
+
+  public get id(): string {
+    return this.folder.path;
+  }
+
+  addChild(node: Node): void {
+    if (this.childern.has(node.id)) {
+      throw new Error('Child already exists');
+    }
+
+    this.childern.set(node.id, node);
+  }
+
+  public isFile(): this is FileNode {
+    return false;
+  }
+
+  public isFolder(): this is FolderNode {
+    return true;
+  }
+}
diff --git a/src/workers/sync-engine/modules/items/domain/ItemsIndexedByPath.ts b/src/context/virtual-drive/items/domain/ItemsIndexedByPath.ts
similarity index 100%
rename from src/workers/sync-engine/modules/items/domain/ItemsIndexedByPath.ts
rename to src/context/virtual-drive/items/domain/ItemsIndexedByPath.ts
diff --git a/src/context/virtual-drive/items/domain/NameDecrypt.ts b/src/context/virtual-drive/items/domain/NameDecrypt.ts
new file mode 100644
index 000000000..858580764
--- /dev/null
+++ b/src/context/virtual-drive/items/domain/NameDecrypt.ts
@@ -0,0 +1,7 @@
+export interface NameDecrypt {
+  decryptName: (
+    name: string,
+    folderId: string,
+    encryptVersion: string
+  ) => string | null;
+}
diff --git a/src/context/virtual-drive/items/domain/Node.ts b/src/context/virtual-drive/items/domain/Node.ts
new file mode 100644
index 000000000..27d930a89
--- /dev/null
+++ b/src/context/virtual-drive/items/domain/Node.ts
@@ -0,0 +1,4 @@
+import { FileNode } from './FileNode';
+import { FolderNode } from './FolderNode';
+
+export type Node = FileNode | FolderNode;
diff --git a/src/context/virtual-drive/items/domain/Tree.ts b/src/context/virtual-drive/items/domain/Tree.ts
new file mode 100644
index 000000000..076f7234b
--- /dev/null
+++ b/src/context/virtual-drive/items/domain/Tree.ts
@@ -0,0 +1,77 @@
+import { File } from '../../files/domain/File';
+import { Folder } from '../../folders/domain/Folder';
+import { FileNode } from './FileNode';
+import { FolderNode } from './FolderNode';
+import { Node } from './Node';
+
+export class Tree {
+  private tree = new Map<string, Node>();
+
+  constructor(rootFolder: Folder) {
+    const node = FolderNode.from(rootFolder);
+
+    this.tree.set('/', node);
+  }
+
+  public get files(): Array<File> {
+    const files: Array<File> = [];
+
+    this.tree.forEach((node) => {
+      if (node.isFile()) {
+        files.push(node.file);
+      }
+    });
+
+    return files;
+  }
+
+  public get filePaths(): Array<string> {
+    return this.files.map((f) => f.path);
+  }
+
+  public get folders(): Array<Folder> {
+    const folders: Array<Folder> = [];
+
+    this.tree.forEach((node) => {
+      if (node.isFolder()) {
+        folders.push(node.folder);
+      }
+    });
+
+    return folders;
+  }
+
+  public get folderPaths(): Array<string> {
+    return this.folders.map((f) => f.path);
+  }
+
+  private addNode(node: Node): void {
+    this.tree.set(node.id, node);
+  }
+
+  addFile(parentNode: Folder, file: File) {
+    const parent = this.tree.get(parentNode.path) as FolderNode;
+
+    if (!parent) {
+      throw new Error('Parent node not found');
+    }
+
+    const node = FileNode.from(file);
+
+    parent.addChild(node);
+    this.addNode(node);
+  }
+
+  addFolder(parentNode: Folder, folder: Folder) {
+    const parent = this.tree.get(parentNode.path) as FolderNode;
+
+    if (!parent) {
+      throw new Error('Parent node not found');
+    }
+
+    const node = FolderNode.from(folder);
+
+    parent.addChild(node);
+    this.addNode(node);
+  }
+}
diff --git a/src/context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt.ts b/src/context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt.ts
new file mode 100644
index 000000000..940f31cba
--- /dev/null
+++ b/src/context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt.ts
@@ -0,0 +1,12 @@
+import crypto from '../../../shared/infrastructure/crypt';
+import { NameDecrypt } from '../domain/NameDecrypt';
+
+export class CryptoJsNameDecrypt implements NameDecrypt {
+  decryptName(
+    name: string,
+    folderId: string,
+    encryptVersion: string
+  ): string | null {
+    return crypto.decryptName(name, folderId, encryptVersion);
+  }
+}
diff --git a/src/workers/sync-engine/modules/shared/application/AbsolutePathToRelativeConverter.ts b/src/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.ts
similarity index 100%
rename from src/workers/sync-engine/modules/shared/application/AbsolutePathToRelativeConverter.ts
rename to src/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.ts
diff --git a/src/workers/sync-engine/modules/shared/application/AllWebdavItemsSearcher.ts b/src/context/virtual-drive/shared/application/AllWebdavItemsSearcher.ts
similarity index 70%
rename from src/workers/sync-engine/modules/shared/application/AllWebdavItemsSearcher.ts
rename to src/context/virtual-drive/shared/application/AllWebdavItemsSearcher.ts
index 7796e9035..8ab4113af 100644
--- a/src/workers/sync-engine/modules/shared/application/AllWebdavItemsSearcher.ts
+++ b/src/context/virtual-drive/shared/application/AllWebdavItemsSearcher.ts
@@ -1,11 +1,11 @@
-import { FileRepository } from '../../files/domain/FileRepository';
+import { OldFileRepository } from '../../files/domain/OldFileRepository';
 import { FolderFinder } from '../../folders/application/FolderFinder';
-import { FolderRepository } from '../../folders/domain/FolderRepository';
+import { OldFolderRepository } from '../../folders/domain/OldFolderRepository';
 
 export class AllWebdavItemsNameLister {
   constructor(
-    private readonly filesRepository: FileRepository,
-    private readonly folderRepository: FolderRepository,
+    private readonly filesRepository: OldFileRepository,
+    private readonly folderRepository: OldFolderRepository,
     private readonly folderfinder: FolderFinder
   ) {}
 
diff --git a/src/workers/sync-engine/modules/shared/application/EitherTransformer.ts b/src/context/virtual-drive/shared/application/EitherTransformer.ts
similarity index 82%
rename from src/workers/sync-engine/modules/shared/application/EitherTransformer.ts
rename to src/context/virtual-drive/shared/application/EitherTransformer.ts
index 7916242a4..8e1482b04 100644
--- a/src/workers/sync-engine/modules/shared/application/EitherTransformer.ts
+++ b/src/context/virtual-drive/shared/application/EitherTransformer.ts
@@ -1,4 +1,4 @@
-import { Either, left, right } from '../domain/Either';
+import { Either, left, right } from '../../../shared/domain/Either';
 
 export class EitherTransformer {
   static handleWithEither<T>(fn: () => T): Either<Error, T> {
diff --git a/src/workers/sync-engine/modules/shared/application/LocalFileIdProvider.ts b/src/context/virtual-drive/shared/application/LocalFileIdProvider.ts
similarity index 100%
rename from src/workers/sync-engine/modules/shared/application/LocalFileIdProvider.ts
rename to src/context/virtual-drive/shared/application/LocalFileIdProvider.ts
diff --git a/src/workers/sync-engine/modules/shared/application/PlatformPathConverter.ts b/src/context/virtual-drive/shared/application/PlatformPathConverter.ts
similarity index 100%
rename from src/workers/sync-engine/modules/shared/application/PlatformPathConverter.ts
rename to src/context/virtual-drive/shared/application/PlatformPathConverter.ts
diff --git a/src/workers/sync-engine/modules/shared/application/RelativePathToAbsoluteConverter.ts b/src/context/virtual-drive/shared/application/RelativePathToAbsoluteConverter.ts
similarity index 100%
rename from src/workers/sync-engine/modules/shared/application/RelativePathToAbsoluteConverter.ts
rename to src/context/virtual-drive/shared/application/RelativePathToAbsoluteConverter.ts
diff --git a/src/workers/sync-engine/modules/shared/application/WebdavUnknownItemTypeSearcher.ts b/src/context/virtual-drive/shared/application/WebdavUnknownItemTypeSearcher.ts
similarity index 62%
rename from src/workers/sync-engine/modules/shared/application/WebdavUnknownItemTypeSearcher.ts
rename to src/context/virtual-drive/shared/application/WebdavUnknownItemTypeSearcher.ts
index 3c958d87f..790a29f47 100644
--- a/src/workers/sync-engine/modules/shared/application/WebdavUnknownItemTypeSearcher.ts
+++ b/src/context/virtual-drive/shared/application/WebdavUnknownItemTypeSearcher.ts
@@ -1,13 +1,13 @@
 import { FilePath } from '../../files/domain/FilePath';
 import { File } from '../../files/domain/File';
-import { FileRepository } from '../../files/domain/FileRepository';
+import { OldFileRepository } from '../../files/domain/OldFileRepository';
 import { Folder } from '../../folders/domain/Folder';
-import { FolderRepository } from '../../folders/domain/FolderRepository';
+import { OldFolderRepository } from '../../folders/domain/OldFolderRepository';
 
 export class WebdavUnknownItemTypeSearcher {
   constructor(
-    private readonly filesRepository: FileRepository,
-    private readonly folderRepository: FolderRepository
+    private readonly filesRepository: OldFileRepository,
+    private readonly folderRepository: OldFolderRepository
   ) {}
 
   run(path: string): File | Folder | undefined {
diff --git a/src/workers/sync-engine/modules/shared/domain/BucketEntry.ts b/src/context/virtual-drive/shared/domain/BucketEntry.ts
similarity index 85%
rename from src/workers/sync-engine/modules/shared/domain/BucketEntry.ts
rename to src/context/virtual-drive/shared/domain/BucketEntry.ts
index 0472389d2..96f9e45fd 100644
--- a/src/workers/sync-engine/modules/shared/domain/BucketEntry.ts
+++ b/src/context/virtual-drive/shared/domain/BucketEntry.ts
@@ -1,4 +1,4 @@
-import { ValueObject } from '../../../../shared/domain/ValueObject';
+import { ValueObject } from '../../../shared/domain/ValueObject';
 
 export class BucketEntry extends ValueObject<number> {
   public static MAX_SIZE = 20 * 1024 * 1024 * 1024;
diff --git a/src/workers/sync-engine/modules/shared/domain/BucketEntryId.ts b/src/context/virtual-drive/shared/domain/BucketEntryId.ts
similarity index 69%
rename from src/workers/sync-engine/modules/shared/domain/BucketEntryId.ts
rename to src/context/virtual-drive/shared/domain/BucketEntryId.ts
index cddf2daef..c150ec958 100644
--- a/src/workers/sync-engine/modules/shared/domain/BucketEntryId.ts
+++ b/src/context/virtual-drive/shared/domain/BucketEntryId.ts
@@ -1,5 +1,5 @@
-import { ValueObject } from '../../../../shared/domain/ValueObject';
-import { InvalidArgumentError } from '../../../../shared/domain/InvalidArgumentError';
+import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { ValueObject } from '../../../shared/domain/ValueObject';
 
 export class BucketEntryId extends ValueObject<string> {
   static readonly VALID_LENGTH = 24;
diff --git a/src/workers/sync-engine/modules/shared/domain/Crypt.ts b/src/context/virtual-drive/shared/domain/Crypt.ts
similarity index 86%
rename from src/workers/sync-engine/modules/shared/domain/Crypt.ts
rename to src/context/virtual-drive/shared/domain/Crypt.ts
index 3c1354d71..c5e4aebf7 100644
--- a/src/workers/sync-engine/modules/shared/domain/Crypt.ts
+++ b/src/context/virtual-drive/shared/domain/Crypt.ts
@@ -1,4 +1,4 @@
-export type Crypt = {
+export interface Crypt {
   decryptName: (
     cipherText: string,
     salt: string,
@@ -6,4 +6,4 @@ export type Crypt = {
   ) => string | null;
 
   encryptName: (name: string, salt: string) => string | null;
-};
+}
diff --git a/src/workers/sync-engine/modules/shared/domain/DelayQueue.ts b/src/context/virtual-drive/shared/domain/DelayQueue.ts
similarity index 100%
rename from src/workers/sync-engine/modules/shared/domain/DelayQueue.ts
rename to src/context/virtual-drive/shared/domain/DelayQueue.ts
diff --git a/src/workers/sync-engine/modules/shared/domain/EventBus.ts b/src/context/virtual-drive/shared/domain/EventBus.ts
similarity index 77%
rename from src/workers/sync-engine/modules/shared/domain/EventBus.ts
rename to src/context/virtual-drive/shared/domain/EventBus.ts
index f427122ac..9c692a629 100644
--- a/src/workers/sync-engine/modules/shared/domain/EventBus.ts
+++ b/src/context/virtual-drive/shared/domain/EventBus.ts
@@ -1,5 +1,5 @@
 import { DomainEventSubscribers } from '../infrastructure/DomainEventSubscribers';
-import { DomainEvent } from './DomainEvent';
+import { DomainEvent } from '../../../shared/domain/DomainEvent';
 
 export interface EventBus {
   publish(events: Array<DomainEvent>): Promise<void>;
diff --git a/src/workers/sync-engine/modules/shared/domain/EventRepository.ts b/src/context/virtual-drive/shared/domain/EventRepository.ts
similarity index 68%
rename from src/workers/sync-engine/modules/shared/domain/EventRepository.ts
rename to src/context/virtual-drive/shared/domain/EventRepository.ts
index f98573a8c..803e68a85 100644
--- a/src/workers/sync-engine/modules/shared/domain/EventRepository.ts
+++ b/src/context/virtual-drive/shared/domain/EventRepository.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from './DomainEvent';
+import { DomainEvent } from '../../../shared/domain/DomainEvent';
 
 export interface EventRepository {
   store(event: DomainEvent): Promise<void>;
diff --git a/src/workers/sync-engine/modules/shared/domain/MapObserver.ts b/src/context/virtual-drive/shared/domain/MapObserver.ts
similarity index 100%
rename from src/workers/sync-engine/modules/shared/domain/MapObserver.ts
rename to src/context/virtual-drive/shared/domain/MapObserver.ts
diff --git a/src/workers/sync-engine/modules/shared/domain/Path.ts b/src/context/virtual-drive/shared/domain/Path.ts
similarity index 90%
rename from src/workers/sync-engine/modules/shared/domain/Path.ts
rename to src/context/virtual-drive/shared/domain/Path.ts
index 8bfe4a56a..d864f5b20 100644
--- a/src/workers/sync-engine/modules/shared/domain/Path.ts
+++ b/src/context/virtual-drive/shared/domain/Path.ts
@@ -1,6 +1,6 @@
 import path from 'path';
-import { ValueObject } from '../../../../shared/domain/ValueObject';
-import { InvalidArgumentError } from '../../../../shared/domain/InvalidArgumentError';
+import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { ValueObject } from '../../../shared/domain/ValueObject';
 
 const isWindowsRootDirectory = /[a-zA-Z]:[\\/]/;
 const containsNullCharacter = /\0/g;
diff --git a/src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers.ts b/src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers.ts
new file mode 100644
index 000000000..237aae79f
--- /dev/null
+++ b/src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers.ts
@@ -0,0 +1,18 @@
+import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
+import { DomainEvent } from '../../../shared/domain/DomainEvent';
+import { DependencyContainer } from '../../../../apps/sync-engine/dependency-injection/DependencyContainer';
+import { DependencyContainerFactory } from '../../../../apps/sync-engine/dependency-injection/DependencyContainerFactory';
+
+export class DomainEventSubscribers {
+  constructor(public items: Array<DomainEventSubscriber<DomainEvent>>) {}
+
+  static from(container: DependencyContainer): DomainEventSubscribers {
+    const subscribers = DependencyContainerFactory.subscribers.map(
+      (subscriber) => {
+        return container[subscriber];
+      }
+    ) as unknown as Array<DomainEventSubscriber<DomainEvent>>;
+
+    return new DomainEventSubscribers(subscribers);
+  }
+}
diff --git a/src/workers/sync-engine/modules/shared/infrastructure/EnvironmentDownloader.ts b/src/context/virtual-drive/shared/infrastructure/EnvironmentDownloader.ts
similarity index 96%
rename from src/workers/sync-engine/modules/shared/infrastructure/EnvironmentDownloader.ts
rename to src/context/virtual-drive/shared/infrastructure/EnvironmentDownloader.ts
index 27b24bf04..78b81111c 100644
--- a/src/workers/sync-engine/modules/shared/infrastructure/EnvironmentDownloader.ts
+++ b/src/context/virtual-drive/shared/infrastructure/EnvironmentDownloader.ts
@@ -1,6 +1,6 @@
 import { DownloadStrategyFunction } from '@internxt/inxt-js/build/lib/core/download/strategy';
-import { Stopwatch } from '../../../../../shared/types/Stopwatch';
 import { EventEmitter, Readable } from 'stream';
+import { Stopwatch } from '../../../../apps/shared/types/Stopwatch';
 
 export type EnvironmentDownloaderEvents = {
   start: () => void;
diff --git a/src/workers/sync-engine/modules/shared/infrastructure/EventRecorder.ts b/src/context/virtual-drive/shared/infrastructure/EventRecorder.ts
similarity index 90%
rename from src/workers/sync-engine/modules/shared/infrastructure/EventRecorder.ts
rename to src/context/virtual-drive/shared/infrastructure/EventRecorder.ts
index c5168477d..4477b2dfc 100644
--- a/src/workers/sync-engine/modules/shared/infrastructure/EventRecorder.ts
+++ b/src/context/virtual-drive/shared/infrastructure/EventRecorder.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from '../domain/DomainEvent';
+import { DomainEvent } from '../../../shared/domain/DomainEvent';
 import { EventBus } from '../domain/EventBus';
 import { EventRepository } from '../domain/EventRepository';
 import { DomainEventSubscribers } from './DomainEventSubscribers';
diff --git a/src/workers/sync-engine/modules/shared/infrastructure/InMemoryEventHistory.ts b/src/context/virtual-drive/shared/infrastructure/InMemoryEventHistory.ts
similarity index 66%
rename from src/workers/sync-engine/modules/shared/infrastructure/InMemoryEventHistory.ts
rename to src/context/virtual-drive/shared/infrastructure/InMemoryEventHistory.ts
index 302f20d78..7e410855f 100644
--- a/src/workers/sync-engine/modules/shared/infrastructure/InMemoryEventHistory.ts
+++ b/src/context/virtual-drive/shared/infrastructure/InMemoryEventHistory.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from '../domain/DomainEvent';
+import { DomainEvent } from '../../../shared/domain/DomainEvent';
 import { EventRepository } from '../domain/EventRepository';
 
 export class InMemoryEventRepository implements EventRepository {
@@ -22,4 +22,15 @@ export class InMemoryEventRepository implements EventRepository {
       this.events.filter((e) => e.aggregateId === aggregateId)
     );
   }
+
+  async filter<Event extends typeof DomainEvent>(
+    aggregateId: string,
+    event: Event
+  ): Promise<Array<Event>> {
+    const events = await this.search(aggregateId);
+
+    const filtered = events.filter((e) => e.eventName === event.EVENT_NAME);
+
+    return filtered as unknown as Event[];
+  }
 }
diff --git a/src/workers/sync-engine/modules/shared/infrastructure/NodeJsEventBus.ts b/src/context/virtual-drive/shared/infrastructure/NodeJsEventBus.ts
similarity index 90%
rename from src/workers/sync-engine/modules/shared/infrastructure/NodeJsEventBus.ts
rename to src/context/virtual-drive/shared/infrastructure/NodeJsEventBus.ts
index e56cc73b1..7f5fa3005 100644
--- a/src/workers/sync-engine/modules/shared/infrastructure/NodeJsEventBus.ts
+++ b/src/context/virtual-drive/shared/infrastructure/NodeJsEventBus.ts
@@ -1,5 +1,5 @@
 import EventEmitter from 'events';
-import { DomainEvent } from '../domain/DomainEvent';
+import { DomainEvent } from '../../../shared/domain/DomainEvent';
 import { EventBus } from '../domain/EventBus';
 import { DomainEventSubscribers } from './DomainEventSubscribers';
 
diff --git a/src/workers/sync-engine/modules/thumbnails/domain/ThumbanailContentId.ts b/src/context/virtual-drive/thumbnails/domain/ThumbanailContentId.ts
similarity index 100%
rename from src/workers/sync-engine/modules/thumbnails/domain/ThumbanailContentId.ts
rename to src/context/virtual-drive/thumbnails/domain/ThumbanailContentId.ts
diff --git a/src/workers/sync-engine/modules/thumbnails/domain/Thumbnail.ts b/src/context/virtual-drive/thumbnails/domain/Thumbnail.ts
similarity index 87%
rename from src/workers/sync-engine/modules/thumbnails/domain/Thumbnail.ts
rename to src/context/virtual-drive/thumbnails/domain/Thumbnail.ts
index ce806e3de..67bac35c2 100644
--- a/src/workers/sync-engine/modules/thumbnails/domain/Thumbnail.ts
+++ b/src/context/virtual-drive/thumbnails/domain/Thumbnail.ts
@@ -1,4 +1,4 @@
-import { AggregateRoot } from '../../shared/domain/AggregateRoot';
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
 import { ThumbnailContentId } from './ThumbanailContentId';
 
 export type ThumbnailAtributes = {
@@ -34,7 +34,7 @@ export class Thumbnail extends AggregateRoot {
     return this._bucket;
   }
 
-  toPrimitives(): ThumbnailAtributes {
+  attributes(): ThumbnailAtributes {
     return {
       id: this.id,
       contentsId: this.contentsId,
diff --git a/src/workers/sync-engine/modules/thumbnails/domain/ThumbnailDownloader.ts b/src/context/virtual-drive/thumbnails/domain/ThumbnailDownloader.ts
similarity index 100%
rename from src/workers/sync-engine/modules/thumbnails/domain/ThumbnailDownloader.ts
rename to src/context/virtual-drive/thumbnails/domain/ThumbnailDownloader.ts
diff --git a/src/workers/sync-engine/modules/thumbnails/infrastructrue/EnvironmentThumbnailDownloader.ts b/src/context/virtual-drive/thumbnails/infrastructrue/EnvironmentThumbnailDownloader.ts
similarity index 100%
rename from src/workers/sync-engine/modules/thumbnails/infrastructrue/EnvironmentThumbnailDownloader.ts
rename to src/context/virtual-drive/thumbnails/infrastructrue/EnvironmentThumbnailDownloader.ts
diff --git a/src/workers/sync-engine/modules/userUsage/application/BytesInBinaryToInternacionalSystem.ts b/src/context/virtual-drive/userUsage/application/BytesInBinaryToInternacionalSystem.ts
similarity index 100%
rename from src/workers/sync-engine/modules/userUsage/application/BytesInBinaryToInternacionalSystem.ts
rename to src/context/virtual-drive/userUsage/application/BytesInBinaryToInternacionalSystem.ts
diff --git a/src/workers/sync-engine/modules/userUsage/application/DecrementDriveUsageOnFileDeleted.ts b/src/context/virtual-drive/userUsage/application/DecrementDriveUsageOnFileDeleted.ts
similarity index 71%
rename from src/workers/sync-engine/modules/userUsage/application/DecrementDriveUsageOnFileDeleted.ts
rename to src/context/virtual-drive/userUsage/application/DecrementDriveUsageOnFileDeleted.ts
index bc84d28d5..b77e7fdce 100644
--- a/src/workers/sync-engine/modules/userUsage/application/DecrementDriveUsageOnFileDeleted.ts
+++ b/src/context/virtual-drive/userUsage/application/DecrementDriveUsageOnFileDeleted.ts
@@ -1,11 +1,11 @@
 import { FileCreatedDomainEvent } from '../../files/domain/events/FileCreatedDomainEvent';
-import { DomainEventClass } from '../../shared/domain/DomainEvent';
-import { WebdavDomainEventSubscriber } from '../../shared/domain/WebdavDomainEventSubscriber';
+import { DomainEventClass } from '../../../shared/domain/DomainEvent';
+import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
 import { UserUsageIncrementer } from './UserUsageIncrementer';
 import { FileDeletedDomainEvent } from '../../files/domain/events/FileDeletedDomainEvent';
 
 export class DecrementDriveUsageOnFileDeleted
-  implements WebdavDomainEventSubscriber<FileCreatedDomainEvent>
+  implements DomainEventSubscriber<FileCreatedDomainEvent>
 {
   constructor(private readonly incrementer: UserUsageIncrementer) {}
 
diff --git a/src/workers/sync-engine/modules/userUsage/application/FreeSpacePerEnvironmentCalculator.ts b/src/context/virtual-drive/userUsage/application/FreeSpacePerEnvironmentCalculator.ts
similarity index 100%
rename from src/workers/sync-engine/modules/userUsage/application/FreeSpacePerEnvironmentCalculator.ts
rename to src/context/virtual-drive/userUsage/application/FreeSpacePerEnvironmentCalculator.ts
diff --git a/src/workers/sync-engine/modules/userUsage/application/IncrementDriveUsageOnFileCreated.ts b/src/context/virtual-drive/userUsage/application/IncrementDriveUsageOnFileCreated.ts
similarity index 67%
rename from src/workers/sync-engine/modules/userUsage/application/IncrementDriveUsageOnFileCreated.ts
rename to src/context/virtual-drive/userUsage/application/IncrementDriveUsageOnFileCreated.ts
index fe239ebc8..53c2e1cbf 100644
--- a/src/workers/sync-engine/modules/userUsage/application/IncrementDriveUsageOnFileCreated.ts
+++ b/src/context/virtual-drive/userUsage/application/IncrementDriveUsageOnFileCreated.ts
@@ -1,10 +1,10 @@
 import { FileCreatedDomainEvent } from '../../files/domain/events/FileCreatedDomainEvent';
-import { DomainEventClass } from '../../shared/domain/DomainEvent';
-import { WebdavDomainEventSubscriber } from '../../shared/domain/WebdavDomainEventSubscriber';
+import { DomainEventClass } from '../../../shared/domain/DomainEvent';
+import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
 import { UserUsageIncrementer } from './UserUsageIncrementer';
 
 export class IncrementDriveUsageOnFileCreated
-  implements WebdavDomainEventSubscriber<FileCreatedDomainEvent>
+  implements DomainEventSubscriber<FileCreatedDomainEvent>
 {
   constructor(private readonly incrementer: UserUsageIncrementer) {}
 
diff --git a/src/workers/sync-engine/modules/userUsage/application/UsedSpaceCalculator.ts b/src/context/virtual-drive/userUsage/application/UsedSpaceCalculator.ts
similarity index 100%
rename from src/workers/sync-engine/modules/userUsage/application/UsedSpaceCalculator.ts
rename to src/context/virtual-drive/userUsage/application/UsedSpaceCalculator.ts
diff --git a/src/workers/sync-engine/modules/userUsage/application/UserUsageDecrementer.ts b/src/context/virtual-drive/userUsage/application/UserUsageDecrementer.ts
similarity index 100%
rename from src/workers/sync-engine/modules/userUsage/application/UserUsageDecrementer.ts
rename to src/context/virtual-drive/userUsage/application/UserUsageDecrementer.ts
diff --git a/src/workers/sync-engine/modules/userUsage/application/UserUsageIncrementer.ts b/src/context/virtual-drive/userUsage/application/UserUsageIncrementer.ts
similarity index 100%
rename from src/workers/sync-engine/modules/userUsage/application/UserUsageIncrementer.ts
rename to src/context/virtual-drive/userUsage/application/UserUsageIncrementer.ts
diff --git a/src/workers/sync-engine/modules/userUsage/domain/UserUsage.ts b/src/context/virtual-drive/userUsage/domain/UserUsage.ts
similarity index 100%
rename from src/workers/sync-engine/modules/userUsage/domain/UserUsage.ts
rename to src/context/virtual-drive/userUsage/domain/UserUsage.ts
diff --git a/src/workers/sync-engine/modules/userUsage/domain/UserUsageRepository.ts b/src/context/virtual-drive/userUsage/domain/UserUsageRepository.ts
similarity index 100%
rename from src/workers/sync-engine/modules/userUsage/domain/UserUsageRepository.ts
rename to src/context/virtual-drive/userUsage/domain/UserUsageRepository.ts
diff --git a/src/workers/sync-engine/modules/userUsage/infrastrucutre/CachedHttpUserUsageRepository.ts b/src/context/virtual-drive/userUsage/infrastrucutre/CachedHttpUserUsageRepository.ts
similarity index 100%
rename from src/workers/sync-engine/modules/userUsage/infrastrucutre/CachedHttpUserUsageRepository.ts
rename to src/context/virtual-drive/userUsage/infrastrucutre/CachedHttpUserUsageRepository.ts
diff --git a/src/workers/sync-engine/modules/userUsage/infrastrucutre/dtos/UserUsageLimitDTO.ts b/src/context/virtual-drive/userUsage/infrastrucutre/dtos/UserUsageLimitDTO.ts
similarity index 100%
rename from src/workers/sync-engine/modules/userUsage/infrastrucutre/dtos/UserUsageLimitDTO.ts
rename to src/context/virtual-drive/userUsage/infrastrucutre/dtos/UserUsageLimitDTO.ts
diff --git a/src/main/analytics/backup-handlers.ts b/src/main/analytics/backup-handlers.ts
deleted file mode 100644
index d28190578..000000000
--- a/src/main/analytics/backup-handlers.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { ipcMain } from 'electron';
-
-import { BackupProgressIssue, BackupsArgs } from '../../workers/backups';
-import {
-  backupCompleted,
-  backupError,
-  backupProcessStarted,
-  folderBackupCompleted,
-  folderBackupStarted,
-} from './service';
-
-export type BackupFolder = number;
-
-export type BackupInfo = {
-  scheduled: boolean;
-  backups: Array<BackupsArgs>;
-};
-
-export type BackupFinishedInfo = BackupInfo & {
-  lastExitReason: 'FORCED_BY_USER' | 'PROCESS_FINISHED';
-};
-
-const backupProcessInfo = {
-  shceduled: false,
-  foldersToBackup: 0,
-  items: {} as Record<BackupFolder, number>,
-  errors: {} as Record<BackupFolder, Array<string>>,
-};
-
-ipcMain.on('BACKUP_PROCESS_STARTED', (state: any) => {
-  backupProcessInfo.shceduled = state.scheduled;
-  backupProcessInfo.foldersToBackup = state.foldersToBackup.length;
-  backupProcessStarted(state.scheduled, state.foldersToBackup.length);
-});
-
-ipcMain.on('BACKUP_PROCESS_FINISHED', (state: any) => {
-  backupCompleted(state.scheduled, backupProcessInfo.foldersToBackup);
-});
-
-ipcMain.on(
-  'BACKUP_ACTION_QUEUE_GENERATED',
-  (
-    _,
-    {
-      folderId,
-      items,
-    }: {
-      folderId: number;
-      items: number;
-    }
-  ) => {
-    backupProcessInfo.items[folderId] = items;
-    backupProcessInfo.errors = [];
-
-    folderBackupStarted(backupProcessInfo.shceduled, items);
-  }
-);
-
-ipcMain.on('BACKUP_COMPLETED', (folderId: any) => {
-  const items = backupProcessInfo.items[folderId];
-  const errors = backupProcessInfo.errors[folderId];
-
-  folderBackupCompleted(backupProcessInfo.shceduled, items);
-
-  if (errors?.length > 0) {
-    backupError(backupProcessInfo.shceduled, items, errors);
-  }
-});
-
-ipcMain.on('BACKUP_FATAL_ERROR', (_, { folderId, errorName }) => {
-  const items = backupProcessInfo.items[folderId];
-
-  backupError(backupProcessInfo.shceduled, items, errorName);
-});
-
-ipcMain.on('BACKUP_ISSUE', (_, issue: BackupProgressIssue) => {
-  if (!backupProcessInfo.errors[issue.folderId]) {
-    backupProcessInfo.errors[issue.folderId] = [];
-  }
-
-  backupProcessInfo.errors[issue.folderId].push(
-    `${issue.errorName} error when ${issue}`
-  );
-});
diff --git a/src/main/app-info/AvaliableAppQuery.ts b/src/main/app-info/AvaliableAppQuery.ts
deleted file mode 100644
index abccce72c..000000000
--- a/src/main/app-info/AvaliableAppQuery.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-const availableMethodsToQuery = ['getPreferredSystemLanguages'] as const;
-
-export type AvaliableMethods = (typeof availableMethodsToQuery)[number];
diff --git a/src/main/app-info/handlers.ts b/src/main/app-info/handlers.ts
deleted file mode 100644
index 97ce89558..000000000
--- a/src/main/app-info/handlers.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { ipcMain, app } from 'electron';
-
-import { executeQuery } from './service';
-
-ipcMain.handle('execute-app-query', (_, query) => executeQuery(query));
-
-ipcMain.handle('get-path', (_, path) => {
-  const result = app.getPath(path);
-  return result;
-});
-
-ipcMain.handle('APP:TEMPORAL_FILES_FOLDER', () => {
-  return app.getPath('temp');
-});
diff --git a/src/main/app-info/service.ts b/src/main/app-info/service.ts
deleted file mode 100644
index 5cbc1b647..000000000
--- a/src/main/app-info/service.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { App, app } from 'electron';
-
-import { AvaliableMethods } from './AvaliableAppQuery';
-
-export type AppQuery<T extends AvaliableMethods> = {
-  method: string;
-  params: Parameters<App[T]>;
-};
-
-export const executeQuery = ({
-  method,
-  params = [],
-}: AppQuery<AvaliableMethods>): ReturnType<App[AvaliableMethods]> => {
-  app.getPreferredSystemLanguages();
-  const fn = app[method as AvaliableMethods];
-
-  return params.length === 0 ? fn() : fn(...params);
-};
diff --git a/src/main/background-processes/backups.ts b/src/main/background-processes/backups.ts
deleted file mode 100644
index 0b19d06fc..000000000
--- a/src/main/background-processes/backups.ts
+++ /dev/null
@@ -1,298 +0,0 @@
-import { app, BrowserWindow, ipcMain, powerSaveBlocker } from 'electron';
-import Logger from 'electron-log';
-import path from 'path';
-
-import { BackupsArgs } from '../../workers/backups';
-import { ProcessFatalErrorName } from '../../workers/types';
-import { getIsLoggedIn } from '../auth/handlers';
-import configStore from '../config';
-import { getBackupsFromDevice, getOrCreateDevice } from '../device/service';
-import eventBus from '../event-bus';
-import { broadcastToWindows } from '../windows';
-import { clearBackupsIssues } from './process-issues';
-import { BackupFatalError } from './types/BackupFatalError';
-
-ipcMain.handle('get-backups-interval', () => {
-  return configStore.get('backupInterval');
-});
-
-ipcMain.handle('set-backups-interval', (_, newValue: number) => {
-  return configStore.set('backupInterval', newValue);
-});
-
-export type BackupsStatus = 'STANDBY' | 'RUNNING';
-export type BackupExitReason = 'FORCED_BY_USER' | 'PROCESS_FINISHED';
-
-let backupsStatus: BackupsStatus = 'STANDBY';
-let backupsProcessRerun: null | ReturnType<typeof setTimeout> = null;
-let backupsLastExitReason: BackupExitReason | null = null;
-
-ipcMain.handle('get-backups-status', () => backupsStatus);
-
-ipcMain.handle('get-backups-enabled', () => configStore.get('backupsEnabled'));
-
-ipcMain.handle('toggle-backups-enabled', () => {
-  configStore.set('backupsEnabled', !configStore.get('backupsEnabled'));
-});
-
-ipcMain.handle('get-last-backup-timestamp', () =>
-  configStore.get('lastBackup')
-);
-
-ipcMain.handle('get-last-backup-exit-reason', () => backupsLastExitReason);
-
-function clearBackupsLastExitReason() {
-  backupsLastExitReason = null;
-}
-
-function clearBackupsTimeout() {
-  if (backupsProcessRerun) {
-    clearTimeout(backupsProcessRerun);
-  }
-}
-
-function scheduleBackups(milliseconds: number) {
-  backupsProcessRerun = setTimeout(
-    () => startBackupProcess(true),
-    milliseconds
-  );
-}
-
-function changeBackupsStatus(newStatus: BackupsStatus) {
-  backupsStatus = newStatus;
-  broadcastToWindows('backups-status-changed', newStatus);
-}
-
-ipcMain.on('start-backups-process', () => startBackupProcess(false));
-
-export type BackupProgress = {
-  currentFolder: number;
-  totalFolders: number;
-  completedItems?: number;
-  totalItems?: number;
-};
-
-async function startBackupProcess(scheduled: boolean) {
-  const backupsEnabled = configStore.get('backupsEnabled');
-
-  if (backupsStatus === 'RUNNING' || !backupsEnabled) {
-    return;
-  }
-
-  const suspensionBlockId = powerSaveBlocker.start('prevent-display-sleep');
-
-  changeBackupsStatus('RUNNING');
-  clearBackupsIssues();
-  clearBackupFatalErrors();
-
-  // It's an object to pass it to
-  // the individual item processors
-  const hasBeenStopped = { value: false };
-
-  ipcMain.once('stop-backups-process', () => {
-    hasBeenStopped.value = true;
-  });
-
-  const device = await getOrCreateDevice();
-
-  const enabledBackupEntries = await getBackupsFromDevice();
-
-  const items: BackupsArgs[] = enabledBackupEntries.map((backup) => ({
-    path: backup.pathname,
-    folderId: backup.id,
-    tmpPath: app.getPath('temp'),
-    backupsBucket: device.bucket,
-  }));
-
-  let currentFolder = 1;
-  const totalFolders = items.length;
-
-  ipcMain.on('BACKUP_PROGRESS', (_, { completedItems, totalItems }) => {
-    broadcastToWindows('backup-progress', {
-      currentFolder,
-      totalFolders,
-      completedItems,
-      totalItems,
-    });
-  });
-
-  ipcMain.emit('BACKUP_PROCESS_STARTED', {
-    scheduled,
-    foldersToBackup: items,
-  });
-
-  for (const item of items) {
-    broadcastToWindows('backup-progress', { currentFolder, totalFolders });
-
-    if (!hasBeenStopped.value) {
-      await processBackupsItem(item, hasBeenStopped);
-    }
-
-    currentFolder++;
-  }
-
-  const currentTimestamp = new Date().valueOf();
-
-  configStore.set('lastBackup', currentTimestamp);
-
-  clearBackupsTimeout();
-
-  const backupsInterval = configStore.get('backupInterval');
-
-  if (backupsInterval !== -1 && getIsLoggedIn()) {
-    scheduleBackups(backupsInterval);
-  }
-
-  changeBackupsStatus('STANDBY');
-
-  ipcMain.removeAllListeners('stop-backups-process');
-
-  powerSaveBlocker.stop(suspensionBlockId);
-
-  backupsLastExitReason = hasBeenStopped.value
-    ? 'FORCED_BY_USER'
-    : 'PROCESS_FINISHED';
-
-  ipcMain.emit('BACKUP_PROCESS_FINISHED', {
-    scheduled,
-    foldersToBackup: items.length,
-    lastExitReason: backupsLastExitReason,
-  });
-
-  ipcMain.removeAllListeners('BACKUP_PROGRESS');
-}
-
-function processBackupsItem(
-  item: BackupsArgs,
-  hasBeenStopped: { value: boolean }
-) {
-  return new Promise<void>((resolve) => {
-    const onExitFuncs: (() => void)[] = [];
-
-    function onExit(
-      payload:
-        | { reason: 'USER_STOPPED' | 'PROCESS_FINISHED' }
-        | { reason: 'FATAL_ERROR'; errorName: ProcessFatalErrorName }
-    ) {
-      Logger.log(
-        `[onBackupsExit] ${item.path} (${item.folderId}) reason: ${payload.reason}`
-      );
-      onExitFuncs.forEach((f) => f());
-
-      if (payload.reason === 'FATAL_ERROR') {
-        addBackupFatalError({ errorName: payload.errorName, ...item });
-      }
-
-      resolve();
-    }
-
-    if (hasBeenStopped.value) {
-      return onExit({ reason: 'USER_STOPPED' });
-    }
-
-    ipcMain.handleOnce('get-backups-details', () => item);
-    onExitFuncs.push(() => ipcMain.removeHandler('get-backups-details'));
-
-    ipcMain.once('BACKUP_FATAL_ERROR', (_, _folderId, errorName) =>
-      onExit({ reason: 'FATAL_ERROR', errorName })
-    );
-    onExitFuncs.push(() => ipcMain.removeAllListeners('BACKUP_FATAL_ERROR'));
-
-    ipcMain.once('BACKUP_EXIT', (_, folderId) => {
-      onExit({ reason: 'PROCESS_FINISHED' });
-      ipcMain.emit('BACKUP_COMPLETED', folderId);
-    });
-    onExitFuncs.push(() => ipcMain.removeAllListeners('BACKUP_EXIT'));
-
-    const worker = spawnBackupsWorker();
-    onExitFuncs.push(() => worker.destroy());
-
-    if (hasBeenStopped.value) {
-      return onExit({ reason: 'USER_STOPPED' });
-    }
-
-    const onUserStopped = () => onExit({ reason: 'USER_STOPPED' });
-    ipcMain.once('stop-backups-process', onUserStopped);
-    onExitFuncs.push(() =>
-      ipcMain.removeListener('stop-backups-process', onUserStopped)
-    );
-  });
-}
-
-function spawnBackupsWorker() {
-  const worker = new BrowserWindow({
-    webPreferences: {
-      nodeIntegration: true,
-      contextIsolation: false,
-    },
-    show: false,
-  });
-
-  worker
-    .loadFile(
-      process.env.NODE_ENV === 'development'
-        ? '../../release/app/dist/backups/index.html'
-        : `${path.join(__dirname, '..', 'backups')}/index.html`
-    )
-    .catch(Logger.error);
-
-  return worker;
-}
-
-let fatalErrors: BackupFatalError[] = [];
-
-function onBackupFatalErrorsChanged() {
-  broadcastToWindows('backup-fatal-errors-changed', fatalErrors);
-}
-
-ipcMain.handle('get-backup-fatal-errors', () => fatalErrors);
-ipcMain.on('add-backup-fatal-errors', (e, errors: Array<BackupFatalError>) => {
-  if (!errors) {
-    (e as unknown as Array<BackupFatalError>).forEach(addBackupFatalError);
-  }
-  errors.forEach(addBackupFatalError);
-});
-
-ipcMain.handle('delete-backup-error', (_event, folderId: number) => {
-  fatalErrors = fatalErrors.filter((error) => error.folderId !== folderId);
-  onBackupFatalErrorsChanged();
-});
-
-function clearBackupFatalErrors() {
-  fatalErrors = [];
-  onBackupFatalErrorsChanged();
-}
-
-function addBackupFatalError(error: BackupFatalError) {
-  fatalErrors.push(error);
-  onBackupFatalErrorsChanged();
-}
-
-eventBus.on('WIDGET_IS_READY', () => {
-  // Check if we should launch backup process
-  const lastBackup = configStore.get('lastBackup');
-  const backupsInterval = configStore.get('backupInterval');
-
-  if (lastBackup !== -1 && backupsInterval !== -1) {
-    const currentTimestamp = new Date().valueOf();
-
-    const millisecondsToNextBackup =
-      lastBackup + backupsInterval - currentTimestamp;
-
-    if (millisecondsToNextBackup <= 0) {
-      startBackupProcess(true);
-    } else {
-      scheduleBackups(millisecondsToNextBackup);
-    }
-  }
-});
-
-function stopAndClearBackups() {
-  ipcMain.emit('stop-backups-process');
-  clearBackupsTimeout();
-  clearBackupFatalErrors();
-  clearBackupsLastExitReason();
-}
-
-eventBus.on('USER_LOGGED_OUT', stopAndClearBackups);
-eventBus.on('USER_WAS_UNAUTHORIZED', stopAndClearBackups);
diff --git a/src/main/background-processes/sync.ts b/src/main/background-processes/sync.ts
deleted file mode 100644
index 494130a35..000000000
--- a/src/main/background-processes/sync.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { ipcMain } from 'electron';
-
-import { ProcessResult } from '../../workers/backups/process';
-import {
-  ProcessFatalErrorName,
-  ProcessInfoUpdatePayload,
-} from '../../workers/types';
-
-import eventBus from '../event-bus';
-import { setTrayStatus } from '../tray/tray';
-import { broadcastToWindows } from '../windows';
-
-export type SyncStatus = 'STANDBY' | 'RUNNING' | 'FAILED';
-
-let syncStatus: SyncStatus = 'STANDBY';
-
-export function getSyncStatus() {
-  return syncStatus;
-}
-
-ipcMain.handle('get-sync-status', getSyncStatus);
-
-export function changeSyncStatus(newStatus: SyncStatus) {
-  syncStatus = newStatus;
-  broadcastToWindows('sync-status-changed', newStatus);
-}
-
-export type SyncStoppedPayload =
-  | {
-      reason: 'STOPPED_BY_USER';
-    }
-  | {
-      reason: 'FATAL_ERROR';
-      errorName: ProcessFatalErrorName;
-    }
-  | { reason: 'EXIT'; result: ProcessResult };
-
-ipcMain.on('SYNC_INFO_UPDATE', (_, payload: ProcessInfoUpdatePayload) => {
-  broadcastToWindows('sync-info-update', payload);
-});
-
-eventBus.on('USER_LOGGED_OUT', () => {
-  ipcMain.emit('stop-sync-process');
-  setTrayStatus('IDLE');
-});
-
-eventBus.on('USER_WAS_UNAUTHORIZED', () => {
-  ipcMain.emit('stop-sync-process');
-  setTrayStatus('IDLE');
-});
diff --git a/src/main/background-processes/types/BackupFatalError.ts b/src/main/background-processes/types/BackupFatalError.ts
deleted file mode 100644
index 5003298d2..000000000
--- a/src/main/background-processes/types/BackupFatalError.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { ProcessFatalErrorName } from '../../../workers/types';
-
-export type BackupFatalError = {
-  path: string;
-  folderId: number;
-  errorName: ProcessFatalErrorName;
-};
diff --git a/src/renderer/actions/backsups-error-actions.ts b/src/renderer/actions/backsups-error-actions.ts
deleted file mode 100644
index 4fa3ec1bc..000000000
--- a/src/renderer/actions/backsups-error-actions.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { BackupFatalError } from '../../main/background-processes/types/BackupFatalError';
-import { tryAgain } from './shared-actions';
-import { FatalErrorActionMap } from './types';
-
-const findBackupFolder = async (
-  error: BackupFatalError | undefined
-): Promise<void> => {
-  if (!error) {
-    return;
-  }
-  const result = await window.electron.changeBackupPath(error.path);
-  if (result) {
-    window.electron.startBackupsProcess();
-  }
-};
-
-export const backupsErrorActions: FatalErrorActionMap = {
-  CANNOT_ACCESS_BASE_DIRECTORY: {
-    name: 'issues.actions.find-folder',
-    func: findBackupFolder,
-  },
-  CANNOT_ACCESS_TMP_DIRECTORY: tryAgain,
-  CANNOT_GET_CURRENT_LISTINGS: tryAgain,
-  NO_INTERNET: tryAgain,
-  NO_REMOTE_CONNECTION: tryAgain,
-  BASE_DIRECTORY_DOES_NOT_EXIST: {
-    name: 'issues.actions.find-folder',
-    func: findBackupFolder,
-  },
-  INSUFICIENT_PERMISION_ACCESSING_BASE_DIRECTORY: tryAgain,
-  UNKNOWN: tryAgain,
-};
diff --git a/src/renderer/actions/types.ts b/src/renderer/actions/types.ts
deleted file mode 100644
index 283ccd93f..000000000
--- a/src/renderer/actions/types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BackupFatalError } from '../../main/background-processes/types/BackupFatalError';
-import { ProcessFatalErrorName } from '../../workers/types';
-
-export interface Action {
-  name: string;
-  func: (() => void) | ((error: BackupFatalError | undefined) => Promise<void>);
-}
-
-export type FatalErrorActionMap = Record<ProcessFatalErrorName, Action>;
diff --git a/src/renderer/hooks/BackupStatus.tsx b/src/renderer/hooks/BackupStatus.tsx
deleted file mode 100644
index a3bd2df59..000000000
--- a/src/renderer/hooks/BackupStatus.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-import { BackupsStatus } from '../../main/background-processes/backups';
-
-export default function useBackupStatus(): BackupsStatus {
-  return 'STANDBY';
-}
diff --git a/src/renderer/pages/Settings/Backups/BackupsFolderList.tsx b/src/renderer/pages/Settings/Backups/BackupsFolderList.tsx
deleted file mode 100644
index 48005dbc9..000000000
--- a/src/renderer/pages/Settings/Backups/BackupsFolderList.tsx
+++ /dev/null
@@ -1,253 +0,0 @@
-import { Dialog, Transition } from '@headlessui/react';
-import { Minus, Plus } from '@phosphor-icons/react';
-import { Fragment, ReactNode, useEffect, useState } from 'react';
-import { useTranslationContext } from 'renderer/context/LocalContext';
-import { useBackups } from '../../../hooks/useBackups';
-import useBackupFatalErrors from '../../../hooks/BackupFatalErrors';
-
-import { Backup } from '../../../../main/device/service';
-import FolderIcon from '../../../assets/folder.svg';
-import Spinner from '../../../assets/spinner.svg';
-import Button from '../../../components/Button';
-import Checkbox from '../../../components/Checkbox';
-
-export interface BackupFolderListProps {
-  onGoToPanel: () => void;
-}
-
-export default function BackupsFolderList({
-  onGoToPanel,
-}: BackupFolderListProps) {
-  const { translate } = useTranslationContext();
-
-  const { backups, addBackup, disableBackup, deleteBackup } = useBackups();
-
-  const [selected, setSelected] = useState<Backup | null>(null);
-  const [showDeleteModal, setShowDeleteModal] = useState(false);
-
-  const { deleteError } = useBackupFatalErrors();
-
-  async function handleAddBackup() {
-    await addBackup();
-  }
-
-  async function handleOnCloseDeleteModal(
-    result: 'CANCEL' | 'DELETE' | 'DISABLE',
-    dontAksAgain?: boolean
-  ) {
-    setShowDeleteModal(false);
-    if (result === 'CANCEL') {
-      return;
-    }
-
-    if (dontAksAgain) {
-      localStorage.setItem('dont-ask-again-on-delete-backup', 'yes');
-    }
-
-    if (result === 'DISABLE') {
-      await disableBackup(selected as Backup);
-    } else {
-      await deleteBackup(selected as Backup);
-    }
-
-    if (selected) {
-      deleteError(selected.id);
-    }
-  }
-
-  const del = () => {
-    const dontAskAgainOnDeleteBackup = localStorage.getItem(
-      'dont-ask-again-on-delete-backup'
-    );
-    if (dontAskAgainOnDeleteBackup === 'yes') {
-      handleOnCloseDeleteModal('DISABLE');
-    } else {
-      setShowDeleteModal(true);
-    }
-  };
-
-  let content: ReactNode;
-
-  if (backups.status === 'SUCCESS' && backups.backups.length) {
-    content = backups.backups.map((folder) => (
-      <li
-        onClick={(e) => {
-          e.stopPropagation();
-          setSelected(folder);
-        }}
-        key={folder.id}
-        className={`flex h-8 w-full items-center space-x-2 truncate px-3 outline-none ${
-          selected?.id === folder.id
-            ? 'bg-primary text-white'
-            : 'bg-surface even:bg-gray-5'
-        }`}
-        title={folder.name}
-      >
-        <FolderIcon className="h-5 w-5 flex-shrink-0" />
-
-        <p className="truncate">{folder.name}</p>
-      </li>
-    ));
-  } else {
-    content = (
-      <div className="flex h-full items-center justify-center">
-        {backups.status === 'LOADING' ? (
-          <Spinner className="h-5 w-5 animate-spin text-gray-100" />
-        ) : backups.status === 'ERROR' ? (
-          <p className="text-sm font-medium">We could not load your backups</p>
-        ) : (
-          <p className="text-sm text-gray-50">
-            {translate('settings.backups.folders.no-folders')}
-          </p>
-        )}
-      </div>
-    );
-  }
-
-  return (
-    <div className="flex flex-col space-y-2">
-      <p className="text-sm font-medium text-gray-100">
-        {translate('settings.backups.folders.explanation')}
-      </p>
-
-      <ul
-        className="h-48 list-none overflow-y-auto rounded-lg border border-gray-20 bg-surface shadow-sm"
-        onClick={() => setSelected(null)}
-        role="none"
-      >
-        {content}
-      </ul>
-
-      <div className="flex items-center justify-between">
-        <div className="flex items-center space-x-1">
-          <Button
-            variant="secondary"
-            disabled={backups.status === 'LOADING'}
-            onClick={handleAddBackup}
-          >
-            <Plus size={16} />
-          </Button>
-          <Button
-            variant="secondary"
-            disabled={selected === null}
-            onClick={() => del()}
-          >
-            <Minus size={16} />
-          </Button>
-        </div>
-
-        <Button onClick={onGoToPanel}>
-          {translate('settings.backups.folders.done')}
-        </Button>
-      </div>
-
-      <Modal
-        isOpen={showDeleteModal}
-        onClose={handleOnCloseDeleteModal}
-        nameOfBackup={selected?.name}
-      />
-    </div>
-  );
-}
-
-function Modal({
-  nameOfBackup,
-  isOpen,
-  onClose,
-}: {
-  nameOfBackup?: string;
-  isOpen: boolean;
-  onClose: (
-    result: 'CANCEL' | 'DISABLE' | 'DELETE',
-    dontAksAgain: boolean
-  ) => void;
-}) {
-  const { translate } = useTranslationContext();
-  const [checkbox, setCheckbox] = useState(false);
-  const [dontAksAgain, setDontAskAgain] = useState(false);
-
-  useEffect(() => {
-    if (isOpen) {
-      setCheckbox(false);
-    }
-  }, [isOpen]);
-
-  return (
-    <Transition appear show={isOpen} as={Fragment}>
-      <Dialog
-        as="div"
-        className="fixed inset-0 z-10 flex h-full items-center justify-center overflow-y-auto"
-        onClose={() => onClose('CANCEL', dontAksAgain)}
-      >
-        <div className="min-h-screen">
-          <Transition.Child
-            as={Fragment}
-            enter="ease-out duration-200"
-            enterFrom="opacity-0"
-            enterTo="opacity-100"
-            leave="ease-in duration-100"
-            leaveFrom="opacity-100"
-            leaveTo="opacity-0"
-          >
-            <Dialog.Overlay className="fixed inset-0 bg-black/40 dark:bg-gray-50/40" />
-          </Transition.Child>
-
-          <Transition.Child
-            as={Fragment}
-            enter="ease-out duration-300"
-            enterFrom="opacity-0 scale-95"
-            enterTo="opacity-100 scale-100"
-            leave="ease-in duration-200"
-            leaveFrom="opacity-100 scale-100"
-            leaveTo="opacity-0 scale-95"
-          >
-            <div className="absolute left-1/2 top-1/2 flex w-80 -translate-x-1/2 -translate-y-1/2 transform flex-col items-stretch space-y-6 overflow-hidden rounded-2xl bg-surface p-5 shadow-xl transition-all dark:bg-gray-1">
-              <div className="flex flex-col space-y-2">
-                <Dialog.Title
-                  as="h3"
-                  className="line-clamp-3 text-lg font-medium leading-6 text-gray-100"
-                >
-                  {translate('settings.backups.folders.stop-baking-up.title')}
-                  &quot;<span>{nameOfBackup}</span>&quot;?
-                </Dialog.Title>
-
-                <p className="text-sm text-gray-50">
-                  {translate(
-                    'settings.backups.folders.stop-baking-up.explanation'
-                  )}
-                </p>
-              </div>
-
-              <Checkbox
-                label={translate(
-                  'settings.backups.folders.stop-baking-up.dont-ask-again'
-                )}
-                checked={dontAksAgain}
-                onClick={() => setDontAskAgain(!dontAksAgain)}
-              />
-
-              <div className="flex flex-col items-stretch space-y-2">
-                <Button
-                  variant="secondary"
-                  size="lg"
-                  onClick={() =>
-                    onClose(checkbox ? 'DELETE' : 'DISABLE', dontAksAgain)
-                  }
-                >
-                  {translate('settings.backups.folders.stop-baking-up.confirm')}
-                </Button>
-                <Button
-                  variant="primary"
-                  size="lg"
-                  onClick={() => onClose('CANCEL', false)}
-                >
-                  {translate('settings.backups.folders.stop-baking-up.cancel')}
-                </Button>
-              </div>
-            </div>
-          </Transition.Child>
-        </div>
-      </Dialog>
-    </Transition>
-  );
-}
diff --git a/src/renderer/pages/Settings/Backups/BackupsPreferences.tsx b/src/renderer/pages/Settings/Backups/BackupsPreferences.tsx
deleted file mode 100644
index 25b2ed392..000000000
--- a/src/renderer/pages/Settings/Backups/BackupsPreferences.tsx
+++ /dev/null
@@ -1,227 +0,0 @@
-import dayjs from 'dayjs';
-import relativeTime from 'dayjs/plugin/relativeTime';
-import { useEffect, useState } from 'react';
-import { BackupProgress } from '../../../../main/background-processes/backups';
-import Button from '../../../components/Button';
-import Select, { SelectOptionsType } from 'renderer/components/Select';
-import Checkbox from '../../../components/Checkbox';
-import { useTranslationContext } from '../../../context/LocalContext';
-import useBackupStatus from '../../../hooks/BackupStatus';
-import { getPercentualProgress } from '../../../utils/backups-progress';
-import useBackupFatalErrors from '../../../hooks/BackupFatalErrors';
-import { WarningCircle } from '@phosphor-icons/react';
-
-dayjs.extend(relativeTime);
-
-interface BackupsIntervalType extends SelectOptionsType {
-  interval: number;
-}
-
-type BackupIntervalType = '6h' | '12h' | '24h' | 'manual';
-
-export interface BackupsPreferencesProps {
-  showFolderList: () => void;
-}
-
-export default function BackupsPreferences({
-  showFolderList,
-}: BackupsPreferencesProps) {
-  const { translate } = useTranslationContext();
-  const backupStatus = useBackupStatus();
-
-  const DEFAULT_INTERVAL = '24h';
-  const [backupsInterval, setBackupsInterval] =
-    useState<BackupIntervalType | null>(null);
-  const [backupsEnabled, setBackupsEnabled] = useState(false);
-  const [lastBackupTimestamp, setLastBackupTimestamp] = useState(-1);
-  const [backupProgress, setBackupProgress] = useState<null | BackupProgress>(
-    null
-  );
-
-  const { thereAreErrors } = useBackupFatalErrors();
-
-  const BackupsIntervals: BackupsIntervalType[] = [
-    {
-      value: '6h',
-      name: translate('settings.backups.frequency.options.6h'),
-      interval: 21_600_000,
-    },
-    {
-      value: '12h',
-      name: translate('settings.backups.frequency.options.12h'),
-      interval: 43_200_000,
-    },
-    {
-      value: '24h',
-      name: translate('settings.backups.frequency.options.24h'),
-      interval: 86_400_000,
-    },
-    {
-      value: 'manual',
-      name: translate('settings.backups.frequency.options.manually'),
-      interval: -1,
-    },
-  ];
-
-  const getIntervalValue = (interval: number): BackupIntervalType =>
-    (BackupsIntervals.find((option) => option.interval === interval)
-      ?.value as BackupIntervalType) ?? DEFAULT_INTERVAL;
-
-  function refreshBackupsInterval() {
-    window.electron
-      .getBackupsInterval()
-      .then((interval) => setBackupsInterval(getIntervalValue(interval)));
-  }
-
-  function refreshBackupsEnabled() {
-    window.electron.getBackupsEnabled().then(setBackupsEnabled);
-  }
-
-  function refreshLastBackupTimestamp() {
-    window.electron.getLastBackupTimestamp().then(setLastBackupTimestamp);
-  }
-
-  useEffect(() => {
-    if (backupStatus === 'STANDBY') {
-      setBackupProgress(null);
-    }
-  }, [backupStatus]);
-
-  useEffect(() => {
-    refreshBackupsInterval();
-    refreshBackupsEnabled();
-  }, []);
-
-  useEffect(() => {
-    const removeListener = window.electron.onBackupProgress(setBackupProgress);
-    return removeListener;
-  }, []);
-
-  useEffect(refreshLastBackupTimestamp, [backupStatus]);
-
-  async function onBackupsIntervalChanged(value: string) {
-    const interval = BackupsIntervals.filter(
-      (option) => option.value === value
-    )[0].interval;
-
-    await window.electron.setBackupsInterval(interval);
-    refreshBackupsInterval();
-  }
-
-  async function onBackupsEnabledClicked() {
-    await window.electron.toggleBackupsEnabled();
-    refreshBackupsEnabled();
-  }
-
-  const progressDisplay = backupProgress
-    ? `(${getPercentualProgress(backupProgress).toFixed(0)}%)`
-    : '(...)';
-
-  const handleOpenURL = async (URL: string) => {
-    try {
-      await window.electron.openUrl(URL);
-    } catch (error) {
-      reportError(error);
-    }
-  };
-
-  return (
-    <div className="flex flex-col space-y-5">
-      <Checkbox
-        checked={backupsEnabled}
-        label={translate('settings.backups.activate')}
-        onClick={onBackupsEnabledClicked}
-      />
-
-      {thereAreErrors() && (
-        <section className="relative z-0 flex items-center space-x-2 overflow-hidden rounded-lg border border-red bg-surface p-3 font-normal text-red shadow-sm ring-3 ring-red/10 before:absolute before:inset-0 before:-z-1 before:bg-red/5 dark:ring-red/35 dark:before:bg-red/10">
-          <div className="relative z-0 flex w-6 items-center justify-center text-red before:absolute before:-z-1 before:h-3 before:w-3 before:bg-white">
-            <WarningCircle size={24} weight="fill" />
-          </div>
-          <span
-            className="flex-1 truncate"
-            title={translate('settings.backups.last-backup-had-issues')}
-          >
-            {translate('settings.backups.last-backup-had-issues')}
-          </span>
-          <Button
-            variant="secondary"
-            size="sm"
-            onClick={() => window.electron.openProcessIssuesWindow()}
-            customClassName="ml-auto"
-          >
-            {translate('settings.backups.see-issues')}
-          </Button>
-        </section>
-      )}
-
-      <div className="flex flex-col space-y-1.5">
-        <div className="flex items-center space-x-2">
-          <Button
-            variant={backupStatus === 'STANDBY' ? 'primary' : 'danger'}
-            disabled={!backupsEnabled}
-            onClick={
-              backupStatus === 'STANDBY'
-                ? window.electron.startBackupsProcess
-                : window.electron.stopBackupsProcess
-            }
-          >
-            {backupStatus === 'STANDBY'
-              ? translate('settings.backups.action.start')
-              : translate('settings.backups.action.stop')}
-          </Button>
-
-          <Button
-            variant="secondary"
-            disabled={!backupsEnabled || backupStatus === 'RUNNING'}
-            onClick={showFolderList}
-          >
-            {translate('settings.backups.select-folders')}
-          </Button>
-        </div>
-
-        <div className="flex h-5 items-center justify-start text-sm text-gray-60">
-          {backupStatus === 'STANDBY'
-            ? lastBackupTimestamp !== -1
-              ? `${translate('settings.backups.action.last-run')} ${dayjs(
-                  lastBackupTimestamp
-                ).fromNow()}`
-              : ''
-            : translate('settings.backups.action.running', {
-                progress: progressDisplay,
-              })}
-        </div>
-      </div>
-
-      <div className="flex items-end justify-between">
-        <div className="flex flex-1 flex-col items-start space-y-2">
-          <p
-            className={`text-sm font-medium leading-4 ${
-              backupsEnabled ? 'text-gray-80' : 'text-gray-40'
-            }`}
-          >
-            {translate('settings.backups.frequency.title')}
-          </p>
-
-          {backupsInterval && (
-            <Select
-              disabled={!backupsEnabled}
-              options={BackupsIntervals}
-              value={backupsInterval}
-              onValueChange={onBackupsIntervalChanged}
-            />
-          )}
-        </div>
-
-        <Button
-          variant="secondary"
-          onClick={() =>
-            handleOpenURL('https://drive.internxt.com/app/backups')
-          }
-        >
-          {translate('settings.backups.view-backups')}
-        </Button>
-      </div>
-    </div>
-  );
-}
diff --git a/src/renderer/pages/Settings/Backups/index.tsx b/src/renderer/pages/Settings/Backups/index.tsx
deleted file mode 100644
index 2599ed53f..000000000
--- a/src/renderer/pages/Settings/Backups/index.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { ReactNode, useContext, useState, useEffect } from 'react';
-
-import Spinner from '../../../assets/spinner.svg';
-import { DeviceContext } from '../../../context/DeviceContext';
-import BackupsFolderList from './BackupsFolderList';
-import BackupsPreferences from './BackupsPreferences';
-
-export default function BackupsSection({ active }: { active: boolean }) {
-  const [showFolderList, setShowFolderList] = useState<boolean>(false);
-  const [deviceState] = useContext(DeviceContext);
-
-  useEffect(() => {
-    if (!active) {
-      setShowFolderList(false);
-    }
-  }, [active]);
-
-  let content: ReactNode;
-
-  if (deviceState.status === 'LOADING') {
-    content = (
-      <div className="flex h-32 items-center justify-center">
-        <Spinner className="h-5 w-5 animate-spin text-gray-100" />
-      </div>
-    );
-  } else if (deviceState.status === 'ERROR') {
-    content = (
-      <div className="flex h-32 items-center justify-center">
-        <p className="font-medium">There was an error loading your backups</p>
-      </div>
-    );
-  } else {
-    content = showFolderList ? (
-      <BackupsFolderList onGoToPanel={() => setShowFolderList(false)} />
-    ) : (
-      <BackupsPreferences showFolderList={() => setShowFolderList(true)} />
-    );
-  }
-
-  return <div className={active ? 'block' : 'hidden'}>{content}</div>;
-}
diff --git a/src/renderer/pages/Widget/BackupsBanner.tsx b/src/renderer/pages/Widget/BackupsBanner.tsx
deleted file mode 100644
index 058439adb..000000000
--- a/src/renderer/pages/Widget/BackupsBanner.tsx
+++ /dev/null
@@ -1,194 +0,0 @@
-import { AnimatePresence, motion } from 'framer-motion';
-import { useContext, useEffect, useState } from 'react';
-
-import {
-  BackupExitReason,
-  BackupProgress,
-} from '../../../main/background-processes/backups';
-import Error from '../../assets/error.svg';
-import Success from '../../assets/success.svg';
-import Warn from '../../assets/warn.svg';
-import useBackupFatalErrors from '../../hooks/BackupFatalErrors';
-import useBackupStatus from '../../hooks/BackupStatus';
-import useProcessIssues from '../../hooks/ProcessIssues';
-import { getPercentualProgress } from '../../utils/backups-progress';
-import { ClockCounterClockwise, X } from '@phosphor-icons/react';
-import { DeviceContext } from 'renderer/context/DeviceContext';
-
-export function BackupsBanner({
-  className = '',
-  onVisibilityChanged,
-}: {
-  className?: string;
-  onVisibilityChanged: (value: boolean) => void;
-}) {
-  const [deviceState] = useContext(DeviceContext);
-  const status = useBackupStatus();
-  const { backupFatalErrors } = useBackupFatalErrors();
-  const issues = useProcessIssues().filter(
-    (issue) => issue.process === 'BACKUPS'
-  );
-
-  const [backupProgress, setBackupProgress] = useState<null | BackupProgress>(
-    null
-  );
-
-  const [hidden, setHidden] = useState(false);
-
-  useEffect(() => {
-    setHidden(false);
-  }, [status]);
-
-  const [lastExit, setLastExit] = useState<null | BackupExitReason>(null);
-
-  useEffect(() => {
-    const removeListener = window.electron.onBackupProgress(setBackupProgress);
-
-    return removeListener;
-  }, []);
-
-  useEffect(() => {
-    window.electron.getLastBackupExitReason().then(setLastExit);
-  }, [status]);
-
-  let body = '';
-  let percentage = '';
-  let action = '';
-
-  if (status === 'RUNNING' && backupProgress) {
-    body =
-      backupProgress.totalFolders > 1
-        ? `Backed up ${backupProgress.currentFolder - 1} out of ${
-            backupProgress.totalFolders
-          } folders`
-        : 'Backing up your folder';
-
-    const percentualProgress = getPercentualProgress(backupProgress);
-
-    percentage = `${percentualProgress.toFixed(0)}%`;
-  } else if (backupFatalErrors.length) {
-    body = 'At least one of your backups failed';
-    action = 'See more';
-  } else if (issues.length) {
-    body = 'Backup completed with issues';
-    action = 'See more';
-  } else if (lastExit === 'FORCED_BY_USER') {
-    body = 'Backup stopped';
-    action = 'Start again';
-  } else if (backupProgress) {
-    body =
-      backupProgress.totalFolders > 1
-        ? `Backed up ${backupProgress.totalFolders} folders`
-        : 'Backed up your folder';
-  }
-
-  let iconVariant: 'SUCCESS' | 'WARNING' | 'ERROR' | undefined;
-
-  if (
-    status === 'STANDBY' &&
-    issues.length === 0 &&
-    backupFatalErrors.length === 0 &&
-    lastExit === 'PROCESS_FINISHED'
-  ) {
-    iconVariant = 'SUCCESS';
-  } else if (backupFatalErrors.length) {
-    iconVariant = 'ERROR';
-  } else if (issues.length) {
-    iconVariant = 'WARNING';
-  }
-
-  const show = (status !== 'STANDBY' || backupProgress) && !hidden;
-
-  useEffect(() => {
-    onVisibilityChanged(show as boolean);
-  }, [status, backupProgress, hidden]);
-
-  function onClick() {
-    if (issues.length || backupFatalErrors.length) {
-      window.electron.openProcessIssuesWindow();
-    } else if (lastExit === 'FORCED_BY_USER') {
-      window.electron.startBackupsProcess();
-    } else {
-      window.electron.openSettingsWindow('BACKUPS');
-    }
-
-    if (status !== 'RUNNING') {
-      setHidden(true);
-    }
-  }
-
-  const BackupsIcon = ({
-    variant,
-  }: {
-    variant?: 'SUCCESS' | 'WARNING' | 'ERROR';
-  }) => {
-    return (
-      <div className="relative">
-        <ClockCounterClockwise
-          size={28}
-          weight="light"
-          className="text-gray-100"
-        />
-        {variant === 'SUCCESS' && (
-          <>
-            <div className="absolute bottom-0 right-0 h-3.5 w-3.5 rounded-full bg-white" />
-            <Success className="absolute bottom-0 right-0 h-3.5 w-3.5" />
-          </>
-        )}
-        {variant === 'WARNING' && (
-          <Warn className="absolute bottom-0 right-0 h-3.5 w-3.5" />
-        )}
-        {variant === 'ERROR' && (
-          <Error className="absolute bottom-0 right-0 h-3.5 w-3.5" />
-        )}
-      </div>
-    );
-  };
-
-  return (
-    <AnimatePresence>
-      {show && (
-        <motion.div
-          initial={{ opacity: 0 }}
-          animate={{ opacity: 1 }}
-          exit={{ opacity: 0 }}
-          transition={{ duration: 0.2, ease: 'easeInOut' }}
-          className={`group/backupsBanner relative flex px-3 pt-3 ${className}`}
-          role="none"
-          onClick={onClick}
-        >
-          <div className="flex h-16 flex-1 items-center space-x-2.5 truncate rounded-lg border border-gray-10 bg-gray-1 px-3 shadow-sm dark:bg-gray-5">
-            <BackupsIcon variant={iconVariant} />
-
-            <div className="flex flex-1 flex-col -space-y-0.5 truncate">
-              <div className="flex h-5 max-h-5 min-h-[20px] flex-1 items-start space-x-4 truncate">
-                <h1 className="flex-1 truncate text-sm font-medium leading-4 text-gray-100">
-                  {deviceState.status === 'SUCCESS'
-                    ? deviceState.device.name
-                    : 'Backup'}
-                </h1>
-
-                <X
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    setHidden(true);
-                  }}
-                  size={20}
-                  className={`hidden shrink-0 cursor-pointer text-gray-60 hover:text-gray-80 active:text-gray-60 ${
-                    status === 'STANDBY' ? 'group-hover/backupsBanner:flex' : ''
-                  }`}
-                />
-              </div>
-
-              <p className="truncate text-xs font-medium text-gray-60">
-                {body}
-                <span className="ml-1">{percentage}</span>
-                <span className="ml-1 text-primary">{action}</span>
-              </p>
-            </div>
-          </div>
-        </motion.div>
-      )}
-    </AnimatePresence>
-  );
-}
diff --git a/src/renderer/pages/Widget/BackupsErrorBanner.tsx b/src/renderer/pages/Widget/BackupsErrorBanner.tsx
deleted file mode 100644
index 8bf0c749a..000000000
--- a/src/renderer/pages/Widget/BackupsErrorBanner.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { useTranslationContext } from 'renderer/context/LocalContext';
-
-import { ProcessFatalErrorName } from '../../../workers/types';
-import Warn from '../../assets/warn.svg';
-import useBackupFatalErrors from '../../hooks/BackupFatalErrors';
-import obtainErrorAction from '../../messages/backups/backups-actions-map';
-import obtainErrorMessage from '../../messages/backups/backups-fatal-errors';
-
-function ErrorBanner({ errorName }: { errorName: ProcessFatalErrorName }) {
-  const { translate } = useTranslationContext();
-
-  const action = obtainErrorAction(errorName);
-
-  return (
-    <div className="flex items-center truncate border-b border-yellow-dark/20 bg-yellow/10 px-3 py-3 text-xs text-yellow-dark">
-      <Warn className="h-5 w-5" />
-      <p
-        className="ml-2 inline flex-1 truncate"
-        title={translate(obtainErrorMessage(errorName))}
-      >
-        {translate(obtainErrorMessage(errorName))}
-      </p>
-      {action && (
-        <span
-          onClick={action.fn}
-          role="button"
-          tabIndex={0}
-          onKeyDown={action.fn}
-          className="mr-2 cursor-pointer whitespace-nowrap text-xs text-yellow-dark underline"
-        >
-          {action.name}
-        </span>
-      )}
-    </div>
-  );
-}
-
-export default function BackupsFatalErrorBanner() {
-  const { backupFatalErrors } = useBackupFatalErrors();
-
-  return (
-    <>
-      {backupFatalErrors.map(({ errorName }) => (
-        <ErrorBanner errorName={errorName} />
-      ))}
-    </>
-  );
-}
diff --git a/src/renderer/utils/backups-progress.ts b/src/renderer/utils/backups-progress.ts
deleted file mode 100644
index 13a2bbff1..000000000
--- a/src/renderer/utils/backups-progress.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BackupProgress } from '../../main/background-processes/backups';
-
-export function getPercentualProgress(progress: BackupProgress) {
-  const partialProgress = progress.totalItems
-    ? progress.completedItems! / progress.totalItems
-    : 0;
-  const totalProgress =
-    (progress.currentFolder - 1 + partialProgress) / progress.totalFolders;
-
-  return totalProgress * 100;
-}
diff --git a/src/renderer/utils/query.ts b/src/renderer/utils/query.ts
deleted file mode 100644
index 09e566482..000000000
--- a/src/renderer/utils/query.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { AvaliableMethods } from '../../main/app-info/AvaliableAppQuery';
-import { AppQuery } from '../../main/app-info/service';
-import { StoredValues } from '../../main/config/service';
-
-export async function queryApp(
-  input: AvaliableMethods | AppQuery<AvaliableMethods>
-) {
-  const query =
-    typeof input === 'string'
-      ? ({ method: input, params: [] } as AppQuery<AvaliableMethods>)
-      : input;
-
-  return window.electron.query(query);
-}
-
-export async function getConfigKey(key: StoredValues) {
-  return window.electron.getConfigKey(key);
-}
diff --git a/src/shared/types/Process.ts b/src/shared/types/Process.ts
deleted file mode 100644
index e7913b709..000000000
--- a/src/shared/types/Process.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type Process = 'SYNC' | 'BACKUPS';
diff --git a/src/workers/backups/backups.ts b/src/workers/backups/backups.ts
deleted file mode 100644
index 9d86cc59e..000000000
--- a/src/workers/backups/backups.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import Logger from 'electron-log';
-import _ from 'lodash';
-
-import Process, { ProcessEvents, ProcessResult } from './process';
-
-class Backups extends Process {
-  private static NUMBER_OF_PARALLEL_QUEUES_FOR_SMALL_FILES = 16;
-
-  private static NUMBER_OF_PARALLEL_QUEUES_FOR_MEDIUM_FILES = 6;
-
-  private static NUMBER_OF_PARALLEL_QUEUES_FOR_BIG_FILES = 2;
-
-  private static MAX_SMALL_FILE_SIZE = 1024 * 1024;
-
-  private static MAX_MEDIUM_FILE_SIZE = 20 * 1024 * 1024;
-
-  async run(): Promise<ProcessResult> {
-    this.emit('SMOKE_TESTING');
-
-    await this.local.smokeTest();
-    await this.remote.smokeTest();
-
-    this.emit('GENERATING_ACTIONS_NEEDED_TO_SYNC');
-
-    const { currentLocal, currentRemote } = await this.getCurrentListings({
-      emitErrors: true,
-    });
-
-    Logger.debug('Current local before', currentLocal);
-    Logger.debug('Current remote before', currentRemote);
-
-    const {
-      filesNotInLocal: deleteInRemote,
-      filesNotInRemote,
-      filesWithDifferentModtime,
-    } = this.getListingsDiff(currentLocal, currentRemote);
-
-    const pullFromRemote = filesNotInRemote.concat(filesWithDifferentModtime);
-
-    Logger.debug('Queue pull from remote', pullFromRemote);
-    Logger.debug('Queue delete from remote', deleteInRemote);
-
-    this.emit(
-      'ACTION_QUEUE_GENERATED',
-      pullFromRemote.length + deleteInRemote.length
-    );
-
-    function getChunkSize(numberOfFiles: number, numberOfQueues: number) {
-      return Math.ceil(numberOfFiles / numberOfQueues);
-    }
-
-    const smallFiles = pullFromRemote.filter(
-      (name) => currentLocal[name].size <= Backups.MAX_SMALL_FILE_SIZE
-    );
-    Logger.debug('Small files: ', smallFiles);
-
-    const smallFileChunks = _.chunk(
-      smallFiles,
-      getChunkSize(
-        smallFiles.length,
-        Backups.NUMBER_OF_PARALLEL_QUEUES_FOR_SMALL_FILES
-      )
-    );
-    Logger.debug('Small file chunks: ', smallFileChunks);
-
-    const smallFileQueues = smallFileChunks.map((chunk) =>
-      this.consumePullQueue(chunk, this.remote, this.local)
-    );
-
-    await Promise.all(smallFileQueues);
-
-    const mediumFiles = pullFromRemote.filter((name) => {
-      const { size } = currentLocal[name];
-
-      return (
-        size > Backups.MAX_SMALL_FILE_SIZE &&
-        size <= Backups.MAX_MEDIUM_FILE_SIZE
-      );
-    });
-    Logger.debug('Medium files: ', mediumFiles);
-
-    const mediumFileChunks = _.chunk(
-      mediumFiles,
-      getChunkSize(
-        mediumFiles.length,
-        Backups.NUMBER_OF_PARALLEL_QUEUES_FOR_MEDIUM_FILES
-      )
-    );
-    Logger.debug('Medium file chunks: ', mediumFileChunks);
-
-    const mediumFileQueues = mediumFileChunks.map((chunk) =>
-      this.consumePullQueue(chunk, this.remote, this.local)
-    );
-
-    await Promise.all(mediumFileQueues);
-
-    const bigFiles = pullFromRemote.filter(
-      (name) => currentLocal[name].size > Backups.MAX_MEDIUM_FILE_SIZE
-    );
-
-    Logger.debug('Big files: ', bigFiles);
-
-    const bigFileChunks = _.chunk(
-      bigFiles,
-      getChunkSize(
-        bigFiles.length,
-        Backups.NUMBER_OF_PARALLEL_QUEUES_FOR_BIG_FILES
-      )
-    );
-    Logger.debug('Big file chunks: ', bigFileChunks);
-
-    const bigFileQueues = bigFileChunks.map((chunk) =>
-      this.consumePullQueue(chunk, this.remote, this.local)
-    );
-
-    await Promise.all([
-      ...bigFileQueues,
-      this.consumeDeleteQueue(deleteInRemote, this.remote),
-    ]);
-
-    const result = await this.generateResult();
-
-    if (result.status === 'IN_SYNC') {
-      const { listing, ...rest } = result;
-
-      return rest;
-    }
-
-    return result;
-  }
-}
-
-interface BackupsEvents extends ProcessEvents {
-  ACTION_QUEUE_GENERATED: (totalItems: number) => void;
-}
-
-/**
- * Enable event typing
- */
-declare interface Backups {
-  on<U extends keyof BackupsEvents>(event: U, listener: BackupsEvents[U]): this;
-
-  emit<U extends keyof BackupsEvents>(
-    event: U,
-    ...args: Parameters<BackupsEvents[U]>
-  ): boolean;
-}
-
-export default Backups;
diff --git a/src/workers/backups/index.ts b/src/workers/backups/index.ts
deleted file mode 100644
index 5cae18f66..000000000
--- a/src/workers/backups/index.ts
+++ /dev/null
@@ -1,249 +0,0 @@
-import { ipcRenderer as electronIpcRenderer } from 'electron';
-import Logger from 'electron-log';
-
-import { getUser } from '../../main/auth/service';
-import configStore from '../../main/config';
-import { getClients } from '../../shared/HttpClient/backgroud-process-clients';
-import { getLocalFilesystem } from '../filesystems/local-filesystem';
-import { getRemoteFilesystem } from '../filesystems/remote-filesystem';
-import {
-  ProcessFatalError,
-  ProcessFatalErrorName,
-  ProcessIssue,
-} from '../types';
-import Backups from './backups';
-
-export type BackupsArgs = {
-  folderId: number;
-  path: string;
-  tmpPath: string;
-  backupsBucket: string;
-};
-
-export type BackupProgressIssue = ProcessIssue & {
-  folderId: number;
-};
-
-export interface BackupsEvents {
-  BACKUP_FATAL_ERROR: (
-    folderId: number,
-    errorName: ProcessFatalErrorName
-  ) => void;
-  BACKUP_PROGRESS: (payload: {
-    completedItems: number;
-    totalItems: number;
-  }) => void;
-  BACKUP_ISSUE: (issue: BackupProgressIssue) => void;
-  BACKUP_EXIT: (folderId: number) => void;
-  BACKUP_ACTION_DONE: () => void;
-  BACKUP_ACTION_QUEUE_GENERATED: ({
-    folderId,
-    items,
-  }: {
-    folderId: number;
-    items: number;
-  }) => void;
-}
-
-interface IpcRenderer {
-  send<U extends keyof BackupsEvents>(
-    event: U,
-    ...args: Parameters<BackupsEvents[U]>
-  ): void;
-  invoke(channel: 'get-backups-details'): Promise<BackupsArgs>;
-  invoke(channel: 'get-headers'): Promise<HeadersInit>;
-}
-
-const ipcRenderer = electronIpcRenderer as IpcRenderer;
-
-let completedItems = 0;
-let totalItems = 0;
-
-function onCompletedItem() {
-  completedItems++;
-  ipcRenderer.send('BACKUP_PROGRESS', { completedItems, totalItems });
-}
-
-async function setUp() {
-  const { tmpPath, path, folderId, backupsBucket } = await ipcRenderer.invoke(
-    'get-backups-details'
-  );
-  const headers = await ipcRenderer.invoke('get-headers');
-  const user = getUser();
-
-  if (!user) {
-    throw new Error('No user');
-  }
-
-  const clients = getClients();
-
-  const remote = getRemoteFilesystem({
-    baseFolderId: folderId,
-    headers,
-    bucket: backupsBucket,
-    mnemonic: configStore.get('mnemonic'),
-    userInfo: user,
-    clients,
-  });
-  const local = getLocalFilesystem(path, tmpPath);
-
-  const backups = new Backups(local, remote);
-
-  backups.on('SMOKE_TESTING', () => Logger.log('Smoke testing'));
-
-  backups.on('GENERATING_ACTIONS_NEEDED_TO_SYNC', () =>
-    Logger.log('Generating actions needed to sync')
-  );
-
-  backups.on('ACTION_QUEUE_GENERATED', (n) => {
-    totalItems = n;
-    ipcRenderer.send('BACKUP_ACTION_QUEUE_GENERATED', { folderId, items: n });
-  });
-
-  backups.on('PULLING_FILE', (name, progress, kind) => {
-    Logger.debug(`Pulling file ${name} from ${kind}: ${progress * 100}%`);
-  });
-
-  backups.on('FILE_PULLED', (name, kind) => {
-    onCompletedItem();
-    Logger.debug(`File ${name} pulled from ${kind}`);
-    ipcRenderer.send('BACKUP_ACTION_DONE');
-  });
-
-  backups.on('ERROR_PULLING_FILE', (name, kind, errorName, errorDetails) => {
-    Logger.error(
-      `Error pulling file in ${kind} (${errorName}), details: ${JSON.stringify(
-        errorDetails,
-        null,
-        2
-      )}`
-    );
-    ipcRenderer.send('BACKUP_ISSUE', {
-      action: 'DELETE_ERROR',
-      kind,
-      name,
-      errorName,
-      process: 'BACKUPS',
-      folderId,
-    });
-  });
-
-  backups.on('RENAMING_FILE', (oldName, newName, kind) => {
-    Logger.debug(`Renaming file ${oldName} -> ${newName} in ${kind}`);
-  });
-
-  backups.on('FILE_RENAMED', (oldName, newName, kind) => {
-    Logger.debug(`File ${oldName} renamed -> ${newName} in ${kind}`);
-    ipcRenderer.send('BACKUP_ACTION_DONE');
-  });
-
-  backups.on(
-    'ERROR_RENAMING_FILE',
-    (oldName, newName, kind, errorName, errorDetails) => {
-      Logger.error(
-        `Error renaming file ${oldName} -> ${newName} in ${kind} (${errorName}), details: ${JSON.stringify(
-          errorDetails,
-          null,
-          2
-        )}`
-      );
-    }
-  );
-
-  backups.on('DELETING_FILE', (name, kind) => {
-    Logger.debug(`Deleting file ${name} in ${kind}`);
-  });
-
-  backups.on('FILE_DELETED', (name, kind) => {
-    onCompletedItem();
-    Logger.debug(`Deleted file ${name} in ${kind}`);
-    ipcRenderer.send('BACKUP_ACTION_DONE');
-  });
-
-  backups.on('ERROR_DELETING_FILE', (name, kind, errorName, errorDetails) => {
-    Logger.error(
-      `Error deleting file ${name} in ${kind} (${errorName}), details: ${JSON.stringify(
-        errorDetails,
-        null,
-        2
-      )}`
-    );
-    ipcRenderer.send('BACKUP_ISSUE', {
-      action: 'DELETE_ERROR',
-      kind,
-      name,
-      errorName,
-      process: 'BACKUPS',
-      folderId,
-    });
-  });
-
-  backups.on('DELETING_FOLDER', (name, kind) => {
-    Logger.debug(`Deleting folder ${name} in ${kind}`);
-  });
-
-  backups.on('FOLDER_DELETED', (name, kind) => {
-    Logger.debug(`Deleted folder ${name} in ${kind}`);
-    ipcRenderer.send('BACKUP_ACTION_DONE');
-  });
-
-  backups.on('ERROR_DELETING_FOLDER', (name, kind, errorName, errorDetails) =>
-    Logger.error(
-      `Error deleting folder ${name} in ${kind} (${errorName}), details: ${JSON.stringify(
-        errorDetails,
-        null,
-        2
-      )}`
-    )
-  );
-
-  backups.on(
-    'ERROR_READING_METADATA',
-    (name, kind, errorName, errorDetails) => {
-      Logger.error(
-        `Error reading metadata ${name} in ${kind} (${errorName}), details: ${JSON.stringify(
-          errorDetails,
-          null,
-          2
-        )}`
-      );
-      ipcRenderer.send('BACKUP_ISSUE', {
-        action: 'METADATA_READ_ERROR',
-        kind,
-        name,
-        errorName,
-        process: 'BACKUPS',
-        folderId,
-      });
-    }
-  );
-
-  try {
-    await backups.run();
-    Logger.log(`Backup done, folderId: ${folderId} & path: ${path}`);
-    ipcRenderer.send('BACKUP_EXIT', folderId);
-  } catch (err) {
-    if (err instanceof ProcessFatalError) {
-      Logger.error(
-        `Backups fatal error (${err.name}), details: ${JSON.stringify(
-          err.details,
-          null,
-          2
-        )}`
-      );
-      ipcRenderer.send(
-        'BACKUP_FATAL_ERROR',
-        folderId,
-        err.name as ProcessFatalErrorName
-      );
-    } else {
-      Logger.error(
-        'Completely unhandled backups fatal error',
-        JSON.stringify(err, null, 2)
-      );
-      ipcRenderer.send('BACKUP_FATAL_ERROR', folderId, 'UNKNOWN');
-    }
-  }
-}
-
-setUp();
diff --git a/src/workers/backups/process.ts b/src/workers/backups/process.ts
deleted file mode 100644
index e1f614a8f..000000000
--- a/src/workers/backups/process.ts
+++ /dev/null
@@ -1,435 +0,0 @@
-import Logger from 'electron-log';
-import { EventEmitter } from 'events';
-import _ from 'lodash';
-import path from 'path';
-
-import { FileSystem as NewFileSystem } from '../filesystems/domain/FileSystem';
-import {
-  ErrorDetails,
-  FileSystem,
-  FileSystemKind,
-  Listing,
-  ProcessError,
-  ProcessErrorName,
-  ProcessFatalError,
-  ReadingMetaErrorEntry,
-} from '../types';
-import { createErrorDetails } from '../utils/reporting';
-
-abstract class Process extends EventEmitter {
-  constructor(
-    protected readonly local: FileSystem,
-    protected readonly remote: FileSystem
-  ) {
-    super();
-  }
-
-  protected rename(name: string, sufix: string): string {
-    const { dir, ext, name: base } = path.parse(name);
-
-    return `${dir ? `${dir}/` : ''}${base}_${sufix}${ext}`;
-  }
-
-  protected async consumeRenameQueue(
-    queue: [string, string][],
-    fileSystem: FileSystem
-  ): Promise<void> {
-    for (const [oldName, newName] of queue) {
-      this.emit('RENAMING_FILE', oldName, newName, fileSystem.kind);
-
-      try {
-        await fileSystem.renameFile(oldName, newName);
-        this.emit('FILE_RENAMED', oldName, newName, fileSystem.kind);
-      } catch (err) {
-        const syncError =
-          err instanceof ProcessError
-            ? err
-            : new ProcessError(
-                'UNKNOWN',
-                createErrorDetails(
-                  err,
-                  'Renaming file',
-                  `oldName: ${oldName}, newName: ${newName}, kind: ${fileSystem.kind}`
-                )
-              );
-
-        this.emit(
-          'ERROR_RENAMING_FILE',
-          oldName,
-          newName,
-          fileSystem.kind,
-          syncError.name as ProcessErrorName,
-          syncError.details
-        );
-      }
-    }
-  }
-
-  protected async consumePullQueue(
-    queue: string[],
-    destFs: Pick<FileSystem | NewFileSystem<any>, 'pullFile' | 'kind'>,
-    srcFs: Pick<FileSystem | NewFileSystem<any>, 'getSource'>
-  ): Promise<void> {
-    const controllers: Array<AbortController> = [];
-
-    this.on('LOST_CONNECTION', () => {
-      Logger.log('[PROCESS] Aborting upload');
-      controllers.every((controller) => controller.abort('LOST_CONNECTION'));
-    });
-
-    for (const name of queue) {
-      const progressCallback = (progress: number) =>
-        this.emit('PULLING_FILE', name, progress, destFs.kind);
-      progressCallback(0);
-
-      try {
-        const source = await srcFs.getSource(name, progressCallback);
-
-        const abortController = new AbortController();
-
-        controllers.push(abortController);
-
-        const id = await destFs.pullFile(
-          name,
-          source,
-          progressCallback,
-          abortController.signal
-        );
-        this.emit('FILE_PULLED', name, destFs.kind, id);
-      } catch (err) {
-        const syncError =
-          err instanceof ProcessError
-            ? err
-            : new ProcessError(
-                'UNKNOWN',
-                createErrorDetails(
-                  err,
-                  'Pulling file',
-                  `name: ${name}, kind: ${destFs.kind}`
-                )
-              );
-        this.emit(
-          'ERROR_PULLING_FILE',
-          name,
-          destFs.kind,
-          syncError.name as ProcessErrorName,
-          syncError.details
-        );
-      }
-    }
-  }
-
-  protected async consumeDeleteQueue(
-    queue: string[],
-    fileSystem: FileSystem
-  ): Promise<void> {
-    for (const name of queue) {
-      this.emit('DELETING_FILE', name, fileSystem.kind);
-
-      try {
-        await fileSystem.deleteFile(name);
-        this.emit('FILE_DELETED', name, fileSystem.kind);
-      } catch (err) {
-        const syncError =
-          err instanceof ProcessError
-            ? err
-            : new ProcessError(
-                'UNKNOWN',
-                createErrorDetails(
-                  err,
-                  'Deleting file',
-                  `name: ${name}, kind: ${fileSystem.kind}`
-                )
-              );
-        this.emit(
-          'ERROR_DELETING_FILE',
-          name,
-          fileSystem.kind,
-          syncError.name as ProcessErrorName,
-          syncError.details
-        );
-      }
-    }
-  }
-
-  protected async consumeDeleteFolderQueue(
-    queue: string[],
-    fileSystem: FileSystem
-  ): Promise<void> {
-    for (const name of queue) {
-      this.emit('DELETING_FOLDER', name, fileSystem.kind);
-
-      try {
-        await fileSystem.deleteFolder(name);
-        this.emit('FOLDER_DELETED', name, fileSystem.kind);
-      } catch (err) {
-        const syncError =
-          err instanceof ProcessError
-            ? err
-            : new ProcessError(
-                'UNKNOWN',
-                createErrorDetails(
-                  err,
-                  'Deleting folder',
-                  `name: ${name}, kind: ${fileSystem.kind}`
-                )
-              );
-        this.emit(
-          'ERROR_DELETING_FOLDER',
-          name,
-          fileSystem.kind,
-          syncError.name as ProcessErrorName,
-          syncError.details
-        );
-      }
-    }
-  }
-
-  protected getListingsDiff(local: Listing, remote: Listing): ListingsDiff {
-    const filesNotInLocal = [];
-    const filesNotInRemote = [];
-    const filesWithDifferentModtime = [];
-    const filesInSync: Listing = {};
-
-    for (const [localName, { modtime: localModtime }] of Object.entries(
-      local
-    )) {
-      const entryInRemote = remote[localName];
-
-      if (!entryInRemote) {
-        filesNotInRemote.push(localName);
-      } else if (localModtime !== entryInRemote.modtime) {
-        filesWithDifferentModtime.push(localName);
-      } else {
-        filesInSync[localName] = entryInRemote;
-      }
-    }
-
-    for (const remoteName of Object.keys(remote)) {
-      if (!(remoteName in local)) {
-        filesNotInLocal.push(remoteName);
-      }
-    }
-
-    return {
-      filesNotInLocal,
-      filesNotInRemote,
-      filesWithDifferentModtime,
-      filesInSync,
-    };
-  }
-
-  protected async getCurrentListings(options: {
-    emitErrors: boolean;
-  }): Promise<{
-    currentLocal: Listing;
-    currentRemote: Listing;
-  }> {
-    try {
-      const [localResult, remoteResult] = await Promise.all([
-        this.local.getCurrentListing(),
-        this.remote.getCurrentListing(),
-      ]);
-
-      if (options.emitErrors) {
-        this.emitReadingMetaErrors(localResult.readingMetaErrors, 'LOCAL');
-        this.emitReadingMetaErrors(remoteResult.readingMetaErrors, 'REMOTE');
-      }
-
-      return {
-        currentLocal: localResult.listing,
-        currentRemote: remoteResult.listing,
-      };
-    } catch (err) {
-      const syncError =
-        err instanceof ProcessError
-          ? new ProcessFatalError('CANNOT_GET_CURRENT_LISTINGS', err.details)
-          : new ProcessFatalError(
-              'CANNOT_GET_CURRENT_LISTINGS',
-              createErrorDetails(err, 'Getting current listings')
-            );
-
-      throw syncError;
-    }
-  }
-
-  protected emitReadingMetaErrors(
-    errors: ReadingMetaErrorEntry[],
-    kind: FileSystemKind
-  ) {
-    errors.forEach((entry) => {
-      this.emit(
-        'ERROR_READING_METADATA',
-        entry.name,
-        kind,
-        entry.errorName,
-        entry.errorDetails
-      );
-    });
-  }
-
-  protected async generateResult(): Promise<
-    (SuccessfulProcessResult & { listing: Listing }) | UnsuccessfulProcessResult
-  > {
-    const { currentLocal, currentRemote } = await this.getCurrentListings({
-      emitErrors: false,
-    });
-
-    if (_.isEqual(currentLocal, currentRemote)) {
-      const currentInBoth = currentLocal;
-      Logger.debug('Current in both:', currentInBoth);
-
-      return { status: 'IN_SYNC', listing: currentInBoth };
-    }
-    Logger.debug('Current local:', currentLocal);
-    Logger.debug('Current remote:', currentRemote);
-
-    const diff = this.getListingsDiff(currentLocal, currentRemote);
-
-    return { status: 'NOT_IN_SYNC', diff };
-  }
-
-  abstract run(): Promise<ProcessResult>;
-}
-
-export interface ProcessEvents {
-  /**
-   * Triggered when the process tries to test
-   * whether the filesystems are operational
-   */
-  SMOKE_TESTING: () => void;
-  /**
-   * Triggered when processing what changes
-   * need to be done in remote/local to be
-   * properly synced
-   */
-  GENERATING_ACTIONS_NEEDED_TO_SYNC: () => void;
-
-  /**
-   * Triggered when a file is being pulled
-   */
-  PULLING_FILE: (
-    name: string,
-    progress: number,
-    fileSystemKind: FileSystemKind
-  ) => void;
-  /**
-   * Triggered when a file has been pulled
-   */
-  FILE_PULLED: (
-    name: string,
-    fileSystemKind: FileSystemKind,
-    fileId: number | undefined
-  ) => void;
-  /**
-   * Triggered when an error has occurred while pulling a file
-   */
-  ERROR_PULLING_FILE: (
-    name: string,
-    fileSystemKind: FileSystemKind,
-    errName: ProcessErrorName,
-    errDetails: ErrorDetails
-  ) => void;
-
-  /**
-   * Triggered when a file is being deleted
-   */
-  DELETING_FILE: (name: string, fileSystemKind: FileSystemKind) => void;
-  /**
-   * Triggered when a file has been deleted
-   */
-  FILE_DELETED: (name: string, fileSystemKind: FileSystemKind) => void;
-  /**
-   * Triggered when an error has occurred while deleting a file
-   */
-  ERROR_DELETING_FILE: (
-    name: string,
-    fileSystemKind: FileSystemKind,
-    errName: ProcessErrorName,
-    errDetails: ErrorDetails
-  ) => void;
-
-  /**
-   * Triggered when a folder is being created
-   */
-  PULLING_FOLDER: (name: string, fileSystemKind: FileSystemKind) => void;
-  /**
-   * Triggered when a folder has been created
-   */
-  FOLDER_PULLED: (name: string, fileSystemKind: FileSystemKind) => void;
-
-  /**
-   * Triggered when a folder is being deleted
-   */
-  DELETING_FOLDER: (name: string, fileSystemKind: FileSystemKind) => void;
-  /**
-   * Triggered when a folder has been deleted
-   */
-  FOLDER_DELETED: (name: string, fileSystemKind: FileSystemKind) => void;
-  /**
-   * Triggered when an error has occurred while deleting a folder
-   */
-  ERROR_DELETING_FOLDER: (
-    name: string,
-    fileSystemKind: FileSystemKind,
-    errName: ProcessErrorName,
-    errDetails: ErrorDetails
-  ) => void;
-
-  /**
-   * Triggered when a file is being renamed
-   */
-  RENAMING_FILE: (
-    oldName: string,
-    newName: string,
-    fileSystemKind: FileSystemKind
-  ) => void;
-  /**
-   * Triggered when a file has been renamed
-   */
-  FILE_RENAMED: (
-    oldName: string,
-    newName: string,
-    fileSystemKind: FileSystemKind
-  ) => void;
-  /**
-   * Triggered when an error has occurred while renaming a file
-   */
-  ERROR_RENAMING_FILE: (
-    oldName: string,
-    newName: string,
-    fileSystemKind: FileSystemKind,
-    errName: ProcessErrorName,
-    errDetails: ErrorDetails
-  ) => void;
-
-  /**
-   * Triggered when an error has occurred while reading the metadata of a file
-   */
-  ERROR_READING_METADATA: (
-    name: string,
-    fileSystemKind: FileSystemKind,
-    errName: ProcessErrorName,
-    errDetails: ErrorDetails
-  ) => void;
-}
-
-export type ListingsDiff = {
-  filesNotInLocal: string[];
-  filesNotInRemote: string[];
-  filesWithDifferentModtime: string[];
-  filesInSync: Listing;
-};
-
-export type ProcessResult = SuccessfulProcessResult | UnsuccessfulProcessResult;
-
-export type SuccessfulProcessResult = {
-  status: 'IN_SYNC';
-};
-
-export type UnsuccessfulProcessResult = {
-  status: 'NOT_IN_SYNC';
-  diff: ListingsDiff;
-};
-
-export default Process;
diff --git a/src/workers/backups/test/backups.test.ts b/src/workers/backups/test/backups.test.ts
deleted file mode 100644
index 1afa7dfb0..000000000
--- a/src/workers/backups/test/backups.test.ts
+++ /dev/null
@@ -1,191 +0,0 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-import { Readable } from 'stream';
-
-import { FileSystem } from '../../types';
-import Backups from '../backups';
-
-describe('backups tests', () => {
-  const mockBase: () => FileSystem = () => ({
-    kind: 'LOCAL',
-    async getCurrentListing() {
-      return { listing: {}, readingMetaErrors: [] };
-    },
-    async deleteFile() {},
-    async pullFile() {},
-    async renameFile() {},
-    async existsFolder() {
-      return false;
-    },
-    async deleteFolder() {},
-    async getSource() {
-      return {
-        modTime: 4,
-        size: 4,
-        stream: {} as Readable,
-      };
-    },
-    async smokeTest() {},
-  });
-
-  function setupEventSpies(backups: Backups) {
-    const smokeTestingCB = jest.fn();
-    const generatingActionsCB = jest.fn();
-    const pullingFileCB = jest.fn();
-    const pulledFileCB = jest.fn();
-    const deletingFileCB = jest.fn();
-    const deletedFileCB = jest.fn();
-    const deletingFolderCB = jest.fn();
-    const deletedFolderCB = jest.fn();
-    const renamingFileCB = jest.fn();
-    const renamedFileCB = jest.fn();
-    const actionQueueGeneratedCB = jest.fn();
-
-    backups.on('SMOKE_TESTING', smokeTestingCB);
-    backups.on('GENERATING_ACTIONS_NEEDED_TO_SYNC', generatingActionsCB);
-    backups.on('PULLING_FILE', pullingFileCB);
-    backups.on('FILE_PULLED', pulledFileCB);
-    backups.on('DELETING_FILE', deletingFileCB);
-    backups.on('FILE_DELETED', deletedFileCB);
-    backups.on('DELETING_FOLDER', deletingFolderCB);
-    backups.on('FOLDER_DELETED', deletedFolderCB);
-    backups.on('RENAMING_FILE', renamingFileCB);
-    backups.on('FILE_RENAMED', renamedFileCB);
-    backups.on('ACTION_QUEUE_GENERATED', actionQueueGeneratedCB);
-
-    return {
-      smokeTestingCB,
-      generatingActionsCB,
-      pullingFileCB,
-      pulledFileCB,
-      deletingFileCB,
-      deletedFileCB,
-      deletingFolderCB,
-      deletedFolderCB,
-      renamingFileCB,
-      renamedFileCB,
-      actionQueueGeneratedCB,
-    };
-  }
-
-  it('should run correctly', async () => {
-    const local: FileSystem = {
-      ...mockBase(),
-      async getCurrentListing() {
-        return {
-          listing: {
-            notExistInLocal: { modtime: 40, size: 1 },
-            existInBothButIsTheSame: { modtime: 30, size: 1 },
-            'folder/nested/existInBoth.txt': { modtime: 44, size: 1 },
-          },
-          readingMetaErrors: [],
-        };
-      },
-    };
-
-    const remote: FileSystem = {
-      ...mockBase(),
-      async getCurrentListing() {
-        return {
-          listing: {
-            notExistInRemote: { modtime: 40, size: 1 },
-            existInBothButIsTheSame: { modtime: 30, size: 1 },
-            'folder/nested/existInBoth.txt': { modtime: 55, size: 1 },
-          },
-          readingMetaErrors: [],
-        };
-      },
-    };
-
-    const backups = new Backups(local, remote);
-
-    const {
-      smokeTestingCB,
-      generatingActionsCB,
-      pullingFileCB,
-      pulledFileCB,
-      deletingFileCB,
-      deletedFileCB,
-      renamingFileCB,
-      renamedFileCB,
-      actionQueueGeneratedCB,
-    } = setupEventSpies(backups);
-
-    const spyRemotePull = jest.spyOn(remote, 'pullFile');
-
-    const spyRemoteDelete = jest.spyOn(remote, 'deleteFile');
-
-    await backups.run();
-
-    expect(spyRemotePull).toHaveBeenCalledTimes(2);
-
-    expect(spyRemotePull).toHaveBeenNthCalledWith(
-      1,
-      'notExistInLocal',
-      expect.anything(),
-      expect.anything(),
-      expect.anything()
-    );
-
-    expect(spyRemotePull).toHaveBeenNthCalledWith(
-      2,
-      'folder/nested/existInBoth.txt',
-      expect.anything(),
-      expect.anything(),
-      expect.anything()
-    );
-
-    expect(spyRemoteDelete).toHaveBeenCalledWith('notExistInRemote');
-
-    expect(smokeTestingCB).toBeCalledTimes(1);
-    expect(generatingActionsCB).toBeCalledTimes(1);
-    expect(pullingFileCB).toBeCalledTimes(2);
-    expect(pulledFileCB).toBeCalledTimes(2);
-    expect(deletingFileCB).toBeCalledTimes(1);
-    expect(deletedFileCB).toBeCalledTimes(1);
-    expect(renamingFileCB).toBeCalledTimes(0);
-    expect(renamedFileCB).toBeCalledTimes(0);
-    expect(actionQueueGeneratedCB).toBeCalledTimes(1);
-  });
-
-  it('should emit a fatal error if get current listings fails', async () => {
-    expect.assertions(1);
-
-    const fsFailing = mockBase();
-    const backups = new Backups(fsFailing, mockBase());
-
-    jest.spyOn(fsFailing, 'getCurrentListing').mockImplementation(async () => {
-      throw new Error();
-    });
-
-    try {
-      await backups.run();
-    } catch (err) {
-      expect(err.name).toBe('CANNOT_GET_CURRENT_LISTINGS');
-    }
-  });
-
-  it('Emits BACKUP_FATAL_ERROR when a file is empty', async () => {
-    const fsFailing = mockBase();
-    const fatalCB = jest.fn();
-
-    jest.spyOn(fsFailing, 'getCurrentListing').mockResolvedValueOnce({
-      listing: {},
-      readingMetaErrors: [
-        {
-          name: 'my file is awesome',
-          errorName: 'TEST_ERROR',
-          errorDetails: 'duno',
-        },
-      ],
-    });
-
-    const backups = new Backups(fsFailing, mockBase());
-    backups.on('ERROR_READING_METADATA', fatalCB);
-
-    const result = await backups.run();
-    expect(fatalCB).toBeCalledTimes(1);
-    expect.assertions(1);
-  });
-});
diff --git a/src/workers/filesystems/domain/FileSystem.ts b/src/workers/filesystems/domain/FileSystem.ts
deleted file mode 100644
index e6a2084d8..000000000
--- a/src/workers/filesystems/domain/FileSystem.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/* eslint-disable no-unused-vars */
-import {
-  FileSystemKind,
-  FileSystemProgressCallback,
-  ReadingMetaErrorEntry,
-  Source,
-} from '../../types';
-
-export interface FileSystem<T> {
-  /**
-   * The kind of filesystem, it's emitted
-   * in some fs events
-   */
-  kind: FileSystemKind;
-
-  /**
-   * Returns the listing of the current files
-   * in this FileSystem
-   */
-  getCurrentListing(): Promise<{
-    listing: T;
-    readingMetaErrors: ReadingMetaErrorEntry[];
-  }>;
-
-  /**
-   * Renames a file in the FileSystem
-   * @param oldName
-   * @param newName
-   */
-  renameFile(oldName: string, newName: string): Promise<void>;
-
-  /**
-   * Deletes a file in the FileSystem,
-   * doesn't throw if the file doesn't exist anymore
-   * @param name
-   */
-  deleteFile(name: string): Promise<void>;
-
-  /**
-   * Pulls a file from other FileSystem into this FileSystem,
-   * overwriting it if already exists
-   * @param name
-   * @param source
-   * @param progressCallback
-   */
-  pullFile(
-    name: string,
-    source: Source,
-    progressCallback: FileSystemProgressCallback,
-    abortSignal?: AbortSignal
-  ): Promise<number | void>;
-
-  /**
-   * Creates a folder into this FileSystem and updates its modtime
-   * @param name
-   * @param modtime
-   */
-  pullFolder(name: string, modtime: number): Promise<void>;
-
-  /**
-   * Checks if a folder exists in the filesystem
-   * @param name
-   */
-  existsFolder(name: string): Promise<boolean>;
-
-  /**
-   * Deletes a folder in the filesystem
-   * doesn't throw if the folder doesn't exist anymore
-   * @param name
-   */
-  deleteFolder(name: string): Promise<void>;
-
-  /**
-   * Returns an object source that contains
-   * anything that another filesystem would need
-   * to pull it
-   * @param name
-   * @param progressCallback
-   */
-  getSource(
-    name: string,
-    progressCallback: FileSystemProgressCallback
-  ): Promise<Source>;
-
-  /**
-   * Check critical resources of this filesystem
-   * and throw an error if it's not operative
-   */
-  smokeTest(): Promise<void>;
-
-  getFolderData(folderFullPath: string): Promise<{ modtime: number }>;
-}
diff --git a/src/workers/filesystems/domain/Transfer.ts b/src/workers/filesystems/domain/Transfer.ts
deleted file mode 100644
index 0326bdfca..000000000
--- a/src/workers/filesystems/domain/Transfer.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum TransferLimits {
-  MultipartUploadThreshold = 5 * 1024 * 1024 * 1024,
-  UploadFileSize = 10 * 1024 * 1024 * 1024,
-}
diff --git a/src/workers/filesystems/local-filesystem.ts b/src/workers/filesystems/local-filesystem.ts
deleted file mode 100644
index d4b59e25d..000000000
--- a/src/workers/filesystems/local-filesystem.ts
+++ /dev/null
@@ -1,362 +0,0 @@
-import Logger from 'electron-log';
-import { constants, createReadStream, createWriteStream } from 'fs';
-import * as fs from 'fs/promises';
-import ignore from 'ignore';
-import path from 'path';
-import glob from 'tiny-glob';
-import * as uuid from 'uuid';
-
-import ignoredFiles from '../../../ignored-files.json';
-import {
-  FileSystem,
-  Listing,
-  ProcessError,
-  ProcessFatalError,
-  ReadingMetaErrorEntry,
-  Source,
-} from '../types';
-import { getDateFromSeconds } from '../utils/date';
-import { fileNameIsValid } from '../utils/name-verification';
-import { createErrorDetails } from '../utils/reporting';
-
-export function getLocalFilesystem(
-  localPath: string,
-  tempDirectory: string
-): FileSystem {
-  /**
-   *
-   * @param actualPath OS Specific absolute path
-   * @returns Listing path relative to localPath with '/' as separator
-   */
-  function getListingPath(actualPath: string) {
-    return actualPath.split(localPath)[1].replaceAll(path.sep, '/');
-  }
-
-  /**
-   *
-   * @param listingPath Relative to localPath with '/' as separator
-   * @returns OS Specific absolute path
-   */
-  function getActualPath(listingPath: string) {
-    const osSpecificRelative = listingPath.replaceAll('/', path.sep);
-
-    return path.join(localPath, osSpecificRelative);
-  }
-
-  async function saferRenameFile(oldPath: string, newPath: string) {
-    try {
-      await fs.rename(oldPath, newPath);
-    } catch (e) {
-      const err = e as { code?: string };
-      if (err.code === 'EXDEV') {
-        await fs.copyFile(oldPath, newPath);
-        await fs.unlink(oldPath);
-      } else {
-        throw new ProcessError(
-          'UNKNOWN',
-          createErrorDetails(
-            err,
-            'Doing a safe rename',
-            `oldPath: ${oldPath}, newPath: ${newPath}`
-          )
-        );
-      }
-    }
-  }
-
-  function getTempFilePath() {
-    return path.join(tempDirectory, `${uuid.v4()}.tmp`);
-  }
-
-  async function getLocalMeta(
-    pathname: string
-  ): Promise<{ modTimeInSeconds: number; size: number }> {
-    const stat = await fs.stat(pathname);
-
-    return {
-      modTimeInSeconds: Math.trunc(stat.mtimeMs / 1000),
-      size: stat.size,
-    };
-  }
-
-  return {
-    kind: 'LOCAL',
-    async getCurrentListing() {
-      const ig = ignore().add(ignoredFiles);
-
-      const list = (
-        await glob('**', {
-          filesOnly: true,
-          absolute: true,
-          dot: true,
-          cwd: localPath,
-        })
-      ).filter((fileName) => {
-        const relativeFileName = path.relative(localPath, fileName);
-
-        if (ig.ignores(relativeFileName)) {
-          return false;
-        }
-
-        const isValid = fileNameIsValid(relativeFileName);
-        if (!isValid) {
-          Logger.warn(
-            `${this.kind} file with name ${relativeFileName} will be ignored due an invalid name`
-          );
-
-          return false;
-        }
-
-        return true;
-      });
-
-      const listing: Listing = {};
-      const readingMetaErrors: ReadingMetaErrorEntry[] = [];
-
-      for (const fileName of list) {
-        const relativeName = getListingPath(fileName);
-        try {
-          const { modTimeInSeconds, size } = await getLocalMeta(fileName);
-
-          if (size) {
-            listing[relativeName] = { modtime: modTimeInSeconds, size };
-          } else {
-            const emptyFileError = {
-              message: 'Internxt does not support empty files',
-              code: '',
-              stack: '',
-            };
-            readingMetaErrors.push({
-              name: relativeName,
-              errorName: 'EMPTY_FILE',
-              errorDetails: createErrorDetails(
-                emptyFileError,
-                'Reading metadata of file',
-                `Size of file is ${size}`
-              ),
-            });
-          }
-        } catch (e) {
-          const err = e as { code?: string };
-
-          readingMetaErrors.push({
-            name: relativeName,
-            errorName: err.code === 'EPERM' ? 'NO_PERMISSION' : 'UNKNOWN',
-            errorDetails: createErrorDetails(
-              err,
-              'Reading metadata of file',
-              `File name is ${fileName}`
-            ),
-          });
-        }
-      }
-
-      return { listing, readingMetaErrors };
-    },
-
-    async deleteFile(name: string) {
-      const actualPath = getActualPath(name);
-      try {
-        await fs.unlink(actualPath);
-      } catch (e) {
-        const err = e as { code?: string };
-
-        if (err.code !== 'ENOENT') {
-          throw new ProcessError(
-            'UNKNOWN',
-            createErrorDetails(err, 'Deleting a file locally', `Name: ${name}`)
-          );
-        }
-      }
-    },
-
-    pullFile(name: string, source: Source) {
-      return new Promise((resolve, reject) => {
-        const tmpFilePath = getTempFilePath();
-
-        const { stream, ...sourceWithoutStream } = source;
-
-        Logger.debug(`Downloading ${name} to temp location ${tmpFilePath}`);
-
-        const writeStream = createWriteStream(tmpFilePath);
-
-        stream.on('data', (chunk) => writeStream.write(chunk));
-
-        stream.on('error', (err) => {
-          reject(
-            new ProcessError(
-              'UNKNOWN',
-              createErrorDetails(
-                err,
-                'Pulling file locally',
-                `Name: ${name}, source: ${JSON.stringify(
-                  sourceWithoutStream,
-                  null,
-                  2
-                )}`
-              )
-            )
-          );
-        });
-
-        stream.on('end', async () => {
-          try {
-            writeStream.close();
-
-            const actualPath = getActualPath(name);
-
-            await fs.mkdir(path.parse(actualPath).dir, { recursive: true });
-
-            await saferRenameFile(tmpFilePath, actualPath);
-
-            const modTime = getDateFromSeconds(source.modTime);
-            fs.utimes(actualPath, modTime, modTime);
-
-            resolve();
-          } catch (err) {
-            if (err instanceof ProcessError) {
-              reject(err);
-            } else {
-              reject(
-                new ProcessError(
-                  'UNKNOWN',
-                  createErrorDetails(
-                    err,
-                    'Making local directory if needed and updating local modtime',
-                    `Name: ${name}, source: ${JSON.stringify(
-                      sourceWithoutStream,
-                      null,
-                      2
-                    )}`
-                  )
-                )
-              );
-            }
-          }
-        });
-      });
-    },
-
-    renameFile(oldName: string, newName: string) {
-      const oldActualPath = getActualPath(oldName);
-      const newActualPath = getActualPath(newName);
-
-      return saferRenameFile(oldActualPath, newActualPath);
-    },
-
-    async existsFolder(name: string): Promise<boolean> {
-      const actualPath = getActualPath(name);
-      try {
-        await fs.access(actualPath);
-
-        return true;
-      } catch {
-        return false;
-      }
-    },
-
-    deleteFolder(name: string): Promise<void> {
-      const actualPath = getActualPath(name);
-
-      return fs.rm(actualPath, { recursive: true, force: true });
-    },
-
-    async getSource(name: string): Promise<Source> {
-      const actualPath = getActualPath(name);
-      const tmpFilePath = getTempFilePath();
-
-      let modTime: number | undefined;
-      let size: number | undefined;
-
-      try {
-        const localMeta = await getLocalMeta(actualPath);
-        modTime = localMeta.modTimeInSeconds;
-        size = localMeta.size;
-
-        await fs.copyFile(actualPath, tmpFilePath);
-      } catch (e) {
-        const err = e as { code?: string };
-        const action =
-          'Getting local meta and copying file to a temp directory';
-        const additional = `Actual path: ${actualPath}, temp path: ${tmpFilePath}, size: ${size}, modTime: ${modTime}`;
-        if (err.code === 'ENOENT') {
-          throw new ProcessError(
-            'NOT_EXISTS',
-            createErrorDetails(err, action, additional)
-          );
-        } else if (err.code === 'EACCES') {
-          throw new ProcessError(
-            'NO_PERMISSION',
-            createErrorDetails(err, action, additional)
-          );
-        } else {
-          throw new ProcessError(
-            'UNKNOWN',
-            createErrorDetails(err, action, additional)
-          );
-        }
-      }
-
-      const stream = createReadStream(tmpFilePath);
-
-      const onEndOrError = () => fs.unlink(tmpFilePath);
-
-      stream.once('end', onEndOrError);
-      stream.once('error', onEndOrError);
-
-      Logger.debug(`Uploading ${name} from temp location ${tmpFilePath}`);
-
-      return { stream, modTime, size };
-    },
-
-    async smokeTest() {
-      try {
-        await fs.access(localPath, constants.R_OK | constants.W_OK);
-        await fs.lstat(localPath);
-      } catch (err) {
-        const systemError = err as { code?: string };
-        if (systemError.code === 'ENOENT') {
-          throw new ProcessFatalError(
-            'BASE_DIRECTORY_DOES_NOT_EXIST',
-            createErrorDetails(
-              err,
-              'Error accessing local base directory',
-              `localPath: ${localPath}`
-            )
-          );
-        }
-        if (systemError.code === 'EACCES') {
-          throw new ProcessFatalError(
-            'INSUFICIENT_PERMISION_ACCESSING_BASE_DIRECTORY',
-            createErrorDetails(
-              err,
-              'Error accessing local base directory',
-              `localPath: ${localPath}`
-            )
-          );
-        }
-        throw new ProcessFatalError(
-          'CANNOT_ACCESS_BASE_DIRECTORY',
-          createErrorDetails(
-            err,
-            'Error accessing local base directory',
-            `localPath: ${localPath}`
-          )
-        );
-      }
-
-      try {
-        await fs.access(tempDirectory, constants.R_OK | constants.W_OK);
-      } catch (err) {
-        throw new ProcessFatalError(
-          'CANNOT_ACCESS_TMP_DIRECTORY',
-          createErrorDetails(
-            err,
-            'Error accessing local temp directory',
-            `localPath: ${tempDirectory}`
-          )
-        );
-      }
-    },
-  };
-}
diff --git a/src/workers/filesystems/remote-filesystem.ts b/src/workers/filesystems/remote-filesystem.ts
deleted file mode 100644
index 2a6b51edf..000000000
--- a/src/workers/filesystems/remote-filesystem.ts
+++ /dev/null
@@ -1,698 +0,0 @@
-import { Environment } from '@internxt/inxt-js';
-import { ipcRenderer } from 'electron';
-import Logger from 'electron-log';
-import EventEmitter from 'events';
-import path from 'path';
-import { Readable } from 'stream';
-import * as uuid from 'uuid';
-
-import { AuthorizedClients } from '../../shared/HttpClient/Clients';
-import { FileCreatedResponseDTO } from '../../shared/HttpClient/responses/file-created';
-import {
-  FileSystem,
-  FileSystemProgressCallback,
-  Listing,
-  ProcessError,
-  ProcessFatalError,
-  ReadingMetaErrorEntry,
-  Source,
-} from '../types';
-import crypt from '../utils/crypt';
-import { getDateFromSeconds, getSecondsFromDateString } from '../utils/date';
-import httpRequest from '../utils/http-request';
-import isOnline from '../utils/is-online';
-import { fileNameIsValid } from '../utils/name-verification';
-import { createErrorDetails, serializeRes } from '../utils/reporting';
-import { TransferLimits } from './domain/Transfer';
-
-/**
- * Server cannot find a file given its route,
- * while we traverse the tree we also store in a cache
- * the info of every file by its route so we can operate with them
- */
-type RemoteCache = Record<
-  string,
-  {
-    id: number;
-    parentId: number;
-    isFolder: boolean;
-    bucket: string | null;
-    fileId?: string;
-    modificationTime?: number;
-    size?: number;
-  }
->;
-
-type ServerFile = {
-  bucket: string;
-  createdAt: string;
-  encrypt_version: string;
-  fileId: string;
-  folderId: number;
-  id: number;
-  modificationTime: string;
-  name: string;
-  size: number;
-  type: string;
-  updatedAt: string;
-  userId: number;
-};
-
-type ServerFolder = {
-  bucket: string | null;
-  created_at: string;
-  id: number;
-  name: string;
-  parent_id: null | number;
-  updated_at: string;
-};
-
-export function getRemoteFilesystem({
-  baseFolderId,
-  headers,
-  userInfo,
-  mnemonic,
-  bucket,
-  clients,
-}: {
-  baseFolderId: number;
-  headers: HeadersInit;
-  userInfo: { email: string; userId: string; bridgeUser: string };
-  mnemonic: string;
-  bucket: string;
-  clients: AuthorizedClients;
-}): FileSystem {
-  const cache: RemoteCache = {};
-  const createFolderQueue = new EventEmitter().setMaxListeners(0);
-
-  async function getTree(): Promise<{
-    files: ServerFile[];
-    folders: ServerFolder[];
-  }> {
-    const PAGE_SIZE = 5000;
-
-    let thereIsMore = true;
-    let offset = 0;
-
-    const files: ServerFile[] = [];
-    const folders: ServerFolder[] = [];
-
-    while (thereIsMore) {
-      try {
-        const batch = await httpRequest(
-          `${process.env.API_URL}/api/desktop/list/${offset}`,
-          {
-            method: 'GET',
-            headers,
-          }
-        ).then((res) => res.json());
-
-        // We can't use spread operator with big arrays
-        // see: https://anchortagdev.com/range-error-maximum-call-stack-size-exceeded-error-using-spread-operator-in-node-js-javascript/
-
-        for (const file of batch.files) {
-          files.push(file);
-        }
-
-        for (const folder of batch.folders) {
-          folders.push(folder);
-        }
-
-        thereIsMore = batch.folders.length === PAGE_SIZE;
-
-        if (thereIsMore) {
-          offset += PAGE_SIZE;
-        }
-      } catch (err) {
-        await handleFetchError(err, 'Fetching tree', `offset: ${offset}`);
-      }
-    }
-
-    return { files, folders };
-  }
-
-  async function handleFetchError(
-    err: any,
-    action: string,
-    additionalInfo?: string
-  ) {
-    if (err instanceof ProcessError) {
-      throw err;
-    }
-
-    const details = createErrorDetails(err, action, additionalInfo);
-
-    if (await isOnline()) {
-      throw new ProcessError('NO_REMOTE_CONNECTION', details);
-    } else {
-      throw new ProcessError('NO_INTERNET', details);
-    }
-  }
-
-  return {
-    kind: 'REMOTE',
-
-    async getCurrentListing() {
-      const tree = await getTree();
-
-      const listing: Listing = {};
-      const readingMetaErrors: Array<ReadingMetaErrorEntry> = [];
-
-      traverse(baseFolderId);
-
-      function traverse(currentId: number, currentName = '') {
-        const filesInThisFolder = tree.files.filter(
-          (file) => file.folderId === currentId
-        );
-        const foldersInThisFolder = tree.folders.filter(
-          (folder) => folder.parent_id === currentId
-        );
-
-        filesInThisFolder
-          .map((file) => ({
-            name:
-              currentName +
-              crypt.decryptName(
-                file.name,
-                file.folderId.toString(),
-                file.encrypt_version
-              ) +
-              (file.type ? `.${file.type}` : ''),
-            file,
-          }))
-          .filter(({ name }) => {
-            const isValid = fileNameIsValid(name);
-
-            if (!isValid) {
-              Logger.warn(
-                `REMOTE file with name ${name} will be ignored due an invalid name`
-              );
-
-              return false;
-            }
-
-            return true;
-          })
-          .forEach(({ file, name }) => {
-            const modificationTime = getSecondsFromDateString(
-              file.modificationTime
-            );
-            listing[name] = { modtime: modificationTime, size: file.size };
-            cache[name] = {
-              id: file.id,
-              parentId: file.folderId,
-              isFolder: false,
-              bucket: file.bucket,
-              fileId: file.fileId,
-              modificationTime,
-              size: file.size,
-            };
-          });
-
-        foldersInThisFolder.forEach((folder) => {
-          const name =
-            currentName +
-            crypt.decryptName(
-              folder.name,
-              (folder.parent_id as number).toString(),
-              '03-aes'
-            );
-          cache[name] = {
-            id: folder.id,
-            parentId: folder.parent_id as number,
-            isFolder: true,
-            bucket: folder.bucket,
-          };
-          traverse(folder.id, `${name}/`);
-        });
-      }
-
-      return { listing, readingMetaErrors };
-    },
-
-    async deleteFile(name: string): Promise<void> {
-      const fileInCache = cache[name];
-
-      const result = await clients.newDrive.post(
-        `${process.env.NEW_DRIVE_URL}/drive/storage/trash/add`,
-        {
-          items: [
-            {
-              type: 'file',
-              id: fileInCache.fileId,
-            },
-          ],
-        }
-      );
-
-      if (result.status !== 200) {
-        await handleFetchError(
-          result.data(),
-          'Moving remote file to trash',
-          `Name: ${name}, fileInCache: ${JSON.stringify(fileInCache, null, 2)}`
-        );
-      }
-    },
-
-    async renameFile(oldName: string, newName: string): Promise<void> {
-      const fileInCache = cache[oldName];
-      const newNameBase = path.parse(newName).name;
-
-      try {
-        const res = await httpRequest(
-          `${process.env.API_URL}/api/storage/file/${fileInCache.fileId}/meta`,
-          {
-            method: 'POST',
-            headers: { ...headers, 'internxt-mnemonic': mnemonic },
-            body: JSON.stringify({
-              metadata: { itemName: newNameBase },
-              bucketId: fileInCache.bucket,
-              relativePath: uuid.v4(),
-            }),
-          }
-        );
-        if (!res.ok) {
-          throw new ProcessError(
-            'BAD_RESPONSE',
-            createErrorDetails(
-              {},
-              'Renaming remote file',
-              `oldName: ${oldName}, newName: ${newName}, fileInCache: ${JSON.stringify(
-                fileInCache,
-                null,
-                2
-              )}, res: ${await serializeRes(res)}`
-            )
-          );
-        }
-        delete cache[oldName];
-        cache[newName] = fileInCache;
-      } catch (err) {
-        await handleFetchError(
-          err,
-          'Renaming remote file',
-          `oldName: ${oldName}, newName: ${newName}, fileInCache: ${JSON.stringify(
-            fileInCache,
-            null,
-            2
-          )}`
-        );
-      }
-    },
-
-    async pullFile(
-      name: string,
-      source: Source,
-      progressCallback: (progress: number) => void
-    ): Promise<number> {
-      const { size, modTime: modTimeInSeconds } = source;
-      const route = name.split('/');
-
-      const { name: baseNameWithoutExt, ext } = path.parse(
-        route.pop() as string
-      );
-      const fileType = ext.slice(1);
-
-      let lastParentId = baseFolderId;
-
-      if (route.length > 0) {
-        for (const [i, folderName] of route.entries()) {
-          const routeToThisPoint = route.slice(0, i + 1).join('/');
-
-          const folderInCache = cache[routeToThisPoint];
-
-          if (folderInCache) {
-            lastParentId = folderInCache.id;
-          } else {
-            if (createFolderQueue.listeners(routeToThisPoint).length === 0) {
-              httpRequest(`${process.env.API_URL}/api/storage/folder`, {
-                method: 'POST',
-                headers,
-                body: JSON.stringify({
-                  folderName,
-                  parentFolderId: lastParentId,
-                }),
-              })
-                .then(async (res) => {
-                  if (!res.ok) {
-                    throw new ProcessError(
-                      'BAD_RESPONSE',
-                      createErrorDetails(
-                        {},
-                        'Creating folder in drive server',
-                        `res: ${await serializeRes(
-                          res
-                        )}, folderName: ${folderName}, parentFolderId: ${lastParentId}`
-                      )
-                    );
-                  } else {
-                    return res;
-                  }
-                })
-                .then((res) => res.json())
-                .then((createdFolder: ServerFolder) => {
-                  cache[routeToThisPoint] = {
-                    id: createdFolder.id,
-                    parentId: createdFolder.parent_id as number,
-                    isFolder: true,
-                    bucket: createdFolder.bucket,
-                  };
-                  createFolderQueue.emit(routeToThisPoint, createdFolder.id);
-                })
-                .catch(async (err) => {
-                  createFolderQueue.emit(routeToThisPoint, err);
-                });
-            }
-
-            try {
-              lastParentId = await new Promise((resolve, reject) =>
-                createFolderQueue.once(routeToThisPoint, (value) => {
-                  if (value instanceof Error) {
-                    reject(value);
-                  } else {
-                    resolve(value);
-                  }
-                })
-              );
-            } catch (err) {
-              await handleFetchError(
-                err,
-                'Creating remote folder',
-                `name: ${name}, folderName: ${folderName}, lastParentId: ${lastParentId}`
-              );
-            }
-          }
-        }
-      }
-
-      const folderIdOfTheNewFile = lastParentId;
-
-      const localUpload = new Environment({
-        bridgeUrl: process.env.BRIDGE_URL,
-        bridgeUser: userInfo.bridgeUser,
-        bridgePass: userInfo.userId,
-        encryptionKey: mnemonic,
-      });
-
-      if (source.size > TransferLimits.UploadFileSize) {
-        throw new ProcessError(
-          'FILE_TOO_BIG',
-          createErrorDetails(
-            {},
-            'Uploading a file',
-            `name: ${name}, source: ${JSON.stringify(source, null, 2)}`
-          )
-        );
-      }
-
-      const uploadedFileId: string = await new Promise((resolve, reject) => {
-        if (source.size > TransferLimits.MultipartUploadThreshold) {
-          localUpload.uploadMultipartFile(bucket, {
-            progressCallback,
-            finishedCallback: async (err: any, fileId: string | null) => {
-              if (err) {
-                // Don't include the stream in the details
-                const { stream, ...sourceWithoutStream } = source;
-
-                const details = createErrorDetails(
-                  err,
-                  'Uploading a file with multipart',
-                  `bucket: ${bucket}, source: ${JSON.stringify(
-                    sourceWithoutStream,
-                    null,
-                    2
-                  )}, name: ${name}, userInfo: ${JSON.stringify(
-                    userInfo,
-                    null,
-                    2
-                  )}`
-                );
-                reject(
-                  (await isOnline())
-                    ? new ProcessError('UNKNOWN', details)
-                    : new ProcessError('NO_INTERNET', details)
-                );
-              } else {
-                resolve(fileId as string);
-              }
-            },
-            fileSize: source.size,
-            source: source.stream,
-          });
-        } else {
-          localUpload.upload(bucket, {
-            progressCallback,
-            finishedCallback: async (err: any, fileId: string) => {
-              if (err) {
-                // Don't include the stream in the details
-                const { stream, ...sourceWithoutStream } = source;
-
-                const details = createErrorDetails(
-                  err,
-                  'Uploading a file',
-                  `bucket: ${bucket}, source: ${JSON.stringify(
-                    sourceWithoutStream,
-                    null,
-                    2
-                  )}, name: ${name}, userInfo: ${JSON.stringify(
-                    userInfo,
-                    null,
-                    2
-                  )}`
-                );
-                reject(
-                  (await isOnline())
-                    ? new ProcessError('UNKNOWN', details)
-                    : new ProcessError('NO_INTERNET', details)
-                );
-              } else {
-                resolve(fileId);
-              }
-            },
-            fileSize: source.size,
-            source: source.stream,
-          });
-        }
-      });
-
-      const oldFileInCache = cache[name];
-
-      if (oldFileInCache) {
-        try {
-          const res = await httpRequest(
-            `${process.env.API_URL}/api/storage/folder/${oldFileInCache.parentId}/file/${oldFileInCache.id}`,
-            {
-              method: 'DELETE',
-              headers,
-            }
-          );
-          if (!res.ok) {
-            Logger.warn(
-              `Error trying to delete outdated remote file. res: ${await serializeRes(
-                res
-              )} fileInCache: ${JSON.stringify(oldFileInCache, null, 2)}`
-            );
-          }
-        } catch (e) {
-          const err = e as Error & { code: string };
-          Logger.warn(
-            `Error trying to delete outdated remote file. ${err.name} ${
-              err.code
-            } ${err.stack} fileInCache: ${JSON.stringify(
-              oldFileInCache,
-              null,
-              2
-            )}`
-          );
-        }
-      }
-
-      const encryptedName = crypt.encryptName(
-        baseNameWithoutExt,
-        folderIdOfTheNewFile.toString()
-      );
-
-      const modificationTime = getDateFromSeconds(modTimeInSeconds);
-
-      try {
-        const res = await httpRequest(
-          `${process.env.API_URL}/api/storage/file`,
-          {
-            headers,
-            method: 'POST',
-            body: JSON.stringify({
-              file: {
-                bucket,
-                encrypt_version: '03-aes',
-                fileId: uploadedFileId,
-                file_id: uploadedFileId,
-                folder_id: folderIdOfTheNewFile,
-                name: encryptedName,
-                plain_name: baseNameWithoutExt,
-                size,
-                type: fileType,
-                modificationTime,
-              },
-            }),
-          }
-        );
-        if (!res.ok) {
-          throw new ProcessError(
-            'BAD_RESPONSE',
-            createErrorDetails(
-              {},
-              'Creating file in drive server',
-              `res: ${await serializeRes(
-                res
-              )}, encryptedName: ${encryptedName}, modificationTime: ${modificationTime}`
-            )
-          );
-        }
-
-        const fileCreated: FileCreatedResponseDTO = await res.json();
-
-        return fileCreated.id;
-      } catch (err) {
-        await handleFetchError(
-          err,
-          'Creating file in drive server',
-          `encryptedName: ${encryptedName}, modificationTime: ${modificationTime}`
-        );
-      }
-
-      return Promise.reject();
-    },
-
-    async existsFolder(name: string): Promise<boolean> {
-      return name in cache;
-    },
-
-    async deleteFolder(name: string): Promise<void> {
-      const folderInCache = cache[name];
-
-      const { id } = folderInCache;
-
-      try {
-        const result = await clients.newDrive.post(
-          `${process.env.NEW_DRIVE_URL}/drive/storage/trash/add`,
-          {
-            items: [
-              {
-                type: 'folder',
-                id,
-              },
-            ],
-          }
-        );
-
-        if (result.status !== 200) {
-          throw new ProcessError(
-            'BAD_RESPONSE',
-            createErrorDetails(
-              {},
-              'Deleting folder from server',
-              `res: ${await serializeRes(
-                result.data
-              )}, folderInCache: ${JSON.stringify(folderInCache, null, 2)}`
-            )
-          );
-        }
-      } catch (err) {
-        await handleFetchError(
-          err,
-          'Deleting folder from server',
-          `folderInCache: ${JSON.stringify(folderInCache, null, 2)}`
-        );
-      }
-    },
-
-    getSource(
-      name: string,
-      progressCallback: FileSystemProgressCallback
-    ): Promise<Source> {
-      const fileInCache = cache[name];
-
-      Logger.log(`Getting source of ${name} fileId: ${fileInCache.fileId}`);
-
-      const environment = new Environment({
-        bridgeUrl: process.env.BRIDGE_URL,
-        bridgeUser: userInfo.bridgeUser,
-        bridgePass: userInfo.userId,
-        encryptionKey: mnemonic,
-      });
-
-      return new Promise((resolve, reject) => {
-        environment.download(
-          fileInCache.bucket as string,
-          fileInCache.fileId as string,
-          {
-            progressCallback,
-            finishedCallback: async (err: any, downloadStream: Readable) => {
-              if (err) {
-                const details = createErrorDetails(
-                  err,
-                  'Downloading a file',
-                  `fileInCache: ${JSON.stringify(
-                    fileInCache,
-                    null,
-                    2
-                  )}, name: ${name}, userInfo: ${JSON.stringify(
-                    userInfo,
-                    null,
-                    2
-                  )}`
-                );
-                reject(
-                  (await isOnline())
-                    ? new ProcessError('UNKNOWN', details)
-                    : new ProcessError('NO_INTERNET', details)
-                );
-              } else {
-                resolve({
-                  stream: downloadStream,
-                  size: fileInCache.size as number,
-                  modTime: fileInCache.modificationTime as number,
-                });
-              }
-            },
-          },
-          {
-            label: 'Dynamic',
-            params: {
-              useProxy: false,
-              concurrency: 10,
-            },
-          }
-        );
-      });
-    },
-
-    async smokeTest() {
-      if (!(await isOnline())) {
-        throw new ProcessFatalError(
-          'NO_INTERNET',
-          createErrorDetails({}, 'Remote smoke test (online test)')
-        );
-      }
-
-      const res = await httpRequest(
-        `${process.env.API_URL}/api/storage/v2/folder/${baseFolderId}`,
-        { headers }
-      );
-
-      if (!res.ok) {
-        if (res.status === 401) {
-          ipcRenderer.emit('user-is-unauthorized');
-        }
-        throw new ProcessFatalError(
-          'NO_REMOTE_CONNECTION',
-          createErrorDetails(
-            {},
-            'Remote smoke test (get base folder test)',
-            `res: ${await serializeRes(res)}`
-          )
-        );
-      }
-    },
-  };
-}
diff --git a/src/workers/filesystems/test/__mocks__/FileSystemMock.ts b/src/workers/filesystems/test/__mocks__/FileSystemMock.ts
deleted file mode 100644
index be7aa3a6a..000000000
--- a/src/workers/filesystems/test/__mocks__/FileSystemMock.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { PartialListing } from '../../../sync/Listings/domain/Listing';
-import {
-  FileSystemKind,
-  FileSystemProgressCallback,
-  ReadingMetaErrorEntry,
-  Source,
-} from '../../../types';
-import { FileSystem } from '../../domain/FileSystem';
-
-export class FileSystemMock implements FileSystem<PartialListing> {
-  private mockGetCurrentListing = jest.fn();
-
-  private mockRenameFile = jest.fn();
-
-  private mockDeleteFile = jest.fn();
-
-  private mockPullFile = jest.fn();
-
-  public mockPullFolder = jest.fn();
-
-  private mockExistsFolder = jest.fn();
-
-  private mockDeleteFolder = jest.fn();
-
-  private mockGetSource = jest.fn();
-
-  public mockGetFolderData = jest.fn();
-
-  private mockSmokeTest = jest.fn();
-
-  public kind: FileSystemKind = 'LOCAL';
-
-  getCurrentListing(): Promise<{
-    listing: PartialListing;
-    readingMetaErrors: ReadingMetaErrorEntry[];
-  }> {
-    return this.mockGetCurrentListing();
-  }
-
-  renameFile(oldName: string, newName: string): Promise<void> {
-    return this.mockRenameFile(oldName, newName);
-  }
-
-  deleteFile(name: string): Promise<void> {
-    return this.mockDeleteFile(name);
-  }
-
-  pullFile(
-    name: string,
-    source: Source,
-    progressCallback: FileSystemProgressCallback
-  ): Promise<void> {
-    return this.mockPullFile(name, source, progressCallback);
-  }
-
-  pullFolder = (name: string): Promise<void> => {
-    return this.mockPullFolder(name);
-  };
-
-  existsFolder(name: string): Promise<boolean> {
-    return this.mockExistsFolder(name);
-  }
-
-  deleteFolder = (name: string): Promise<void> => {
-    return this.mockDeleteFolder(name);
-  };
-
-  getSource(
-    name: string,
-    progressCallback: FileSystemProgressCallback
-  ): Promise<Source> {
-    return this.mockGetSource(name, progressCallback);
-  }
-
-  getFolderData(folderFullPath: string): Promise<{ modtime: number }> {
-    return this.mockGetFolderData(folderFullPath);
-  }
-
-  smokeTest(): Promise<void> {
-    return this.mockSmokeTest();
-  }
-
-  assertNumberOfFoldersPulled(n: number) {
-    expect(this.mockPullFolder).toBeCalledTimes(n);
-  }
-
-  assertOrderOfFoldersPulled(names: Array<string>) {
-    names.forEach((name: string) =>
-      expect(this.mockPullFolder).toBeCalledWith(name)
-    );
-  }
-
-  assertFolderWasNeverPulled(folder: string) {
-    expect(this.mockPullFolder).not.toBeCalledWith(folder);
-  }
-
-  assertFolderHasBeenPulledBeforeThan(before: string, ...after: Array<string>) {
-    const calls = (
-      this.mockPullFolder.mock.calls as Array<Array<string>>
-    ).flat();
-
-    const expectedBeforeCall = calls.indexOf(before);
-    const expectedAfterCalls = after.map((a) => calls.indexOf(a));
-
-    expectedAfterCalls.forEach((expectedAfterCall) => {
-      expect(expectedBeforeCall).toBeLessThan(expectedAfterCall);
-    });
-  }
-}
diff --git a/src/workers/sync-engine/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts b/src/workers/sync-engine/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts
deleted file mode 100644
index 8c691858b..000000000
--- a/src/workers/sync-engine/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { TreePlaceholderCreator } from '../../modules/boundaryBridge/application/TreePlaceholderCreator';
-import { FileCreationOrchestrator } from '../../modules/boundaryBridge/application/FileCreationOrchestrator';
-import { SyncPlaceholders } from '../../modules/boundaryBridge/application/SyncPlaceholders';
-
-export interface BoundaryBridgeContainer {
-  fileCreationOrchestrator: FileCreationOrchestrator;
-  treePlaceholderCreator: TreePlaceholderCreator;
-  syncPlaceholders: SyncPlaceholders;
-}
diff --git a/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts b/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts
deleted file mode 100644
index 15b105da4..000000000
--- a/src/workers/sync-engine/dependency-injection/boundaryBridge/build.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { BoundaryBridgeContainer } from './BoundaryBridgeContainer';
-import { FileCreationOrchestrator } from 'workers/sync-engine/modules/boundaryBridge/application/FileCreationOrchestrator';
-import { ContentsContainer } from '../contents/ContentsContainer';
-import { FilesContainer } from '../files/FilesContainer';
-import { PlaceholderContainer } from '../placeholders/PlaceholdersContainer';
-import { TreePlaceholderCreator } from '../../modules/boundaryBridge/application/TreePlaceholderCreator';
-import { ItemsContainer } from '../items/ItemsContainer';
-import { FoldersContainer } from '../folders/FoldersContainer';
-import { UpdatePlaceholderFile } from 'workers/sync-engine/modules/boundaryBridge/application/UpdatePlaceholderFile';
-import { SharedContainer } from '../shared/SharedContainer';
-import { SyncPlaceholders } from 'workers/sync-engine/modules/boundaryBridge/application/SyncPlaceholders';
-import { UpdatePlaceholderFolder } from 'workers/sync-engine/modules/boundaryBridge/application/UpdatePlaceholderFolder';
-import { DependencyInjectionEventRepository } from '../common/eventRepository';
-import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
-
-export function buildBoundaryBridgeContainer(
-  contentsContainer: ContentsContainer,
-  filesContainer: FilesContainer,
-  foldersContainer: FoldersContainer,
-  itemsContainer: ItemsContainer,
-  placeholderContainer: PlaceholderContainer,
-  sharedContainer: SharedContainer
-): BoundaryBridgeContainer {
-  const eventHistory = DependencyInjectionEventRepository.get();
-  const virtualDrive = DependencyInjectionVirtualDrive.virtualDrive;
-
-  const fileCreationOrchestrator = new FileCreationOrchestrator(
-    contentsContainer.contentsUploader,
-    filesContainer.fileCreator,
-    filesContainer.sameFileWasMoved
-  );
-
-  const treePlaceholderCreator = new TreePlaceholderCreator(
-    itemsContainer.existingItemsTreeBuilder,
-    placeholderContainer.placeholderCreator
-  );
-
-  const syncRemoteFile = new UpdatePlaceholderFile(
-    filesContainer.fileByPartialSearcher,
-    filesContainer.managedFileRepository,
-    placeholderContainer.placeholderCreator,
-    sharedContainer.relativePathToAbsoluteConverter,
-    sharedContainer.localFileIdProvider,
-    eventHistory
-  );
-
-  const syncRemoteFolder = new UpdatePlaceholderFolder(
-    foldersContainer.folderByPartialSearcher,
-    foldersContainer.managedFolderRepository,
-    placeholderContainer.placeholderCreator,
-    sharedContainer.relativePathToAbsoluteConverter
-  );
-
-  const syncPlaceholders = new SyncPlaceholders(
-    itemsContainer.allStatusesTreeBuilder,
-    syncRemoteFile,
-    syncRemoteFolder,
-    virtualDrive
-  );
-
-  return {
-    fileCreationOrchestrator,
-    treePlaceholderCreator,
-    syncPlaceholders: syncPlaceholders,
-  };
-}
diff --git a/src/workers/sync-engine/dependency-injection/contents/ContentsContainer.ts b/src/workers/sync-engine/dependency-injection/contents/ContentsContainer.ts
deleted file mode 100644
index efba1baf1..000000000
--- a/src/workers/sync-engine/dependency-injection/contents/ContentsContainer.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { RetryContentsUploader } from '../../modules/contents/application/RetryContentsUploader';
-import { ContentsDownloader } from '../../modules/contents/application/ContentsDownloader';
-import { TemporalFolderProvider } from '../../modules/contents/application/temporalFolderProvider';
-
-export interface ContentsContainer {
-  contentsUploader: RetryContentsUploader;
-  contentsDownloader: ContentsDownloader;
-  temporalFolderProvider: TemporalFolderProvider;
-}
diff --git a/src/workers/sync-engine/dependency-injection/files/FilesContainer.ts b/src/workers/sync-engine/dependency-injection/files/FilesContainer.ts
deleted file mode 100644
index 0da76325d..000000000
--- a/src/workers/sync-engine/dependency-injection/files/FilesContainer.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { ManagedFileRepository } from 'workers/sync-engine/modules/files/domain/ManagedFileRepository';
-import { CreateFilePlaceholderOnDeletionFailed } from '../../modules/files/application/CreateFilePlaceholderOnDeletionFailed';
-import { FileByPartialSearcher } from '../../modules/files/application/FileByPartialSearcher';
-import { FileClearer } from '../../modules/files/application/FileClearer';
-import { FileCreator } from '../../modules/files/application/FileCreator';
-import { FileDeleter } from '../../modules/files/application/FileDeleter';
-import { FileFinderByContentsId } from '../../modules/files/application/FileFinderByContentsId';
-import { FilePathUpdater } from '../../modules/files/application/FilePathUpdater';
-import { FilePlaceholderCreatorFromContentsId } from '../../modules/files/application/FilePlaceholderCreatorFromContentsId';
-import { FileSearcher } from '../../modules/files/application/FileSearcher';
-import { LocalRepositoryRepositoryRefresher } from '../../modules/files/application/LocalRepositoryRepositoryRefresher';
-import { RetrieveAllFiles } from '../../modules/files/application/RetrieveAllFiles';
-import { SameFileWasMoved } from '../../modules/files/application/SameFileWasMoved';
-
-export interface FilesContainer {
-  fileFinderByContentsId: FileFinderByContentsId;
-  localRepositoryRefresher: LocalRepositoryRepositoryRefresher;
-  fileDeleter: FileDeleter;
-  fileByPartialSearcher: FileByPartialSearcher;
-  filePathUpdater: FilePathUpdater;
-  fileCreator: FileCreator;
-  fileSearcher: FileSearcher;
-  filePlaceholderCreatorFromContentsId: FilePlaceholderCreatorFromContentsId;
-  createFilePlaceholderOnDeletionFailed: CreateFilePlaceholderOnDeletionFailed;
-  fileClearer: FileClearer;
-  managedFileRepository: ManagedFileRepository;
-  sameFileWasMoved: SameFileWasMoved;
-  retrieveAllFiles: RetrieveAllFiles;
-}
diff --git a/src/workers/sync-engine/dependency-injection/files/builder.ts b/src/workers/sync-engine/dependency-injection/files/builder.ts
deleted file mode 100644
index df2444e59..000000000
--- a/src/workers/sync-engine/dependency-injection/files/builder.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import crypt from '../../../utils/crypt';
-import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
-import { CreateFilePlaceholderOnDeletionFailed } from '../../modules/files/application/CreateFilePlaceholderOnDeletionFailed';
-import { FileByPartialSearcher } from '../../modules/files/application/FileByPartialSearcher';
-import { FileClearer } from '../../modules/files/application/FileClearer';
-import { FileCreator } from '../../modules/files/application/FileCreator';
-import { FileDeleter } from '../../modules/files/application/FileDeleter';
-import { FileFinderByContentsId } from '../../modules/files/application/FileFinderByContentsId';
-import { FilePathUpdater } from '../../modules/files/application/FilePathUpdater';
-import { FilePlaceholderCreatorFromContentsId } from '../../modules/files/application/FilePlaceholderCreatorFromContentsId';
-import { FileSearcher } from '../../modules/files/application/FileSearcher';
-import { LocalRepositoryRepositoryRefresher } from '../../modules/files/application/LocalRepositoryRepositoryRefresher';
-import { RetrieveAllFiles } from '../../modules/files/application/RetrieveAllFiles';
-import { SameFileWasMoved } from '../../modules/files/application/SameFileWasMoved';
-import { HttpFileRepository } from '../../modules/files/infrastructure/HttpFileRepository';
-import { DependencyInjectionHttpClientsProvider } from '../common/clients';
-import { DependencyInjectionEventBus } from '../common/eventBus';
-import { DependencyInjectionEventRepository } from '../common/eventRepository';
-import { DependencyInjectionTraverserProvider } from '../common/traverser';
-import { DependencyInjectionUserProvider } from '../common/user';
-import { FoldersContainer } from '../folders/FoldersContainer';
-import { PlaceholderContainer } from '../placeholders/PlaceholdersContainer';
-import { SharedContainer } from '../shared/SharedContainer';
-import { FilesContainer } from './FilesContainer';
-
-export async function buildFilesContainer(
-  folderContainer: FoldersContainer,
-  placeholderContainer: PlaceholderContainer,
-  sharedContainer: SharedContainer
-): Promise<{
-  container: FilesContainer;
-  subscribers: any;
-}> {
-  const clients = DependencyInjectionHttpClientsProvider.get();
-  const traverser = DependencyInjectionTraverserProvider.get();
-  const user = DependencyInjectionUserProvider.get();
-  const { bus: eventBus } = DependencyInjectionEventBus;
-  const eventHistory = DependencyInjectionEventRepository.get();
-
-  const fileRepository = new HttpFileRepository(
-    crypt,
-    clients.drive,
-    clients.newDrive,
-    traverser,
-    user.bucket,
-    ipcRendererSyncEngine
-  );
-
-  await fileRepository.init();
-
-  const fileFinderByContentsId = new FileFinderByContentsId(fileRepository);
-
-  const localRepositoryRefresher = new LocalRepositoryRepositoryRefresher(
-    ipcRendererSyncEngine,
-    fileRepository
-  );
-
-  const fileDeleter = new FileDeleter(
-    fileRepository,
-    folderContainer.allParentFoldersStatusIsExists,
-    placeholderContainer.placeholderCreator,
-    ipcRendererSyncEngine
-  );
-
-  const fileByPartialSearcher = new FileByPartialSearcher(fileRepository);
-
-  const sameFileWasMoved = new SameFileWasMoved(
-    fileByPartialSearcher,
-    sharedContainer.localFileIdProvider,
-    eventHistory
-  );
-
-  const filePathUpdater = new FilePathUpdater(
-    fileRepository,
-    fileFinderByContentsId,
-    folderContainer.folderFinder,
-    ipcRendererSyncEngine,
-    sharedContainer.localFileIdProvider,
-    eventBus
-  );
-
-  const fileCreator = new FileCreator(
-    fileRepository,
-    folderContainer.folderFinder,
-    fileDeleter,
-    eventBus,
-    ipcRendererSyncEngine
-  );
-
-  const fileSearcher = new FileSearcher(fileRepository);
-
-  const filePlaceholderCreatorFromContentsId =
-    new FilePlaceholderCreatorFromContentsId(
-      fileFinderByContentsId,
-      placeholderContainer.placeholderCreator
-    );
-
-  const createFilePlaceholderOnDeletionFailed =
-    new CreateFilePlaceholderOnDeletionFailed(
-      filePlaceholderCreatorFromContentsId
-    );
-
-  const fileClearer = new FileClearer(fileRepository);
-
-  const container: FilesContainer = {
-    fileFinderByContentsId,
-    localRepositoryRefresher: localRepositoryRefresher,
-    fileDeleter,
-    fileByPartialSearcher,
-    filePathUpdater,
-    fileCreator,
-    fileSearcher,
-    filePlaceholderCreatorFromContentsId: filePlaceholderCreatorFromContentsId,
-    createFilePlaceholderOnDeletionFailed:
-      createFilePlaceholderOnDeletionFailed,
-    fileClearer,
-    managedFileRepository: fileRepository,
-    sameFileWasMoved,
-    retrieveAllFiles: new RetrieveAllFiles(fileRepository),
-  };
-
-  return { container, subscribers: [] };
-}
diff --git a/src/workers/sync-engine/dependency-injection/folders/FoldersContainer.ts b/src/workers/sync-engine/dependency-injection/folders/FoldersContainer.ts
deleted file mode 100644
index ae8c99429..000000000
--- a/src/workers/sync-engine/dependency-injection/folders/FoldersContainer.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { AllParentFoldersStatusIsExists } from '../../modules/folders/application/AllParentFoldersStatusIsExists';
-import { FolderByPartialSearcher } from '../../modules/folders/application/FolderByPartialSearcher';
-import { FolderCreator } from '../../modules/folders/application/FolderCreator';
-import { FolderDeleter } from '../../modules/folders/application/FolderDeleter';
-import { FolderFinder } from '../../modules/folders/application/FolderFinder';
-import { FolderPathUpdater } from '../../modules/folders/application/FolderPathUpdater';
-import { FolderSearcher } from '../../modules/folders/application/FolderSearcher';
-import { FolderClearer } from '../../modules/folders/application/FolderClearer';
-import { OfflineFolderCreator } from '../../modules/folders/application/Offline/OfflineFolderCreator';
-import { OfflineFolderPathUpdater } from '../../modules/folders/application/Offline/OfflineFolderPathUpdater';
-import { SynchronizeOfflineModifications } from '../../modules/folders/application/SynchronizeOfflineModifications';
-import { SynchronizeOfflineModificationsOnFolderCreated } from '../../modules/folders/application/SynchronizeOfflineModificationsOnFolderCreated';
-import { ManagedFolderRepository } from '../../modules/folders/domain/ManagedFolderRepository';
-import { RetrieveAllFolders } from '../../modules/folders/application/RetrieveAllFolders';
-
-export interface FoldersContainer {
-  folderCreator: FolderCreator;
-  folderFinder: FolderFinder;
-  folderSearcher: FolderSearcher;
-  folderDeleter: FolderDeleter;
-  allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
-  folderPathUpdater: FolderPathUpdater;
-  folderClearer: FolderClearer;
-  folderByPartialSearcher: FolderByPartialSearcher;
-  synchronizeOfflineModificationsOnFolderCreated: SynchronizeOfflineModificationsOnFolderCreated;
-  offline: {
-    folderCreator: OfflineFolderCreator;
-    folderPathUpdater: OfflineFolderPathUpdater;
-    synchronizeOfflineModifications: SynchronizeOfflineModifications;
-  };
-  managedFolderRepository: ManagedFolderRepository;
-  retrieveAllFolders: RetrieveAllFolders;
-}
diff --git a/src/workers/sync-engine/dependency-injection/folders/builder.ts b/src/workers/sync-engine/dependency-injection/folders/builder.ts
deleted file mode 100644
index 32ec71c12..000000000
--- a/src/workers/sync-engine/dependency-injection/folders/builder.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
-import { AllParentFoldersStatusIsExists } from '../../modules/folders/application/AllParentFoldersStatusIsExists';
-import { FolderByPartialSearcher } from '../../modules/folders/application/FolderByPartialSearcher';
-import { FolderClearer } from '../../modules/folders/application/FolderClearer';
-import { FolderCreator } from '../../modules/folders/application/FolderCreator';
-import { FolderDeleter } from '../../modules/folders/application/FolderDeleter';
-import { FolderFinder } from '../../modules/folders/application/FolderFinder';
-import { FolderMover } from '../../modules/folders/application/FolderMover';
-import { FolderPathUpdater } from '../../modules/folders/application/FolderPathUpdater';
-import { FolderRenamer } from '../../modules/folders/application/FolderRenamer';
-import { FolderSearcher } from '../../modules/folders/application/FolderSearcher';
-import { OfflineFolderCreator } from '../../modules/folders/application/Offline/OfflineFolderCreator';
-import { OfflineFolderMover } from '../../modules/folders/application/Offline/OfflineFolderMover';
-import { OfflineFolderPathUpdater } from '../../modules/folders/application/Offline/OfflineFolderPathUpdater';
-import { OfflineFolderRenamer } from '../../modules/folders/application/Offline/OfflineFolderRenamer';
-import { RetrieveAllFolders } from '../../modules/folders/application/RetrieveAllFolders';
-import { SynchronizeOfflineModifications } from '../../modules/folders/application/SynchronizeOfflineModifications';
-import { SynchronizeOfflineModificationsOnFolderCreated } from '../../modules/folders/application/SynchronizeOfflineModificationsOnFolderCreated';
-import { HttpFolderRepository } from '../../modules/folders/infrastructure/HttpFolderRepository';
-import { InMemoryOfflineFolderRepository } from '../../modules/folders/infrastructure/InMemoryOfflineFolderRepository';
-import { DependencyInjectionHttpClientsProvider } from '../common/clients';
-import { DependencyInjectionEventBus } from '../common/eventBus';
-import { DependencyInjectionTraverserProvider } from '../common/traverser';
-import { PlaceholderContainer } from '../placeholders/PlaceholdersContainer';
-import { FoldersContainer } from './FoldersContainer';
-
-export async function buildFoldersContainer(
-  placeholdersContainer: PlaceholderContainer
-): Promise<FoldersContainer> {
-  const clients = DependencyInjectionHttpClientsProvider.get();
-  const traverser = DependencyInjectionTraverserProvider.get();
-  const eventBus = DependencyInjectionEventBus.bus;
-
-  const repository = new HttpFolderRepository(
-    clients.drive,
-    clients.newDrive,
-    traverser,
-    ipcRendererSyncEngine
-  );
-
-  await repository.init();
-
-  const folderFinder = new FolderFinder(repository);
-
-  const folderSearcher = new FolderSearcher(repository);
-
-  const allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
-    repository
-  );
-
-  const folderDeleter = new FolderDeleter(
-    repository,
-    allParentFoldersStatusIsExists,
-    placeholdersContainer.placeholderCreator
-  );
-
-  const folderCreator = new FolderCreator(
-    repository,
-    folderFinder,
-    ipcRendererSyncEngine,
-    eventBus
-  );
-
-  const folderMover = new FolderMover(repository, folderFinder);
-  const folderRenamer = new FolderRenamer(repository, ipcRendererSyncEngine);
-
-  const folderByPartialSearcher = new FolderByPartialSearcher(repository);
-
-  const folderPathUpdater = new FolderPathUpdater(
-    repository,
-    folderMover,
-    folderRenamer
-  );
-
-  const folderClearer = new FolderClearer(repository);
-  const offlineRepository = new InMemoryOfflineFolderRepository();
-  const offlineFolderCreator = new OfflineFolderCreator(
-    folderFinder,
-    offlineRepository,
-    repository
-  );
-
-  const offlineFolderMover = new OfflineFolderMover(
-    offlineRepository,
-    folderFinder
-  );
-  const offlineFolderRenamer = new OfflineFolderRenamer(offlineRepository);
-  const offlineFolderPathUpdater = new OfflineFolderPathUpdater(
-    offlineRepository,
-    offlineFolderMover,
-    offlineFolderRenamer
-  );
-  const synchronizeOfflineModifications = new SynchronizeOfflineModifications(
-    offlineRepository,
-    repository,
-    folderRenamer
-  );
-
-  const synchronizeOfflineModificationsOnFolderCreated =
-    new SynchronizeOfflineModificationsOnFolderCreated(
-      synchronizeOfflineModifications
-    );
-
-  return {
-    folderCreator,
-    folderFinder,
-    folderSearcher,
-    folderDeleter,
-    allParentFoldersStatusIsExists: allParentFoldersStatusIsExists,
-    folderPathUpdater,
-    folderClearer,
-    folderByPartialSearcher,
-    synchronizeOfflineModificationsOnFolderCreated,
-    offline: {
-      folderCreator: offlineFolderCreator,
-      folderPathUpdater: offlineFolderPathUpdater,
-      synchronizeOfflineModifications,
-    },
-    managedFolderRepository: repository,
-    retrieveAllFolders: new RetrieveAllFolders(repository),
-  };
-}
diff --git a/src/workers/sync-engine/dependency-injection/placeholders/PlaceholdersContainer.ts b/src/workers/sync-engine/dependency-injection/placeholders/PlaceholdersContainer.ts
deleted file mode 100644
index 3389daa13..000000000
--- a/src/workers/sync-engine/dependency-injection/placeholders/PlaceholdersContainer.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { NotifyMainProcessHydrationFinished } from '../../modules/placeholders/application/NotifyMainProcessHydrationFinished';
-import { PlaceholderCreator } from '../../modules/placeholders/domain/PlaceholderCreator';
-
-export interface PlaceholderContainer {
-  placeholderCreator: PlaceholderCreator;
-  notifyMainProcessHydrationFinished: NotifyMainProcessHydrationFinished;
-}
diff --git a/src/workers/sync-engine/dependency-injection/placeholders/builder.ts b/src/workers/sync-engine/dependency-injection/placeholders/builder.ts
deleted file mode 100644
index b171079e3..000000000
--- a/src/workers/sync-engine/dependency-injection/placeholders/builder.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
-import { NotifyMainProcessHydrationFinished } from '../../modules/placeholders/application/NotifyMainProcessHydrationFinished';
-import { VirtualDrivePlaceholderCreator } from '../../modules/placeholders/infrastructure/VirtualDrivePlaceholderCreator';
-import { DependencyInjectionEventRepository } from '../common/eventRepository';
-import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
-import { PlaceholderContainer } from './PlaceholdersContainer';
-
-export function buildPlaceholdersContainer(): PlaceholderContainer {
-  const { virtualDrive } = DependencyInjectionVirtualDrive;
-  const eventRepository = DependencyInjectionEventRepository.get();
-
-  const placeholderCreator = new VirtualDrivePlaceholderCreator(virtualDrive);
-
-  const notifyMainProcessHydrationFinished =
-    new NotifyMainProcessHydrationFinished(
-      eventRepository,
-      ipcRendererSyncEngine
-    );
-
-  return { placeholderCreator, notifyMainProcessHydrationFinished };
-}
diff --git a/src/workers/sync-engine/dependency-injection/shared/SharedContainer.ts b/src/workers/sync-engine/dependency-injection/shared/SharedContainer.ts
deleted file mode 100644
index b1c13384e..000000000
--- a/src/workers/sync-engine/dependency-injection/shared/SharedContainer.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { LocalFileIdProvider } from 'workers/sync-engine/modules/shared/application/LocalFileIdProvider';
-import { AbsolutePathToRelativeConverter } from '../../modules/shared/application/AbsolutePathToRelativeConverter';
-import { RelativePathToAbsoluteConverter } from '../../modules/shared/application/RelativePathToAbsoluteConverter';
-
-export interface SharedContainer {
-  absolutePathToRelativeConverter: AbsolutePathToRelativeConverter;
-  relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter;
-  localFileIdProvider: LocalFileIdProvider;
-}
diff --git a/src/workers/sync-engine/modules/boundaryBridge/application/SyncPlaceholders.ts b/src/workers/sync-engine/modules/boundaryBridge/application/SyncPlaceholders.ts
deleted file mode 100644
index 628f4034e..000000000
--- a/src/workers/sync-engine/modules/boundaryBridge/application/SyncPlaceholders.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { UpdatePlaceholderFile } from './UpdatePlaceholderFile';
-import { UpdatePlaceholderFolder } from './UpdatePlaceholderFolder';
-import { File } from '../../files/domain/File';
-import { Folder } from '../../folders/domain/Folder';
-import { TreeBuilder } from '../../items/application/TreeBuilder';
-import { VirtualDrive } from 'virtual-drive/dist';
-import { trimPlaceholderId } from '../../placeholders/domain/CommonPlaceholder';
-import { FilePlaceholderIdPrefix } from '../../placeholders/domain/FilePlaceholderId';
-import { FolderPlaceholderIdPrefix } from '../../placeholders/domain/FolderPlaceholderId';
-
-export class SyncPlaceholders {
-  constructor(
-    private readonly treeBuilder: TreeBuilder,
-    private readonly updatePlaceholderFile: UpdatePlaceholderFile,
-    private readonly updatePlaceholderFolder: UpdatePlaceholderFolder,
-    private readonly virtualDrive: VirtualDrive
-  ) {}
-
-  async run() {
-    const tree = await this.treeBuilder.run();
-
-    const listPlaceholdersIds = (await this.virtualDrive.getItemsIds()).map(id => trimPlaceholderId(id));
-
-    const folders = Object.values(tree).filter((item) =>
-      item.isFolder() && listPlaceholdersIds.includes(FolderPlaceholderIdPrefix + item.uuid)
-    ) as Array<Folder>;
-
-    const foldersActualization = folders.map((folder) => {
-      this.updatePlaceholderFolder.run(folder);
-    });
-
-    await Promise.all(foldersActualization);
-
-    const files = Object.values(tree).filter((item) =>
-      item.isFile() && listPlaceholdersIds.includes(FilePlaceholderIdPrefix + item.contentsId)
-    ) as Array<File>;
-
-    const filesActualization = files.map((file) =>
-      this.updatePlaceholderFile.run(file)
-    );
-
-    await Promise.all(filesActualization);
-  }
-}
diff --git a/src/workers/sync-engine/modules/boundaryBridge/application/TreePlaceholderCreator.ts b/src/workers/sync-engine/modules/boundaryBridge/application/TreePlaceholderCreator.ts
deleted file mode 100644
index 389d429d5..000000000
--- a/src/workers/sync-engine/modules/boundaryBridge/application/TreePlaceholderCreator.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { File } from '../../files/domain/File';
-import { Folder } from '../../folders/domain/Folder';
-import { TreeBuilder } from '../../items/application/TreeBuilder';
-import { PlaceholderCreator } from '../../placeholders/domain/PlaceholderCreator';
-
-type Items = { files: Array<File>; folders: Array<Folder> };
-
-export class TreePlaceholderCreator {
-  constructor(
-    private readonly treeBuilder: TreeBuilder,
-    private readonly placeholderCreator: PlaceholderCreator
-  ) {}
-
-  async run(): Promise<void> {
-    const tree = await this.treeBuilder.run();
-
-    const items = tree.reduce(
-      (items, item) => {
-        if (item.isFile()) {
-          items.files.push(item);
-        }
-
-        if (item.isFolder()) {
-          items.folders.push(item);
-        }
-
-        return items;
-      },
-      {
-        files: [],
-        folders: [],
-      } as Items
-    );
-
-    items.folders.forEach((folder) => {
-      this.placeholderCreator.folder(folder);
-    });
-
-    items.files.forEach((file) => {
-      return this.placeholderCreator.file(file);
-    });
-  }
-}
diff --git a/src/workers/sync-engine/modules/contents/test/__mocks__/LocalFileWriterMock.ts b/src/workers/sync-engine/modules/contents/test/__mocks__/LocalFileWriterMock.ts
deleted file mode 100644
index 4ef52d2ca..000000000
--- a/src/workers/sync-engine/modules/contents/test/__mocks__/LocalFileWriterMock.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { LocalFileContents } from '../../domain/LocalFileContents';
-import { LocalFileWriter } from '../../domain/LocalFileWriter';
-
-export class LocalFileWriterMock implements LocalFileWriter {
-  public writeMock = jest.fn();
-
-  write(contents: LocalFileContents): Promise<string> {
-    return this.writeMock(contents);
-  }
-}
diff --git a/src/workers/sync-engine/modules/contents/test/__mocks__/LocationProviderMock.ts b/src/workers/sync-engine/modules/contents/test/__mocks__/LocationProviderMock.ts
deleted file mode 100644
index a6cff6c49..000000000
--- a/src/workers/sync-engine/modules/contents/test/__mocks__/LocationProviderMock.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { LocationProvider } from '../../infrastructure/FSLocalFileWriter';
-
-export class LocationProviderMock {
-  public mock = jest.fn();
-
-  provider: LocationProvider = this.mock;
-}
diff --git a/src/workers/sync-engine/modules/files/application/FileByPartialSearcher.ts b/src/workers/sync-engine/modules/files/application/FileByPartialSearcher.ts
deleted file mode 100644
index 00af1c996..000000000
--- a/src/workers/sync-engine/modules/files/application/FileByPartialSearcher.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { File, FileAttributes } from '../domain/File';
-import { FileRepository } from '../domain/FileRepository';
-
-export class FileByPartialSearcher {
-  constructor(private readonly repository: FileRepository) {}
-
-  run(partial: Partial<FileAttributes>): File | undefined {
-    return this.repository.searchByPartial(partial);
-  }
-}
diff --git a/src/workers/sync-engine/modules/files/application/FileClearer.ts b/src/workers/sync-engine/modules/files/application/FileClearer.ts
deleted file mode 100644
index 570f0cd93..000000000
--- a/src/workers/sync-engine/modules/files/application/FileClearer.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { FileRepository } from '../domain/FileRepository';
-
-/** @deprecated */
-export class FileClearer {
-  constructor(private readonly repository: FileRepository) {}
-
-  run(): void {
-    return this.repository.clear();
-  }
-}
diff --git a/src/workers/sync-engine/modules/files/application/FileSearcher.ts b/src/workers/sync-engine/modules/files/application/FileSearcher.ts
deleted file mode 100644
index 4bfd6d42b..000000000
--- a/src/workers/sync-engine/modules/files/application/FileSearcher.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { FileRepository } from '../domain/FileRepository';
-import { File } from '../domain/File';
-import { HttpFileRepository } from '../infrastructure/HttpFileRepository';
-
-export class FileSearcher {
-  constructor(private readonly repository: FileRepository) {}
-
-  async run(): Promise<Array<File>> {
-    // TODO: avoid the cast
-    const repository = this.repository as HttpFileRepository;
-
-    // await repository.init();
-
-    return Object.values(repository.files);
-  }
-}
diff --git a/src/workers/sync-engine/modules/files/application/LocalRepositoryRepositoryRefresher.ts b/src/workers/sync-engine/modules/files/application/LocalRepositoryRepositoryRefresher.ts
deleted file mode 100644
index 64077acaf..000000000
--- a/src/workers/sync-engine/modules/files/application/LocalRepositoryRepositoryRefresher.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { SyncEngineIpc } from '../../../ipcRendererSyncEngine';
-import { HttpFileRepository } from '../infrastructure/HttpFileRepository';
-
-export class LocalRepositoryRepositoryRefresher {
-  constructor(
-    private readonly ipc: SyncEngineIpc,
-    private readonly repository: HttpFileRepository
-  ) {}
-
-  async run() {
-    await this.ipc.invoke('START_REMOTE_SYNC');
-    await this.repository.init();
-  }
-}
diff --git a/src/workers/sync-engine/modules/files/domain/ManagedFileRepository.ts b/src/workers/sync-engine/modules/files/domain/ManagedFileRepository.ts
deleted file mode 100644
index 552d79a1a..000000000
--- a/src/workers/sync-engine/modules/files/domain/ManagedFileRepository.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { File } from './File';
-
-// TODO: Find a better name
-export interface ManagedFileRepository {
-  insert(file: File): Promise<void>;
-  overwrite(oldFile: File, newFile: File): Promise<void>;
-}
diff --git a/src/workers/sync-engine/modules/files/infrastructure/HttpFileRepository.ts b/src/workers/sync-engine/modules/files/infrastructure/HttpFileRepository.ts
deleted file mode 100644
index e40ec9cf2..000000000
--- a/src/workers/sync-engine/modules/files/infrastructure/HttpFileRepository.ts
+++ /dev/null
@@ -1,246 +0,0 @@
-import { Axios } from 'axios';
-import { FileCreatedResponseDTO } from 'shared/HttpClient/responses/file-created';
-import { Nullable } from 'shared/types/Nullable';
-import { ServerFile } from '../../../../filesystems/domain/ServerFile';
-import { ServerFolder } from '../../../../filesystems/domain/ServerFolder';
-import { File, FileAttributes } from '../domain/File';
-import { FileRepository } from '../domain/FileRepository';
-import * as uuid from 'uuid';
-import { Traverser } from '../../items/application/Traverser';
-import { AddFileDTO } from './dtos/AddFileDTO';
-import { UpdateFileParentDirDTO } from './dtos/UpdateFileParentDirDTO';
-import { UpdateFileNameDTO } from './dtos/UpdateFileNameDTO';
-import { FilePath } from '../domain/FilePath';
-import { RemoteItemsGenerator } from '../../items/application/RemoteItemsGenerator';
-import { FileStatuses } from '../domain/FileStatus';
-import { Crypt } from '../../shared/domain/Crypt';
-import { SyncEngineIpc } from '../../../ipcRendererSyncEngine';
-import { ManagedFileRepository } from '../domain/ManagedFileRepository';
-
-export class HttpFileRepository
-  implements FileRepository, ManagedFileRepository
-{
-  public files: Record<string, File> = {};
-
-  constructor(
-    private readonly crypt: Crypt,
-    private readonly httpClient: Axios,
-    private readonly trashHttpClient: Axios,
-    private readonly traverser: Traverser,
-    private readonly bucket: string,
-    private readonly ipc: SyncEngineIpc
-  ) {}
-
-  private async getTree(): Promise<{
-    files: ServerFile[];
-    folders: ServerFolder[];
-  }> {
-    const remoteItemsGenerator = new RemoteItemsGenerator(this.ipc);
-    return remoteItemsGenerator.getAll();
-  }
-
-  public all(): Promise<Array<File>> {
-    return Promise.resolve(Object.values(this.files));
-  }
-
-  public async init(startingFiles: Record<string, File> = {}): Promise<void> {
-    const raw = await this.getTree();
-
-    this.traverser.reset();
-    const all = this.traverser.run(raw);
-
-    const files = Object.entries(all).filter(
-      ([_, value]) =>
-        value instanceof File && value.hasStatus(FileStatuses.EXISTS)
-    ) as Array<[string, File]>;
-
-    this.files = files.reduce((items, [key, value]) => {
-      if (items[key] === undefined) {
-        items[key] = value;
-      } else if (value.updatedAt > items[key].updatedAt) {
-        items[key] = value;
-      }
-
-      return items;
-    }, startingFiles);
-  }
-
-  private async reload(): Promise<void> {
-    await this.init(this.files);
-  }
-
-  search(path: FilePath): Nullable<File> {
-    const item = this.files[path.value];
-
-    if (!item) return;
-
-    return File.from(item.attributes());
-  }
-
-  searchByPartial(partial: Partial<FileAttributes>): Nullable<File> {
-    const keys = Object.keys(partial) as Array<keyof Partial<FileAttributes>>;
-
-    const file = Object.values(this.files).find((file) => {
-      return keys.every((key: keyof FileAttributes) => {
-        if (key === 'contentsId') {
-          return (
-            (file.attributes()[key] as string).normalize() ==
-            (partial[key] as string).normalize()
-          );
-        }
-
-        return file.attributes()[key] == partial[key];
-      });
-    });
-
-    if (file) {
-      return File.from(file.attributes());
-    }
-
-    return undefined;
-  }
-
-  async delete(file: File): Promise<void> {
-    const result = await this.trashHttpClient.post(
-      `${process.env.NEW_DRIVE_URL}/drive/storage/trash/add`,
-      {
-        items: [
-          {
-            type: 'file',
-            id: file.contentsId,
-          },
-        ],
-      }
-    );
-
-    if (result.status === 200) {
-      this.files[file.path.value] = file;
-      await this.reload();
-    }
-  }
-
-  async add(file: File): Promise<void> {
-    const encryptedName = this.crypt.encryptName(
-      file.name,
-      file.folderId.toString()
-    );
-
-    if (!encryptedName) {
-      throw new Error('Failed to encrypt name');
-    }
-
-    const body: AddFileDTO = {
-      file: {
-        bucket: this.bucket,
-        encrypt_version: '03-aes',
-        fileId: file.contentsId,
-        file_id: file.contentsId,
-        folder_id: file.folderId,
-        name: encryptedName,
-        plain_name: file.name,
-        size: file.size,
-        type: file.type,
-        modificationTime: Date.now(),
-      },
-    };
-
-    const result = await this.httpClient.post<FileCreatedResponseDTO>(
-      `${process.env.API_URL}/api/storage/file`,
-      body
-    );
-
-    if (result.status === 500) {
-      throw new Error('Invalid response creating file');
-    }
-
-    const created = File.from({
-      ...result.data,
-      contentsId: result.data.fileId,
-      folderId: result.data.folder_id,
-      size: parseInt(result.data.size, 10),
-      path: file.path.value,
-      status: FileStatuses.EXISTS,
-    });
-
-    this.files[file.path.value] = created;
-
-    await this.reload();
-  }
-
-  async updateName(file: File): Promise<void> {
-    const url = `${process.env.API_URL}/api/storage/file/${file.contentsId}/meta`;
-
-    const body: UpdateFileNameDTO = {
-      metadata: { itemName: file.name },
-      bucketId: this.bucket,
-      relativePath: uuid.v4(),
-    };
-
-    const res = await this.httpClient.post(url, body);
-
-    if (res.status !== 200) {
-      throw new Error(
-        `[REPOSITORY] Error updating item metadata: ${res.status}`
-      );
-    }
-
-    const oldFileEntry = Object.entries(this.files).find(
-      ([_, f]) => f.contentsId === file.contentsId && f.name !== file.name
-    );
-
-    if (oldFileEntry) {
-      delete this.files[oldFileEntry[0]];
-    }
-
-    this.files[file.path.value] = File.from(file.attributes());
-
-    await this.reload();
-  }
-
-  async updateParentDir(file: File): Promise<void> {
-    const url = `${process.env.API_URL}/api/storage/move/file`;
-    const body: UpdateFileParentDirDTO = {
-      destination: file.folderId,
-      fileId: file.contentsId,
-    };
-
-    const res = await this.httpClient.post(url, body);
-
-    if (res.status !== 200) {
-      throw new Error(`[REPOSITORY] Error moving item: ${res.status}`);
-    }
-
-    const old = this.searchByPartial({ contentsId: file.contentsId });
-
-    if (old) {
-      delete this.files[old?.path.value];
-    }
-
-    this.files[file.path.value] = file;
-  }
-
-  async searchOnFolder(folderId: number): Promise<Array<File>> {
-    await this.reload();
-    return Object.values(this.files).filter((file) => file.hasParent(folderId));
-  }
-
-  /** @deprecated */
-  clear(): void {
-    this.files = {};
-  }
-
-  insert(file: File): Promise<void> {
-    if (this.files[file.path.value]) {
-      throw new Error('Insert file only should insert non existent');
-    }
-    this.files[file.path.value] = file;
-    return Promise.resolve();
-  }
-
-  overwrite(oldFile: File, newFile: File): Promise<void> {
-    delete this.files[oldFile.path.value];
-
-    this.files[newFile.path.value] = newFile;
-    return Promise.resolve();
-  }
-}
diff --git a/src/workers/sync-engine/modules/files/test/__mocks__/FileRepositoryMock.ts b/src/workers/sync-engine/modules/files/test/__mocks__/FileRepositoryMock.ts
deleted file mode 100644
index 9fea08d26..000000000
--- a/src/workers/sync-engine/modules/files/test/__mocks__/FileRepositoryMock.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Nullable } from 'shared/types/Nullable';
-import { FilePath } from '../../domain/FilePath';
-import { File, FileAttributes } from '../../domain/File';
-import { FileRepository } from '../../domain/FileRepository';
-
-export class FileRepositoryMock implements FileRepository {
-  public mockSearch = jest.fn();
-  public mockSearchByPartial = jest.fn();
-  public mockDelete = jest.fn();
-  public mockAdd = jest.fn();
-  public mockUpdateName = jest.fn();
-  public mockUpdateParentDir = jest.fn();
-  public mockSearchOnFolder = jest.fn();
-  public mockClear = jest.fn();
-  public mockInsert = jest.fn();
-  public mockAll = jest.fn();
-
-  all(): Promise<Array<File>> {
-    return this.mockAll();
-  }
-
-  insert(file: File): Promise<void> {
-    return this.mockInsert(file);
-  }
-
-  search(pathLike: FilePath): Nullable<File> {
-    return this.mockSearch(pathLike);
-  }
-
-  searchByPartial(partial: Partial<FileAttributes>): Nullable<File> {
-    return this.mockSearchByPartial(partial);
-  }
-
-  delete(file: File): Promise<void> {
-    return this.mockDelete(file);
-  }
-
-  add(file: File): Promise<void> {
-    return this.mockAdd(file);
-  }
-
-  updateName(item: File): Promise<void> {
-    return this.mockUpdateName(item);
-  }
-
-  updateParentDir(item: File): Promise<void> {
-    return this.mockUpdateParentDir(item);
-  }
-
-  searchOnFolder(folderId: number): Promise<Array<File>> {
-    return this.mockSearchOnFolder(folderId);
-  }
-
-  clear(): void {
-    return this.mockClear();
-  }
-
-  clearMocks() {
-    jest.clearAllMocks();
-  }
-}
diff --git a/src/workers/sync-engine/modules/files/test/application/FileCreator.test.ts b/src/workers/sync-engine/modules/files/test/application/FileCreator.test.ts
deleted file mode 100644
index 06935c75d..000000000
--- a/src/workers/sync-engine/modules/files/test/application/FileCreator.test.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import { FolderMother } from '../../../folders/test/domain/FolderMother';
-import { FolderRepositoryMock } from '../../../folders/test/__mocks__/FolderRepositoryMock';
-import { FolderFinder } from '../../../folders/application/FolderFinder';
-import { FileCreator } from '../../application/FileCreator';
-import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
-import { EventBusMock } from '../../../shared/test/__mock__/EventBusMock';
-import { FilePath } from '../../domain/FilePath';
-import { FileContentsMother } from '../../../contents/test/domain/FileContentsMother';
-import { FileDeleter } from '../../application/FileDeleter';
-import { AllParentFoldersStatusIsExists } from '../../../folders/application/AllParentFoldersStatusIsExists';
-import { PlaceholderCreatorMock } from '../../../placeholders/test/__mock__/PlaceholderCreatorMock';
-import { IpcRendererSyncEngineMock } from '../../../shared/test/__mock__/IpcRendererSyncEngineMock';
-import { FileMother } from '../domain/FileMother';
-describe('File Creator', () => {
-  let fileRepository: FileRepositoryMock;
-  let folderRepository: FolderRepositoryMock;
-  let fileDeleter: FileDeleter;
-  let eventBus: EventBusMock;
-
-  let SUT: FileCreator;
-
-  const placeholderCreator = new PlaceholderCreatorMock();
-  const ipc = new IpcRendererSyncEngineMock();
-
-  beforeEach(() => {
-    fileRepository = new FileRepositoryMock();
-    folderRepository = new FolderRepositoryMock();
-    const allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
-      folderRepository
-    );
-
-    fileDeleter = new FileDeleter(
-      fileRepository,
-      allParentFoldersStatusIsExists,
-      placeholderCreator,
-      ipc
-    );
-
-    const folderFinder = new FolderFinder(folderRepository);
-    eventBus = new EventBusMock();
-
-    SUT = new FileCreator(
-      fileRepository,
-      folderFinder,
-      fileDeleter,
-      eventBus,
-      ipc
-    );
-  });
-
-  it('creates the file on the drive server', async () => {
-    const path = new FilePath('/cat.png');
-    const contents = FileContentsMother.random();
-
-    const folder = FolderMother.any();
-
-    folderRepository.mockSearch.mockReturnValueOnce(folder);
-    fileRepository.mockAdd.mockImplementationOnce(() => {
-      // returns Promise<void>
-    });
-
-    await SUT.run(path, contents);
-
-    expect(fileRepository.mockAdd.mock.calls[0][0].contentsId).toBe(
-      contents.id
-    );
-    expect(fileRepository.mockAdd.mock.calls[0][0].size).toStrictEqual(
-      contents.size
-    );
-    expect(fileRepository.mockAdd.mock.calls[0][0].folderId).toBe(folder.id);
-  });
-
-  it('once the file entry is created the creation event should have been emitted', async () => {
-    const path = new FilePath('/cat.png');
-    const contents = FileContentsMother.random();
-
-    const folder = FolderMother.any();
-
-    folderRepository.mockSearch.mockReturnValueOnce(folder);
-    fileRepository.mockAdd.mockImplementationOnce(() => {
-      // returns Promise<void>
-    });
-
-    await SUT.run(path, contents);
-
-    expect(eventBus.publishMock.mock.calls[0][0][0].eventName).toBe(
-      'file.created'
-    );
-    expect(eventBus.publishMock.mock.calls[0][0][0].aggregateId).toBe(
-      contents.id
-    );
-  });
-
-  it('deletes the file on remote if it already exists on the path', async () => {
-    const path = new FilePath('/cat.png');
-    const existingFile = FileMother.fromPath(path.value);
-    const contents = FileContentsMother.random();
-
-    const folder = FolderMother.any();
-
-    fileRepository.mockSearchByPartial
-      .mockReturnValueOnce(existingFile)
-      .mockReturnValueOnce(existingFile);
-
-    folderRepository.mockSearchByPartial.mockReturnValueOnce(folder);
-    fileRepository.mockDelete.mockImplementationOnce(() => {
-      // returns Promise<void>
-    });
-    folderRepository.mockSearch.mockReturnValueOnce(folder);
-    fileRepository.mockAdd.mockImplementationOnce(() => {
-      // returns Promise<void>
-    });
-
-    await SUT.run(path, contents);
-
-    expect(fileRepository.mockDelete.mock.calls[0][0].contentsId).toBe(
-      existingFile.contentsId
-    );
-    expect(fileRepository.mockAdd.mock.calls[0][0].contentsId).toBe(
-      contents.id
-    );
-  });
-});
diff --git a/src/workers/sync-engine/modules/files/test/application/FilePathUpdater.test.ts b/src/workers/sync-engine/modules/files/test/application/FilePathUpdater.test.ts
deleted file mode 100644
index f9ca946c9..000000000
--- a/src/workers/sync-engine/modules/files/test/application/FilePathUpdater.test.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { FilePathUpdater } from '../../application/FilePathUpdater';
-import { FilePath } from '../../domain/FilePath';
-import { FileMother } from '../domain/FileMother';
-import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
-import { FolderFinder } from '../../../folders/application/FolderFinder';
-import { FolderFinderMock } from '../../../folders/test/__mocks__/FolderFinderMock';
-import { FileFinderByContentsId } from '../../application/FileFinderByContentsId';
-import { IpcRendererSyncEngineMock } from '../../../shared/test/__mock__/IpcRendererSyncEngineMock';
-import { LocalFileIdProvider } from '../../../shared/application/LocalFileIdProvider';
-import { EventBusMock } from '../../../shared/test/__mock__/EventBusMock';
-
-describe('File path updater', () => {
-  let repository: FileRepositoryMock;
-  let fileFinderByContentsId: FileFinderByContentsId;
-  let folderFinder: FolderFinderMock;
-  let ipcRendererMock: IpcRendererSyncEngineMock;
-  let localFileIdProvider: LocalFileIdProvider;
-  let eventBus: EventBusMock;
-  let SUT: FilePathUpdater;
-
-  beforeEach(() => {
-    repository = new FileRepositoryMock();
-    folderFinder = new FolderFinderMock();
-    fileFinderByContentsId = new FileFinderByContentsId(repository);
-    ipcRendererMock = new IpcRendererSyncEngineMock();
-    eventBus = new EventBusMock();
-
-    SUT = new FilePathUpdater(
-      repository,
-      fileFinderByContentsId,
-      folderFinder as unknown as FolderFinder,
-      ipcRendererMock,
-      localFileIdProvider,
-      eventBus
-    );
-  });
-
-  it('when the extension does not changes it updates the name of the file', async () => {
-    const file = FileMother.any();
-
-    repository.mockSearchByPartial.mockReturnValue(file);
-
-    const destination = new FilePath(
-      `${file.dirname}/_${file.nameWithExtension}`
-    );
-
-    await SUT.run(file.contentsId, destination.value);
-
-    expect(repository.mockUpdateName).toBeCalledWith(
-      expect.objectContaining(file)
-    );
-  });
-});
diff --git a/src/workers/sync-engine/modules/files/test/infrastructure/HttpFileRepository.test.ts b/src/workers/sync-engine/modules/files/test/infrastructure/HttpFileRepository.test.ts
deleted file mode 100644
index 1a1be8894..000000000
--- a/src/workers/sync-engine/modules/files/test/infrastructure/HttpFileRepository.test.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import axios from 'axios';
-import { Traverser } from '../../../items/application/Traverser';
-import { HttpFileRepository } from '../../infrastructure/HttpFileRepository';
-import { IpcRendererSyncEngineMock } from '../../../shared/test/__mock__/IpcRendererSyncEngineMock';
-import { FilePath } from '../../domain/FilePath';
-import { ServerFileMother } from './ServerFileMother';
-import { ServerFolderMother } from '../../../items/test/persistance/ServerFolderMother';
-import { File } from '../../domain/File';
-import { fakeDecryptor } from '../../../shared/test/domain/FakeCrypt';
-import Chance from 'chance';
-const chance = new Chance();
-
-jest.mock('axios');
-
-const rootFolderId = 31420;
-
-const rootFolder = ServerFolderMother.fromPartial({
-  parentId: null,
-  id: rootFolderId,
-});
-
-describe('Http File Repository', () => {
-  let traverser: Traverser;
-  let ipc: IpcRendererSyncEngineMock;
-  let SUT: HttpFileRepository;
-
-  beforeEach(() => {
-    traverser = new Traverser(fakeDecryptor, rootFolderId);
-
-    ipc = new IpcRendererSyncEngineMock();
-
-    SUT = new HttpFileRepository(
-      fakeDecryptor,
-      axios,
-      axios,
-      traverser,
-      'bucket',
-      ipc
-    );
-  });
-
-  describe('Rename', () => {
-    it('after a file is renamed cannot be found ', async () => {
-      const originalFiles = ['a', 'b', 'c', 'd'].map((char: string) =>
-        ServerFileMother.fromPartial({
-          name: char,
-          folderId: rootFolderId,
-          fileId: chance.string({ length: 24 }),
-          type: '',
-        })
-      );
-
-      const resultFiles = ['aa', 'b', 'c', 'd'].map((char: string) =>
-        ServerFileMother.fromPartial({
-          name: char,
-          folderId: rootFolderId,
-          fileId: chance.string({ length: 24 }),
-          type: '',
-        })
-      );
-
-      ipc.onInvokeMock
-        .mockResolvedValueOnce({
-          folders: [rootFolder],
-          files: originalFiles,
-        })
-        .mockResolvedValueOnce({
-          folders: [rootFolder],
-          files: resultFiles,
-        });
-
-      axios.post = jest.fn().mockResolvedValueOnce({ status: 200, data: {} });
-
-      await SUT.init();
-
-      const fileSearchedBeforeRename = SUT.search(new FilePath('/a')) as File;
-
-      fileSearchedBeforeRename.rename(new FilePath('/aa'));
-
-      await SUT.updateName(fileSearchedBeforeRename);
-
-      const fileSearchedAfterRename = SUT.search(new FilePath('/a'));
-
-      expect(fileSearchedAfterRename).not.toBeDefined();
-    });
-  });
-});
diff --git a/src/workers/sync-engine/modules/folders/application/FolderClearer.ts b/src/workers/sync-engine/modules/folders/application/FolderClearer.ts
deleted file mode 100644
index aed571e7f..000000000
--- a/src/workers/sync-engine/modules/folders/application/FolderClearer.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { FolderRepository } from '../domain/FolderRepository';
-
-/** @deprecated */
-export class FolderClearer {
-  constructor(private readonly repository: FolderRepository) {}
-
-  run(): void {
-    return this.repository.clear();
-  }
-}
diff --git a/src/workers/sync-engine/modules/folders/application/FolderSearcher.ts b/src/workers/sync-engine/modules/folders/application/FolderSearcher.ts
deleted file mode 100644
index 4f60eb6c8..000000000
--- a/src/workers/sync-engine/modules/folders/application/FolderSearcher.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Folder } from '../domain/Folder';
-import { FolderRepository } from '../domain/FolderRepository';
-import { HttpFolderRepository } from '../infrastructure/HttpFolderRepository';
-
-export class FolderSearcher {
-  constructor(private readonly repository: FolderRepository) {}
-
-  run(): Array<Folder> {
-    // TODO: avoid cast
-    const repository = this.repository as HttpFolderRepository;
-
-    return Object.values(repository.folders);
-  }
-}
diff --git a/src/workers/sync-engine/modules/folders/domain/OfflineFolderRepository.ts b/src/workers/sync-engine/modules/folders/domain/OfflineFolderRepository.ts
deleted file mode 100644
index 167d777bf..000000000
--- a/src/workers/sync-engine/modules/folders/domain/OfflineFolderRepository.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { OfflineFolder } from './OfflineFolder';
-
-export interface OfflineFolderRepository {
-  getByUuid(uuid: OfflineFolder['uuid']): OfflineFolder | undefined;
-  getByPath(path: string): OfflineFolder | undefined;
-  update(folder: OfflineFolder): void;
-  remove(folder: OfflineFolder): void;
-}
diff --git a/src/workers/sync-engine/modules/folders/infrastructure/HttpFolderRepository.ts b/src/workers/sync-engine/modules/folders/infrastructure/HttpFolderRepository.ts
deleted file mode 100644
index 968d2edc2..000000000
--- a/src/workers/sync-engine/modules/folders/infrastructure/HttpFolderRepository.ts
+++ /dev/null
@@ -1,226 +0,0 @@
-import { Axios } from 'axios';
-import Logger from 'electron-log';
-import nodePath from 'path';
-import { Nullable } from 'shared/types/Nullable';
-import * as uuid from 'uuid';
-import { ServerFile } from '../../../../filesystems/domain/ServerFile';
-import { ServerFolder } from '../../../../filesystems/domain/ServerFolder';
-import { SyncEngineIpc } from '../../../ipcRendererSyncEngine';
-import { RemoteItemsGenerator } from '../../items/application/RemoteItemsGenerator';
-import { Traverser } from '../../items/application/Traverser';
-import { PlatformPathConverter } from '../../shared/application/PlatformPathConverter';
-import { Folder, FolderAttributes } from '../domain/Folder';
-import { FolderPath } from '../domain/FolderPath';
-import { FolderRepository } from '../domain/FolderRepository';
-import { FolderStatuses } from '../domain/FolderStatus';
-import { ManagedFolderRepository } from '../domain/ManagedFolderRepository';
-import { UpdateFolderNameDTO } from './dtos/UpdateFolderNameDTO';
-
-export class HttpFolderRepository
-  implements FolderRepository, ManagedFolderRepository
-{
-  public folders: Record<string, Folder> = {};
-
-  constructor(
-    private readonly driveClient: Axios,
-    private readonly trashClient: Axios,
-    private readonly traverser: Traverser,
-    private readonly ipc: SyncEngineIpc
-  ) {}
-
-  private async getTree(): Promise<{
-    files: ServerFile[];
-    folders: ServerFolder[];
-  }> {
-    const remoteItemsGenerator = new RemoteItemsGenerator(this.ipc);
-    return remoteItemsGenerator.getAll();
-  }
-
-  public async init(
-    startingFolders: Record<string, Folder> = {}
-  ): Promise<void> {
-    const raw = await this.getTree();
-
-    this.traverser.reset();
-    const all = this.traverser.run(raw);
-
-    const folders = Object.entries(all).filter(
-      ([_key, value]) =>
-        value instanceof Folder && value.hasStatus(FolderStatuses.EXISTS)
-    ) as Array<[string, Folder]>;
-
-    this.folders = folders.reduce((items, [key, value]) => {
-      if (items[key] === undefined) {
-        items[key] = value;
-      } else if (value.updatedAt > items[key].updatedAt) {
-        items[key] = value;
-      }
-
-      return items;
-    }, startingFolders);
-  }
-
-  private async reload(): Promise<void> {
-    await this.init(this.folders);
-  }
-
-  all(): Promise<Array<Folder>> {
-    return Promise.resolve(Object.values(this.folders));
-  }
-
-  search(path: string): Nullable<Folder> {
-    return this.folders[path];
-  }
-
-  searchByPartial(partial: Partial<FolderAttributes>): Nullable<Folder> {
-    const keys = Object.keys(partial) as Array<keyof Partial<FolderAttributes>>;
-
-    const folder = Object.values(this.folders).find((folder) => {
-      return keys.every((key) => folder.attributes()[key] === partial[key]);
-    });
-
-    if (folder) {
-      return Folder.from(folder.attributes());
-    }
-
-    return undefined;
-  }
-
-  async create(
-    path: FolderPath,
-    parentId: number,
-    uuid: Folder['uuid']
-  ): Promise<Folder> {
-    const plainName = path.name();
-
-    if (!plainName) {
-      throw new Error('Bad folder name');
-    }
-
-    const response = await this.driveClient.post(
-      `${process.env.API_URL}/api/storage/folder`,
-      {
-        folderName: plainName,
-        parentFolderId: parentId,
-        uuid,
-      }
-    );
-
-    if (response.status !== 201) {
-      throw new Error('Folder creation failed');
-    }
-
-    const serverFolder = response.data as ServerFolder | null;
-
-    if (!serverFolder) {
-      throw new Error('Folder creation failed, no data returned');
-    }
-
-    const folder = Folder.create({
-      id: serverFolder.id,
-      uuid: serverFolder.uuid,
-      parentId: serverFolder.parentId,
-      updatedAt: serverFolder.updatedAt,
-      createdAt: serverFolder.createdAt,
-      path: path.value,
-      status: FolderStatuses.EXISTS,
-    });
-
-    const normalized = nodePath.normalize(folder.path.value);
-    const posix = PlatformPathConverter.winToPosix(normalized);
-    this.folders[posix] = folder;
-
-    return folder;
-  }
-
-  async updateName(folder: Folder): Promise<void> {
-    const url = `${process.env.API_URL}/api/storage/folder/${folder.id}/meta`;
-
-    const body: UpdateFolderNameDTO = {
-      metadata: { itemName: folder.name },
-      relativePath: uuid.v4(),
-    };
-
-    const res = await this.driveClient.post(url, body);
-
-    if (res.status !== 200) {
-      throw new Error(
-        `[REPOSITORY] Error updating item metadata: ${res.status}`
-      );
-    }
-
-    const old = this.searchByPartial({ uuid: folder.uuid });
-
-    if (old) {
-      delete this.folders[old?.path.value];
-    }
-
-    this.folders[folder.path.value] = folder;
-  }
-
-  async updateParentDir(folder: Folder): Promise<void> {
-    const url = `${process.env.API_URL}/api/storage/move/folder`;
-
-    const body = { destination: folder.parentId, folderId: folder.id };
-
-    const res = await this.driveClient.post(url, body);
-
-    if (res.status !== 200) {
-      throw new Error(`[REPOSITORY] Error moving item: ${res.status}`);
-    }
-
-    const old = this.searchByPartial({ uuid: folder.uuid });
-
-    if (old) {
-      delete this.folders[old?.path.value];
-    }
-
-    this.folders[folder.path.value] = folder;
-  }
-
-  async searchOn(folder: Folder): Promise<Array<Folder>> {
-    await this.reload();
-    return Object.values(this.folders).filter((f) => f.isIn(folder));
-  }
-
-  async trash(folder: Folder): Promise<void> {
-    const result = await this.trashClient.post(
-      `${process.env.NEW_DRIVE_URL}/drive/storage/trash/add`,
-      {
-        items: [{ type: 'folder', id: folder.id }],
-      }
-    );
-
-    if (result.status !== 200) {
-      Logger.error(
-        '[FOLDER REPOSITORY] Folder deletion failed with status: ',
-        result.status,
-        result.statusText
-      );
-      return;
-    }
-
-    const normalized = nodePath.normalize(folder.path.value);
-    const posix = PlatformPathConverter.winToPosix(normalized);
-    this.folders[posix] = folder;
-  }
-
-  /** @deprecated */
-  clear(): void {
-    this.folders = {};
-  }
-
-  insert(folder: Folder): Promise<void> {
-    if (this.folders[folder.path.value]) {
-      throw new Error('Insert file only should insert non existent');
-    }
-    this.folders[folder.path.value] = folder;
-    return Promise.resolve();
-  }
-  overwrite(oldFolder: Folder, newFolder: Folder): Promise<void> {
-    delete this.folders[oldFolder.path.value];
-
-    this.folders[newFolder.path.value] = newFolder;
-    return Promise.resolve();
-  }
-}
diff --git a/src/workers/sync-engine/modules/folders/infrastructure/InMemoryOfflineFolderRepository.ts b/src/workers/sync-engine/modules/folders/infrastructure/InMemoryOfflineFolderRepository.ts
deleted file mode 100644
index b9801e396..000000000
--- a/src/workers/sync-engine/modules/folders/infrastructure/InMemoryOfflineFolderRepository.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { OfflineFolder } from '../domain/OfflineFolder';
-import { OfflineFolderRepository } from '../domain/OfflineFolderRepository';
-import Logger from 'electron-log';
-
-export class InMemoryOfflineFolderRepository
-  implements OfflineFolderRepository
-{
-  private foldersByPath: Record<string, OfflineFolder> = {};
-  private foldersByUuid: Record<string, OfflineFolder> = {};
-
-  getByUuid(uuid: string): OfflineFolder | undefined {
-    return this.foldersByUuid[uuid];
-  }
-
-  getByPath(path: string): OfflineFolder | undefined {
-    return this.foldersByPath[path];
-  }
-
-  update(folder: OfflineFolder): void {
-    try {
-      const storedFolder = this.foldersByPath[folder.path.value] as
-        | OfflineFolder
-        | undefined;
-
-      const storedEvents = storedFolder ? storedFolder.pullDomainEvents() : [];
-      const newEvents = folder.pullDomainEvents();
-
-      [...storedEvents, ...newEvents].forEach((event) => folder.record(event));
-
-      this.foldersByPath[folder.path.value] = folder;
-      this.foldersByUuid[folder.uuid] = folder;
-    } catch (error: unknown) {
-      Logger.error('ERROR UPDATING OFFLINE FOLDER', error);
-    }
-  }
-
-  remove(folder: OfflineFolder): void {
-    delete this.foldersByPath[folder.path.value];
-    delete this.foldersByUuid[folder.uuid];
-  }
-}
diff --git a/src/workers/sync-engine/modules/folders/test/__mocks__/FolderRepositoryMock.ts b/src/workers/sync-engine/modules/folders/test/__mocks__/FolderRepositoryMock.ts
deleted file mode 100644
index 9f4748c4e..000000000
--- a/src/workers/sync-engine/modules/folders/test/__mocks__/FolderRepositoryMock.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Nullable } from 'shared/types/Nullable';
-import { FolderPath } from '../../domain/FolderPath';
-import { Folder, FolderAttributes } from '../../domain/Folder';
-import { FolderRepository } from '../../domain/FolderRepository';
-
-export class FolderRepositoryMock implements FolderRepository {
-  public mockSearch = jest.fn();
-  public mockSearchByPartial = jest.fn();
-  public mockAdd = jest.fn();
-  public mockUpdateName = jest.fn();
-  public mockUpdateParentDir = jest.fn();
-  public mockCreate = jest.fn();
-  public mockSearchOnFolder = jest.fn();
-  public mockTrash = jest.fn();
-  public mockClear = jest.fn();
-  public mockAll = jest.fn();
-
-  all(): Promise<Array<Folder>> {
-    return this.mockAll();
-  }
-
-  search(pathLike: string): Nullable<Folder> {
-    return this.mockSearch(pathLike);
-  }
-
-  searchByPartial(partial: Partial<FolderAttributes>): Nullable<Folder> {
-    return this.mockSearchByPartial(partial);
-  }
-
-  add(file: Folder): Promise<void> {
-    return this.mockAdd(file);
-  }
-
-  updateName(item: Folder): Promise<void> {
-    return this.mockUpdateName(item);
-  }
-
-  updateParentDir(item: Folder): Promise<void> {
-    return this.mockUpdateParentDir(item);
-  }
-
-  create(
-    name: FolderPath,
-    parentId: number | null,
-    uuid: Folder['uuid']
-  ): Promise<Folder> {
-    return this.mockCreate(name, parentId, uuid);
-  }
-
-  searchOn(folder: Folder): Promise<Folder[]> {
-    return this.mockSearchOnFolder(folder);
-  }
-
-  trash(folder: Folder): Promise<void> {
-    return this.mockTrash(folder);
-  }
-
-  clear(): void {
-    return this.mockClear();
-  }
-
-  clearMocks() {
-    jest.clearAllMocks();
-  }
-}
diff --git a/src/workers/sync-engine/modules/folders/test/infrastructure/HttpFolderRepository.test.ts b/src/workers/sync-engine/modules/folders/test/infrastructure/HttpFolderRepository.test.ts
deleted file mode 100644
index f8e24ed94..000000000
--- a/src/workers/sync-engine/modules/folders/test/infrastructure/HttpFolderRepository.test.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import axios from 'axios';
-import { Traverser } from '../../../items/application/Traverser';
-import { FolderPath } from '../../domain/FolderPath';
-import { HttpFolderRepository } from '../../infrastructure/HttpFolderRepository';
-import { fakeDecryptor } from '../../../shared/test/domain/FakeCrypt';
-import { IpcRendererSyncEngineMock } from '../../../shared/test/__mock__/IpcRendererSyncEngineMock';
-import { ServerFolderMother } from '../../../items/test/persistance/ServerFolderMother';
-
-jest.mock('axios');
-
-const rootFolderId = 4206870830;
-
-describe('Http Folder Repository', () => {
-  let ipc: IpcRendererSyncEngineMock;
-  let SUT: HttpFolderRepository;
-
-  describe('save', () => {
-    beforeEach(() => {
-      const traverser = new Traverser(fakeDecryptor, rootFolderId);
-
-      ipc = new IpcRendererSyncEngineMock();
-
-      SUT = new HttpFolderRepository(axios, axios, traverser, ipc);
-    });
-
-    it.skip('after a folder is saved it has to have all its properties set', async () => {
-      const serverFolder = ServerFolderMother.any();
-
-      axios.post = jest
-        .fn()
-        .mockResolvedValueOnce({ status: 201, data: serverFolder });
-
-      ipc.onInvokeMock.mockImplementationOnce(() => {
-        //no op
-      });
-
-      await SUT.create(
-        new FolderPath(`/${serverFolder.name}`),
-        serverFolder.parentId as unknown as number,
-        'd337ce74-4524-5e87-aebd-0a6f56628065'
-      );
-
-      const savedFolder = SUT.search(`/${serverFolder.name}`);
-
-      expect(savedFolder).toBeDefined();
-      expect(savedFolder?.updatedAt).toBeDefined();
-      expect(savedFolder?.createdAt).toBeDefined();
-    });
-  });
-});
diff --git a/src/workers/sync-engine/modules/items/application/Traverser.ts b/src/workers/sync-engine/modules/items/application/Traverser.ts
deleted file mode 100644
index 420c418ba..000000000
--- a/src/workers/sync-engine/modules/items/application/Traverser.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-import Logger from 'electron-log';
-import {
-  ServerFile,
-  ServerFileStatus,
-} from '../../../../filesystems/domain/ServerFile';
-import {
-  ServerFolder,
-  ServerFolderStatus,
-} from '../../../../filesystems/domain/ServerFolder';
-import { FolderStatus } from '../../folders/domain/FolderStatus';
-import { Folder } from '../../folders/domain/Folder';
-import { ItemsIndexedByPath } from '../domain/ItemsIndexedByPath';
-import { EitherTransformer } from '../../shared/application/EitherTransformer';
-import { createFileFromServerFile } from './FileCreatorFromServerFile';
-import { createFolderFromServerFolder } from './FolderCreatorFromServerFolder';
-
-export class Traverser {
-  private readonly collection: ItemsIndexedByPath = {};
-  private static readonly ROOT_FOLDER_UUID =
-    '43711926-15c2-5ebf-8c24-5099fa9af3c3';
-
-  private rawTree: {
-    files: Array<ServerFile>;
-    folders: Array<ServerFolder>;
-  } | null = null;
-
-  constructor(
-    private readonly decrypt: {
-      decryptName: (
-        name: string,
-        folderId: string,
-        encryptVersion: string
-      ) => string | null;
-    },
-    private readonly baseFolderId: number,
-    private readonly fileStatusesToFilter: Array<ServerFileStatus>,
-    private readonly folderStatusesToFilter: Array<ServerFolderStatus>
-  ) {}
-
-  static existingItems(
-    decrypt: {
-      decryptName: (
-        name: string,
-        folderId: string,
-        encryptVersion: string
-      ) => string | null;
-    },
-    baseFolderId: number
-  ): Traverser {
-    return new Traverser(
-      decrypt,
-      baseFolderId,
-      [ServerFileStatus.EXISTS],
-      [ServerFolderStatus.EXISTS]
-    );
-  }
-
-  static allItems(
-    decrypt: {
-      decryptName: (
-        name: string,
-        folderId: string,
-        encryptVersion: string
-      ) => string | null;
-    },
-    baseFolderId: number
-  ): Traverser {
-    return new Traverser(decrypt, baseFolderId, [], []);
-  }
-
-  private traverse(currentId: number, currentName = '') {
-    if (!this.rawTree) return;
-
-    const filesInThisFolder = this.rawTree.files.filter(
-      (file) => file.folderId === currentId
-    );
-
-    const foldersInThisFolder = this.rawTree.folders.filter((folder) => {
-      return folder.parentId === currentId;
-    });
-
-    filesInThisFolder.forEach((file) => {
-      if (!this.fileStatusesToFilter.includes(file.status)) {
-        return;
-      }
-
-      const decryptedName = this.decrypt.decryptName(
-        file.name,
-        file.folderId.toString(),
-        file.encrypt_version
-      );
-      const extensionToAdd = file.type ? `.${file.type}` : '';
-
-      const relativeFilePath = `${currentName}/${decryptedName}${extensionToAdd}`;
-
-      EitherTransformer.handleWithEither(() =>
-        createFileFromServerFile(file, relativeFilePath)
-      ).fold(
-        (error) => {
-          Logger.warn(
-            `[Traverser] File with path ${relativeFilePath} could not be created: `,
-            error
-          );
-        },
-        (file) => {
-          this.collection[relativeFilePath] = file;
-        }
-      );
-    });
-
-    foldersInThisFolder.forEach((folder: ServerFolder) => {
-      const plainName =
-        folder.plain_name ||
-        this.decrypt.decryptName(
-          folder.name,
-          (folder.parentId as number).toString(),
-          '03-aes'
-        ) ||
-        folder.name;
-
-      const name = `${currentName}/${plainName}`;
-
-      if (!this.folderStatusesToFilter.includes(folder.status)) {
-        return;
-      }
-
-      EitherTransformer.handleWithEither(() =>
-        createFolderFromServerFolder(folder, name)
-      ).fold(
-        (error) => {
-          Logger.warn(
-            `[Traverser] Folder with path ${name} could not be created: `,
-            error
-          );
-        },
-        (folder) => {
-          this.collection[name] = folder;
-        }
-      );
-
-      if (folder.status === ServerFolderStatus.EXISTS) {
-        // The folders and the files from trashed or deleted folders
-        // will have the status "EXISTS", to avoid filtering witch folders and files
-        // are in a deleted or trashed folder they not included on the collection.
-        // We cannot perform any action on them either way
-        this.traverse(folder.id, `${name}`);
-      }
-    });
-  }
-
-  public reset() {
-    Object.keys(this.collection).forEach(
-      (k: string) => delete this.collection[k]
-    );
-
-    this.collection['/'] = Folder.from({
-      id: this.baseFolderId,
-      uuid: Traverser.ROOT_FOLDER_UUID,
-      parentId: null,
-      updatedAt: new Date().toISOString(),
-      createdAt: new Date().toISOString(),
-      path: '/',
-      status: FolderStatus.Exists.value,
-    });
-  }
-
-  public run(rawTree: {
-    files: Array<ServerFile>;
-    folders: Array<ServerFolder>;
-  }) {
-    this.rawTree = rawTree;
-
-    this.traverse(this.baseFolderId);
-
-    this.collection['/'] = Folder.from({
-      id: this.baseFolderId,
-      uuid: Traverser.ROOT_FOLDER_UUID,
-      parentId: null,
-      updatedAt: new Date().toISOString(),
-      createdAt: new Date().toISOString(),
-      path: '/',
-      status: FolderStatus.Exists.value,
-    });
-
-    return this.collection;
-  }
-}
diff --git a/src/workers/sync-engine/modules/placeholders/domain/CommonPlaceholder.ts b/src/workers/sync-engine/modules/placeholders/domain/CommonPlaceholder.ts
deleted file mode 100644
index f8039c884..000000000
--- a/src/workers/sync-engine/modules/placeholders/domain/CommonPlaceholder.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-
-export function trimPlaceholderId(id: string): string {
-    return id.replace(
-        // eslint-disable-next-line no-control-regex
-        /[\x00-\x1F\x7F-\x9F]/g,
-        ''
-    ).normalize();
-}
diff --git a/src/workers/sync-engine/modules/placeholders/domain/PlaceholderCreator.ts b/src/workers/sync-engine/modules/placeholders/domain/PlaceholderCreator.ts
deleted file mode 100644
index 21102c3e7..000000000
--- a/src/workers/sync-engine/modules/placeholders/domain/PlaceholderCreator.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { File } from '../../files/domain/File';
-import { Folder } from '../../folders/domain/Folder';
-
-export interface PlaceholderCreator {
-  folder: (folder: Folder) => void;
-  file: (file: File) => void;
-}
diff --git a/src/workers/sync-engine/modules/placeholders/infrastructure/VirtualDrivePlaceholderCreator.ts b/src/workers/sync-engine/modules/placeholders/infrastructure/VirtualDrivePlaceholderCreator.ts
deleted file mode 100644
index 972d21630..000000000
--- a/src/workers/sync-engine/modules/placeholders/infrastructure/VirtualDrivePlaceholderCreator.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { VirtualDrive } from 'virtual-drive/dist';
-import { File } from '../../files/domain/File';
-import { Folder } from '../../folders/domain/Folder';
-import { PlaceholderCreator } from '../domain/PlaceholderCreator';
-import { createFolderPlaceholderId } from '../domain/FolderPlaceholderId';
-import { createFilePlaceholderId } from '../domain/FilePlaceholderId';
-import { FolderStatuses } from '../../folders/domain/FolderStatus';
-import { FileStatuses } from '../../files/domain/FileStatus';
-
-export class VirtualDrivePlaceholderCreator implements PlaceholderCreator {
-  constructor(private readonly drive: VirtualDrive) {}
-
-  folder(folder: Folder): void {
-    if (!folder.hasStatus(FolderStatuses.EXISTS)) {
-      return;
-    }
-
-    const folderPath = `${folder.path.value}/`;
-
-    const placeholderId = createFolderPlaceholderId(folder.uuid);
-
-    this.drive.createFolderByPath(
-      folderPath,
-      placeholderId,
-      0,
-      folder.createdAt.getTime(),
-      folder.updatedAt.getTime()
-    );
-  }
-
-  file(file: File): void {
-    if (!file.hasStatus(FileStatuses.EXISTS)) {
-      return;
-    }
-
-    const placeholderId = createFilePlaceholderId(file.contentsId);
-
-    this.drive.createFileByPath(
-      file.path.value,
-      placeholderId,
-      file.size,
-      file.createdAt.getTime(),
-      file.updatedAt.getTime()
-    );
-  }
-}
diff --git a/src/workers/sync-engine/modules/placeholders/test/__mock__/PlaceholderCreatorMock.ts b/src/workers/sync-engine/modules/placeholders/test/__mock__/PlaceholderCreatorMock.ts
deleted file mode 100644
index ac12fd92a..000000000
--- a/src/workers/sync-engine/modules/placeholders/test/__mock__/PlaceholderCreatorMock.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { File } from 'workers/sync-engine/modules/files/domain/File';
-import { PlaceholderCreator } from '../../domain/PlaceholderCreator';
-import { Folder } from 'workers/sync-engine/modules/folders/domain/Folder';
-
-export class PlaceholderCreatorMock implements PlaceholderCreator {
-  fileMock = jest.fn();
-  folderMock = jest.fn();
-
-  file(file: File) {
-    this.fileMock(file);
-  }
-
-  folder(folder: Folder) {
-    this.folderMock(folder);
-  }
-}
diff --git a/src/workers/sync-engine/modules/shared/domain/OfflineActionsQueue.ts b/src/workers/sync-engine/modules/shared/domain/OfflineActionsQueue.ts
deleted file mode 100644
index cd3f54b86..000000000
--- a/src/workers/sync-engine/modules/shared/domain/OfflineActionsQueue.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export type OfflineAction = () => Promise<void>;
-export type OfflineActions = Array<OfflineAction>;
-
-export class OfflineActionsQueue {
-  private queue: OfflineActions = [];
-
-  add(action: OfflineAction): void {
-    this.queue.push(action);
-  }
-}
diff --git a/src/workers/sync-engine/modules/shared/domain/WebdavItem.ts b/src/workers/sync-engine/modules/shared/domain/WebdavItem.ts
deleted file mode 100644
index aa9533d33..000000000
--- a/src/workers/sync-engine/modules/shared/domain/WebdavItem.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { File } from '../../files/domain/File';
-import { Folder } from '../../folders/domain/Folder';
-import { Path } from './Path';
-
-export abstract class Item {
-  abstract readonly path: Path;
-
-  abstract readonly createdAt: Date;
-
-  abstract readonly updatedAt: Date;
-
-  abstract readonly size: number;
-
-  abstract rename(path: Path): Item;
-  abstract moveTo(folder: Folder): Item;
-
-  abstract isFolder(): this is Folder;
-  abstract isFile(): this is File;
-  abstract hasParent(id: number): boolean;
-  abstract toProps(): Record<string, string | number>;
-}
diff --git a/src/workers/sync-engine/modules/shared/infrastructure/DomainEventSubscribers.ts b/src/workers/sync-engine/modules/shared/infrastructure/DomainEventSubscribers.ts
deleted file mode 100644
index b309f7621..000000000
--- a/src/workers/sync-engine/modules/shared/infrastructure/DomainEventSubscribers.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { DependencyContainerFactory } from 'workers/sync-engine/dependency-injection/DependencyContainerFactory';
-import { DependencyContainer } from 'workers/sync-engine/dependency-injection/DependencyContainer';
-import { WebdavDomainEventSubscriber } from '../domain/WebdavDomainEventSubscriber';
-import { DomainEvent } from '../domain/DomainEvent';
-
-export class DomainEventSubscribers {
-  constructor(public items: Array<WebdavDomainEventSubscriber<DomainEvent>>) {}
-
-  static from(container: DependencyContainer): DomainEventSubscribers {
-    const subscribers = DependencyContainerFactory.subscribers.map(
-      (subscriber) => {
-        return container[subscriber];
-      }
-    ) as unknown as Array<WebdavDomainEventSubscriber<DomainEvent>>;
-
-    return new DomainEventSubscribers(subscribers);
-  }
-}
diff --git a/src/test/LanguagePicker.e2e.ts b/tests/LanguagePicker.e2e.ts
similarity index 100%
rename from src/test/LanguagePicker.e2e.ts
rename to tests/LanguagePicker.e2e.ts
diff --git a/src/workers/sync-engine/modules/contents/test/__mocks__/ContentFileDownloaderMock.ts b/tests/context/virtual-drive/contents/__mocks__/ContentFileDownloaderMock.ts
similarity index 85%
rename from src/workers/sync-engine/modules/contents/test/__mocks__/ContentFileDownloaderMock.ts
rename to tests/context/virtual-drive/contents/__mocks__/ContentFileDownloaderMock.ts
index 2ecb8e19d..5fa88c343 100644
--- a/src/workers/sync-engine/modules/contents/test/__mocks__/ContentFileDownloaderMock.ts
+++ b/tests/context/virtual-drive/contents/__mocks__/ContentFileDownloaderMock.ts
@@ -2,7 +2,7 @@ import { Readable } from 'stream';
 import {
   ContentFileDownloader,
   FileDownloadEvents,
-} from '../../domain/contentHandlers/ContentFileDownloader';
+} from '../../../../../src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader';
 
 export class ContentFileDownloaderMock implements ContentFileDownloader {
   mock = jest.fn();
diff --git a/src/workers/sync-engine/modules/contents/test/__mocks__/ContentFileUploaderMock.ts b/tests/context/virtual-drive/contents/__mocks__/ContentFileUploaderMock.ts
similarity index 76%
rename from src/workers/sync-engine/modules/contents/test/__mocks__/ContentFileUploaderMock.ts
rename to tests/context/virtual-drive/contents/__mocks__/ContentFileUploaderMock.ts
index ab3f92718..4773b9f26 100644
--- a/src/workers/sync-engine/modules/contents/test/__mocks__/ContentFileUploaderMock.ts
+++ b/tests/context/virtual-drive/contents/__mocks__/ContentFileUploaderMock.ts
@@ -2,8 +2,8 @@ import { Readable } from 'stream';
 import {
   ContentFileUploader,
   FileUploadEvents,
-} from '../../domain/contentHandlers/ContentFileUploader';
-import { ContentsId } from '../../domain/ContentsId';
+} from '../../../../../src/context/virtual-drive/contents/domain/contentHandlers/ContentFileUploader';
+import { ContentsId } from '../../../../../src/context/virtual-drive/contents/domain/ContentsId';
 
 export class ContentFileUploaderMock implements ContentFileUploader {
   uploadMock = jest.fn();
diff --git a/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts b/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
new file mode 100644
index 000000000..063fa606a
--- /dev/null
+++ b/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
@@ -0,0 +1,10 @@
+import { LocalFileContents } from '../../../../../src/context/virtual-drive/contents/domain/LocalFileContents';
+import { LocalFileWriter } from '../../../../../src/context/virtual-drive/contents/domain/LocalFileWriter';
+
+export class LocalFileWriterMock implements LocalFileWriter {
+  public writeMock = jest.fn();
+
+  write(contents: LocalFileContents): Promise<string> {
+    return this.writeMock(contents);
+  }
+}
diff --git a/tests/context/virtual-drive/contents/__mocks__/LocationProviderMock.ts b/tests/context/virtual-drive/contents/__mocks__/LocationProviderMock.ts
new file mode 100644
index 000000000..57f78c551
--- /dev/null
+++ b/tests/context/virtual-drive/contents/__mocks__/LocationProviderMock.ts
@@ -0,0 +1,7 @@
+import { LocationProvider } from '../../../../../src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter';
+
+export class LocationProviderMock {
+  public mock = jest.fn();
+
+  provider: LocationProvider = this.mock;
+}
diff --git a/src/workers/sync-engine/modules/contents/test/__mocks__/ReadableHelloWorld.ts b/tests/context/virtual-drive/contents/__mocks__/ReadableHelloWorld.ts
similarity index 100%
rename from src/workers/sync-engine/modules/contents/test/__mocks__/ReadableHelloWorld.ts
rename to tests/context/virtual-drive/contents/__mocks__/ReadableHelloWorld.ts
diff --git a/src/workers/sync-engine/modules/contents/test/__mocks__/RemoteFileContentsManagersFactoryMock.ts b/tests/context/virtual-drive/contents/__mocks__/RemoteFileContentsManagersFactoryMock.ts
similarity index 53%
rename from src/workers/sync-engine/modules/contents/test/__mocks__/RemoteFileContentsManagersFactoryMock.ts
rename to tests/context/virtual-drive/contents/__mocks__/RemoteFileContentsManagersFactoryMock.ts
index 90392a784..e39f4a067 100644
--- a/src/workers/sync-engine/modules/contents/test/__mocks__/RemoteFileContentsManagersFactoryMock.ts
+++ b/tests/context/virtual-drive/contents/__mocks__/RemoteFileContentsManagersFactoryMock.ts
@@ -1,9 +1,9 @@
-import { ContentsManagersFactory } from '../../domain/ContentsManagersFactory';
-import { ContentFileUploader } from '../../domain/contentHandlers/ContentFileUploader';
-import { ContentFileUploaderMock } from './ContentFileUploaderMock';
+import { ContentsManagersFactory } from '../../../../../src/context/virtual-drive/contents/domain/ContentsManagersFactory';
+import { LocalFileContents } from '../../../../../src/context/virtual-drive/contents/domain/LocalFileContents';
+import { ContentFileDownloader } from '../../../../../src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader';
+import { ContentFileUploader } from '../../../../../src/context/virtual-drive/contents/domain/contentHandlers/ContentFileUploader';
 import { ContentFileDownloaderMock } from './ContentFileDownloaderMock';
-import { ContentFileDownloader } from '../../domain/contentHandlers/ContentFileDownloader';
-import { LocalFileContents } from '../../domain/LocalFileContents';
+import { ContentFileUploaderMock } from './ContentFileUploaderMock';
 
 export class RemoteFileContentsManagersFactoryMock
   implements ContentsManagersFactory
diff --git a/src/workers/sync-engine/modules/contents/test/__mocks__/environment/DownloadStrategyFunctionMock.ts b/tests/context/virtual-drive/contents/__mocks__/environment/DownloadStrategyFunctionMock.ts
similarity index 100%
rename from src/workers/sync-engine/modules/contents/test/__mocks__/environment/DownloadStrategyFunctionMock.ts
rename to tests/context/virtual-drive/contents/__mocks__/environment/DownloadStrategyFunctionMock.ts
diff --git a/src/workers/sync-engine/modules/contents/test/__mocks__/environment/UploadStrategyFunctionMock.ts b/tests/context/virtual-drive/contents/__mocks__/environment/UploadStrategyFunctionMock.ts
similarity index 100%
rename from src/workers/sync-engine/modules/contents/test/__mocks__/environment/UploadStrategyFunctionMock.ts
rename to tests/context/virtual-drive/contents/__mocks__/environment/UploadStrategyFunctionMock.ts
diff --git a/src/workers/sync-engine/modules/contents/test/application/ContentsDownloader.test.ts b/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
similarity index 73%
rename from src/workers/sync-engine/modules/contents/test/application/ContentsDownloader.test.ts
rename to tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
index 7974cc475..10a2333ca 100644
--- a/src/workers/sync-engine/modules/contents/test/application/ContentsDownloader.test.ts
+++ b/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
@@ -1,14 +1,14 @@
-import { ContentsDownloader } from '../../application/ContentsDownloader';
-import { FileMother } from '../../../files/test/domain/FileMother';
-import { RemoteFileContentsManagersFactoryMock } from '../__mocks__/RemoteFileContentsManagersFactoryMock';
-import { IpcRendererSyncEngineMock } from '../../../shared/test/__mock__/IpcRendererSyncEngineMock';
-import { FileDownloadEvents } from '../../domain/contentHandlers/ContentFileDownloader';
-import { ReadableHelloWorld } from '../__mocks__/ReadableHelloWorld';
+import { ContentsDownloader } from '../../../../../src/context/virtual-drive/contents/application/ContentsDownloader';
+import { temporalFolderProvider } from '../../../../../src/context/virtual-drive/contents/application/temporalFolderProvider';
+import { FileDownloadEvents } from '../../../../../src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader';
+import { FileMother } from '../../files/domain/FileMother';
+import { EventBusMock } from '../../shared/__mock__/EventBusMock';
+import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
 import { LocalFileWriterMock } from '../__mocks__/LocalFileWriterMock';
-import { temporalFolderProvider } from '../../application/temporalFolderProvider';
-import { EventBusMock } from '../../../shared/test/__mock__/EventBusMock';
+import { ReadableHelloWorld } from '../__mocks__/ReadableHelloWorld';
+import { RemoteFileContentsManagersFactoryMock } from '../__mocks__/RemoteFileContentsManagersFactoryMock';
 
-describe('Contents Downloader', () => {
+describe.skip('Contents Downloader', () => {
   let localWriter: LocalFileWriterMock;
   let factory: RemoteFileContentsManagersFactoryMock;
   let ipc: IpcRendererSyncEngineMock;
diff --git a/src/workers/sync-engine/modules/contents/test/domain/ContentsIdMother.ts b/tests/context/virtual-drive/contents/domain/ContentsIdMother.ts
similarity index 76%
rename from src/workers/sync-engine/modules/contents/test/domain/ContentsIdMother.ts
rename to tests/context/virtual-drive/contents/domain/ContentsIdMother.ts
index 442fd5234..ab72d7330 100644
--- a/src/workers/sync-engine/modules/contents/test/domain/ContentsIdMother.ts
+++ b/tests/context/virtual-drive/contents/domain/ContentsIdMother.ts
@@ -1,5 +1,6 @@
-import { ContentsId } from '../../domain/ContentsId';
 import Chance from 'chance';
+import { ContentsId } from '../../../../../src/context/virtual-drive/contents/domain/ContentsId';
+
 const chance = new Chance();
 
 export class ContentsIdMother {
diff --git a/src/workers/sync-engine/modules/contents/test/domain/ContentsSizeMother.ts b/tests/context/virtual-drive/contents/domain/ContentsSizeMother.ts
similarity index 71%
rename from src/workers/sync-engine/modules/contents/test/domain/ContentsSizeMother.ts
rename to tests/context/virtual-drive/contents/domain/ContentsSizeMother.ts
index 6f9a55e78..6c1b17c87 100644
--- a/src/workers/sync-engine/modules/contents/test/domain/ContentsSizeMother.ts
+++ b/tests/context/virtual-drive/contents/domain/ContentsSizeMother.ts
@@ -1,5 +1,5 @@
-import { ContentsSize } from '../../domain/ContentsSize';
 import Chance from 'chance';
+import { ContentsSize } from '../../../../../src/context/virtual-drive/contents/domain/ContentsSize';
 const chance = new Chance();
 
 export class ContentsSizeMother {
diff --git a/src/workers/sync-engine/modules/contents/test/domain/FileContentsMother.ts b/tests/context/virtual-drive/contents/domain/FileContentsMother.ts
similarity index 74%
rename from src/workers/sync-engine/modules/contents/test/domain/FileContentsMother.ts
rename to tests/context/virtual-drive/contents/domain/FileContentsMother.ts
index b22940241..564eb8448 100644
--- a/src/workers/sync-engine/modules/contents/test/domain/FileContentsMother.ts
+++ b/tests/context/virtual-drive/contents/domain/FileContentsMother.ts
@@ -1,4 +1,4 @@
-import { RemoteFileContents } from '../../domain/RemoteFileContents';
+import { RemoteFileContents } from '../../../../../src/context/virtual-drive/contents/domain/RemoteFileContents';
 import { ContentsIdMother } from './ContentsIdMother';
 import { ContentsSizeMother } from './ContentsSizeMother';
 
diff --git a/src/workers/sync-engine/modules/contents/test/infrastructure/download/EnvironmentContentFileDownloader.test.ts b/tests/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.test.ts
similarity index 91%
rename from src/workers/sync-engine/modules/contents/test/infrastructure/download/EnvironmentContentFileDownloader.test.ts
rename to tests/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.test.ts
index f37263e4a..250ab819c 100644
--- a/src/workers/sync-engine/modules/contents/test/infrastructure/download/EnvironmentContentFileDownloader.test.ts
+++ b/tests/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.test.ts
@@ -1,7 +1,7 @@
 import { Readable } from 'stream';
-import { FileMother } from '../../../../files/test/domain/FileMother';
+import { FileMother } from '../../../files/domain/FileMother';
 import { createDownloadStrategy } from '../../__mocks__/environment/DownloadStrategyFunctionMock';
-import { EnvironmentContentFileDownloader } from '../../../infrastructure/download/EnvironmentContentFileDownloader';
+import { EnvironmentContentFileDownloader } from '../../../../../../src/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader';
 
 describe('Environment Content File Downloader', () => {
   const bucket = 'b51fd6af-cdac-51ec-b41c-21958aa4c2ae';
diff --git a/src/workers/sync-engine/modules/contents/test/infrastructure/upload/EnvironmentContentFileUploader.test.ts b/tests/context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader.test.ts
similarity index 96%
rename from src/workers/sync-engine/modules/contents/test/infrastructure/upload/EnvironmentContentFileUploader.test.ts
rename to tests/context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader.test.ts
index 4156ffeeb..33631bb34 100644
--- a/src/workers/sync-engine/modules/contents/test/infrastructure/upload/EnvironmentContentFileUploader.test.ts
+++ b/tests/context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader.test.ts
@@ -1,5 +1,5 @@
 import { Readable } from 'stream';
-import { EnvironmentContentFileUploader } from '../../../infrastructure/upload/EnvironmentContentFileUploader';
+import { EnvironmentContentFileUploader } from '../../../../../../src/context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader';
 import { createUploadStrategy } from '../../__mocks__/environment/UploadStrategyFunctionMock';
 import { ContentsIdMother } from '../../domain/ContentsIdMother';
 
diff --git a/tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts b/tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts
new file mode 100644
index 000000000..dfcb8359a
--- /dev/null
+++ b/tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts
@@ -0,0 +1,30 @@
+import { Nullable } from '../../../../../src/apps/shared/types/Nullable';
+import {
+  File,
+  FileAttributes,
+} from '../../../../../src/context/virtual-drive/files/domain/File';
+import { FileRepository } from '../../../../../src/context/virtual-drive/files/domain/FileRepository';
+
+export class FileRepositoryMock implements FileRepository {
+  public readonly allMock = jest.fn();
+  public readonly searchByPartialMock = jest.fn();
+  public readonly deleteMock = jest.fn();
+  public readonly addMock = jest.fn();
+  public readonly updateMock = jest.fn();
+
+  all(): Promise<File[]> {
+    return this.allMock();
+  }
+  searchByPartial(partial: Partial<FileAttributes>): Nullable<File> {
+    return this.searchByPartialMock(partial);
+  }
+  delete(id: string): Promise<void> {
+    return this.deleteMock(id);
+  }
+  add(file: File): Promise<void> {
+    return this.addMock(file);
+  }
+  update(file: File): Promise<void> {
+    return this.updateMock(file);
+  }
+}
diff --git a/tests/context/virtual-drive/files/__mocks__/LocalFileSystemMock.ts b/tests/context/virtual-drive/files/__mocks__/LocalFileSystemMock.ts
new file mode 100644
index 000000000..6495b0307
--- /dev/null
+++ b/tests/context/virtual-drive/files/__mocks__/LocalFileSystemMock.ts
@@ -0,0 +1,15 @@
+import { LocalFileSystem } from '../../../../../src/context/virtual-drive/files/domain/file-systems/LocalFileSystem';
+import { File } from '../../../../../src/context/virtual-drive/files/domain/File';
+
+export class LocalFileSystemMock implements LocalFileSystem {
+  public readonly createPlaceHolderMock = jest.fn();
+  public readonly getLocalFileIdMock = jest.fn();
+
+  createPlaceHolder(file: File): Promise<void> {
+    return this.createPlaceHolder(file);
+  }
+
+  getLocalFileId(file: File): Promise<`${string}-${string}`> {
+    return this.getLocalFileIdMock(file);
+  }
+}
diff --git a/tests/context/virtual-drive/files/__mocks__/RemoteFileSystemMock.ts b/tests/context/virtual-drive/files/__mocks__/RemoteFileSystemMock.ts
new file mode 100644
index 000000000..76473803f
--- /dev/null
+++ b/tests/context/virtual-drive/files/__mocks__/RemoteFileSystemMock.ts
@@ -0,0 +1,29 @@
+import {
+  File,
+  FileAttributes,
+} from '../../../../../src/context/virtual-drive/files/domain/File';
+import { OfflineFile } from '../../../../../src/context/virtual-drive/files/domain/OfflineFile';
+import { RemoteFileSystem } from '../../../../../src/context/virtual-drive/files/domain/file-systems/RemoteFileSystem';
+
+export class RemoteFileSystemMock implements RemoteFileSystem {
+  public readonly persistMock = jest.fn();
+  public readonly trashMock = jest.fn();
+  public readonly moveMock = jest.fn();
+  public readonly renameMock = jest.fn();
+
+  persist(offline: OfflineFile): Promise<FileAttributes> {
+    return this.persistMock(offline);
+  }
+
+  trash(contentsId: string): Promise<void> {
+    return this.trashMock(contentsId);
+  }
+
+  move(file: File): Promise<void> {
+    return this.moveMock(file);
+  }
+
+  rename(file: File): Promise<void> {
+    return this.renameMock(file);
+  }
+}
diff --git a/tests/context/virtual-drive/files/application/FileCreator.test.ts b/tests/context/virtual-drive/files/application/FileCreator.test.ts
new file mode 100644
index 000000000..544fac2c3
--- /dev/null
+++ b/tests/context/virtual-drive/files/application/FileCreator.test.ts
@@ -0,0 +1,141 @@
+import { FileCreator } from '../../../../../src/context/virtual-drive/files/application/FileCreator';
+import { FileDeleter } from '../../../../../src/context/virtual-drive/files/application/FileDeleter';
+import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/FilePath';
+import { File } from '../../../../../src/context/virtual-drive/files/domain/File';
+import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
+import { FileContentsMother } from '../../contents/domain/FileContentsMother';
+import { FolderRepositoryMock } from '../../folders/__mocks__/FolderRepositoryMock';
+import { FolderMother } from '../../folders/domain/FolderMother';
+import { EventBusMock } from '../../shared/__mock__/EventBusMock';
+import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
+import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
+import { RemoteFileSystemMock } from '../__mocks__/RemoteFileSystemMock';
+import { FileMother } from '../domain/FileMother';
+
+describe('File Creator', () => {
+  let remoteFileSystemMock: RemoteFileSystemMock;
+  let fileRepository: FileRepositoryMock;
+  let folderRepository: FolderRepositoryMock;
+  let fileDeleter: FileDeleter;
+  let eventBus: EventBusMock;
+
+  let SUT: FileCreator;
+
+  const ipc = new IpcRendererSyncEngineMock();
+
+  beforeEach(() => {
+    remoteFileSystemMock = new RemoteFileSystemMock();
+
+    fileRepository = new FileRepositoryMock();
+    folderRepository = new FolderRepositoryMock();
+    fileDeleter = {
+      run: (_id: string) => {
+        //no-op
+      },
+    } as unknown as FileDeleter;
+
+    const folderFinder = new FolderFinder(folderRepository);
+    eventBus = new EventBusMock();
+
+    SUT = new FileCreator(
+      remoteFileSystemMock,
+      fileRepository,
+      folderFinder,
+      fileDeleter,
+      eventBus,
+      ipc
+    );
+  });
+
+  it('creates the file on the drive server', async () => {
+    const path = new FilePath('/cat.png');
+    const contents = FileContentsMother.random();
+
+    const folder = FolderMother.any();
+
+    const fileAttributes = FileMother.fromPartial({
+      path: path.value,
+      contentsId: contents.id,
+    }).attributes();
+
+    folderRepository.searchByPartialMock.mockReturnValueOnce(folder);
+    fileRepository.addMock.mockImplementationOnce(() => {
+      // returns Promise<void>
+    });
+
+    remoteFileSystemMock.persistMock.mockResolvedValueOnce(fileAttributes);
+
+    await SUT.run(path, contents);
+
+    expect(fileRepository.addMock).toBeCalledWith(
+      expect.objectContaining(File.from(fileAttributes))
+    );
+  });
+
+  it('once the file entry is created the creation event should have been emitted', async () => {
+    const path = new FilePath('/cat.png');
+    const contents = FileContentsMother.random();
+    const fileAttributes = FileMother.fromPartial({
+      path: path.value,
+      contentsId: contents.id,
+    }).attributes();
+
+    const folder = FolderMother.any();
+
+    folderRepository.searchByPartialMock.mockReturnValueOnce(folder);
+    fileRepository.addMock.mockImplementationOnce(() => {
+      // returns Promise<void>
+    });
+
+    remoteFileSystemMock.persistMock.mockResolvedValueOnce(fileAttributes);
+
+    await SUT.run(path, contents);
+
+    expect(eventBus.publishMock.mock.calls[0][0][0].eventName).toBe(
+      'file.created'
+    );
+    expect(eventBus.publishMock.mock.calls[0][0][0].aggregateId).toBe(
+      contents.id
+    );
+  });
+
+  it('deletes the file on remote if it already exists on the path', async () => {
+    const path = new FilePath('/cat.png');
+    const existingFile = FileMother.fromPath(path.value);
+    const contents = FileContentsMother.random();
+    const fileAttributes = FileMother.fromPartial({
+      path: path.value,
+      contentsId: contents.id,
+    }).attributes();
+
+    const folder = FolderMother.any();
+
+    fileRepository.searchByPartialMock
+      .mockReturnValueOnce(existingFile)
+      .mockReturnValueOnce(existingFile);
+
+    const deleterSpy = jest
+      .spyOn(fileDeleter, 'run')
+      .mockResolvedValueOnce(Promise.resolve());
+
+    remoteFileSystemMock.persistMock.mockResolvedValueOnce(fileAttributes);
+
+    folderRepository.searchByPartialMock.mockReturnValueOnce(folder);
+    fileRepository.addMock.mockImplementationOnce(() => {
+      // returns Promise<void>
+    });
+
+    await SUT.run(path, contents);
+
+    expect(deleterSpy).toBeCalledWith(existingFile.contentsId);
+
+    expect(remoteFileSystemMock.persistMock).toBeCalledWith(
+      expect.objectContaining({
+        contentsId: contents.id,
+      })
+    );
+    expect(fileRepository.addMock).toBeCalledWith(
+      expect.objectContaining(File.from(fileAttributes))
+    );
+  });
+});
diff --git a/src/workers/sync-engine/modules/files/test/application/FileDeleter.test.ts b/tests/context/virtual-drive/files/application/FileDeleter.test.ts
similarity index 53%
rename from src/workers/sync-engine/modules/files/test/application/FileDeleter.test.ts
rename to tests/context/virtual-drive/files/application/FileDeleter.test.ts
index 6e91d53f6..f0119a682 100644
--- a/src/workers/sync-engine/modules/files/test/application/FileDeleter.test.ts
+++ b/tests/context/virtual-drive/files/application/FileDeleter.test.ts
@@ -1,17 +1,18 @@
-import { AllParentFoldersStatusIsExists } from '../../../folders/application/AllParentFoldersStatusIsExists';
 import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
-import { PlaceholderCreatorMock } from '../../../placeholders/test/__mock__/PlaceholderCreatorMock';
-import { IpcRendererSyncEngineMock } from '../../../shared/test/__mock__/IpcRendererSyncEngineMock';
-import { FileDeleter } from '../../application/FileDeleter';
-import { FolderRepositoryMock } from '../../../folders/test/__mocks__/FolderRepositoryMock';
-import { ContentsIdMother } from '../../../contents/test/domain/ContentsIdMother';
 import { FileMother } from '../domain/FileMother';
-import { FileStatus } from '../../domain/FileStatus';
+import { RemoteFileSystemMock } from '../__mocks__/RemoteFileSystemMock';
+import { LocalFileSystemMock } from '../__mocks__/LocalFileSystemMock';
+import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
+import { FileDeleter } from '../../../../../src/context/virtual-drive/files/application/FileDeleter';
+import { FolderRepositoryMock } from '../../folders/__mocks__/FolderRepositoryMock';
+import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
+import { AllParentFoldersStatusIsExists } from '../../../../../src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
 
 describe('File Deleter', () => {
   let repository: FileRepositoryMock;
   let allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
-  let placeholderCreator: PlaceholderCreatorMock;
+  let remoteFileSystemMock: RemoteFileSystemMock;
+  let localFilseSystemMock: LocalFileSystemMock;
   let ipc: IpcRendererSyncEngineMock;
 
   let SUT: FileDeleter;
@@ -22,13 +23,15 @@ describe('File Deleter', () => {
     allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
       folderRepository
     );
-    placeholderCreator = new PlaceholderCreatorMock();
+    localFilseSystemMock = new LocalFileSystemMock();
+    remoteFileSystemMock = new RemoteFileSystemMock();
     ipc = new IpcRendererSyncEngineMock();
 
     SUT = new FileDeleter(
+      remoteFileSystemMock,
+      localFilseSystemMock,
       repository,
       allParentFoldersStatusIsExists,
-      placeholderCreator,
       ipc
     );
   });
@@ -36,50 +39,49 @@ describe('File Deleter', () => {
   it('does not nothing if the file its not found', async () => {
     const contentsId = ContentsIdMother.raw();
 
-    repository.mockSearch.mockReturnValueOnce(undefined);
+    repository.searchByPartialMock.mockReturnValueOnce(undefined);
     jest
       .spyOn(allParentFoldersStatusIsExists, 'run')
       .mockReturnValueOnce(false);
 
     await SUT.run(contentsId);
 
-    expect(repository.mockDelete).not.toBeCalled();
+    expect(repository.deleteMock).not.toBeCalled();
   });
 
   it('does not delete a file if it has a parent already trashed', async () => {
     const file = FileMother.any();
 
-    repository.mockSearchByPartial.mockReturnValueOnce(file);
+    repository.searchByPartialMock.mockReturnValueOnce(file);
     jest
       .spyOn(allParentFoldersStatusIsExists, 'run')
       .mockReturnValueOnce(false);
 
     await SUT.run(file.contentsId);
 
-    expect(repository.mockDelete).not.toBeCalled();
+    expect(repository.deleteMock).not.toBeCalled();
   });
 
   it('trashes the file if it exists and does not have any parent trashed', async () => {
     const file = FileMother.any();
 
-    repository.mockSearchByPartial.mockReturnValueOnce(file);
+    repository.searchByPartialMock.mockReturnValueOnce(file);
     jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
 
     await SUT.run(file.contentsId);
 
-    expect(repository.mockDelete).toBeCalled();
+    expect(repository.deleteMock).toBeCalled();
   });
 
   it('trashes the file with the status trashed', async () => {
     const file = FileMother.any();
 
-    repository.mockSearchByPartial.mockReturnValueOnce(file);
+    repository.searchByPartialMock.mockReturnValueOnce(file);
     jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
 
     await SUT.run(file.contentsId);
 
-    expect(repository.mockDelete).toBeCalledWith(
-      expect.objectContaining({ status: FileStatus.Trashed })
-    );
+    expect(remoteFileSystemMock.trashMock).toBeCalledWith(file.contentsId);
+    expect(repository.deleteMock).toBeCalledWith(file.contentsId);
   });
 });
diff --git a/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts b/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
new file mode 100644
index 000000000..8074fd60a
--- /dev/null
+++ b/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
@@ -0,0 +1,120 @@
+import { FileFinderByContentsId } from '../../../../../src/context/virtual-drive/files/application/FileFinderByContentsId';
+import { FilePathUpdater } from '../../../../../src/context/virtual-drive/files/application/FilePathUpdater';
+import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/FilePath';
+import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
+import { FolderFinderMock } from '../../folders/__mocks__/FolderFinderMock';
+import { FolderMother } from '../../folders/domain/FolderMother';
+import { EventBusMock } from '../../shared/__mock__/EventBusMock';
+import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
+import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
+import { LocalFileSystemMock } from '../__mocks__/LocalFileSystemMock';
+import { RemoteFileSystemMock } from '../__mocks__/RemoteFileSystemMock';
+import { FileMother } from '../domain/FileMother';
+
+describe('File path updater', () => {
+  let repository: FileRepositoryMock;
+  let fileFinderByContentsId: FileFinderByContentsId;
+  let folderFinder: FolderFinderMock;
+  let ipcRendererMock: IpcRendererSyncEngineMock;
+  let localFileSystem: LocalFileSystemMock;
+  let eventBus: EventBusMock;
+  let remoteFileSystemMock: RemoteFileSystemMock;
+  let SUT: FilePathUpdater;
+
+  beforeEach(() => {
+    repository = new FileRepositoryMock();
+    folderFinder = new FolderFinderMock();
+    fileFinderByContentsId = new FileFinderByContentsId(repository);
+    ipcRendererMock = new IpcRendererSyncEngineMock();
+    eventBus = new EventBusMock();
+    remoteFileSystemMock = new RemoteFileSystemMock();
+    localFileSystem = new LocalFileSystemMock();
+
+    SUT = new FilePathUpdater(
+      remoteFileSystemMock,
+      localFileSystem,
+      repository,
+      fileFinderByContentsId,
+      folderFinder as unknown as FolderFinder,
+      ipcRendererMock,
+      eventBus
+    );
+  });
+
+  it('renames a file when the extension and folder does not change', async () => {
+    const fileToRename = FileMother.any();
+    const fileWithDestinationPath = undefined;
+
+    repository.searchByPartialMock
+      .mockReturnValueOnce(fileToRename)
+      .mockReturnValueOnce(fileWithDestinationPath);
+
+    const destination = new FilePath(
+      `${fileToRename.dirname}/_${fileToRename.nameWithExtension}`
+    );
+
+    await SUT.run(fileToRename.contentsId, destination.value);
+
+    expect(repository.updateMock).toBeCalledWith(
+      expect.objectContaining({ path: destination.value })
+    );
+    expect(remoteFileSystemMock.renameMock).toBeCalledWith(
+      expect.objectContaining({ path: destination.value })
+    );
+  });
+
+  it('does not rename or moves a file when the extension changes', async () => {
+    const fileToRename = FileMother.any();
+    const fileWithDestinationPath = undefined;
+
+    repository.searchByPartialMock
+      .mockReturnValueOnce(fileToRename)
+      .mockReturnValueOnce(fileWithDestinationPath);
+
+    const destination = new FilePath(
+      `${fileToRename.dirname}/_${fileToRename.nameWithExtension}n`
+    );
+
+    expect(async () => {
+      await SUT.run(fileToRename.contentsId, destination.value);
+    }).rejects.toThrow();
+  });
+
+  it('moves a file when the folder changes', async () => {
+    const fileToMove = FileMother.any();
+    const fileInDestination = undefined;
+    const localFileId = '1-2';
+
+    repository.searchByPartialMock
+      .mockReturnValueOnce(fileToMove)
+      .mockReturnValueOnce(fileInDestination);
+
+    localFileSystem.getLocalFileIdMock.mockResolvedValueOnce(localFileId);
+
+    const destination = new FilePath(
+      `${fileToMove.dirname}_/${fileToMove.nameWithExtension}`
+    );
+
+    const destinationFolder = FolderMother.fromPartial({
+      id: fileToMove.folderId + 1,
+      path: destination.dirname(),
+    });
+
+    folderFinder.mock.mockReturnValueOnce(destinationFolder);
+
+    await SUT.run(fileToMove.contentsId, destination.value);
+
+    expect(repository.updateMock).toBeCalledWith(
+      expect.objectContaining({
+        folderId: destinationFolder.id,
+        path: destination.value,
+      })
+    );
+    expect(remoteFileSystemMock.moveMock).toBeCalledWith(
+      expect.objectContaining({
+        folderId: destinationFolder.id,
+        path: destination.value,
+      })
+    );
+  });
+});
diff --git a/src/workers/sync-engine/modules/files/test/domain/FileMother.ts b/tests/context/virtual-drive/files/domain/FileMother.ts
similarity index 82%
rename from src/workers/sync-engine/modules/files/test/domain/FileMother.ts
rename to tests/context/virtual-drive/files/domain/FileMother.ts
index de2c5c313..fc60a91ac 100644
--- a/src/workers/sync-engine/modules/files/test/domain/FileMother.ts
+++ b/tests/context/virtual-drive/files/domain/FileMother.ts
@@ -1,6 +1,7 @@
-import { FileStatuses } from '../../domain/FileStatus';
-import { File, FileAttributes } from '../../domain/File';
-import { ContentsIdMother } from '../../../contents/test/domain/ContentsIdMother';
+import { FileAttributes } from '../../../../../src/context/virtual-drive/files/domain/File';
+import { FileStatuses } from '../../../../../src/context/virtual-drive/files/domain/FileStatus';
+import { File } from '../../../../../src/context/virtual-drive/files/domain/File';
+import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
 import { FilePathMother } from './FilePathMother';
 
 export class FileMother {
diff --git a/src/workers/sync-engine/modules/files/test/domain/FilePath.test.ts b/tests/context/virtual-drive/files/domain/FilePath.test.ts
similarity index 91%
rename from src/workers/sync-engine/modules/files/test/domain/FilePath.test.ts
rename to tests/context/virtual-drive/files/domain/FilePath.test.ts
index 25b2117b7..a77b02014 100644
--- a/src/workers/sync-engine/modules/files/test/domain/FilePath.test.ts
+++ b/tests/context/virtual-drive/files/domain/FilePath.test.ts
@@ -1,4 +1,4 @@
-import { FilePath } from '../../domain/FilePath';
+import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/FilePath';
 
 describe('Path', () => {
   describe('extension handling', () => {
diff --git a/src/workers/sync-engine/modules/files/test/domain/FilePathMother.ts b/tests/context/virtual-drive/files/domain/FilePathMother.ts
similarity index 74%
rename from src/workers/sync-engine/modules/files/test/domain/FilePathMother.ts
rename to tests/context/virtual-drive/files/domain/FilePathMother.ts
index 40ff10927..a3296150f 100644
--- a/src/workers/sync-engine/modules/files/test/domain/FilePathMother.ts
+++ b/tests/context/virtual-drive/files/domain/FilePathMother.ts
@@ -1,6 +1,6 @@
 import Chance from 'chance';
 import path from 'path';
-import { FilePath } from '../../domain/FilePath';
+import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/FilePath';
 const chance = new Chance();
 
 export class FilePathMother {
@@ -9,7 +9,7 @@ export class FilePathMother {
       throw new Error('Nested level of a file must be greater or equal to 0');
     }
 
-    const name = `${chance.word()}.${chance.word({ length: 3 })}`;
+    const name = `/${chance.word()}.${chance.word({ length: 3 })}`;
 
     if (level === 0) {
       return new FilePath(path.posix.join(name));
diff --git a/src/workers/sync-engine/modules/files/test/domain/FileSize.test.ts b/tests/context/virtual-drive/files/domain/FileSize.test.ts
similarity index 88%
rename from src/workers/sync-engine/modules/files/test/domain/FileSize.test.ts
rename to tests/context/virtual-drive/files/domain/FileSize.test.ts
index 0e30b2a6d..7d99f67c5 100644
--- a/src/workers/sync-engine/modules/files/test/domain/FileSize.test.ts
+++ b/tests/context/virtual-drive/files/domain/FileSize.test.ts
@@ -1,4 +1,4 @@
-import { FileSize } from '../../domain/FileSize';
+import { FileSize } from '../../../../../src/context/virtual-drive/files/domain/FileSize';
 
 describe('File Size', () => {
   const twentyGB = 20 * 1024 * 1024 * 1024;
diff --git a/src/workers/sync-engine/modules/files/test/infrastructure/ServerFileMother.ts b/tests/context/virtual-drive/files/infrastructure/ServerFileMother.ts
similarity index 81%
rename from src/workers/sync-engine/modules/files/test/infrastructure/ServerFileMother.ts
rename to tests/context/virtual-drive/files/infrastructure/ServerFileMother.ts
index 3dbe71a6a..7f3a89caa 100644
--- a/src/workers/sync-engine/modules/files/test/infrastructure/ServerFileMother.ts
+++ b/tests/context/virtual-drive/files/infrastructure/ServerFileMother.ts
@@ -1,8 +1,8 @@
 import {
   ServerFile,
   ServerFileStatus,
-} from '../../../../../filesystems/domain/ServerFile';
-import { ContentsIdMother } from '../../../contents/test/domain/ContentsIdMother';
+} from '../../../../../src/context/shared/domain/ServerFile';
+import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
 
 export class ServerFileMother {
   static fromPartial(partial: Partial<ServerFile>): ServerFile {
diff --git a/src/workers/sync-engine/modules/folders/test/__mocks__/FolderFinderMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts
similarity index 100%
rename from src/workers/sync-engine/modules/folders/test/__mocks__/FolderFinderMock.ts
rename to tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderLocalFileSystemMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderLocalFileSystemMock.ts
new file mode 100644
index 000000000..eccabee32
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderLocalFileSystemMock.ts
@@ -0,0 +1,10 @@
+import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { LocalFileSystem } from '../../../../../src/context/virtual-drive/folders/domain/file-systems/LocalFileSystem';
+
+export class FolderLocalFileSystemMock implements LocalFileSystem {
+  public readonly createPlaceHolderMock = jest.fn();
+
+  createPlaceHolder(folder: Folder): Promise<void> {
+    return this.createPlaceHolderMock(folder);
+  }
+}
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderRemoteFileSystemMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderRemoteFileSystemMock.ts
new file mode 100644
index 000000000..4a43211c3
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderRemoteFileSystemMock.ts
@@ -0,0 +1,26 @@
+import {
+  Folder,
+  FolderAttributes,
+} from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { OfflineFolder } from '../../../../../src/context/virtual-drive/folders/domain/OfflineFolder';
+import { RemoteFileSystem } from '../../../../../src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem';
+
+export class FolderRemoteFileSystemMock implements RemoteFileSystem {
+  public readonly persistMock = jest.fn();
+  public readonly trashMock = jest.fn();
+  public readonly moveMock = jest.fn();
+  public readonly renameMock = jest.fn();
+
+  persist(offline: OfflineFolder): Promise<FolderAttributes> {
+    return this.persistMock(offline);
+  }
+  trash(id: number): Promise<void> {
+    return this.trashMock(id);
+  }
+  move(folder: Folder): Promise<void> {
+    return this.moveMock(folder);
+  }
+  rename(folder: Folder): Promise<void> {
+    return this.renameMock(folder);
+  }
+}
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts
new file mode 100644
index 000000000..68827b525
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts
@@ -0,0 +1,33 @@
+import {
+  Folder,
+  FolderAttributes,
+} from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { FolderRepository } from '../../../../../src/context/virtual-drive/folders/domain/FolderRepository';
+
+export class FolderRepositoryMock implements FolderRepository {
+  public readonly allMock = jest.fn();
+  public readonly searchByPartialMock = jest.fn();
+  public readonly addMock = jest.fn();
+  public readonly deleteMock = jest.fn();
+  public readonly updateMock = jest.fn();
+
+  all(): Promise<Folder[]> {
+    return this.allMock();
+  }
+
+  searchByPartial(partial: Partial<FolderAttributes>): Folder | undefined {
+    return this.searchByPartialMock(partial);
+  }
+
+  add(folder: Folder): Promise<void> {
+    return this.addMock(folder);
+  }
+
+  delete(id: number): Promise<void> {
+    return this.deleteMock(id);
+  }
+
+  update(folder: Folder): Promise<void> {
+    return this.updateMock(folder);
+  }
+}
diff --git a/src/workers/sync-engine/modules/folders/test/application/FolderCreator.test.ts b/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
similarity index 50%
rename from src/workers/sync-engine/modules/folders/test/application/FolderCreator.test.ts
rename to tests/context/virtual-drive/folders/application/FolderCreator.test.ts
index 37ab9778e..d216e8f6e 100644
--- a/src/workers/sync-engine/modules/folders/test/application/FolderCreator.test.ts
+++ b/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
@@ -1,79 +1,57 @@
-import { IpcRendererSyncEngineMock } from '../../../shared/test/__mock__/IpcRendererSyncEngineMock';
-import { FolderCreator } from '../../application/FolderCreator';
-import { FolderFinder } from '../../application/FolderFinder';
+import { FolderCreator } from '../../../../../src/context/virtual-drive/folders/application/FolderCreator';
+import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { EventBusMock } from '../../shared/__mock__/EventBusMock';
+import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
+import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
 import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
 import { FolderMother } from '../domain/FolderMother';
-import { EventBusMock } from '../../../shared/test/__mock__/EventBusMock';
 import { OfflineFolderMother } from '../domain/OfflineFolderMother';
-import { Folder } from '../../domain/Folder';
 
 describe('Folder Creator', () => {
   let SUT: FolderCreator;
 
   let repository: FolderRepositoryMock;
-  let folderFinder: FolderFinder;
+  let remote: FolderRemoteFileSystemMock;
   let syncEngineIpc: IpcRendererSyncEngineMock;
   let eventBus: EventBusMock;
 
   beforeEach(() => {
     repository = new FolderRepositoryMock();
-    folderFinder = new FolderFinder(repository);
     syncEngineIpc = new IpcRendererSyncEngineMock();
+    remote = new FolderRemoteFileSystemMock();
 
     eventBus = new EventBusMock();
 
-    SUT = new FolderCreator(repository, folderFinder, syncEngineIpc, eventBus);
+    SUT = new FolderCreator(repository, remote, syncEngineIpc, eventBus);
   });
 
   it('creates on a folder from a offline folder', async () => {
     const offlineFolder = OfflineFolderMother.random();
+    const folder = FolderMother.fromPartial(offlineFolder.attributes());
 
-    const parentFolder = FolderMother.fromPartial({
-      id: offlineFolder.parentId,
-      path: offlineFolder.dirname,
-    });
-
-    const resultFolderAttributes = FolderMother.fromPartial(
-      offlineFolder.attributes()
-    ).attributes();
-
-    repository.mockCreate.mockResolvedValueOnce(
-      Folder.create(resultFolderAttributes)
-    );
+    remote.persistMock.mockResolvedValueOnce(folder.attributes());
 
-    const spy = jest
-      .spyOn(folderFinder, 'run')
-      .mockReturnValueOnce(parentFolder);
+    repository.addMock.mockResolvedValueOnce(Promise.resolve());
 
     await SUT.run(offlineFolder);
 
-    expect(spy).toBeCalledWith(parentFolder.path.value);
-    expect(repository.mockCreate).toBeCalledWith(
-      offlineFolder.path,
-      parentFolder.id,
-      offlineFolder.uuid
-    );
+    expect(repository.addMock).toBeCalledWith(folder);
   });
 
   describe('Synchronization messages', () => {
     it('sends the message FOLDER_CREATING', async () => {
       const offlineFolder = OfflineFolderMother.random();
 
-      const parentFolder = FolderMother.fromPartial({
-        id: offlineFolder.parentId,
-        path: offlineFolder.dirname,
-      });
-
       const resultFolderAttributes = FolderMother.fromPartial(
         offlineFolder.attributes()
       ).attributes();
 
-      repository.mockCreate.mockResolvedValueOnce(
+      remote.persistMock.mockResolvedValueOnce(resultFolderAttributes);
+
+      repository.addMock.mockResolvedValueOnce(
         Folder.create(resultFolderAttributes)
       );
 
-      jest.spyOn(folderFinder, 'run').mockReturnValueOnce(parentFolder);
-
       await SUT.run(offlineFolder);
 
       expect(syncEngineIpc.sendMock).toBeCalledWith('FOLDER_CREATING', {
@@ -84,20 +62,15 @@ describe('Folder Creator', () => {
     it('sends the message FOLDER_CREATED', async () => {
       const offlineFolder = OfflineFolderMother.random();
 
-      const parentFolder = FolderMother.fromPartial({
-        id: offlineFolder.parentId,
-        path: offlineFolder.dirname,
-      });
-
       const resultFolderAttributes = FolderMother.fromPartial(
         offlineFolder.attributes()
       ).attributes();
 
-      repository.mockCreate.mockResolvedValueOnce(
+      repository.addMock.mockResolvedValueOnce(
         Folder.create(resultFolderAttributes)
       );
 
-      jest.spyOn(folderFinder, 'run').mockReturnValueOnce(parentFolder);
+      remote.persistMock.mockResolvedValueOnce(resultFolderAttributes);
 
       await SUT.run(offlineFolder);
 
diff --git a/src/workers/sync-engine/modules/folders/test/application/FolderDeleter.test.ts b/tests/context/virtual-drive/folders/application/FolderDeleter.test.ts
similarity index 58%
rename from src/workers/sync-engine/modules/folders/test/application/FolderDeleter.test.ts
rename to tests/context/virtual-drive/folders/application/FolderDeleter.test.ts
index 18a22ea9d..42917c90f 100644
--- a/src/workers/sync-engine/modules/folders/test/application/FolderDeleter.test.ts
+++ b/tests/context/virtual-drive/folders/application/FolderDeleter.test.ts
@@ -1,14 +1,15 @@
-import { FolderDeleter } from '../../application/FolderDeleter';
-import { FolderStatus } from '../../domain/FolderStatus';
-import { FolderMother } from '../domain/FolderMother';
+import { AllParentFoldersStatusIsExists } from '../../../../../src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
+import { FolderDeleter } from '../../../../../src/context/virtual-drive/folders/application/FolderDeleter';
+import { FolderLocalFileSystemMock } from '../__mocks__/FolderLocalFileSystemMock';
+import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
 import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
-import { AllParentFoldersStatusIsExists } from '../../application/AllParentFoldersStatusIsExists';
-import { PlaceholderCreatorMock } from '../../../placeholders/test/__mock__/PlaceholderCreatorMock';
+import { FolderMother } from '../domain/FolderMother';
 
 describe('Folder deleter', () => {
   let repository: FolderRepositoryMock;
-  let placeholderCreator: PlaceholderCreatorMock;
   let allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
+  let remote: FolderRemoteFileSystemMock;
+  let local: FolderLocalFileSystemMock;
   let SUT: FolderDeleter;
 
   beforeEach(() => {
@@ -16,46 +17,45 @@ describe('Folder deleter', () => {
     allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
       repository
     );
-    placeholderCreator = new PlaceholderCreatorMock();
+    remote = new FolderRemoteFileSystemMock();
+    local = new FolderLocalFileSystemMock();
+
     SUT = new FolderDeleter(
       repository,
-      allParentFoldersStatusIsExists,
-      placeholderCreator
+      remote,
+      local,
+      allParentFoldersStatusIsExists
     );
   });
 
   it('trashes an existing folder', async () => {
     const folder = FolderMother.exists();
 
-    repository.mockSearchByPartial.mockReturnValueOnce(folder);
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
     jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
 
     await SUT.run(folder.uuid);
 
-    expect(repository.mockTrash).toBeCalledWith(
-      expect.objectContaining({
-        status: FolderStatus.Trashed,
-      })
-    );
+    expect(repository.deleteMock).toBeCalledWith(folder.id);
   });
 
   it('throws an error when trashing a folder already trashed', async () => {
     const folder = FolderMother.trashed();
 
-    repository.mockSearchByPartial.mockReturnValueOnce(folder);
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
     jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
 
     await SUT.run(folder.uuid).catch((err) => {
       expect(err).toBeDefined();
     });
 
-    expect(repository.mockTrash).not.toBeCalled();
+    expect(repository.deleteMock).not.toBeCalled();
   });
 
   it('does not delete the folder if a higher folder is already deleted ', async () => {
     const folder = FolderMother.exists();
 
-    repository.mockSearchByPartial.mockReturnValueOnce(folder);
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
     jest
       .spyOn(allParentFoldersStatusIsExists, 'run')
       .mockReturnValueOnce(false);
@@ -64,20 +64,20 @@ describe('Folder deleter', () => {
       expect(err).toBeDefined();
     });
 
-    expect(repository.mockTrash).not.toBeCalled();
+    expect(repository.deleteMock).not.toBeCalled();
   });
 
   it('recreates the placeholder if the deletion fails', async () => {
     const folder = FolderMother.exists();
 
-    repository.mockSearchByPartial.mockReturnValueOnce(folder);
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
     jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
-    repository.mockTrash.mockRejectedValue(
+    repository.deleteMock.mockRejectedValue(
       new Error('Error during the deletion')
     );
 
     await SUT.run(folder.uuid);
 
-    expect(placeholderCreator.folderMock).toBeCalledWith(folder);
+    expect(local.createPlaceHolderMock).toBeCalledWith(folder);
   });
 });
diff --git a/src/workers/sync-engine/modules/folders/test/application/FolderMover.test.ts b/tests/context/virtual-drive/folders/application/FolderMover.test.ts
similarity index 61%
rename from src/workers/sync-engine/modules/folders/test/application/FolderMover.test.ts
rename to tests/context/virtual-drive/folders/application/FolderMover.test.ts
index b52c1befa..93ae06223 100644
--- a/src/workers/sync-engine/modules/folders/test/application/FolderMover.test.ts
+++ b/tests/context/virtual-drive/folders/application/FolderMover.test.ts
@@ -1,26 +1,29 @@
-import { FolderFinder } from '../../application/FolderFinder';
-import { FolderMover } from '../../application/FolderMover';
-import { FolderMother } from '../domain/FolderMother';
+import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
+import { FolderMover } from '../../../../../src/context/virtual-drive/folders/application/FolderMover';
+import { FolderPath } from '../../../../../src/context/virtual-drive/folders/domain/FolderPath';
+import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
 import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
-import { FolderPath } from '../../domain/FolderPath';
+import { FolderMother } from '../domain/FolderMother';
 
 describe('Folder Mover', () => {
   let repository: FolderRepositoryMock;
   let folderFinder: FolderFinder;
+  let remoteFileSystem: FolderRemoteFileSystemMock;
   let SUT: FolderMover;
 
   beforeEach(() => {
     repository = new FolderRepositoryMock();
     folderFinder = new FolderFinder(repository);
+    remoteFileSystem = new FolderRemoteFileSystemMock();
 
-    SUT = new FolderMover(repository, folderFinder);
+    SUT = new FolderMover(repository, remoteFileSystem, folderFinder);
   });
 
   it('Folders cannot be overwrite', async () => {
     const folder = FolderMother.in(1, '/folderA/folderB');
     const destination = new FolderPath('/folderC/folderB');
 
-    repository.mockSearch.mockImplementation(() =>
+    repository.searchByPartialMock.mockImplementation(() =>
       FolderMother.in(2, destination.value)
     );
 
@@ -31,8 +34,7 @@ describe('Folder Mover', () => {
       expect(err).toBeDefined();
     }
 
-    expect(repository.mockUpdateName).not.toBeCalled();
-    expect(repository.mockUpdateParentDir).not.toBeCalled();
+    expect(repository.updateMock).not.toBeCalled();
   });
 
   describe('Move', () => {
@@ -41,14 +43,13 @@ describe('Folder Mover', () => {
       const destination = new FolderPath('/folderC/folderB');
       const folderC = FolderMother.in(2, '/folderC');
 
-      repository.mockSearch
+      repository.searchByPartialMock
         .mockReturnValueOnce(undefined)
         .mockReturnValueOnce(folderC);
 
       await SUT.run(folder, destination);
 
-      expect(repository.mockUpdateParentDir).toHaveBeenCalled();
-      expect(repository.mockUpdateName).not.toHaveBeenCalled();
+      expect(repository.updateMock).toHaveBeenCalled();
     });
   });
 });
diff --git a/src/workers/sync-engine/modules/folders/test/application/SynchronizeOfflineModifications.test.ts b/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
similarity index 53%
rename from src/workers/sync-engine/modules/folders/test/application/SynchronizeOfflineModifications.test.ts
rename to tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
index 189baad07..1a5c20b3f 100644
--- a/src/workers/sync-engine/modules/folders/test/application/SynchronizeOfflineModifications.test.ts
+++ b/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
@@ -1,46 +1,60 @@
-import { IpcRendererSyncEngineMock } from '../../../shared/test/__mock__/IpcRendererSyncEngineMock';
-import { FolderRenamer } from '../../application/FolderRenamer';
-import { SynchronizeOfflineModifications } from '../../application/SynchronizeOfflineModifications';
-import { InMemoryOfflineFolderRepository } from '../../infrastructure/InMemoryOfflineFolderRepository';
+import { FolderRenamer } from '../../../../../src/context/virtual-drive/folders/application/FolderRenamer';
+import { SynchronizeOfflineModifications } from '../../../../../src/context/virtual-drive/folders/application/SynchronizeOfflineModifications';
+import { FolderPath } from '../../../../../src/context/virtual-drive/folders/domain/FolderPath';
+import { FolderUuid } from '../../../../../src/context/virtual-drive/folders/domain/FolderUuid';
+import { FolderRenamedDomainEvent } from '../../../../../src/context/virtual-drive/folders/domain/events/FolderRenamedDomainEvent';
+import { InMemoryOfflineFolderRepository } from '../../../../../src/context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository';
+import { EventRepositoryMock } from '../../shared/__mock__/EventRepositoryMock';
+import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
+import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
 import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
-import { FolderUuid } from '../../domain/FolderUuid';
-import { OfflineFolderMother } from '../domain/OfflineFolderMother';
 import { FolderMother } from '../domain/FolderMother';
-import { FolderPath } from '../../domain/FolderPath';
+import { OfflineFolderMother } from '../domain/OfflineFolderMother';
 
 describe('Synchronize Offline Modifications', () => {
   let offlineRepository: InMemoryOfflineFolderRepository;
   let repository: FolderRepositoryMock;
+  let folderRemoteFileSystemMock: FolderRemoteFileSystemMock;
   let renamer: FolderRenamer;
+  let eventRepositoryMock: EventRepositoryMock;
 
   let SUT: SynchronizeOfflineModifications;
 
   beforeEach(() => {
     offlineRepository = new InMemoryOfflineFolderRepository();
+    folderRemoteFileSystemMock = new FolderRemoteFileSystemMock();
     repository = new FolderRepositoryMock();
-    renamer = new FolderRenamer(repository, new IpcRendererSyncEngineMock());
+    renamer = new FolderRenamer(
+      repository,
+      folderRemoteFileSystemMock,
+      new IpcRendererSyncEngineMock()
+    );
+    eventRepositoryMock = new EventRepositoryMock();
 
     SUT = new SynchronizeOfflineModifications(
       offlineRepository,
       repository,
-      renamer
+      renamer,
+      eventRepositoryMock
     );
   });
 
   it('does nothing if there is no offline folder with the given uuid', async () => {
-    jest.spyOn(offlineRepository, 'getByUuid').mockReturnValueOnce(undefined);
+    jest
+      .spyOn(offlineRepository, 'searchByPartial')
+      .mockReturnValueOnce(undefined);
 
     await SUT.run(FolderUuid.random().value);
 
-    expect(repository.mockSearchByPartial).not.toBeCalled();
+    expect(repository.searchByPartialMock).not.toBeCalled();
   });
 
   it('throws an error if there is no folder with the given uuid', async () => {
     jest
-      .spyOn(offlineRepository, 'getByUuid')
+      .spyOn(offlineRepository, 'searchByPartial')
       .mockReturnValueOnce(OfflineFolderMother.random());
 
-    repository.mockSearchByPartial.mockReturnValueOnce(undefined);
+    repository.searchByPartialMock.mockReturnValueOnce(undefined);
 
     try {
       await SUT.run(FolderUuid.random().value);
@@ -63,19 +77,19 @@ describe('Synchronize Offline Modifications', () => {
     });
 
     const offlineRepositorySyp = jest
-      .spyOn(offlineRepository, 'getByUuid')
+      .spyOn(offlineRepository, 'searchByPartial')
       .mockReturnValueOnce(offlineFolder);
 
-    repository.mockSearchByPartial.mockReturnValueOnce(folder);
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
 
     const renamerSpy = jest.spyOn(renamer, 'run');
 
+    eventRepositoryMock.searchMock.mockResolvedValueOnce([]);
+
     await SUT.run(offlineFolder.uuid);
 
-    expect(offlineRepositorySyp).toBeCalledWith(offlineFolder.uuid);
-    expect(repository.mockSearchByPartial).toBeCalledWith({
-      uuid: offlineFolder.uuid,
-    });
+    expect(offlineRepositorySyp).toBeCalledWith({ uuid: offlineFolder.uuid });
+    expect(eventRepositoryMock.searchMock).toBeCalledWith(offlineFolder.uuid);
     expect(renamerSpy).not.toBeCalled();
   });
 
@@ -88,12 +102,20 @@ describe('Synchronize Offline Modifications', () => {
     );
 
     jest
-      .spyOn(offlineRepository, 'getByUuid')
+      .spyOn(offlineRepository, 'searchByPartial')
       .mockReturnValueOnce(offlineFolder);
 
     const renamerSpy = jest.spyOn(renamer, 'run');
 
-    repository.mockSearchByPartial.mockReturnValueOnce(folder);
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
+
+    const event = new FolderRenamedDomainEvent({
+      aggregateId: offlineFolder.uuid,
+      previousPath: folder.path,
+      nextPath: offlineFolder.path.value,
+    });
+
+    eventRepositoryMock.searchMock.mockResolvedValueOnce([event]);
 
     await SUT.run(offlineFolder.uuid);
 
@@ -110,23 +132,29 @@ describe('Synchronize Offline Modifications', () => {
     const afterFirstRename = FolderMother.fromPartial(
       offlineFolder.attributes()
     );
-    offlineFolder.rename(
-      FolderPath.fromParts(offlineFolder.dirname, offlineFolder.name + '!')
-    );
+
+    const event = new FolderRenamedDomainEvent({
+      aggregateId: offlineFolder.uuid,
+      previousPath: afterCreation.path,
+      nextPath: afterFirstRename.path,
+    });
+
+    eventRepositoryMock.searchMock.mockResolvedValueOnce([event]);
 
     jest
-      .spyOn(offlineRepository, 'getByUuid')
+      .spyOn(offlineRepository, 'searchByPartial')
       .mockReturnValueOnce(offlineFolder);
 
     const renamerSpy = jest.spyOn(renamer, 'run');
 
-    repository.mockSearchByPartial
+    repository.searchByPartialMock
       .mockReturnValueOnce(afterCreation)
       .mockReturnValueOnce(afterFirstRename);
 
     const uuid = offlineFolder.uuid;
+
     await SUT.run(uuid);
 
-    expect(renamerSpy).toBeCalledTimes(2);
+    expect(renamerSpy).toBeCalledTimes(1);
   });
 });
diff --git a/src/workers/sync-engine/modules/folders/test/domain/FolderMother.ts b/tests/context/virtual-drive/folders/domain/FolderMother.ts
similarity index 85%
rename from src/workers/sync-engine/modules/folders/test/domain/FolderMother.ts
rename to tests/context/virtual-drive/folders/domain/FolderMother.ts
index 023becbd8..51f0f35ba 100644
--- a/src/workers/sync-engine/modules/folders/test/domain/FolderMother.ts
+++ b/tests/context/virtual-drive/folders/domain/FolderMother.ts
@@ -1,7 +1,10 @@
-import { File } from '../../../files/domain/File';
-import { FolderStatuses } from '../../domain/FolderStatus';
-import { Folder, FolderAttributes } from '../../domain/Folder';
-import { FolderUuid } from '../../domain/FolderUuid';
+import { File } from '../../../../../src/context/virtual-drive/files/domain/File';
+import { FolderStatuses } from '../../../../../src/context/virtual-drive/folders/domain/FolderStatus';
+import {
+  Folder,
+  FolderAttributes,
+} from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { FolderUuid } from '../../../../../src/context/virtual-drive/folders/domain/FolderUuid';
 import Chance from 'chance';
 const chance = new Chance();
 
diff --git a/src/workers/sync-engine/modules/folders/test/domain/FolderPath.test.ts b/tests/context/virtual-drive/folders/domain/FolderPath.test.ts
similarity index 75%
rename from src/workers/sync-engine/modules/folders/test/domain/FolderPath.test.ts
rename to tests/context/virtual-drive/folders/domain/FolderPath.test.ts
index faeba3a8e..a6799f377 100644
--- a/src/workers/sync-engine/modules/folders/test/domain/FolderPath.test.ts
+++ b/tests/context/virtual-drive/folders/domain/FolderPath.test.ts
@@ -1,5 +1,5 @@
-import { FolderPath } from '../../domain/FolderPath';
 import path from 'path';
+import { FolderPath } from '../../../../../src/context/virtual-drive/folders/domain/FolderPath';
 
 describe('Path', () => {
   describe('path instantiation', () => {
diff --git a/src/workers/sync-engine/modules/folders/test/domain/OfflineFolderMother.ts b/tests/context/virtual-drive/folders/domain/OfflineFolderMother.ts
similarity index 71%
rename from src/workers/sync-engine/modules/folders/test/domain/OfflineFolderMother.ts
rename to tests/context/virtual-drive/folders/domain/OfflineFolderMother.ts
index 75d25e2f7..0555d9974 100644
--- a/src/workers/sync-engine/modules/folders/test/domain/OfflineFolderMother.ts
+++ b/tests/context/virtual-drive/folders/domain/OfflineFolderMother.ts
@@ -1,9 +1,9 @@
-import { FolderStatuses } from '../../domain/FolderStatus';
-import { FolderUuid } from '../../domain/FolderUuid';
+import { FolderStatuses } from '../../../../../src/context/virtual-drive/folders/domain/FolderStatus';
+import { FolderUuid } from '../../../../../src/context/virtual-drive/folders/domain/FolderUuid';
 import {
   OfflineFolder,
   OfflineFolderAttributes,
-} from '../../domain/OfflineFolder';
+} from '../../../../../src/context/virtual-drive/folders/domain/OfflineFolder';
 
 import Chance from 'chance';
 const chance = new Chance();
diff --git a/src/workers/sync-engine/modules/items/test/application/Traverser.test.ts b/tests/context/virtual-drive/items/application/Traverser.test.ts
similarity index 69%
rename from src/workers/sync-engine/modules/items/test/application/Traverser.test.ts
rename to tests/context/virtual-drive/items/application/Traverser.test.ts
index f07a3feb4..62adf56d4 100644
--- a/src/workers/sync-engine/modules/items/test/application/Traverser.test.ts
+++ b/tests/context/virtual-drive/items/application/Traverser.test.ts
@@ -1,20 +1,18 @@
-import { ContentsIdMother } from '../../../contents/test/domain/ContentsIdMother';
 import {
   ServerFile,
   ServerFileStatus,
-} from '../../../../../filesystems/domain/ServerFile';
+} from '../../../../../src/context/shared/domain/ServerFile';
 import {
-  ServerFolder,
   ServerFolderStatus,
-} from '../../../../../filesystems/domain/ServerFolder';
-import { Traverser } from '../../application/Traverser';
-
-const fakeDecrypt = {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  decryptName: (name: string, _a: string, _b: string) => name,
-};
+  ServerFolder,
+} from '../../../../../src/context/shared/domain/ServerFolder';
+import { Traverser } from '../../../../../src/context/virtual-drive/items/application/Traverser';
+import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
+import { FakeNameDecrypt } from '../infrastructure/FakeNameDecrypt';
 
 describe('Traverser', () => {
+  const nameDecrypt = new FakeNameDecrypt();
+
   it('first level files starts with /', () => {
     const baseFolderId = 6;
     const rawTree = {
@@ -30,15 +28,16 @@ describe('Traverser', () => {
       folders: [],
     };
     const SUT = new Traverser(
-      fakeDecrypt,
+      nameDecrypt,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
     );
 
-    const result = SUT.run(rawTree);
+    const tree = SUT.run(rawTree);
 
-    expect(Object.keys(result)).toStrictEqual(['/file A', '/']);
+    expect(tree.filePaths).toEqual(['/file A']);
+    expect(tree.folderPaths).toEqual(['/']);
   });
 
   it('second level files starts with /', () => {
@@ -64,19 +63,16 @@ describe('Traverser', () => {
       ],
     };
     const SUT = new Traverser(
-      fakeDecrypt,
+      nameDecrypt,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
     );
 
-    const result = SUT.run(rawTree);
+    const tree = SUT.run(rawTree);
 
-    expect(Object.keys(result)).toStrictEqual([
-      '/folder A',
-      '/folder A/file A',
-      '/',
-    ]);
+    expect(tree.filePaths).toEqual(['/folder A/file A']);
+    expect(tree.folderPaths).toEqual(['/', '/folder A']);
   });
 
   it('first level folder starts with /', () => {
@@ -94,15 +90,15 @@ describe('Traverser', () => {
       ],
     };
     const SUT = new Traverser(
-      fakeDecrypt,
+      nameDecrypt,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
     );
 
-    const result = SUT.run(rawTree);
+    const tree = SUT.run(rawTree);
 
-    expect(Object.keys(result)).toStrictEqual(['/folder A', '/']);
+    expect(tree.folderPaths).toEqual(['/', '/folder A']);
   });
 
   it('second level folder starts with /', () => {
@@ -127,19 +123,15 @@ describe('Traverser', () => {
       ],
     };
     const SUT = new Traverser(
-      fakeDecrypt,
+      nameDecrypt,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
     );
 
-    const result = SUT.run(rawTree);
+    const tree = SUT.run(rawTree);
 
-    expect(Object.keys(result)).toStrictEqual([
-      '/folder A',
-      '/folder A/folder B',
-      '/',
-    ]);
+    expect(tree.folderPaths).toEqual(['/', '/folder A', '/folder A/folder B']);
   });
 
   it('root folder should exist', () => {
@@ -164,19 +156,15 @@ describe('Traverser', () => {
       ],
     };
     const SUT = new Traverser(
-      fakeDecrypt,
+      nameDecrypt,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
     );
 
-    const result = SUT.run(rawTree);
+    const tree = SUT.run(rawTree);
 
-    expect(Object.keys(result)).toStrictEqual([
-      '/folder A',
-      '/folder A/folder B',
-      '/',
-    ]);
+    expect(tree.folderPaths).toEqual(['/', '/folder A', '/folder A/folder B']);
   });
 
   it('when a file data is invalid ignore it and continue', () => {
@@ -208,15 +196,15 @@ describe('Traverser', () => {
       folders: [],
     };
     const SUT = new Traverser(
-      fakeDecrypt,
+      nameDecrypt,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
     );
 
-    const result = SUT.run(rawTree);
+    const tree = SUT.run(rawTree);
 
-    expect(Object.keys(result)).toStrictEqual(['/valid_name', '/']);
+    expect(tree.filePaths).toEqual(['/valid_name']);
   });
 
   it('when a folder data is invalid ignore it and continue', () => {
@@ -235,15 +223,51 @@ describe('Traverser', () => {
       ],
     };
     const SUT = new Traverser(
-      fakeDecrypt,
+      nameDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
+
+    const tree = SUT.run(rawTree);
+
+    expect(tree.filePaths).toEqual([]);
+    expect(tree.folderPaths).toEqual(['/', '/folder A']);
+  });
+
+  it('filters the files and folders depending on the filters set', () => {
+    const baseFolderId = 6;
+    const rawTree = {
+      files: [
+        {
+          name: 'file A',
+          fileId: ContentsIdMother.raw(),
+          folderId: baseFolderId,
+          size: 67,
+          status: 'TRASHED',
+        } as ServerFile,
+      ],
+      folders: [
+        {
+          id: 22491,
+          parentId: baseFolderId,
+          plain_name: 'folder A',
+          status: 'TRASHED',
+          uuid: 'fc790269-92ac-5990-b9e0-a08d6552bf0b',
+        } as ServerFolder,
+      ],
+    };
+    const SUT = new Traverser(
+      nameDecrypt,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
     );
 
-    const result = SUT.run(rawTree);
+    const tree = SUT.run(rawTree);
 
-    expect(Object.keys(result)).toStrictEqual(['/folder A', '/']);
+    expect(tree.filePaths).toEqual(['/file A']);
+    expect(tree.folderPaths).toEqual(['/']);
   });
 
   it('filters the files and folders depending on the filters set', () => {
@@ -269,14 +293,15 @@ describe('Traverser', () => {
       ],
     };
     const SUT = new Traverser(
-      fakeDecrypt,
+      nameDecrypt,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
     );
 
-    const result = SUT.run(rawTree);
+    const tree = SUT.run(rawTree);
 
-    expect(Object.keys(result)).toStrictEqual(['/file A', '/']);
+    expect(tree.filePaths).toEqual(['/file A']);
+    expect(tree.folderPaths).toEqual(['/']);
   });
 });
diff --git a/tests/context/virtual-drive/items/infrastructure/FakeNameDecrypt.ts b/tests/context/virtual-drive/items/infrastructure/FakeNameDecrypt.ts
new file mode 100644
index 000000000..f45d9dc52
--- /dev/null
+++ b/tests/context/virtual-drive/items/infrastructure/FakeNameDecrypt.ts
@@ -0,0 +1,13 @@
+import { NameDecrypt } from '../../../../../src/context/virtual-drive/items/domain/NameDecrypt';
+
+export class FakeNameDecrypt implements NameDecrypt {
+  decryptName(
+    name: string,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _folderId: string,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _encryptVersion: string
+  ): string | null {
+    return name;
+  }
+}
diff --git a/src/workers/sync-engine/modules/items/test/persistance/ServerFolderMother.ts b/tests/context/virtual-drive/items/persistance/ServerFolderMother.ts
similarity index 84%
rename from src/workers/sync-engine/modules/items/test/persistance/ServerFolderMother.ts
rename to tests/context/virtual-drive/items/persistance/ServerFolderMother.ts
index 3a5a75660..b52de12a0 100644
--- a/src/workers/sync-engine/modules/items/test/persistance/ServerFolderMother.ts
+++ b/tests/context/virtual-drive/items/persistance/ServerFolderMother.ts
@@ -1,8 +1,8 @@
-import { FolderUuid } from '../../../folders/domain/FolderUuid';
 import {
   ServerFolder,
   ServerFolderStatus,
-} from '../../../../../filesystems/domain/ServerFolder';
+} from '../../../../../src/context/shared/domain/ServerFolder';
+import { FolderUuid } from '../../../../../src/context/virtual-drive/folders/domain/FolderUuid';
 
 export class ServerFolderMother {
   static any(): ServerFolder {
diff --git a/src/workers/sync-engine/modules/shared/test/__mock__/EventBusMock.ts b/tests/context/virtual-drive/shared/__mock__/EventBusMock.ts
similarity index 73%
rename from src/workers/sync-engine/modules/shared/test/__mock__/EventBusMock.ts
rename to tests/context/virtual-drive/shared/__mock__/EventBusMock.ts
index d702eafbf..f7fcbeb68 100644
--- a/src/workers/sync-engine/modules/shared/test/__mock__/EventBusMock.ts
+++ b/tests/context/virtual-drive/shared/__mock__/EventBusMock.ts
@@ -1,6 +1,6 @@
-import { DomainEvent } from '../../domain/DomainEvent';
-import { EventBus } from '../../domain/EventBus';
-import { DomainEventSubscribers } from '../../infrastructure/DomainEventSubscribers';
+import { DomainEvent } from '../../../../../src/context/shared/domain/DomainEvent';
+import { EventBus } from '../../../../../src/context/virtual-drive/shared/domain/EventBus';
+import { DomainEventSubscribers } from '../../../../../src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers';
 
 export class EventBusMock implements EventBus {
   public publishMock = jest.fn();
diff --git a/tests/context/virtual-drive/shared/__mock__/EventRepositoryMock.ts b/tests/context/virtual-drive/shared/__mock__/EventRepositoryMock.ts
new file mode 100644
index 000000000..9484794c2
--- /dev/null
+++ b/tests/context/virtual-drive/shared/__mock__/EventRepositoryMock.ts
@@ -0,0 +1,14 @@
+import { DomainEvent } from '../../../../../src/context/shared/domain/DomainEvent';
+import { EventRepository } from '../../../../../src/context/virtual-drive/shared/domain/EventRepository';
+
+export class EventRepositoryMock implements EventRepository {
+  public readonly storeMock = jest.fn();
+  public readonly searchMock = jest.fn();
+
+  store(event: DomainEvent): Promise<void> {
+    return this.storeMock(event);
+  }
+  search(aggregateId: string): Promise<DomainEvent[]> {
+    return this.searchMock(aggregateId);
+  }
+}
diff --git a/src/workers/sync-engine/modules/shared/test/__mock__/IpcRendererSyncEngineMock.ts b/tests/context/virtual-drive/shared/__mock__/IpcRendererSyncEngineMock.ts
similarity index 83%
rename from src/workers/sync-engine/modules/shared/test/__mock__/IpcRendererSyncEngineMock.ts
rename to tests/context/virtual-drive/shared/__mock__/IpcRendererSyncEngineMock.ts
index b7feb1882..c1f6bcf38 100644
--- a/src/workers/sync-engine/modules/shared/test/__mock__/IpcRendererSyncEngineMock.ts
+++ b/tests/context/virtual-drive/shared/__mock__/IpcRendererSyncEngineMock.ts
@@ -1,5 +1,8 @@
-import { FromMain, FromProcess } from 'shared/IPC/events/sync-engine';
-import { SyncEngineIpc } from '../../../../ipcRendererSyncEngine';
+import {
+  FromMain,
+  FromProcess,
+} from '../../../../../src/apps/shared/IPC/events/sync-engine';
+import { SyncEngineIpc } from '../../../../../src/apps/sync-engine/ipcRendererSyncEngine';
 
 export class IpcRendererSyncEngineMock implements SyncEngineIpc {
   sendMock = jest.fn();
diff --git a/src/workers/sync-engine/modules/shared/test/application/AbsolutePathToRelativeConverter.test.ts b/tests/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.test.ts
similarity index 71%
rename from src/workers/sync-engine/modules/shared/test/application/AbsolutePathToRelativeConverter.test.ts
rename to tests/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.test.ts
index 483ccdcdf..73cfda30e 100644
--- a/src/workers/sync-engine/modules/shared/test/application/AbsolutePathToRelativeConverter.test.ts
+++ b/tests/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.test.ts
@@ -1,4 +1,4 @@
-import { AbsolutePathToRelativeConverter } from '../../application/AbsolutePathToRelativeConverter';
+import { AbsolutePathToRelativeConverter } from '../../../../../src/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
 
 describe('AbsolutePathToRelativeConverter', () => {
   it('works', () => {
diff --git a/src/workers/sync-engine/modules/shared/test/application/PlatformPathConverter.test.ts b/tests/context/virtual-drive/shared/application/PlatformPathConverter.test.ts
similarity index 80%
rename from src/workers/sync-engine/modules/shared/test/application/PlatformPathConverter.test.ts
rename to tests/context/virtual-drive/shared/application/PlatformPathConverter.test.ts
index 58f947982..772d88a15 100644
--- a/src/workers/sync-engine/modules/shared/test/application/PlatformPathConverter.test.ts
+++ b/tests/context/virtual-drive/shared/application/PlatformPathConverter.test.ts
@@ -1,4 +1,4 @@
-import { PlatformPathConverter } from '../../application/PlatformPathConverter';
+import { PlatformPathConverter } from '../../../../../src/context/virtual-drive/shared/application/PlatformPathConverter';
 
 describe('PlatformPathConverter', () => {
   describe('winToPosix', () => {
diff --git a/src/workers/sync-engine/modules/shared/test/domain/FakeCrypt.ts b/tests/context/virtual-drive/shared/domain/FakeCrypt.ts
similarity index 80%
rename from src/workers/sync-engine/modules/shared/test/domain/FakeCrypt.ts
rename to tests/context/virtual-drive/shared/domain/FakeCrypt.ts
index 9003787a4..3c65cafe3 100644
--- a/src/workers/sync-engine/modules/shared/test/domain/FakeCrypt.ts
+++ b/tests/context/virtual-drive/shared/domain/FakeCrypt.ts
@@ -1,4 +1,4 @@
-import { Crypt } from '../../domain/Crypt';
+import { Crypt } from '../../../../../src/context/virtual-drive/shared/domain/Crypt';
 
 export const fakeDecryptor: Crypt = {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/src/workers/sync-engine/modules/shared/test/domain/Path.test.ts b/tests/context/virtual-drive/shared/domain/Path.test.ts
similarity index 89%
rename from src/workers/sync-engine/modules/shared/test/domain/Path.test.ts
rename to tests/context/virtual-drive/shared/domain/Path.test.ts
index bd7a8c88a..443624cf9 100644
--- a/src/workers/sync-engine/modules/shared/test/domain/Path.test.ts
+++ b/tests/context/virtual-drive/shared/domain/Path.test.ts
@@ -1,4 +1,4 @@
-import { Path } from '../../domain/Path';
+import { Path } from '../../../../../src/context/virtual-drive/shared/domain/Path';
 
 class PathTestClass extends Path {
   constructor(value: string) {
diff --git a/src/workers/sync-engine/modules/userUsage/test/application/BytesInBinaryToInternacionalSystem.test.ts b/tests/context/virtual-drive/user-usage/application/BytesInBinaryToInternacionalSystem.test.ts
similarity index 89%
rename from src/workers/sync-engine/modules/userUsage/test/application/BytesInBinaryToInternacionalSystem.test.ts
rename to tests/context/virtual-drive/user-usage/application/BytesInBinaryToInternacionalSystem.test.ts
index 0c2c00906..fd86cf3b1 100644
--- a/src/workers/sync-engine/modules/userUsage/test/application/BytesInBinaryToInternacionalSystem.test.ts
+++ b/tests/context/virtual-drive/user-usage/application/BytesInBinaryToInternacionalSystem.test.ts
@@ -1,4 +1,4 @@
-import { BytesInBinaryToInternacionalSystem } from '../../application/BytesInBinaryToInternacionalSystem';
+import { BytesInBinaryToInternacionalSystem } from '../../../../../src/context/virtual-drive/userUsage/application/BytesInBinaryToInternacionalSystem';
 
 describe('Bytes in binary to internacional system conversion', () => {
   it('when the bytes are 0 returns 0', () => {
diff --git a/src/test/fixtures/AccessResponse.json b/tests/fixtures/AccessResponse.json
similarity index 100%
rename from src/test/fixtures/AccessResponse.json
rename to tests/fixtures/AccessResponse.json
diff --git a/src/test/fixtures/errors.ts b/tests/fixtures/errors.ts
similarity index 68%
rename from src/test/fixtures/errors.ts
rename to tests/fixtures/errors.ts
index 7f6e2d8f1..6bf7aa417 100644
--- a/src/test/fixtures/errors.ts
+++ b/tests/fixtures/errors.ts
@@ -1,15 +1,12 @@
-import { BackupFatalError } from '../../main/background-processes/types/BackupFatalError';
 import {
-  GeneralErrorName,
-  GeneralIssue,
-  ProcessErrorName,
   ProcessFatalErrorName,
+  ProcessErrorName,
   ProcessIssue,
-} from '../../workers/types';
+  GeneralErrorName,
+  GeneralIssue,
+} from '../../src/apps/shared/types';
 
-export const createBackupFatalError = (
-  errorName: ProcessFatalErrorName
-): BackupFatalError => ({
+export const createBackupFatalError = (errorName: ProcessFatalErrorName) => ({
   path: `folder/file${Date.now()}.txt`,
   folderId: 24816,
   errorName,
@@ -22,12 +19,6 @@ export const createSyncError = (
   name: 'name',
   action: 'DELETE_ERROR',
   errorName: processErrorName,
-  errorDetails: {
-    action: 'a',
-    message: 'b',
-    code: 'lkañjsdlfk',
-    stack: 'dsasdf',
-  },
   process: 'SYNC',
 });
 
diff --git a/src/test/issues.e2e.ts b/tests/issues.e2e.ts
similarity index 94%
rename from src/test/issues.e2e.ts
rename to tests/issues.e2e.ts
index 219ad2b44..a7f05dac1 100644
--- a/src/test/issues.e2e.ts
+++ b/tests/issues.e2e.ts
@@ -4,13 +4,7 @@ import {
   ipcMainEmit,
 } from 'electron-playwright-helpers';
 import { _electron as electron } from 'playwright';
-import { DEFAULT_LANGUAGE } from '../shared/Locale/Language';
 
-import {
-  GeneralIssue,
-  ProcessErrorName,
-  ProcessFatalErrorName,
-} from '../workers/types';
 import AccessResponseFixtures from './fixtures/AccessResponse.json';
 import {
   createBackupFatalError,
@@ -19,22 +13,17 @@ import {
 } from './fixtures/errors';
 import { getWindowTopBarTitle } from './selectors';
 import { wait } from './utils';
+import { DEFAULT_LANGUAGE } from '../src/apps/shared/Locale/Language';
+import {
+  ProcessErrorName,
+  ProcessFatalErrorName,
+  GeneralIssue,
+} from '../src/apps/shared/types';
 
 const activeTabSelector = 'button.text-neutral-500';
 const tabSelector = (name: 'Sync' | 'Backups' | 'General') =>
   `button.text-m-neutral-80:has-text("${name}")`;
 const emptyIssuesListSelector = 'p.text-xs.font-medium.text-m-neutral-60';
-const infoCircleSelector = '.inline.h-4.w-4.text-blue-60';
-
-const allProcessErrorsName: Array<ProcessErrorName> = [
-  'NOT_EXISTS',
-  'NO_PERMISSION',
-  'NO_INTERNET',
-  'NO_REMOTE_CONNECTION',
-  'BAD_RESPONSE',
-  'EMPTY_FILE',
-  'UNKNOWN',
-];
 
 test.describe('process issues', () => {
   let electronApp: ElectronApplication;
diff --git a/src/test/main/thumbnails/fixtures/1000x1000.jpg b/tests/main/thumbnails/fixtures/1000x1000.jpg
similarity index 100%
rename from src/test/main/thumbnails/fixtures/1000x1000.jpg
rename to tests/main/thumbnails/fixtures/1000x1000.jpg
diff --git a/src/test/main/thumbnails/fixtures/result.png b/tests/main/thumbnails/fixtures/result.png
similarity index 100%
rename from src/test/main/thumbnails/fixtures/result.png
rename to tests/main/thumbnails/fixtures/result.png
diff --git a/src/test/main/thumbnails/fixtures/source.pdf b/tests/main/thumbnails/fixtures/source.pdf
similarity index 100%
rename from src/test/main/thumbnails/fixtures/source.pdf
rename to tests/main/thumbnails/fixtures/source.pdf
diff --git a/src/test/main/thumbnails/helpers.ts b/tests/main/thumbnails/helpers.ts
similarity index 100%
rename from src/test/main/thumbnails/helpers.ts
rename to tests/main/thumbnails/helpers.ts
diff --git a/src/test/main/thumbnails/resize-image.test.ts b/tests/main/thumbnails/resize-image.test.ts
similarity index 84%
rename from src/test/main/thumbnails/resize-image.test.ts
rename to tests/main/thumbnails/resize-image.test.ts
index c69872b0b..a2d50db82 100644
--- a/src/test/main/thumbnails/resize-image.test.ts
+++ b/tests/main/thumbnails/resize-image.test.ts
@@ -1,9 +1,9 @@
+import { execSync } from 'child_process';
 import { createReadStream } from 'fs';
-import { reziseImage } from '../../../main/thumbnails/application/resize-image';
-import { getFileSize } from './helpers';
 import path from 'path';
-import { execSync } from 'child_process';
-import { ThumbnailProperties } from '../../../main/thumbnails/domain/ThumbnailProperties';
+import { reziseImage } from '../../../src/apps/main/thumbnails/application/resize-image';
+import { ThumbnailProperties } from '../../../src/apps/main/thumbnails/domain/ThumbnailProperties';
+import { getFileSize } from './helpers';
 
 describe.skip('GM Resize Image', () => {
   it('gm is installed', () => {
diff --git a/src/test/onboarding.e2e.ts b/tests/onboarding.e2e.ts
similarity index 100%
rename from src/test/onboarding.e2e.ts
rename to tests/onboarding.e2e.ts
diff --git a/src/test/playwright.config.ts b/tests/playwright.config.ts
similarity index 100%
rename from src/test/playwright.config.ts
rename to tests/playwright.config.ts
diff --git a/src/test/selectors.ts b/tests/selectors.ts
similarity index 100%
rename from src/test/selectors.ts
rename to tests/selectors.ts
diff --git a/src/test/unauthorized.e2e.ts b/tests/unauthorized.e2e.ts
similarity index 100%
rename from src/test/unauthorized.e2e.ts
rename to tests/unauthorized.e2e.ts
diff --git a/src/test/utils.ts b/tests/utils.ts
similarity index 100%
rename from src/test/utils.ts
rename to tests/utils.ts
diff --git a/tsconfig.json b/tsconfig.json
index 160bcf2d3..350064683 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,7 +12,7 @@
     "strict": true,
     "pretty": true,
     "sourceMap": true,
-    "baseUrl": "./src",
+    "rootDir": ".",
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noImplicitReturns": true,
@@ -31,14 +31,11 @@
     "outDir": "release/app/dist"
   },
   "exclude": [
-    "test",
     "release/build",
     "release/app/dist",
     ".erb/dll",
-    "__mock__",
     "src/workers/backups/process.ts",
     "src/workers/backups",
     "src/workers/filesystems",
-    "src/test",
   ]
-}
\ No newline at end of file
+}

From 70a6f704236b3e81c7f945a1db90b9c5658e2ef2 Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Wed, 15 Nov 2023 02:00:08 -0500
Subject: [PATCH 041/188] add notificationCallback, show error size limit from
 node-win in client

---
 .../background-processes/process-issues.ts    |  1 +
 src/renderer/localize/locales/en.json         |  4 ++--
 src/renderer/localize/locales/es.json         |  4 ++--
 src/renderer/localize/locales/fr.json         |  4 ++--
 src/workers/sync-engine/BindingManager.ts     | 21 +++++++++++++++++++
 5 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/main/background-processes/process-issues.ts b/src/main/background-processes/process-issues.ts
index cdec67929..68488e26d 100644
--- a/src/main/background-processes/process-issues.ts
+++ b/src/main/background-processes/process-issues.ts
@@ -65,6 +65,7 @@ ipcMain.on('SYNC_INFO_UPDATE', (_, payload: ProcessInfoUpdatePayload) => {
       'RENAME_ERROR',
       'DELETE_ERROR',
       'METADATA_READ_ERROR',
+      'UPLOAD_ERROR',
     ].includes(payload.action)
   ) {
     addProcessIssue(payload as ProcessIssue);
diff --git a/src/renderer/localize/locales/en.json b/src/renderer/localize/locales/en.json
index 0d8ce4b20..7eec344ee 100644
--- a/src/renderer/localize/locales/en.json
+++ b/src/renderer/localize/locales/en.json
@@ -320,7 +320,7 @@
       "no-internet-connection": "No internet connection",
       "no-permission": "Insufficient permissions",
       "file-does-not-exist": "File doesn't exist",
-      "file-too-big": "Max upload size is 10GB. Please try smaller files."
+      "file-too-big": "Max upload size is 20GB. Please try smaller files."
     },
     "error-messages": {
       "no-internet": "Looks like you are not connected to the internet, we'll try again later",
@@ -334,7 +334,7 @@
       "empty-file": "We don't support files with a size of 0 bytes because of our processes of sharding and encryption",
       "bad-response": "We got a bad response from our servers while processing this file. Please, try starting the sync process again.",
       "file-does-not-exist": "This file was present when we compared your local folder with your Internxt drive but dissapeared when we tried to access it. If you deleted this file, don't worry, this error should dissapear the next time the sync process starts.",
-      "file-too-big": "Max upload size is 10GB. Please try smaller files."
+      "file-too-big": "Max upload size is 20GB. Please try smaller files."
     },
     "report-modal": {
       "actions": {
diff --git a/src/renderer/localize/locales/es.json b/src/renderer/localize/locales/es.json
index c3aa42ac3..94376a65b 100644
--- a/src/renderer/localize/locales/es.json
+++ b/src/renderer/localize/locales/es.json
@@ -319,7 +319,7 @@
       "no-internet-connection": "No hay conexión a Internet",
       "no-permission": "Permisos insuficientes",
       "file-does-not-exist": "El archivo no existe",
-      "file-too-big": "El tamaño máximo de carga es de 10GB. Por favor, intenta con archivos más pequeños."
+      "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños."
     },
     "error-messages": {
       "no-internet": "No estás conectado a Internet, lo intentaremos más tarde",
@@ -333,7 +333,7 @@
       "empty-file": "No admitimos archivos con un tamaño de 0 bytes debido a nuestros procesos de cifrado",
       "bad-response": "Error de servidor al procesar este archivo. Por favor, intente iniciar de nuevo el proceso de sincronización",
       "file-does-not-exist": "Este archivo estaba presente cuando comparamos su carpeta local con su unidad Internxt, pero desapareció cuando intentamos acceder a él. Si has eliminado este archivo, no te preocupes, este error debería desaparecer la próxima vez que se inicie el proceso de sincronización",
-      "file-too-big": "El tamaño máximo de carga es de 10GB. Por favor, intenta con archivos más pequeños."
+      "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños."
     },
     "report-modal": {
       "actions": {
diff --git a/src/renderer/localize/locales/fr.json b/src/renderer/localize/locales/fr.json
index 1a75f91bf..1a43bb3b1 100644
--- a/src/renderer/localize/locales/fr.json
+++ b/src/renderer/localize/locales/fr.json
@@ -314,7 +314,7 @@
       "no-internet-connection": "Pas de connexion internet",
       "no-permission": "Permissions insuffisantes",
       "file-does-not-exist": "Le fichier n'existe pas",
-      "file-too-big": "La taille maximale de téléchargement est de 10 GB. Veuillez essayer des fichiers plus petits."
+      "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits."
     },
     "error-messages": {
       "no-internet": "Il semble que vous ne soyez pas connecté à l'internet, nous réessayerons plus tard",
@@ -328,7 +328,7 @@
       "empty-file": "Nous ne prenons pas en charge les fichiers d'une taille de 0 octet en raison de nos processus de  chiffrement",
       "bad-response": "Nous avons reçu une mauvaise réponse de nos serveurs lors du traitement de ce fichier. Veuillez essayer de relancer le processus de synchronisation.",
       "file-does-not-exist": "Ce fichier était présent lorsque nous avons comparé votre dossier local avec votre disque interne, mais il a disparu lorsque nous avons essayé d'y accéder. Si vous avez supprimé ce fichier, ne vous inquiétez pas, cette erreur devrait disparaître au prochain démarrage du processus de synchronisation.",
-      "file-too-big": "La taille maximale de téléchargement est de 10 GB. Veuillez essayer des fichiers plus petits."
+      "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits."
     },
     "report-modal": {
       "actions": {
diff --git a/src/workers/sync-engine/BindingManager.ts b/src/workers/sync-engine/BindingManager.ts
index 7d41f0f44..c55be1822 100644
--- a/src/workers/sync-engine/BindingManager.ts
+++ b/src/workers/sync-engine/BindingManager.ts
@@ -8,6 +8,7 @@ import { ipcRendererSyncEngine } from './ipcRendererSyncEngine';
 import { PlatformPathConverter } from './modules/shared/application/PlatformPathConverter';
 import { ItemsSearcher } from './modules/items/application/ItemsSearcher';
 import * as fs from 'fs';
+import { ProcessIssue } from 'workers/types';
 
 export type CallbackDownload = (
   success: boolean,
@@ -130,6 +131,26 @@ export class BindingsManager {
           callback(false, '');
         }
       },
+      notifyMessageCallback: (
+        message: string,
+        action: ProcessIssue['action'],
+        errorName: ProcessIssue['errorName'],
+        callback: (response: boolean) => void
+      ) => {
+        try {
+          callback(true);
+          ipcRendererSyncEngine.send('SYNC_INFO_UPDATE', {
+            name: message,
+            action: action,
+            errorName,
+            process: 'SYNC',
+            kind: 'LOCAL',
+          });
+        } catch (error) {
+          Logger.error(error);
+          callback(false);
+        }
+      },
       validateDataCallback: () => {
         Logger.debug('validateDataCallback');
       },

From 468ea35a738f45a6c21d5dede84f92943ea92a77 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 15 Nov 2023 13:39:47 +0100
Subject: [PATCH 042/188] chore: use fileRepositoryFactory

---
 .../files/__mocks__/FileDeleterFactory.ts     | 12 +++++++++
 .../files/application/FileCreator.test.ts     | 26 +++----------------
 .../folders/__mocks__/FolderFinderFactory.ts  | 16 ++++++++++++
 3 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 tests/context/virtual-drive/files/__mocks__/FileDeleterFactory.ts
 create mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderFinderFactory.ts

diff --git a/tests/context/virtual-drive/files/__mocks__/FileDeleterFactory.ts b/tests/context/virtual-drive/files/__mocks__/FileDeleterFactory.ts
new file mode 100644
index 000000000..3a5504d5c
--- /dev/null
+++ b/tests/context/virtual-drive/files/__mocks__/FileDeleterFactory.ts
@@ -0,0 +1,12 @@
+import { FileDeleter } from '../../../../../src/context/virtual-drive/files/application/FileDeleter';
+
+export class FileDeleterFactory {
+  static deletionSucces(): FileDeleter {
+    return {
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      run: (_id: string) => {
+        //no-op
+      },
+    } as unknown as FileDeleter;
+  }
+}
diff --git a/tests/context/virtual-drive/files/application/FileCreator.test.ts b/tests/context/virtual-drive/files/application/FileCreator.test.ts
index 544fac2c3..303f19bf8 100644
--- a/tests/context/virtual-drive/files/application/FileCreator.test.ts
+++ b/tests/context/virtual-drive/files/application/FileCreator.test.ts
@@ -2,20 +2,18 @@ import { FileCreator } from '../../../../../src/context/virtual-drive/files/appl
 import { FileDeleter } from '../../../../../src/context/virtual-drive/files/application/FileDeleter';
 import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/FilePath';
 import { File } from '../../../../../src/context/virtual-drive/files/domain/File';
-import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
 import { FileContentsMother } from '../../contents/domain/FileContentsMother';
-import { FolderRepositoryMock } from '../../folders/__mocks__/FolderRepositoryMock';
-import { FolderMother } from '../../folders/domain/FolderMother';
 import { EventBusMock } from '../../shared/__mock__/EventBusMock';
 import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
 import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
 import { RemoteFileSystemMock } from '../__mocks__/RemoteFileSystemMock';
 import { FileMother } from '../domain/FileMother';
+import { FolderFinderFactory } from '../../folders/__mocks__/FolderFinderFactory';
+import { FileDeleterFactory } from '../__mocks__/FileDeleterFactory';
 
 describe('File Creator', () => {
   let remoteFileSystemMock: RemoteFileSystemMock;
   let fileRepository: FileRepositoryMock;
-  let folderRepository: FolderRepositoryMock;
   let fileDeleter: FileDeleter;
   let eventBus: EventBusMock;
 
@@ -25,16 +23,9 @@ describe('File Creator', () => {
 
   beforeEach(() => {
     remoteFileSystemMock = new RemoteFileSystemMock();
-
     fileRepository = new FileRepositoryMock();
-    folderRepository = new FolderRepositoryMock();
-    fileDeleter = {
-      run: (_id: string) => {
-        //no-op
-      },
-    } as unknown as FileDeleter;
-
-    const folderFinder = new FolderFinder(folderRepository);
+    fileDeleter = FileDeleterFactory.deletionSucces();
+    const folderFinder = FolderFinderFactory.existingFolder();
     eventBus = new EventBusMock();
 
     SUT = new FileCreator(
@@ -51,14 +42,11 @@ describe('File Creator', () => {
     const path = new FilePath('/cat.png');
     const contents = FileContentsMother.random();
 
-    const folder = FolderMother.any();
-
     const fileAttributes = FileMother.fromPartial({
       path: path.value,
       contentsId: contents.id,
     }).attributes();
 
-    folderRepository.searchByPartialMock.mockReturnValueOnce(folder);
     fileRepository.addMock.mockImplementationOnce(() => {
       // returns Promise<void>
     });
@@ -80,9 +68,6 @@ describe('File Creator', () => {
       contentsId: contents.id,
     }).attributes();
 
-    const folder = FolderMother.any();
-
-    folderRepository.searchByPartialMock.mockReturnValueOnce(folder);
     fileRepository.addMock.mockImplementationOnce(() => {
       // returns Promise<void>
     });
@@ -108,8 +93,6 @@ describe('File Creator', () => {
       contentsId: contents.id,
     }).attributes();
 
-    const folder = FolderMother.any();
-
     fileRepository.searchByPartialMock
       .mockReturnValueOnce(existingFile)
       .mockReturnValueOnce(existingFile);
@@ -120,7 +103,6 @@ describe('File Creator', () => {
 
     remoteFileSystemMock.persistMock.mockResolvedValueOnce(fileAttributes);
 
-    folderRepository.searchByPartialMock.mockReturnValueOnce(folder);
     fileRepository.addMock.mockImplementationOnce(() => {
       // returns Promise<void>
     });
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderFinderFactory.ts b/tests/context/virtual-drive/folders/__mocks__/FolderFinderFactory.ts
new file mode 100644
index 000000000..d7fd12d79
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderFinderFactory.ts
@@ -0,0 +1,16 @@
+import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
+import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { FolderMother } from '../domain/FolderMother';
+import { FolderRepositoryMock } from './FolderRepositoryMock';
+
+export class FolderFinderFactory {
+  static existingFolder(folder?: Folder): FolderFinder {
+    const repository = new FolderRepositoryMock();
+
+    const resolved = folder || FolderMother.any();
+
+    repository.searchByPartialMock.mockResolvedValueOnce(resolved);
+
+    return new FolderFinder(repository);
+  }
+}

From 51f729bb2daaf6b531a88dcd44468a8702664ed8 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 16 Nov 2023 13:13:16 +0100
Subject: [PATCH 043/188] fix: import missing functions

---
 .../pages/Migration/slides/DeleteOldDriveFolderSlide.tsx | 9 ++++-----
 src/apps/renderer/pages/Settings/Account/index.tsx       | 4 +---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/apps/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx b/src/apps/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx
index 20f67591f..06ec32d82 100644
--- a/src/apps/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx
+++ b/src/apps/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx
@@ -1,16 +1,15 @@
 import React from 'react';
 import { MigrationSlideProps } from '../helpers';
-import { SideTextAnimation } from '../../Onboarding/helpers';
+import {
+  SideTextAnimation,
+  getPlatformPhraseTranslationKey,
+} from '../../Onboarding/helpers';
 
 export type DeleteOldDriveFolderSlideProps = MigrationSlideProps;
 
 export const DeleteOldDriveFolderSlide: React.FC<
   DeleteOldDriveFolderSlideProps
 > = (props) => {
-  function getPlatformPhraseTranslationKey(_platform: string): any {
-    throw new Error('Function not implemented.');
-  }
-
   return (
     <div className="flex h-full w-full">
       <SideTextAnimation display>
diff --git a/src/apps/renderer/pages/Settings/Account/index.tsx b/src/apps/renderer/pages/Settings/Account/index.tsx
index c82123aac..efeff87ee 100644
--- a/src/apps/renderer/pages/Settings/Account/index.tsx
+++ b/src/apps/renderer/pages/Settings/Account/index.tsx
@@ -5,6 +5,7 @@ import useUsage from '../../../hooks/useUsage';
 import Usage from './Usage';
 import UserInfo from './UserInfo';
 import Button from '../../../components/Button';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export default function AccountSection({ active }: { active: boolean }) {
   const { translate } = useTranslationContext();
@@ -43,6 +44,3 @@ export default function AccountSection({ active }: { active: boolean }) {
     </div>
   );
 }
-function useTranslationContext(): { translate: any } {
-  throw new Error('Function not implemented.');
-}

From da5c10980c311c40a1f6cc0211c174b6a52b8157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Gonz=C3=A1lez?= <cgonzalez@shokworks.io>
Date: Thu, 16 Nov 2023 09:39:34 -0400
Subject: [PATCH 044/188] feat: delet downloaded files from temp folder

---
 release/app/package-lock.json                 |  4 +-
 release/app/yarn.lock                         | 95 +++++++++++++++----
 .../pages/ProcessIssues/ReportModal.tsx       | 12 +--
 src/apps/sync-engine/BindingManager.ts        |  2 +
 .../application/ContentsDownloader.ts         |  5 -
 5 files changed, 84 insertions(+), 34 deletions(-)

diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 14777a90a..ba155ba1c 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "internxt-drive",
-      "version": "2.0.0",
+      "version": "2.0.2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/release/app/yarn.lock b/release/app/yarn.lock
index a07508864..b4f8416f3 100644
--- a/release/app/yarn.lock
+++ b/release/app/yarn.lock
@@ -35,6 +35,36 @@
   resolved "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz"
   integrity sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==
 
+"@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz#901c5937e1441572ea23e631fe6deca68482fe76"
+  integrity sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==
+
+"@msgpackr-extract/msgpackr-extract-darwin-x64@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.2.0.tgz#fb877fe6bae3c4d3cea29786737840e2ae689066"
+  integrity sha512-vq0tT8sjZsy4JdSqmadWVw6f66UXqUCabLmUVHZwUFzMgtgoIIQjT4VVRHKvlof3P/dMCkbMJ5hB1oJ9OWHaaw==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm64@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.2.0.tgz#986179c38b10ac41fbdaf7d036c825cbc72855d9"
+  integrity sha512-hlxxLdRmPyq16QCutUtP8Tm6RDWcyaLsRssaHROatgnkOxdleMTgetf9JsdncL8vLh7FVy/RN9i3XR5dnb9cRA==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.2.0.tgz#15f2c6fe9e0adc06c21af7e95f484ff4880d79ce"
+  integrity sha512-SaJ3Qq4lX9Syd2xEo9u3qPxi/OB+5JO/ngJKK97XDpa1C587H9EWYO6KD8995DAjSinWvdHKRrCOXVUC5fvGOg==
+
+"@msgpackr-extract/msgpackr-extract-linux-x64@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.2.0.tgz#30cae5c9a202f3e1fa1deb3191b18ffcb2f239a2"
+  integrity sha512-94y5PJrSOqUNcFKmOl7z319FelCLAE0rz/jPCWS+UtdMZvpa4jrQd+cJPQCLp2Fes1yAW/YUQj/Di6YVT3c3Iw==
+
+"@msgpackr-extract/msgpackr-extract-win32-x64@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.2.0.tgz#016d855b6bc459fd908095811f6826e45dd4ba64"
+  integrity sha512-XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA==
+
 "@rudderstack/rudder-sdk-node@^1.1.4":
   version "1.1.4"
   resolved "https://registry.npmjs.org/@rudderstack/rudder-sdk-node/-/rudder-sdk-node-1.1.4.tgz"
@@ -118,7 +148,7 @@ base64-js@^1.3.1:
   resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-"better-sqlite3@^7.1.2 || ^8.0.0", better-sqlite3@^8.3.0:
+better-sqlite3@^8.3.0:
   version "8.3.0"
   resolved "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.3.0.tgz"
   integrity sha512-JTmvBZL/JLTc+3Msbvq6gK6elbU9/wVMqiudplHrVJpr7sVMR9KJrNhZAbW+RhXKlpMcuEhYkdcHa3TXKNXQ1w==
@@ -247,16 +277,16 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
-color-name@^1.0.0, color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
+color-name@^1.0.0, color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
 color-string@^1.6.0:
   version "1.9.1"
   resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"
@@ -450,7 +480,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@2:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4:
   version "2.0.4"
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -460,7 +490,7 @@ ini@~1.3.0:
   resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
-ioredis@^5.0.0, ioredis@^5.0.4:
+ioredis@^5.0.0:
   version "5.2.5"
   resolved "https://registry.npmjs.org/ioredis/-/ioredis-5.2.5.tgz"
   integrity sha512-7HKo/ClM2DGLRXdFq8ruS3Uuadensz4A76wPOU0adqlOqd1qkhoLPDaBhmVhUhNGpB+J65/bhLmNB8DDY99HJQ==
@@ -505,6 +535,11 @@ join-component@^1.1.0:
   resolved "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz"
   integrity sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==
 
+json5@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
 kuler@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz"
@@ -584,6 +619,11 @@ minimist@^1.2.0, minimist@^1.2.3:
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
+minimist@^1.2.6:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
 mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   version "0.5.3"
   resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"
@@ -594,16 +634,16 @@ mkdirp@^2.1.3:
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz"
   integrity sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==
 
-ms@^2.1.1, ms@^2.1.3:
-  version "2.1.3"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
-  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+ms@^2.1.1, ms@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
 msgpackr-extract@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-2.2.0.tgz"
@@ -846,13 +886,6 @@ standard-as-callback@^2.1.0:
   resolved "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz"
   integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
@@ -862,6 +895,13 @@ string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
@@ -869,6 +909,11 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
+
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
@@ -926,6 +971,15 @@ triple-beam@^1.3.0:
   resolved "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz"
   integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
 
+tsconfig-paths@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
+  integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
+  dependencies:
+    json5 "^2.2.2"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
 tslib@^2.5.0:
   version "2.5.0"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"
@@ -976,7 +1030,6 @@ uuid@^9.0.0:
 
 virtual-drive@../../../node-win:
   version "1.0.1"
-  resolved "file:../../../node-win"
   dependencies:
     tsconfig-paths "^4.2.0"
 
diff --git a/src/apps/renderer/pages/ProcessIssues/ReportModal.tsx b/src/apps/renderer/pages/ProcessIssues/ReportModal.tsx
index f2bd9d7cc..ab421c785 100644
--- a/src/apps/renderer/pages/ProcessIssues/ReportModal.tsx
+++ b/src/apps/renderer/pages/ProcessIssues/ReportModal.tsx
@@ -37,12 +37,12 @@ export function ReportModal({
   const [includeLogs, setIncludeLogs] = useState(true);
   const [userComment, setUserComment] = useState('');
 
-  const dialogTitle = data
-    ? translate(shortMessages[data.errorName])
-    : undefined;
-  const errorDescription = data
-    ? translate(longMessages[data.errorName])
-    : undefined;
+
+  //@ts-ignore
+  const dialogTitle = data ? translate(shortMessages[data.errorName]) : undefined;
+
+  //@ts-ignore
+  const errorDescription = data ? translate(longMessages[data.errorName]) : undefined;
 
   const handleOpenURL = async (URL: string) => {
     try {
diff --git a/src/apps/sync-engine/BindingManager.ts b/src/apps/sync-engine/BindingManager.ts
index 2274a94aa..88914f7f9 100644
--- a/src/apps/sync-engine/BindingManager.ts
+++ b/src/apps/sync-engine/BindingManager.ts
@@ -135,6 +135,8 @@ export class BindingsManager {
               resolve(true);
             }, 500);
           });
+
+          fs.unlinkSync(path);
         } catch (error) {
           Logger.error(error);
           callback(false, '');
diff --git a/src/context/virtual-drive/contents/application/ContentsDownloader.ts b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
index a9cc1cfd5..e45e8bfc2 100644
--- a/src/context/virtual-drive/contents/application/ContentsDownloader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
@@ -47,10 +47,6 @@ export class ContentsDownloader {
     downloader.on('progress', async () => {
       const result = await cb(true, filePath);
       const hydrationProgress = result.progress;
-      Logger.debug(
-        '\n\n******************************************hydrationProgress : \n\n',
-        hydrationProgress
-      );
 
       if (result.finished) {
         downloader.forceStop();
@@ -81,7 +77,6 @@ export class ContentsDownloader {
     });
 
     downloader.on('finish', () => {
-      Logger.error('INSIDE FINISH=======================');
       // The file download being finished does not mean it has been hidratated
       // TODO: We might want to track this time instead of the whole completion time
     });

From f7ff1a012ef4f70e754c09b119a149372587c67d Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Thu, 16 Nov 2023 17:12:18 -0500
Subject: [PATCH 045/188] add icon path

---
 src/apps/sync-engine/index.ts | 3 ++-
 src/apps/utils/icon.ts        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/apps/sync-engine/index.ts b/src/apps/sync-engine/index.ts
index bc2b6ce25..c5ea70358 100644
--- a/src/apps/sync-engine/index.ts
+++ b/src/apps/sync-engine/index.ts
@@ -4,6 +4,7 @@ import { DependencyContainerFactory } from './dependency-injection/DependencyCon
 import packageJson from '../../../package.json';
 import { BindingsManager } from './BindingManager';
 import fs from 'fs/promises';
+import { iconPath } from '../utils/icon';
 
 async function ensureTheFolderExist(path: string) {
   try {
@@ -28,7 +29,7 @@ async function setUp() {
 
   const bindings = new BindingsManager(container, {
     root: virtualDrivePath,
-    icon: '',
+    icon: iconPath,
   });
 
   ipcRenderer.on('STOP_SYNC_ENGINE_PROCESS', async (event) => {
diff --git a/src/apps/utils/icon.ts b/src/apps/utils/icon.ts
index c45ba2c2b..c98b9cf47 100644
--- a/src/apps/utils/icon.ts
+++ b/src/apps/utils/icon.ts
@@ -2,5 +2,5 @@ import path from 'path';
 
 export const iconPath =
   process.env.NODE_ENV === 'development'
-    ? path.join(__dirname, '../../../../../assets', 'icon.ico')
+    ? path.join(__dirname, '../../../../assets', 'icon.ico')
     : path.join(process.resourcesPath, 'assets', 'icon.ico');

From 5d33ae3e0f326709deb7190599bcabc233d00f39 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Fri, 17 Nov 2023 17:52:41 +0100
Subject: [PATCH 046/188] wip

---
 ...onmentRemoteFileContentsManagersFactory.ts |  2 +-
 .../infrastructure/FSLocalFileProvider.ts     | 40 +++++++++++++++++--
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts b/src/context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
index 0bca52526..621cc0e70 100644
--- a/src/context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
+++ b/src/context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
@@ -31,7 +31,7 @@ export class EnvironmentRemoteFileContentsManagersFactory
     const fn =
       contents.size >
       EnvironmentRemoteFileContentsManagersFactory.MULTIPART_UPLOAD_SIZE_THRESHOLD
-        ? this.environment.uploadMultipartFile
+        ? this.environment.uploadMultipartFile.bind(this.environment)
         : this.environment.upload;
 
     return new EnvironmentContentFileUploader(fn, this.bucket, abortSignal);
diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileProvider.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileProvider.ts
index d9be2ff50..279f8b71d 100644
--- a/src/context/virtual-drive/contents/infrastructure/FSLocalFileProvider.ts
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileProvider.ts
@@ -16,18 +16,49 @@ function extractNameAndExtension(nameWithExtension: string): [string, string] {
 }
 
 export class FSLocalFileProvider implements LocalContentsProvider {
+  private static readonly TIMEOUT_BUSY_CHECK = 10_000;
   private reading = new Map<string, AbortController>();
 
-  private createAbortableStream(filePath: string): {
+  private async untilIsNotBusy(filePath: string): Promise<void> {
+    const readable = createReadStream(filePath);
+
+    return new Promise((resolve, reject) => {
+      readable.on('error', async (err: NodeJS.ErrnoException) => {
+        if (err.code === 'EBUSY') {
+          Logger.debug(
+            `File is busy, will wait ${FSLocalFileProvider.TIMEOUT_BUSY_CHECK} ms and try it again`
+          );
+
+          await new Promise((next) => {
+            setTimeout(next, FSLocalFileProvider.TIMEOUT_BUSY_CHECK);
+          });
+
+          readable.read();
+        }
+      });
+
+      readable.on('data', () => {
+        Logger.debug('data!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+        readable.close();
+        resolve();
+      });
+
+      readable.read();
+    });
+  }
+
+  private async createAbortableStream(filePath: string): Promise<{
     readable: Readable;
     controller: AbortController;
-  } {
+  }> {
     const isBeingRead = this.reading.get(filePath);
 
     if (isBeingRead) {
       isBeingRead.abort();
     }
 
+    await this.untilIsNotBusy(filePath);
+
     const readStream = createReadStream(filePath);
 
     const controller = new AbortController();
@@ -38,8 +69,9 @@ export class FSLocalFileProvider implements LocalContentsProvider {
   }
 
   async provide(absoluteFilePath: string) {
-    const { readable, controller } =
-      this.createAbortableStream(absoluteFilePath);
+    const { readable, controller } = await this.createAbortableStream(
+      absoluteFilePath
+    );
 
     const { size, mtimeMs, birthtimeMs } = await fs.stat(absoluteFilePath);
 

From 9ea82457ebee6e1df6d54632ed996e35be4fca76 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 20 Nov 2023 10:59:04 +0100
Subject: [PATCH 047/188] wip

---
 package.json                                  |   4 +-
 src/apps/fuse/FuseApp.ts                      | 245 +++++++++++++
 src/apps/fuse/callbacks/Callback.ts           |   3 +
 src/apps/fuse/callbacks/Getattr.ts            |  29 ++
 src/apps/fuse/callbacks/Open.ts               |  33 ++
 src/apps/fuse/callbacks/Readdir.ts            |  28 ++
 .../DependencyContainer.ts                    |  10 +
 .../DependencyContainerFactory.ts             |  45 +++
 .../dependency-injection/common/clients.ts    |  18 +
 .../fuse/dependency-injection/common/crypt.ts |   0
 .../dependency-injection/common/eventBus.ts   |  24 ++
 .../common/eventRepository.ts                 |  16 +
 .../common/localRootFolderPath.ts             |  15 +
 .../dependency-injection/common/mnemonic.ts   |  20 +
 .../fuse/dependency-injection/common/sdk.ts   |  35 ++
 .../dependency-injection/common/traverser.ts  |  21 ++
 .../fuse/dependency-injection/common/user.ts  |  20 +
 .../common/virtualDrive.ts                    |  20 +
 .../contents/ContentsContainer.ts             |   5 +
 .../dependency-injection/contents/builder.ts  |  41 +++
 .../files/FilesContainer.ts                   |   7 +
 .../dependency-injection/files/builder.ts     |  30 ++
 .../folders/FoldersContainer.ts               |   9 +
 .../dependency-injection/folders/builder.ts   |  32 ++
 .../tree/TreeContainer.ts                     |   5 +
 .../fuse/dependency-injection/tree/builder.ts |  32 ++
 src/apps/fuse/index.ts                        |  78 ++++
 src/apps/fuse/ipcRendererFuse.ts              |   7 +
 .../main/background-processes/sync-engine.ts  | 342 +-----------------
 src/apps/shared/HttpClient/HttpClient.ts      |  26 +-
 src/apps/sync-engine/BindingManager.ts        | 244 +++++++++----
 .../dependency-injection/items/builder.ts     |   6 +-
 .../DownloadContentsToPlainFile.ts            |  31 ++
 .../application/FileCreatorFromServerFile.ts  |   1 +
 .../application/FilesByFolderPathSearcher.ts  |  18 +
 .../files/application/FilesSearcher.ts        |  12 +
 .../virtual-drive/files/domain/File.ts        |  10 +
 .../files/domain/FileRepository.ts            |   2 +
 .../infrastructure/InMemoryFileRepository.ts  |  20 +
 .../folders/application/FolderSearcher.ts     |  12 +
 .../FoldersByParentPathNameLister.ts          |  20 +
 .../folders/domain/FolderRepository.ts        |   2 +
 .../InMemoryFolderRepository.ts               |  16 +
 .../items/application/TreeBuilder.ts          |   2 +-
 .../items/domain/RemoteItemsGenerator.ts      |   6 +
 .../IpcRemoteItemsGenerator.ts}               |   3 +-
 .../SQLiteRemoteItemsGenerator.ts             |  51 +++
 tests/apps/fuse/file2.txt                     |   1 +
 tests/apps/fuse/test.sh                       |  26 ++
 .../files/__mocks__/FileRepositoryMock.ts     |   4 +
 .../files/application/FileCreator.test.ts     |   2 +-
 .../virtual-drive/files/domain/FileMother.ts  |   7 +
 .../folders/__mocks__/FolderRepositoryMock.ts |   5 +
 yarn.lock                                     |   7 +-
 54 files changed, 1266 insertions(+), 442 deletions(-)
 create mode 100644 src/apps/fuse/FuseApp.ts
 create mode 100644 src/apps/fuse/callbacks/Callback.ts
 create mode 100644 src/apps/fuse/callbacks/Getattr.ts
 create mode 100644 src/apps/fuse/callbacks/Open.ts
 create mode 100644 src/apps/fuse/callbacks/Readdir.ts
 create mode 100644 src/apps/fuse/dependency-injection/DependencyContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/DependencyContainerFactory.ts
 create mode 100644 src/apps/fuse/dependency-injection/common/clients.ts
 create mode 100644 src/apps/fuse/dependency-injection/common/crypt.ts
 create mode 100644 src/apps/fuse/dependency-injection/common/eventBus.ts
 create mode 100644 src/apps/fuse/dependency-injection/common/eventRepository.ts
 create mode 100644 src/apps/fuse/dependency-injection/common/localRootFolderPath.ts
 create mode 100644 src/apps/fuse/dependency-injection/common/mnemonic.ts
 create mode 100644 src/apps/fuse/dependency-injection/common/sdk.ts
 create mode 100644 src/apps/fuse/dependency-injection/common/traverser.ts
 create mode 100644 src/apps/fuse/dependency-injection/common/user.ts
 create mode 100644 src/apps/fuse/dependency-injection/common/virtualDrive.ts
 create mode 100644 src/apps/fuse/dependency-injection/contents/ContentsContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/contents/builder.ts
 create mode 100644 src/apps/fuse/dependency-injection/files/FilesContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/files/builder.ts
 create mode 100644 src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/folders/builder.ts
 create mode 100644 src/apps/fuse/dependency-injection/tree/TreeContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/tree/builder.ts
 create mode 100644 src/apps/fuse/index.ts
 create mode 100644 src/apps/fuse/ipcRendererFuse.ts
 create mode 100644 src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
 create mode 100644 src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts
 create mode 100644 src/context/virtual-drive/files/application/FilesSearcher.ts
 create mode 100644 src/context/virtual-drive/folders/application/FolderSearcher.ts
 create mode 100644 src/context/virtual-drive/folders/application/FoldersByParentPathNameLister.ts
 create mode 100644 src/context/virtual-drive/items/domain/RemoteItemsGenerator.ts
 rename src/context/virtual-drive/items/{application/RemoteItemsGenerator.ts => infrastructure/IpcRemoteItemsGenerator.ts} (92%)
 create mode 100644 src/context/virtual-drive/items/infrastructure/SQLiteRemoteItemsGenerator.ts
 create mode 100644 tests/apps/fuse/file2.txt
 create mode 100755 tests/apps/fuse/test.sh

diff --git a/package.json b/package.json
index 43e984b35..742e74576 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "publish": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish always",
     "postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts && opencollective-postinstall",
     "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:renderer",
-    "start:main": "cross-env NODE_ENV=development electron -r ts-node/register/transpile-only ./src/main/main.ts",
+    "start:main": "cross-env NODE_ENV=development electron -r ts-node/register/transpile-only ./src/apps/main/main.ts",
     "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
     "start:sync": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync.ts",
     "start:sync-engine": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync-engine.ts",
@@ -251,7 +251,7 @@
     "ts-jest": "^27.1.2",
     "ts-loader": "^9.2.6",
     "ts-node": "^10.4.0",
-    "typescript": "^4.5.4",
+    "typescript": "^5.2.2",
     "url-loader": "^4.1.1",
     "webpack": "^5.73.0",
     "webpack-bundle-analyzer": "^4.5.0",
diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
new file mode 100644
index 000000000..de42d65f3
--- /dev/null
+++ b/src/apps/fuse/FuseApp.ts
@@ -0,0 +1,245 @@
+import fs, { unlink } from 'fs';
+import _path from 'path';
+import Logger from 'electron-log';
+import { DependencyContainer } from './dependency-injection/DependencyContainer';
+import { Readdir } from './callbacks/Readdir';
+import { Getattr } from './callbacks/Getattr';
+import { Open } from './callbacks/Open';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const fuse = require('@gcas/fuse');
+
+export class FuseApp {
+  private files: Record<string, any>;
+  private folders: Record<string, any>;
+
+  private _fuse: any;
+
+  constructor(
+    private readonly container: DependencyContainer,
+    private readonly paths: {
+      root: string;
+      local: string;
+    }
+  ) {
+    this.files = {};
+    this.folders = {};
+  }
+
+  private getOpt() {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const Chance = require('chance');
+    const chance = new Chance();
+
+    const renameFile = async (src: string, dest: string) => {
+      const srcFile = this.files[src];
+
+      const destFile = { ...srcFile };
+
+      delete this.files[src];
+      this.files[dest] = destFile;
+
+      const oldPath = _path.join(this.paths.local, src);
+      const newPath = _path.join(this.paths.local, dest);
+
+      fs.renameSync(oldPath, newPath);
+    };
+
+    const renameFolder = async (src: string, dest: string) => {
+      const srcFolder = this.folders[src];
+
+      const destFolder = { ...srcFolder };
+
+      delete this.folders[src];
+      this.folders[dest] = destFolder;
+
+      const oldPath = _path.join(this.paths.local, src);
+      const newPath = _path.join(this.paths.local, dest);
+
+      fs.renameSync(oldPath, newPath);
+    };
+
+    const readdir = new Readdir(this.container);
+    const getattr = new Getattr(this.container);
+    const open = new Open(this.container);
+
+    return {
+      listxattr: (path: string, cb: (err: number, list?: string[]) => void) => {
+        cb(0, []);
+      },
+      getxattr: (
+        path: string,
+        name: string,
+        size: number,
+        cb: (err: number, data: Buffer) => void
+      ) => {
+        Logger.debug('GETXATTR', path, name, size, cb);
+        const buff = Buffer.from('in sync');
+        cb(0, buff);
+      },
+      getattr: getattr.execute.bind(getattr),
+      readdir: readdir.execute.bind(readdir),
+      open: open.execute.bind(open),
+      read: (
+        path: string,
+        fd: any,
+        buf: Buffer,
+        len: number,
+        pos: number,
+        cb: (code: number, params?: any) => void
+      ) => {
+        Logger.debug(`READ ${path}`);
+        const fullPath = _path.join(this.paths.local, path);
+
+        fs.readFile(fullPath, (err, data) => {
+          if (err) {
+            console.error(`Error reading file: ${err}`);
+            cb(fuse.ENOENT); // Indicate an error code, e.g., if the file doesn't exist
+            return;
+          }
+
+          // Convert the data to a Buffer
+          const dataBuffer = Buffer.from(data);
+
+          // Determine the number of bytes to read based on the length and position
+          const bytesRead = Math.min(dataBuffer.length - pos, len);
+
+          // Copy the data to the provided buffer
+          dataBuffer.copy(buf, 0, pos, pos + bytesRead);
+
+          cb(bytesRead); // Indicate the number of bytes read
+        });
+      },
+      rename: async (src: string, dest: string, cb: any) => {
+        Logger.debug(`RENAME ${src} -> ${dest}`);
+        // ALSO HANDLES THE MOVE ACTION
+        if (this.files[src] !== undefined) {
+          await renameFile(src, dest);
+          cb(0);
+        }
+
+        if (this.folders[src] !== undefined) {
+          await renameFolder(src, dest);
+          cb(0);
+        }
+
+        return cb(fuse.ENOENT);
+      },
+      create: async (path: string, mode: number, cb: any) => {
+        Logger.debug(`CREATE ${path}`);
+        this.files[path] = {
+          uid: chance.integer({ min: 100 }),
+          gid: chance.integer({ min: 100 }),
+          mode: 33188,
+        };
+
+        cb(0);
+      },
+      write: (
+        path: string,
+        fd: string,
+        buffer: Buffer,
+        len: number,
+        pos: number,
+        cb: any
+      ) => {
+        Logger.debug(`WRITE ${path}`);
+        const fullPath = _path.join(this.paths.local, path);
+        fs.open(fullPath, 'w', (err, fileDescriptor) => {
+          if (err) {
+            console.error(`Error opening file for writing: ${err}`);
+            cb(fuse.ENOENT); // Indicate an error code, e.g., if the file doesn't exist
+            return;
+          }
+
+          // Create a Buffer from the incoming data
+          const dataBuffer = Buffer.from(buffer.slice(0, len));
+
+          // Write data to the file at the specified position
+          fs.write(fileDescriptor, dataBuffer, 0, len, pos, (writeErr) => {
+            if (writeErr) {
+              console.error(`Error writing to file: ${writeErr}`);
+              cb(fuse.EIO); // Indicate an error code, e.g., EIO for I/O error
+            } else {
+              cb(len); // Indicate success by returning the number of bytes written
+            }
+
+            // Close the file
+            fs.close(fileDescriptor, () => {
+              if (writeErr) {
+                console.error(`Error closing file: ${writeErr}`);
+              }
+            });
+          });
+        });
+      },
+      mkdir: async (path: string, mode: number, cb: any) => {
+        Logger.debug(`MKDIR ${path}`);
+        this.folders[path] = {
+          uid: 123401,
+          gid: 123401,
+          mode: 16877,
+        };
+
+        Logger.debug('Folder created:', path);
+
+        fs.mkdirSync(_path.join(this.paths.local, path));
+
+        cb(0);
+      },
+      release: function (
+        readPath: string,
+        fd: number,
+        cb: (status: number) => void
+      ): void {
+        Logger.debug(`RELEASE ${readPath}`);
+        cb(0);
+      },
+      unlink: (path: string, cb: (code: number) => void) => {
+        Logger.debug(`UNLINK ${path}`);
+        delete this.files[path];
+
+        unlink(_path.join(this.paths.local, path), (err) => {
+          if (err) {
+            Logger.error('ERROR DELETING FILE', err);
+            return cb(fuse.EIO);
+          }
+
+          cb(0);
+        });
+      },
+      rmdir: (path: string, cb: (code: number) => void) => {
+        Logger.debug(`RMDIR ${path}`);
+        delete this.folders[path];
+
+        fs.rmdirSync(_path.join(this.paths.local, path));
+
+        cb(0);
+      },
+    };
+  }
+
+  async start(): Promise<void> {
+    const ops = this.getOpt();
+
+    this._fuse = new fuse(this.paths.root, ops, {
+      debug: false,
+      mkdir: true,
+      force: true,
+    });
+
+    this._fuse.mount((err: any) => {
+      if (err) {
+        Logger.error(`FUSE mount error: ${err}`);
+      }
+    });
+  }
+
+  async stop(): Promise<void> {
+    this._fuse?.unmount((err: any) => {
+      if (err) {
+        Logger.error(`FUSE unmount error: ${err}`);
+      }
+    });
+  }
+}
diff --git a/src/apps/fuse/callbacks/Callback.ts b/src/apps/fuse/callbacks/Callback.ts
new file mode 100644
index 000000000..7fa018ed3
--- /dev/null
+++ b/src/apps/fuse/callbacks/Callback.ts
@@ -0,0 +1,3 @@
+export type Callback = (code: number, params?: any) => void;
+
+export type TypedCallback<T> = (code: number, params?: T) => void;
diff --git a/src/apps/fuse/callbacks/Getattr.ts b/src/apps/fuse/callbacks/Getattr.ts
new file mode 100644
index 000000000..4916c3fae
--- /dev/null
+++ b/src/apps/fuse/callbacks/Getattr.ts
@@ -0,0 +1,29 @@
+import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { Callback } from './Callback';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const fuse = require('@gcas/fuse');
+
+export class Getattr {
+  constructor(private readonly container: DependencyContainer) {}
+
+  async execute(path: string, cb: Callback): Promise<void> {
+    if (path === '/') {
+      return cb(0, { mode: 16877, size: 0 });
+    }
+
+    const file = await this.container.filesSearcher.run({ path });
+
+    if (file) {
+      return cb(0, { mode: 33188, size: file.size });
+    }
+
+    const folder = await this.container.folderSearcher.run({ path });
+
+    if (folder) {
+      return cb(0, { mode: 16877, size: 0 });
+    }
+
+    cb(fuse.ENOENT);
+  }
+}
diff --git a/src/apps/fuse/callbacks/Open.ts b/src/apps/fuse/callbacks/Open.ts
new file mode 100644
index 000000000..07b9eff3c
--- /dev/null
+++ b/src/apps/fuse/callbacks/Open.ts
@@ -0,0 +1,33 @@
+import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { Callback } from './Callback';
+import Logger from 'electron-log';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const fuse = require('@gcas/fuse');
+
+export class Open {
+  constructor(private readonly container: DependencyContainer) {}
+
+  async execute(path: string, _flags: Array<any>, cb: Callback): Promise<void> {
+    Logger.debug('OPEN ', path);
+    const file = await this.container.filesSearcher.run({ path });
+
+    if (!file) {
+      return cb(fuse.ENOENT);
+    }
+
+    Logger.debug(path, ' FOUNDED', file.contentsId);
+
+    try {
+      Logger.info('[FUSE] Starting the download of ', path);
+
+      await this.container.downloadContentsToPlainFile.run(file);
+
+      Logger.info('[FUSE] Download ended ', path);
+      cb(0, file.id);
+    } catch (err: unknown) {
+      Logger.error('[FUSE] Error downloading file: ', err);
+      cb(fuse.EIO);
+    }
+  }
+}
diff --git a/src/apps/fuse/callbacks/Readdir.ts b/src/apps/fuse/callbacks/Readdir.ts
new file mode 100644
index 000000000..7c2515d69
--- /dev/null
+++ b/src/apps/fuse/callbacks/Readdir.ts
@@ -0,0 +1,28 @@
+import Logger from 'electron-log';
+import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { TypedCallback } from './Callback';
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const fuse = require('@gcas/fuse');
+
+export class Readdir {
+  constructor(private readonly container: DependencyContainer) {}
+
+  async execute(path: string, cb: TypedCallback<Array<string>>): Promise<void> {
+    try {
+      const files = await this.container.filesByFolderPathNameLister.run(path);
+
+      const fileNames = files.map((file) => file.nameWithExtension);
+
+      const folders = await this.container.foldersByParentPathSearcher.run(
+        path
+      );
+
+      const foldersNames = folders.map((folder) => folder.name);
+
+      cb(0, ['.', '..', ...fileNames, ...foldersNames]);
+    } catch (error) {
+      Logger.error('FUSE READDIR ', error);
+      cb(fuse.ENOENT);
+    }
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/DependencyContainer.ts b/src/apps/fuse/dependency-injection/DependencyContainer.ts
new file mode 100644
index 000000000..30f2d98ee
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/DependencyContainer.ts
@@ -0,0 +1,10 @@
+import { ContentsContainer } from './contents/ContentsContainer';
+import { FilesContainer } from './files/FilesContainer';
+import { FoldersContainer } from './folders/FoldersContainer';
+import { TreeContainer } from './tree/TreeContainer';
+
+export interface DependencyContainer
+  extends TreeContainer,
+    FilesContainer,
+    FoldersContainer,
+    ContentsContainer {}
diff --git a/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts b/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts
new file mode 100644
index 000000000..f02879a8b
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts
@@ -0,0 +1,45 @@
+import { DependencyContainer } from './DependencyContainer';
+import { buildContentsContainer } from './contents/builder';
+import { buildFilesContainer } from './files/builder';
+import { buildFoldersContainer } from './folders/builder';
+import { buildTreeContainer } from './tree/builder';
+
+export class DependencyContainerFactory {
+  private static _container: DependencyContainer | undefined;
+
+  static readonly subscribers: Array<keyof DependencyContainer> = [];
+
+  eventSubscribers(
+    key: keyof DependencyContainer
+  ): DependencyContainer[keyof DependencyContainer] | undefined {
+    if (!DependencyContainerFactory._container) return undefined;
+
+    return DependencyContainerFactory._container[key];
+  }
+
+  async build(): Promise<DependencyContainer> {
+    if (DependencyContainerFactory._container !== undefined) {
+      return DependencyContainerFactory._container;
+    }
+
+    const treeContainer = buildTreeContainer();
+
+    const tree = await treeContainer.existingNodesTreeBuilder.run();
+
+    const folderContainer = await buildFoldersContainer(tree.folders);
+    const filesContainer = await buildFilesContainer(
+      tree.files,
+      folderContainer
+    );
+    const contentsContainer = await buildContentsContainer();
+
+    const container = {
+      ...treeContainer,
+      ...folderContainer,
+      ...filesContainer,
+      ...contentsContainer,
+    };
+
+    return container;
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/common/clients.ts b/src/apps/fuse/dependency-injection/common/clients.ts
new file mode 100644
index 000000000..61d2b7f88
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/common/clients.ts
@@ -0,0 +1,18 @@
+import { AuthorizedClients } from '../../../shared/HttpClient/Clients';
+import { getClients } from '../../../shared/HttpClient/background-process-clients';
+
+export class DependencyInjectionHttpClientsProvider {
+  private static clients: AuthorizedClients;
+
+  static get(): AuthorizedClients {
+    if (DependencyInjectionHttpClientsProvider.clients) {
+      return DependencyInjectionHttpClientsProvider.clients;
+    }
+
+    const clients = getClients();
+
+    DependencyInjectionHttpClientsProvider.clients = clients;
+
+    return clients;
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/common/crypt.ts b/src/apps/fuse/dependency-injection/common/crypt.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/apps/fuse/dependency-injection/common/eventBus.ts b/src/apps/fuse/dependency-injection/common/eventBus.ts
new file mode 100644
index 000000000..4958886ca
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/common/eventBus.ts
@@ -0,0 +1,24 @@
+import { EventBus } from '../../../../context/virtual-drive/shared/domain/EventBus';
+import { EventRecorder } from '../../../../context/virtual-drive/shared/infrastructure/EventRecorder';
+import { NodeJsEventBus } from '../../../../context/virtual-drive/shared/infrastructure/NodeJsEventBus';
+import { DependencyInjectionEventRepository } from './eventRepository';
+
+export class DependencyInjectionEventBus {
+  private static _bus: EventBus;
+
+  static get bus(): EventBus {
+    if (DependencyInjectionEventBus._bus) {
+      return DependencyInjectionEventBus._bus;
+    }
+
+    const eventBus = new NodeJsEventBus();
+
+    const eventHistory = DependencyInjectionEventRepository.get();
+
+    const bus = new EventRecorder(eventHistory, eventBus);
+
+    DependencyInjectionEventBus._bus = bus;
+
+    return DependencyInjectionEventBus._bus;
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/common/eventRepository.ts b/src/apps/fuse/dependency-injection/common/eventRepository.ts
new file mode 100644
index 000000000..485237051
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/common/eventRepository.ts
@@ -0,0 +1,16 @@
+import { EventRepository } from '../../../../context/virtual-drive/shared/domain/EventRepository';
+import { InMemoryEventRepository } from '../../../../context/virtual-drive/shared/infrastructure/InMemoryEventHistory';
+
+export class DependencyInjectionEventRepository {
+  private static history: EventRepository;
+
+  static get(): EventRepository {
+    if (DependencyInjectionEventRepository.history) {
+      return DependencyInjectionEventRepository.history;
+    }
+
+    DependencyInjectionEventRepository.history = new InMemoryEventRepository();
+
+    return DependencyInjectionEventRepository.history;
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/common/localRootFolderPath.ts b/src/apps/fuse/dependency-injection/common/localRootFolderPath.ts
new file mode 100644
index 000000000..c8f34a324
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/common/localRootFolderPath.ts
@@ -0,0 +1,15 @@
+import configStore from '../../../main/config';
+
+export class DependencyInjectionLocalRootFolderPath {
+  private static path: string;
+
+  static get(): string {
+    if (DependencyInjectionLocalRootFolderPath.path) {
+      return DependencyInjectionLocalRootFolderPath.path;
+    }
+
+    DependencyInjectionLocalRootFolderPath.path = configStore.get('syncRoot');
+
+    return DependencyInjectionLocalRootFolderPath.path;
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/common/mnemonic.ts b/src/apps/fuse/dependency-injection/common/mnemonic.ts
new file mode 100644
index 000000000..24100430b
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/common/mnemonic.ts
@@ -0,0 +1,20 @@
+import configStore from '../../../main/config';
+
+export class DependencyInjectionMnemonicProvider {
+  private static _: string;
+
+  static get() {
+    if (DependencyInjectionMnemonicProvider._) {
+      return DependencyInjectionMnemonicProvider._;
+    }
+
+    const mnemonic = configStore.get('mnemonic');
+
+    if (mnemonic) {
+      DependencyInjectionMnemonicProvider._ = mnemonic;
+      return mnemonic;
+    }
+
+    throw new Error('Could not get mnemonic in dependency injection');
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/common/sdk.ts b/src/apps/fuse/dependency-injection/common/sdk.ts
new file mode 100644
index 000000000..84437b858
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/common/sdk.ts
@@ -0,0 +1,35 @@
+import { Storage } from '@internxt/sdk/dist/drive/storage';
+import { ipcRenderer } from 'electron';
+import { onUserUnauthorized } from '../../../shared/HttpClient/background-process-clients';
+import packageJson from '../../../../../package.json';
+
+export class DependencyInjectionStorageSdk {
+  private static sdk: Storage;
+
+  static async get(): Promise<any> {
+    if (DependencyInjectionStorageSdk.sdk) {
+      return DependencyInjectionStorageSdk.sdk;
+    }
+
+    const url = `${process.env.API_URL}/api`;
+    const { name: clientName, version: clientVersion } = packageJson;
+
+    const token = await ipcRenderer.invoke('get-token');
+
+    const sdk = Storage.client(
+      url,
+      {
+        clientName,
+        clientVersion,
+      },
+      {
+        token,
+        unauthorizedCallback: onUserUnauthorized,
+      }
+    );
+
+    DependencyInjectionStorageSdk.sdk = sdk;
+
+    return DependencyInjectionStorageSdk.sdk;
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/common/traverser.ts b/src/apps/fuse/dependency-injection/common/traverser.ts
new file mode 100644
index 000000000..b25de6491
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/common/traverser.ts
@@ -0,0 +1,21 @@
+import crypt from '../../../../context/shared/infrastructure/crypt';
+import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
+import { DependencyInjectionUserProvider } from './user';
+
+export class DependencyInjectionTraverserProvider {
+  private static traverser: Traverser;
+
+  static get(): Traverser {
+    if (DependencyInjectionTraverserProvider.traverser) {
+      return DependencyInjectionTraverserProvider.traverser;
+    }
+
+    const user = DependencyInjectionUserProvider.get();
+
+    const traverser = Traverser.existingItems(crypt, user.root_folder_id);
+
+    DependencyInjectionTraverserProvider.traverser = traverser;
+
+    return traverser;
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/common/user.ts b/src/apps/fuse/dependency-injection/common/user.ts
new file mode 100644
index 000000000..fddca6487
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/common/user.ts
@@ -0,0 +1,20 @@
+import { getUser } from '../../../main/auth/service';
+import { User } from '../../../main/types';
+
+export class DependencyInjectionUserProvider {
+  private static _user: User;
+
+  static get() {
+    if (DependencyInjectionUserProvider._user)
+      return DependencyInjectionUserProvider._user;
+
+    const user = getUser();
+
+    if (user) {
+      DependencyInjectionUserProvider._user = user;
+      return user;
+    }
+
+    throw new Error('Could not get user in dependency injection');
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/common/virtualDrive.ts b/src/apps/fuse/dependency-injection/common/virtualDrive.ts
new file mode 100644
index 000000000..e74b97645
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/common/virtualDrive.ts
@@ -0,0 +1,20 @@
+import { VirtualDrive } from 'virtual-drive/dist';
+import { DependencyInjectionLocalRootFolderPath } from './localRootFolderPath';
+
+export class DependencyInjectionVirtualDrive {
+  private static _vd: VirtualDrive;
+
+  static get virtualDrive(): VirtualDrive {
+    if (DependencyInjectionVirtualDrive._vd) {
+      return DependencyInjectionVirtualDrive._vd;
+    }
+
+    const root = DependencyInjectionLocalRootFolderPath.get();
+
+    const vd = new VirtualDrive(root);
+
+    DependencyInjectionVirtualDrive._vd = vd;
+
+    return DependencyInjectionVirtualDrive._vd;
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/contents/ContentsContainer.ts b/src/apps/fuse/dependency-injection/contents/ContentsContainer.ts
new file mode 100644
index 000000000..ce302ba79
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/contents/ContentsContainer.ts
@@ -0,0 +1,5 @@
+import { DownloadContentsToPlainFile } from '../../../../context/virtual-drive/contents/application/DownloadContentsToPlainFile';
+
+export interface ContentsContainer {
+  downloadContentsToPlainFile: DownloadContentsToPlainFile;
+}
diff --git a/src/apps/fuse/dependency-injection/contents/builder.ts b/src/apps/fuse/dependency-injection/contents/builder.ts
new file mode 100644
index 000000000..2e901cb39
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/contents/builder.ts
@@ -0,0 +1,41 @@
+import { Environment } from '@internxt/inxt-js';
+import { DownloadContentsToPlainFile } from '../../../../context/virtual-drive/contents/application/DownloadContentsToPlainFile';
+import { ContentsContainer } from './ContentsContainer';
+import { DependencyInjectionUserProvider } from '../common/user';
+import { DependencyInjectionMnemonicProvider } from '../common/mnemonic';
+import { EnvironmentRemoteFileContentsManagersFactory } from '../../../../context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
+import { FSLocalFileWriter } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileWriter';
+import { app } from 'electron';
+import { DependencyInjectionEventBus } from '../common/eventBus';
+
+export async function buildContentsContainer(): Promise<ContentsContainer> {
+  const user = DependencyInjectionUserProvider.get();
+  const mnemonic = DependencyInjectionMnemonicProvider.get();
+  const { bus: eventBus } = DependencyInjectionEventBus;
+
+  const environment = new Environment({
+    bridgeUrl: process.env.BRIDGE_URL,
+    bridgeUser: user.bridgeUser,
+    bridgePass: user.userId,
+    encryptionKey: mnemonic,
+  });
+
+  const contentsManagerFactory =
+    new EnvironmentRemoteFileContentsManagersFactory(environment, user.bucket);
+
+  const temporalFolderProvider = () => {
+    return Promise.resolve(app.getPath('temp'));
+  };
+
+  const localWriter = new FSLocalFileWriter(temporalFolderProvider);
+
+  const downloadContentsToPlainFile = new DownloadContentsToPlainFile(
+    contentsManagerFactory,
+    localWriter,
+    eventBus
+  );
+
+  return {
+    downloadContentsToPlainFile,
+  };
+}
diff --git a/src/apps/fuse/dependency-injection/files/FilesContainer.ts b/src/apps/fuse/dependency-injection/files/FilesContainer.ts
new file mode 100644
index 000000000..f45310bee
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/files/FilesContainer.ts
@@ -0,0 +1,7 @@
+import { FilesSearcher } from '../../../../context/virtual-drive/files/application/FilesSearcher';
+import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
+
+export interface FilesContainer {
+  filesByFolderPathNameLister: FilesByFolderPathSearcher;
+  filesSearcher: FilesSearcher;
+}
diff --git a/src/apps/fuse/dependency-injection/files/builder.ts b/src/apps/fuse/dependency-injection/files/builder.ts
new file mode 100644
index 000000000..ff222e458
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/files/builder.ts
@@ -0,0 +1,30 @@
+import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
+import { FilesSearcher } from '../../../../context/virtual-drive/files/application/FilesSearcher';
+import { RepositoryPopulator } from '../../../../context/virtual-drive/files/application/RepositoryPopulator';
+import { File } from '../../../../context/virtual-drive/files/domain/File';
+import { InMemoryFileRepository } from '../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
+import { FoldersContainer } from '../folders/FoldersContainer';
+import { FilesContainer } from './FilesContainer';
+
+export async function buildFilesContainer(
+  initialFiles: Array<File>,
+  folderContainer: FoldersContainer
+): Promise<FilesContainer> {
+  const repository = new InMemoryFileRepository();
+
+  const repositoryPopulator = new RepositoryPopulator(repository);
+
+  await repositoryPopulator.run(initialFiles);
+
+  const filesByFolderPathNameLister = new FilesByFolderPathSearcher(
+    repository,
+    folderContainer.folderFinder
+  );
+
+  const filesSearcher = new FilesSearcher(repository);
+
+  return {
+    filesByFolderPathNameLister,
+    filesSearcher,
+  };
+}
diff --git a/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts b/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
new file mode 100644
index 000000000..a87567c8e
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
@@ -0,0 +1,9 @@
+import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
+import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
+import { FoldersByParentPathSearcher } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
+
+export interface FoldersContainer {
+  folderFinder: FolderFinder;
+  folderSearcher: FolderSearcher;
+  foldersByParentPathSearcher: FoldersByParentPathSearcher;
+}
diff --git a/src/apps/fuse/dependency-injection/folders/builder.ts b/src/apps/fuse/dependency-injection/folders/builder.ts
new file mode 100644
index 000000000..130dff0d0
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/folders/builder.ts
@@ -0,0 +1,32 @@
+import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
+import { FolderRepositoryInitiator } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
+import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
+import { FoldersByParentPathSearcher } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
+import { Folder } from '../../../../context/virtual-drive/folders/domain/Folder';
+import { InMemoryFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
+import { FoldersContainer } from './FoldersContainer';
+
+export async function buildFoldersContainer(
+  initialFolders: Array<Folder>
+): Promise<FoldersContainer> {
+  const repository = new InMemoryFolderRepository();
+
+  const folderRepositoryInitiator = new FolderRepositoryInitiator(repository);
+
+  await folderRepositoryInitiator.run(initialFolders);
+
+  const folderFinder = new FolderFinder(repository);
+
+  const folderSearcher = new FolderSearcher(repository);
+
+  const foldersByParentPathSearcher = new FoldersByParentPathSearcher(
+    folderFinder,
+    repository
+  );
+
+  return {
+    folderFinder,
+    folderSearcher,
+    foldersByParentPathSearcher,
+  };
+}
diff --git a/src/apps/fuse/dependency-injection/tree/TreeContainer.ts b/src/apps/fuse/dependency-injection/tree/TreeContainer.ts
new file mode 100644
index 000000000..599d00b4e
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/tree/TreeContainer.ts
@@ -0,0 +1,5 @@
+import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
+
+export interface TreeContainer {
+  existingNodesTreeBuilder: TreeBuilder;
+}
diff --git a/src/apps/fuse/dependency-injection/tree/builder.ts b/src/apps/fuse/dependency-injection/tree/builder.ts
new file mode 100644
index 000000000..018c5a2be
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/tree/builder.ts
@@ -0,0 +1,32 @@
+import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
+import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
+import { CryptoJsNameDecrypt } from '../../../../context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt';
+import { getUser } from '../../../main/auth/service';
+import { TreeContainer } from './TreeContainer';
+import { SQLiteRemoteItemsGenerator } from '../../../../context/virtual-drive/items/infrastructure/SQLiteRemoteItemsGenerator';
+
+export function buildTreeContainer(): TreeContainer {
+  const user = getUser();
+
+  if (!user) {
+    throw new Error('Could not get user when building Items dependencies');
+  }
+
+  const remoteItemsGenerator = new SQLiteRemoteItemsGenerator();
+
+  const nameDecryptor = new CryptoJsNameDecrypt();
+
+  const existingItemsTraverser = Traverser.existingItems(
+    nameDecryptor,
+    user.root_folder_id
+  );
+
+  const existingNodesTreeBuilder = new TreeBuilder(
+    remoteItemsGenerator,
+    existingItemsTraverser
+  );
+
+  return {
+    existingNodesTreeBuilder,
+  };
+}
diff --git a/src/apps/fuse/index.ts b/src/apps/fuse/index.ts
new file mode 100644
index 000000000..2dd85a5a7
--- /dev/null
+++ b/src/apps/fuse/index.ts
@@ -0,0 +1,78 @@
+import Logger from 'electron-log';
+
+import fs, { unlink } from 'fs';
+import _path from 'path';
+import { app } from 'electron';
+import { getRootVirtualDrive } from '../main/virutal-root-folder/service';
+import eventBus from '../main/event-bus';
+import { FuseApp } from './FuseApp';
+import { DependencyContainerFactory } from './dependency-injection/DependencyContainerFactory';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+// const fuse = require('@cocalc/fuse-native');
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+// const fuse = require('@gcas/fuse');
+
+// let _fuse: {
+//   unmount(arg0: (err: any) => void): unknown;
+//   mount: (arg0: (err: any) => void) => void;
+// };
+
+const temp = app.getPath('temp');
+
+const tempFolder = _path.join(temp, 'internxt');
+
+let fuseApp: FuseApp;
+
+async function spawnSyncEngineWorker() {
+  await new Promise<void>((resolve) =>
+    fs.stat(tempFolder, (err) => {
+      if (err) {
+        fs.mkdirSync(tempFolder);
+      }
+      resolve();
+    })
+  );
+
+  const root = getRootVirtualDrive();
+
+  Logger.debug('ROOT FOLDER: ', root);
+
+  const containerFactory = new DependencyContainerFactory();
+
+  const container = await containerFactory.build();
+
+  fuseApp = new FuseApp(container, { root, local: tempFolder });
+
+  await fuseApp.start();
+
+  // fuse.isConfigured((err: Error | null, isConfigured: boolean) => {
+  //   if (err) {
+  //     Logger.error('FUSE ERROR: ', err);
+  //   }
+
+  //   Logger.info(`FUSE is configured: ${isConfigured}`);
+
+  //   if (!isConfigured) {
+  //     fuse.configure((...params: any[]) => {
+  //       Logger.debug(`FUSE configure cb params: ${{ params }}`);
+  //     });
+  //   }
+  // });
+}
+
+export async function stopSyncEngineWatcher() {
+  await fuseApp.stop();
+}
+
+async function stopAndClearSyncEngineWatcher() {
+  stopSyncEngineWatcher();
+}
+
+export function updateSyncEngine() {
+  // no op
+}
+
+eventBus.on('USER_LOGGED_OUT', stopAndClearSyncEngineWatcher);
+eventBus.on('USER_WAS_UNAUTHORIZED', stopAndClearSyncEngineWatcher);
+eventBus.on('INITIAL_SYNC_READY', spawnSyncEngineWorker);
diff --git a/src/apps/fuse/ipcRendererFuse.ts b/src/apps/fuse/ipcRendererFuse.ts
new file mode 100644
index 000000000..5ac455415
--- /dev/null
+++ b/src/apps/fuse/ipcRendererFuse.ts
@@ -0,0 +1,7 @@
+import { CustomIpc } from '../shared/IPC/IPCs';
+import { FromProcess, FromMain } from '../shared/IPC/events/sync-engine';
+import { ipcRenderer } from 'electron';
+
+export type FuseIpc = CustomIpc<FromProcess, FromMain>;
+
+export const ipcRenderFuse = ipcRenderer as unknown as FuseIpc;
diff --git a/src/apps/main/background-processes/sync-engine.ts b/src/apps/main/background-processes/sync-engine.ts
index 8a5d8b40c..bc9be2e7f 100644
--- a/src/apps/main/background-processes/sync-engine.ts
+++ b/src/apps/main/background-processes/sync-engine.ts
@@ -1,341 +1 @@
-import Logger from 'electron-log';
-import eventBus from '../event-bus';
-import { getRootVirtualDrive } from '../virutal-root-folder/service';
-import fs, { unlink } from 'fs';
-import _path from 'path';
-import { app } from 'electron';
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-// const fuse = require('@cocalc/fuse-native');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fuse = require('@gcas/fuse');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Chance = require('chance');
-
-let _fuse: {
-  unmount(arg0: (err: any) => void): unknown;
-  mount: (arg0: (err: any) => void) => void;
-};
-
-const temp = app.getPath('temp');
-
-const tempFolder = _path.join(temp, 'InternxtDrive');
-
-const files: Record<string, any> = {};
-
-const folders: Record<string, any> = {};
-
-const chance = new Chance();
-
-async function spawnSyncEngineWorker() {
-  await new Promise<void>((resolve) =>
-    fs.stat(tempFolder, (err) => {
-      if (err) {
-        fs.mkdirSync(tempFolder);
-      }
-      resolve();
-    })
-  );
-
-  const renameFile = async (src: string, dest: string) => {
-    const srcFile = files[src];
-
-    const destFile = { ...srcFile };
-
-    delete files[src];
-    files[dest] = destFile;
-
-    const oldPath = _path.join(tempFolder, src);
-    const newPath = _path.join(tempFolder, dest);
-
-    fs.renameSync(oldPath, newPath);
-  };
-
-  const renameFolder = async (src: string, dest: string) => {
-    const srcFolder = folders[src];
-
-    const destFolder = { ...srcFolder };
-
-    delete folders[src];
-    folders[dest] = destFolder;
-
-    const oldPath = _path.join(tempFolder, src);
-    const newPath = _path.join(tempFolder, dest);
-
-    fs.renameSync(oldPath, newPath);
-  };
-
-  const ops = {
-    listxattr: (path: string, cb: (err: number, list?: string[]) => void) => {
-      cb(0, ['sync_status', 'b']);
-    },
-    getxattr: (
-      path: string,
-      name: string,
-      size: number,
-      cb: (err: number, data: Buffer) => void
-    ) => {
-      Logger.debug('GETXATTR', path, name, size, cb);
-      const buff = Buffer.from('in sync');
-      cb(0, buff);
-    },
-    getattr: (path: string, cb: (code: number, params?: any) => void) => {
-      Logger.debug(`GETATTR ${path}`);
-      if (path === '/') {
-        cb(0, { mode: 16877, size: 0 });
-      } else if (files[path] !== undefined) {
-        const file = files[path];
-
-        const getSize = () => {
-          try {
-            const { size } = fs.statSync(_path.join(tempFolder, path));
-            return size;
-          } catch {
-            return 0;
-          }
-        };
-
-        const size = getSize();
-
-        return process.nextTick(cb, 0, {
-          ...file,
-          size,
-          sync_status: 'online',
-        });
-      } else if (folders[path]) {
-        return cb(0, { ...folders[path], sync_status: 'online' });
-      } else {
-        cb(fuse.ENOENT);
-      }
-    },
-    readdir: (path: string, cb: (code: number, params?: any) => void) => {
-      Logger.debug(`READDIR ${path}`);
-      if (path === '/') {
-        const filesNames = Object.keys(files)
-          .filter((f) => {
-            return f.includes('f', 1);
-          })
-          .map((n) => n.split('/')[-1]);
-        const foldersNames = Object.keys(folders)
-          .filter((f) => !f.startsWith('/.Trash-'))
-          .map((n) => n.split('/').join(''));
-        cb(0, ['.', '..', ...filesNames, ...foldersNames]);
-      } else {
-        const isFolder = Object.keys(folders).includes(path);
-
-        if (!isFolder) {
-          return cb(fuse.ENOENT);
-        }
-
-        const filesNames = Object.keys(files)
-          .filter((f) => {
-            return f.includes(_path.dirname(path));
-          })
-          .map((f) => {
-            return _path.basename(f);
-          });
-
-        const foldersNames = Object.keys(folders)
-          .filter((f) => {
-            return f.includes(_path.dirname(path));
-          })
-          .map((f) => {
-            return _path.basename(f);
-          });
-
-        cb(0, ['.', '..', ...filesNames, ...foldersNames]);
-      }
-    },
-    open: (path: string, flags, cb: (code: number, params?: any) => void) => {
-      Logger.debug(`OPEN ${path}`);
-      const file = files[path];
-
-      if (!file) {
-        return cb(fuse.ENOENT);
-      }
-
-      cb(0, file.uid);
-    },
-    read: (
-      path: string,
-      fd: any,
-      buf: Buffer,
-      len: number,
-      pos: number,
-      cb: (code: number, params?: any) => void
-    ) => {
-      Logger.debug(`READ ${path}`);
-      const fullPath = _path.join(tempFolder, path);
-      fs.readFile(fullPath, (err, data) => {
-        if (err) {
-          console.error(`Error reading file: ${err}`);
-          cb(fuse.ENOENT); // Indicate an error code, e.g., if the file doesn't exist
-          return;
-        }
-
-        // Convert the data to a Buffer
-        const dataBuffer = Buffer.from(data);
-
-        // Determine the number of bytes to read based on the length and position
-        const bytesRead = Math.min(dataBuffer.length - pos, len);
-
-        // Copy the data to the provided buffer
-        dataBuffer.copy(buf, 0, pos, pos + bytesRead);
-
-        cb(bytesRead); // Indicate the number of bytes read
-      });
-    },
-    rename: async (src: string, dest: string, cb: any) => {
-      Logger.debug(`RENAME ${src} -> ${dest}`);
-      // ALSO HANDLES THE MOVE ACTION
-      if (files[src] !== undefined) {
-        await renameFile(src, dest);
-        cb(0);
-      }
-
-      if (folders[src] !== undefined) {
-        await renameFolder(src, dest);
-        cb(0);
-      }
-
-      return cb(fuse.ENOENT);
-    },
-    create: async (path: string, mode: number, cb: any) => {
-      Logger.debug(`CREATE ${path}`);
-      files[path] = {
-        uid: chance.integer({ min: 100 }),
-        gid: chance.integer({ min: 100 }),
-        mode: 33188,
-      };
-
-      cb(0);
-    },
-    write: (
-      path: string,
-      fd: string,
-      buffer: Buffer,
-      len: number,
-      pos: number,
-      cb: any
-    ) => {
-      Logger.debug(`WRITE ${path}`);
-      const fullPath = _path.join(tempFolder, path);
-      fs.open(fullPath, 'w', (err, fileDescriptor) => {
-        if (err) {
-          console.error(`Error opening file for writing: ${err}`);
-          cb(fuse.ENOENT); // Indicate an error code, e.g., if the file doesn't exist
-          return;
-        }
-
-        // Create a Buffer from the incoming data
-        const dataBuffer = Buffer.from(buffer.slice(0, len));
-
-        // Write data to the file at the specified position
-        fs.write(fileDescriptor, dataBuffer, 0, len, pos, (writeErr) => {
-          if (writeErr) {
-            console.error(`Error writing to file: ${writeErr}`);
-            cb(fuse.EIO); // Indicate an error code, e.g., EIO for I/O error
-          } else {
-            cb(len); // Indicate success by returning the number of bytes written
-          }
-
-          // Close the file
-          fs.close(fileDescriptor, () => {
-            if (writeErr) {
-              console.error(`Error closing file: ${writeErr}`);
-            }
-          });
-        });
-      });
-    },
-    mkdir: async (path: string, mode: number, cb: any) => {
-      Logger.debug(`MKDIR ${path}`);
-      folders[path] = {
-        uid: 123401,
-        gid: 123401,
-        mode: 16877,
-      };
-
-      fs.mkdirSync(_path.join(tempFolder, path));
-
-      cb(0);
-    },
-    release: function (
-      readPath: string,
-      fd: number,
-      cb: (status: number) => void
-    ): void {
-      Logger.debug(`RELEASE ${readPath}`);
-      cb(0);
-    },
-    unlink: (path: string, cb: (code: number) => void) => {
-      Logger.debug(`UNLINK ${path}`);
-      delete files[path];
-
-      unlink(_path.join(tempFolder, path), (err) => {
-        if (err) {
-          Logger.error('ERROR DELETING FILE', err);
-          return cb(fuse.EIO);
-        }
-
-        cb(0);
-      });
-    },
-    rmdir: (path: string, cb: (code: number) => void) => {
-      Logger.debug(`RMDIR ${path}`);
-      delete folders[path];
-
-      fs.rmdirSync(_path.join(tempFolder, path));
-
-      cb(0);
-    },
-  };
-
-  const root = getRootVirtualDrive();
-
-  Logger.debug('ROOT FOLDER: ', root);
-
-  _fuse = new fuse(root, ops, {
-    debug: true,
-    mkdir: true,
-    force: true,
-  });
-
-  _fuse.mount((err: any) => {
-    if (err) {
-      Logger.error(`FUSE mount error: ${err}`);
-    }
-  });
-
-  // fuse.isConfigured((err: Error | null, isConfigured: boolean) => {
-  //   if (err) {
-  //     Logger.error('FUSE ERROR: ', err);
-  //   }
-
-  //   Logger.info(`FUSE is configured: ${isConfigured}`);
-
-  //   if (!isConfigured) {
-  //     fuse.configure((...params: any[]) => {
-  //       Logger.debug(`FUSE configure cb params: ${{ params }}`);
-  //     });
-  //   }
-  // });
-}
-
-export async function stopSyncEngineWatcher() {
-  _fuse?.unmount((err: any) => {
-    if (err) {
-      Logger.error(`FUSE unmount error: ${err}`);
-    }
-  });
-}
-
-async function stopAndClearSyncEngineWatcher() {
-  stopSyncEngineWatcher();
-}
-
-export function updateSyncEngine() {}
-
-eventBus.on('USER_LOGGED_OUT', stopAndClearSyncEngineWatcher);
-eventBus.on('USER_WAS_UNAUTHORIZED', stopAndClearSyncEngineWatcher);
-eventBus.on('INITIAL_SYNC_READY', spawnSyncEngineWorker);
+import '../../fuse';
diff --git a/src/apps/shared/HttpClient/HttpClient.ts b/src/apps/shared/HttpClient/HttpClient.ts
index 75150cfbe..ed0361dc9 100644
--- a/src/apps/shared/HttpClient/HttpClient.ts
+++ b/src/apps/shared/HttpClient/HttpClient.ts
@@ -12,6 +12,19 @@ export type UnauthorizedNotifier = () => void;
 export class AuthorizedHttpClient {
   public readonly client: AxiosInstance;
 
+  constructor(
+    private headersProvider: HeadersProvider,
+    private unauthorizedNotifier: UnauthorizedNotifier
+  ) {
+    this.client = axios.create();
+
+    this.client.interceptors.request.use(this.addApplicationHeaders.bind(this));
+
+    this.client.interceptors.response.use((response: AxiosResponse) => {
+      return response;
+    }, this.handleUnauthorizedResponse.bind(this));
+  }
+
   private handleUnauthorizedResponse(error: AxiosError) {
     if (error?.response?.status === 401) {
       Logger.warn('[AUTH] Request unauthorized');
@@ -30,17 +43,4 @@ export class AuthorizedHttpClient {
 
     return config;
   }
-
-  constructor(
-    private headersProvider: HeadersProvider,
-    private unauthorizedNotifier: UnauthorizedNotifier
-  ) {
-    this.client = axios.create();
-
-    this.client.interceptors.request.use(this.addApplicationHeaders.bind(this));
-
-    this.client.interceptors.response.use((response: AxiosResponse) => {
-      return response;
-    }, this.handleUnauthorizedResponse.bind(this));
-  }
 }
diff --git a/src/apps/sync-engine/BindingManager.ts b/src/apps/sync-engine/BindingManager.ts
index fa4919092..5a33533d1 100644
--- a/src/apps/sync-engine/BindingManager.ts
+++ b/src/apps/sync-engine/BindingManager.ts
@@ -8,6 +8,7 @@ import { buildControllers } from './callbacks-controllers/buildControllers';
 import { executeControllerWithFallback } from './callbacks-controllers/middlewares/executeControllerWithFallback';
 import { DependencyContainer } from './dependency-injection/DependencyContainer';
 import { ipcRendererSyncEngine } from './ipcRendererSyncEngine';
+import { ProcessIssue } from '../shared/types';
 
 export type CallbackDownload = (
   success: boolean,
@@ -15,10 +16,9 @@ export type CallbackDownload = (
 ) => Promise<{ finished: boolean; progress: number }>;
 export class BindingsManager {
   private static readonly PROVIDER_NAME = 'Internxt';
-
-  private fuse: any | null = null;
-
+  private progressBuffer = 0;
   constructor(
+    private readonly container: DependencyContainer,
     private readonly paths: {
       root: string;
       icon: string;
@@ -36,94 +36,183 @@ export class BindingsManager {
   }
 
   async start(version: string, providerId: string) {
-    const fuse = require('fuse-native');
-    const ops = {
-      getattr: (path: string, cb: (code: number, params?: any) => void) => {
-        if (path === '/') {
-          cb(0, { mode: 16877, size: 0 });
-        } else if (path === '/hello.txt') {
-          cb(0, { mode: 33188, size: 12 });
-        } else {
-          cb(Fuse.ENOENT);
-        }
+    await this.stop();
+
+    const controllers = buildControllers(this.container);
+
+    const callbacks = {
+      notifyDeleteCallback: (
+        contentsId: string,
+        callback: (response: boolean) => void
+      ) => {
+        controllers.delete
+          .execute(contentsId)
+          .then(() => {
+            callback(true);
+          })
+          .catch((error: Error) => {
+            Logger.error(error);
+            callback(false);
+          });
       },
-      readdir: (path: string, cb: (code: number, params?: any) => void) => {
-        if (path === '/') {
-          cb(0, ['.', '..', 'hello.txt']);
-        } else {
-          cb(Fuse.ENOENT);
-        }
+      notifyDeleteCompletionCallback: () => {
+        Logger.info('Deletion completed');
       },
-      open: (path: string, flags, cb: (code: number, params?: any) => void) => {
-        if (path === '/hello.txt') {
-          cb(0, 123); // Use a unique file descriptor (123 in this example)
-        } else {
-          cb(Fuse.ENOENT);
-        }
+      notifyRenameCallback: (
+        absolutePath: string,
+        contentsId: string,
+        callback: (response: boolean) => void
+      ) => {
+        const fn = executeControllerWithFallback({
+          handler: controllers.renameOrMove.execute.bind(
+            controllers.renameOrMove
+          ),
+          fallback: controllers.offline.renameOrMove.execute.bind(
+            controllers.offline.renameOrMove
+          ),
+        });
+        fn(absolutePath, contentsId, callback);
+      },
+      notifyFileAddedCallback: (
+        absolutePath: string,
+        callback: (acknowledge: boolean, id: string) => boolean
+      ) => {
+        controllers.addFile.execute(absolutePath, callback);
       },
-      read: (
-        path: string,
-        fd,
-        buf,
-        len,
-        pos,
-        cb: (code: number, params?: any) => void
+      fetchDataCallback: async (
+        contentsId: FilePlaceholderId,
+        callback: CallbackDownload
       ) => {
-        if (path === '/hello.txt') {
-          const data = Buffer.from('Hello, FUSE!');
-          if (pos >= data.length) {
-            cb(0);
-          } else {
-            const slice = data.slice(pos, pos + len);
-            slice.copy(buf);
-            cb(slice.length);
+        try {
+          const path = await controllers.downloadFile.execute(
+            contentsId,
+            callback
+          );
+          Logger.debug('Execute Fetch Data Callback, sending path:', path);
+          const file = controllers.downloadFile.fileFinderByContentsId(
+            contentsId
+              .replace(
+                // eslint-disable-next-line no-control-regex
+                /[\x00-\x1F\x7F-\x9F]/g,
+                ''
+              )
+              .split(':')[1]
+          );
+          let finished = false;
+          while (!finished) {
+            const result = await callback(true, path);
+            finished = result.finished;
+            if (this.progressBuffer == result.progress) {
+              break;
+            } else {
+              this.progressBuffer = result.progress;
+            }
+            Logger.debug('condition', finished);
+            ipcRendererSyncEngine.send('FILE_DOWNLOADING', {
+              name: file.name,
+              extension: file.type,
+              nameWithExtension: file.nameWithExtension,
+              size: file.size,
+              processInfo: {
+                elapsedTime: 0,
+                progress: result.progress,
+              },
+            });
+          }
+
+          this.progressBuffer = 0;
+          try {
+            await controllers.notifyPlaceholderHydrationFinished.execute(
+              contentsId
+            );
+          } catch (error) {
+            Logger.error('notify: ', error);
           }
-        } else {
-          cb(Fuse.ENOENT);
+
+          // Esperar hasta que la ejecución de fetchDataCallback esté completa antes de continuar
+          await new Promise((resolve) => {
+            setTimeout(() => {
+              Logger.debug('timeout');
+              resolve(true);
+            }, 500);
+          });
+
+          fs.unlinkSync(path);
+        } catch (error) {
+          Logger.error(error);
+          callback(false, '');
         }
       },
-      release: function (
-        readPath: string,
-        fd: number,
-        cb: (status: number) => void
-      ): void {
-        throw new Error('Function not implemented.');
+      notifyMessageCallback: (
+        message: string,
+        action: ProcessIssue['action'],
+        errorName: ProcessIssue['errorName'],
+        callback: (response: boolean) => void
+      ) => {
+        try {
+          callback(true);
+          ipcRendererSyncEngine.send('SYNC_INFO_UPDATE', {
+            name: message,
+            action: action,
+            errorName,
+            process: 'SYNC',
+            kind: 'LOCAL',
+          });
+        } catch (error) {
+          Logger.error(error);
+          callback(false);
+        }
+      },
+      validateDataCallback: () => {
+        Logger.debug('validateDataCallback');
+      },
+      cancelFetchDataCallback: () => {
+        Logger.debug('cancelFetchDataCallback');
+      },
+      fetchPlaceholdersCallback: () => {
+        Logger.debug('fetchPlaceholdersCallback');
+      },
+      cancelFetchPlaceholdersCallback: () => {
+        Logger.debug('cancelFetchPlaceholdersCallback');
+      },
+      notifyFileOpenCompletionCallback: () => {
+        Logger.debug('notifyFileOpenCompletionCallback');
+      },
+      notifyFileCloseCompletionCallback: () => {
+        Logger.debug('notifyFileCloseCompletionCallback');
+      },
+      notifyDehydrateCallback: () => {
+        Logger.debug('notifyDehydrateCallback');
+      },
+      notifyDehydrateCompletionCallback: () => {
+        Logger.debug('notifyDehydrateCompletionCallback');
+      },
+      notifyRenameCompletionCallback: () => {
+        Logger.debug('notifyRenameCompletionCallback');
+      },
+      noneCallback: () => {
+        Logger.debug('noneCallback');
       },
     };
-    // this.fuse = new fuse(this.paths.root, ops, { debug: true });
-    // this.fuse.mount((err: any) => {
-    //   if (err) {
-    //     Logger.error(`FUSE mount error: ${err}`);
-    //   }
-    // });
-
-    Logger.debug('FUSE: ', { fuse });
-
-<<<<<<< HEAD:src/workers/sync-engine/BindingManager.ts
-    fuse.isConfigured((isConfigured: boolean) => {
-      Logger.info(`FUSE is configured: ${isConfigured}`);
-
-      if (!isConfigured) {
-        fuse.configure((...params: any[]) => {
-          Logger.debug(`FUSE configure cb params: ${{ params }}`);
-        });
-      }
-    });
-=======
+
+    await this.container.virtualDrive.registerSyncRoot(
+      BindingsManager.PROVIDER_NAME,
+      version,
+      providerId,
+      callbacks,
+      this.paths.icon
+    );
+
     await this.container.virtualDrive.connectSyncRoot();
 
     await this.load();
->>>>>>> windows:src/apps/sync-engine/BindingManager.ts
   }
 
-  watch() {}
+  watch() {
+    this.container.virtualDrive.watchAndWait(this.paths.root);
+  }
 
   async stop() {
-<<<<<<< HEAD:src/workers/sync-engine/BindingManager.ts
-    this.fuse?.unmount((err: any) => {
-      if (err) {
-        Logger.error(`FUSE unmount error: ${err}`);
-=======
     await this.container.virtualDrive.disconnectSyncRoot();
   }
 
@@ -178,14 +267,10 @@ export class BindingsManager {
         fs.rmdirSync(item, { recursive: true });
       } catch (error) {
         Logger.error(error);
->>>>>>> windows:src/apps/sync-engine/BindingManager.ts
       }
     });
   }
 
-<<<<<<< HEAD:src/workers/sync-engine/BindingManager.ts
-  async cleanUp() {}
-=======
   async update() {
     Logger.info('[SYNC ENGINE]: Updating placeholders');
 
@@ -198,5 +283,4 @@ export class BindingsManager {
       Logger.error('[SYNC ENGINE] ', error);
     }
   }
->>>>>>> windows:src/apps/sync-engine/BindingManager.ts
 }
diff --git a/src/apps/sync-engine/dependency-injection/items/builder.ts b/src/apps/sync-engine/dependency-injection/items/builder.ts
index c6f66a759..430a77a4b 100644
--- a/src/apps/sync-engine/dependency-injection/items/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/items/builder.ts
@@ -1,4 +1,4 @@
-import { RemoteItemsGenerator } from '../../../../context/virtual-drive/items/application/RemoteItemsGenerator';
+import { IpcRemoteItemsGenerator } from '../../../../context/virtual-drive/items/infrastructure/IpcRemoteItemsGenerator';
 import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
 import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
 import { CryptoJsNameDecrypt } from '../../../../context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt';
@@ -13,7 +13,9 @@ export function buildItemsContainer(): ItemsContainer {
     throw new Error('Could not get user when building Items dependencies');
   }
 
-  const remoteItemsGenerator = new RemoteItemsGenerator(ipcRendererSyncEngine);
+  const remoteItemsGenerator = new IpcRemoteItemsGenerator(
+    ipcRendererSyncEngine
+  );
 
   const nameDecryptor = new CryptoJsNameDecrypt();
 
diff --git a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
new file mode 100644
index 000000000..340dc3065
--- /dev/null
+++ b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
@@ -0,0 +1,31 @@
+import { File } from '../../files/domain/File';
+import { EventBus } from '../../shared/domain/EventBus';
+import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
+import { LocalFileContents } from '../domain/LocalFileContents';
+import { LocalFileWriter } from '../domain/LocalFileWriter';
+
+export class DownloadContentsToPlainFile {
+  constructor(
+    private readonly managerFactory: ContentsManagersFactory,
+    private readonly localWriter: LocalFileWriter,
+    private readonly eventBus: EventBus
+  ) {}
+
+  async run(file: File): Promise<string> {
+    const downloader = this.managerFactory.downloader();
+
+    const readable = await downloader.download(file);
+    const localContents = LocalFileContents.downloadedFrom(
+      file,
+      readable,
+      downloader.elapsedTime()
+    );
+
+    const write = await this.localWriter.write(localContents);
+
+    const events = localContents.pullDomainEvents();
+    await this.eventBus.publish(events);
+
+    return write;
+  }
+}
diff --git a/src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts b/src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts
index 454a71441..5978d1970 100644
--- a/src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts
+++ b/src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts
@@ -6,6 +6,7 @@ export function createFileFromServerFile(
   relativePath: string
 ): File {
   return File.from({
+    id: server.id,
     folderId: server.folderId,
     contentsId: server.fileId,
     modificationTime: server.modificationTime,
diff --git a/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts b/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts
new file mode 100644
index 000000000..c4ca13a5f
--- /dev/null
+++ b/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts
@@ -0,0 +1,18 @@
+import { FolderFinder } from '../../folders/application/FolderFinder';
+import { File } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+
+export class FilesByFolderPathSearcher {
+  constructor(
+    private readonly repository: FileRepository,
+    private readonly folderFinder: FolderFinder
+  ) {}
+
+  async run(folderPath: string): Promise<Array<File>> {
+    const folder = this.folderFinder.run(folderPath);
+
+    const files = await this.repository.listByPartial({ folderId: folder.id });
+
+    return files;
+  }
+}
diff --git a/src/context/virtual-drive/files/application/FilesSearcher.ts b/src/context/virtual-drive/files/application/FilesSearcher.ts
new file mode 100644
index 000000000..42f9f5f64
--- /dev/null
+++ b/src/context/virtual-drive/files/application/FilesSearcher.ts
@@ -0,0 +1,12 @@
+import { File, FileAttributes } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+
+export class FilesSearcher {
+  constructor(private readonly repository: FileRepository) {}
+
+  async run(attributes: Partial<FileAttributes>): Promise<File | undefined> {
+    const file = this.repository.searchByPartial(attributes);
+
+    return file;
+  }
+}
diff --git a/src/context/virtual-drive/files/domain/File.ts b/src/context/virtual-drive/files/domain/File.ts
index e8f831024..e95236db2 100644
--- a/src/context/virtual-drive/files/domain/File.ts
+++ b/src/context/virtual-drive/files/domain/File.ts
@@ -15,6 +15,7 @@ import { FileRenamedDomainEvent } from './events/FileRenamedDomainEvent';
 import { FilePlaceholderId, createFilePlaceholderId } from './PlaceholderId';
 
 export type FileAttributes = {
+  id: number;
   contentsId: string;
   folderId: number;
   createdAt: string;
@@ -27,6 +28,7 @@ export type FileAttributes = {
 
 export class File extends AggregateRoot {
   private constructor(
+    private _id: number,
     private _contentsId: ContentsId,
     private _folderId: number,
     private _path: FilePath,
@@ -38,6 +40,10 @@ export class File extends AggregateRoot {
     super();
   }
 
+  public get id(): number {
+    return this._id;
+  }
+
   public get contentsId() {
     return this._contentsId.value;
   }
@@ -80,6 +86,7 @@ export class File extends AggregateRoot {
 
   static from(attributes: FileAttributes): File {
     return new File(
+      attributes.id,
       new ContentsId(attributes.contentsId),
       attributes.folderId,
       new FilePath(attributes.path),
@@ -91,12 +98,14 @@ export class File extends AggregateRoot {
   }
 
   static create(
+    id: number,
     contentsId: string,
     folder: Folder,
     size: FileSize,
     path: FilePath
   ): File {
     const file = new File(
+      id,
       new ContentsId(contentsId),
       folder.id,
       path,
@@ -185,6 +194,7 @@ export class File extends AggregateRoot {
 
   attributes(): FileAttributes {
     return {
+      id: this.id,
       contentsId: this.contentsId,
       folderId: this.folderId,
       createdAt: this.createdAt.toISOString(),
diff --git a/src/context/virtual-drive/files/domain/FileRepository.ts b/src/context/virtual-drive/files/domain/FileRepository.ts
index db12ab343..e08d455c1 100644
--- a/src/context/virtual-drive/files/domain/FileRepository.ts
+++ b/src/context/virtual-drive/files/domain/FileRepository.ts
@@ -5,6 +5,8 @@ export interface FileRepository {
 
   searchByPartial(partial: Partial<FileAttributes>): File | undefined;
 
+  listByPartial(partial: Partial<FileAttributes>): Promise<Array<File>>;
+
   delete(id: File['contentsId']): Promise<void>;
 
   add(file: File): Promise<void>;
diff --git a/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts b/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
index cc7623820..eedc59fb8 100644
--- a/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
+++ b/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
@@ -41,6 +41,26 @@ export class InMemoryFileRepository implements FileRepository {
     return undefined;
   }
 
+  listByPartial(partial: Partial<FileAttributes>): Promise<Array<File>> {
+    const keys = Object.keys(partial) as Array<keyof Partial<FileAttributes>>;
+
+    const filesAttributes = this.values.filter((attributes) => {
+      return keys.every((key: keyof FileAttributes) => {
+        if (key === 'contentsId') {
+          return (
+            attributes[key].normalize() == (partial[key] as string).normalize()
+          );
+        }
+
+        return attributes[key] == partial[key];
+      });
+    });
+
+    const files = filesAttributes.map((attributes) => File.from(attributes));
+
+    return Promise.resolve(files);
+  }
+
   async delete(id: File['contentsId']): Promise<void> {
     const deleted = this.files.delete(id);
 
diff --git a/src/context/virtual-drive/folders/application/FolderSearcher.ts b/src/context/virtual-drive/folders/application/FolderSearcher.ts
new file mode 100644
index 000000000..924a65cb1
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FolderSearcher.ts
@@ -0,0 +1,12 @@
+import { Folder, FolderAttributes } from '../domain/Folder';
+import { FolderRepository } from '../domain/FolderRepository';
+
+export class FolderSearcher {
+  constructor(private readonly repository: FolderRepository) {}
+
+  run(partial: Partial<FolderAttributes>): Promise<Folder | undefined> {
+    const folder = this.repository.searchByPartial(partial);
+
+    return Promise.resolve(folder);
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/FoldersByParentPathNameLister.ts b/src/context/virtual-drive/folders/application/FoldersByParentPathNameLister.ts
new file mode 100644
index 000000000..626454f00
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FoldersByParentPathNameLister.ts
@@ -0,0 +1,20 @@
+import { Folder } from '../domain/Folder';
+import { FolderRepository } from '../domain/FolderRepository';
+import { FolderFinder } from './FolderFinder';
+
+export class FoldersByParentPathSearcher {
+  constructor(
+    private readonly folderFinder: FolderFinder,
+    private readonly repository: FolderRepository
+  ) {}
+
+  async run(path: string): Promise<Array<Folder>> {
+    const parent = this.folderFinder.run(path);
+
+    const folders = await this.repository.listByPartial({
+      parentId: parent?.id,
+    });
+
+    return folders;
+  }
+}
diff --git a/src/context/virtual-drive/folders/domain/FolderRepository.ts b/src/context/virtual-drive/folders/domain/FolderRepository.ts
index a13870a3d..fb27c56d0 100644
--- a/src/context/virtual-drive/folders/domain/FolderRepository.ts
+++ b/src/context/virtual-drive/folders/domain/FolderRepository.ts
@@ -5,6 +5,8 @@ export interface FolderRepository {
 
   searchByPartial(partial: Partial<FolderAttributes>): Folder | undefined;
 
+  listByPartial(partial: Partial<FolderAttributes>): Promise<Array<Folder>>;
+
   add(folder: Folder): Promise<void>;
 
   delete(id: Folder['id']): Promise<void>;
diff --git a/src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts b/src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts
index 6c02495e5..e2e2c8a28 100644
--- a/src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts
+++ b/src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts
@@ -36,6 +36,22 @@ export class InMemoryFolderRepository implements FolderRepository {
     return undefined;
   }
 
+  listByPartial(partial: Partial<FolderAttributes>): Promise<Folder[]> {
+    const keys = Object.keys(partial) as Array<keyof Partial<FolderAttributes>>;
+
+    const folderAttributes = this.values.filter((attributes) => {
+      return keys.every(
+        (key: keyof FolderAttributes) => attributes[key] === partial[key]
+      );
+    });
+
+    const folders = folderAttributes.map((attributes) =>
+      Folder.from(attributes)
+    );
+
+    return Promise.resolve(folders);
+  }
+
   async add(folder: Folder): Promise<void> {
     this.folders.set(folder.id, folder.attributes());
   }
diff --git a/src/context/virtual-drive/items/application/TreeBuilder.ts b/src/context/virtual-drive/items/application/TreeBuilder.ts
index 75c1da182..494d264f2 100644
--- a/src/context/virtual-drive/items/application/TreeBuilder.ts
+++ b/src/context/virtual-drive/items/application/TreeBuilder.ts
@@ -1,5 +1,5 @@
+import { RemoteItemsGenerator } from '../domain/RemoteItemsGenerator';
 import { Tree } from '../domain/Tree';
-import { RemoteItemsGenerator } from './RemoteItemsGenerator';
 import { Traverser } from './Traverser';
 
 export class TreeBuilder {
diff --git a/src/context/virtual-drive/items/domain/RemoteItemsGenerator.ts b/src/context/virtual-drive/items/domain/RemoteItemsGenerator.ts
new file mode 100644
index 000000000..b6c718a64
--- /dev/null
+++ b/src/context/virtual-drive/items/domain/RemoteItemsGenerator.ts
@@ -0,0 +1,6 @@
+import { ServerFile } from '../../../shared/domain/ServerFile';
+import { ServerFolder } from '../../../shared/domain/ServerFolder';
+
+export interface RemoteItemsGenerator {
+  getAll(): Promise<{ files: ServerFile[]; folders: ServerFolder[] }>;
+}
diff --git a/src/context/virtual-drive/items/application/RemoteItemsGenerator.ts b/src/context/virtual-drive/items/infrastructure/IpcRemoteItemsGenerator.ts
similarity index 92%
rename from src/context/virtual-drive/items/application/RemoteItemsGenerator.ts
rename to src/context/virtual-drive/items/infrastructure/IpcRemoteItemsGenerator.ts
index fb09c825e..7c3d23d5c 100644
--- a/src/context/virtual-drive/items/application/RemoteItemsGenerator.ts
+++ b/src/context/virtual-drive/items/infrastructure/IpcRemoteItemsGenerator.ts
@@ -7,8 +7,9 @@ import {
   ServerFolder,
   ServerFolderStatus,
 } from '../../../shared/domain/ServerFolder';
+import { RemoteItemsGenerator } from '../domain/RemoteItemsGenerator';
 
-export class RemoteItemsGenerator {
+export class IpcRemoteItemsGenerator implements RemoteItemsGenerator {
   constructor(private readonly ipc: SyncEngineIpc) {}
 
   async getAll(): Promise<{ files: ServerFile[]; folders: ServerFolder[] }> {
diff --git a/src/context/virtual-drive/items/infrastructure/SQLiteRemoteItemsGenerator.ts b/src/context/virtual-drive/items/infrastructure/SQLiteRemoteItemsGenerator.ts
new file mode 100644
index 000000000..659ce2290
--- /dev/null
+++ b/src/context/virtual-drive/items/infrastructure/SQLiteRemoteItemsGenerator.ts
@@ -0,0 +1,51 @@
+import { getUpdatedRemoteItems } from '../../../../apps/main/remote-sync/handlers';
+import {
+  ServerFile,
+  ServerFileStatus,
+} from '../../../shared/domain/ServerFile';
+import {
+  ServerFolder,
+  ServerFolderStatus,
+} from '../../../shared/domain/ServerFolder';
+import { RemoteItemsGenerator } from '../domain/RemoteItemsGenerator';
+
+export class SQLiteRemoteItemsGenerator implements RemoteItemsGenerator {
+  async getAll(): Promise<{ files: ServerFile[]; folders: ServerFolder[] }> {
+    const result = await getUpdatedRemoteItems();
+
+    const files = result.files.map<ServerFile>((updatedFile) => {
+      return {
+        bucket: updatedFile.bucket,
+        createdAt: updatedFile.createdAt,
+        encrypt_version: '03-aes',
+        fileId: updatedFile.fileId,
+        folderId: updatedFile.folderId,
+        id: updatedFile.id,
+        modificationTime: updatedFile.modificationTime,
+        name: updatedFile.name,
+        plainName: updatedFile.plainName,
+        size: updatedFile.size,
+        type: updatedFile.type ?? null,
+        updatedAt: updatedFile.updatedAt,
+        userId: updatedFile.userId,
+        status: updatedFile.status as ServerFileStatus,
+      };
+    });
+
+    const folders = result.folders.map<ServerFolder>((updatedFolder) => {
+      return {
+        bucket: updatedFolder.bucket ?? null,
+        createdAt: updatedFolder.createdAt,
+        id: updatedFolder.id,
+        name: updatedFolder.name,
+        parentId: updatedFolder.parentId ?? null,
+        updatedAt: updatedFolder.updatedAt,
+        plain_name: updatedFolder.plainName ?? null,
+        status: updatedFolder.status as ServerFolderStatus,
+        uuid: updatedFolder.uuid,
+      };
+    });
+
+    return { files, folders };
+  }
+}
diff --git a/tests/apps/fuse/file2.txt b/tests/apps/fuse/file2.txt
new file mode 100644
index 000000000..d18867c07
--- /dev/null
+++ b/tests/apps/fuse/file2.txt
@@ -0,0 +1 @@
+write and rename
diff --git a/tests/apps/fuse/test.sh b/tests/apps/fuse/test.sh
new file mode 100755
index 000000000..eb9b63d4e
--- /dev/null
+++ b/tests/apps/fuse/test.sh
@@ -0,0 +1,26 @@
+cd ~/InternxtDrive;
+
+echo "write and print" > test.txt
+cat test.txt
+rm test.txt
+
+echo "write and rename" > file.txt
+mv file.txt file2.txt
+cat file2.txt
+
+mkdir test
+rmdir test
+
+
+mkdir test;
+echo lkañjdlfka > a.txt
+mv a.txt test
+
+mkdir test2;
+mv test2 test
+
+
+mkdir test3
+echo alsdkjfña > b.txt
+mv b.txt test3
+mv test3 test
diff --git a/tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts b/tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts
index dfcb8359a..519b31a89 100644
--- a/tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts
+++ b/tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts
@@ -8,6 +8,7 @@ import { FileRepository } from '../../../../../src/context/virtual-drive/files/d
 export class FileRepositoryMock implements FileRepository {
   public readonly allMock = jest.fn();
   public readonly searchByPartialMock = jest.fn();
+  public readonly listByPartialMock = jest.fn();
   public readonly deleteMock = jest.fn();
   public readonly addMock = jest.fn();
   public readonly updateMock = jest.fn();
@@ -18,6 +19,9 @@ export class FileRepositoryMock implements FileRepository {
   searchByPartial(partial: Partial<FileAttributes>): Nullable<File> {
     return this.searchByPartialMock(partial);
   }
+  listByPartial(partial: Partial<FileAttributes>): Promise<File[]> {
+    return this.listByPartialMock(partial);
+  }
   delete(id: string): Promise<void> {
     return this.deleteMock(id);
   }
diff --git a/tests/context/virtual-drive/files/application/FileCreator.test.ts b/tests/context/virtual-drive/files/application/FileCreator.test.ts
index 303f19bf8..92b3ccbc0 100644
--- a/tests/context/virtual-drive/files/application/FileCreator.test.ts
+++ b/tests/context/virtual-drive/files/application/FileCreator.test.ts
@@ -86,7 +86,7 @@ describe('File Creator', () => {
 
   it('deletes the file on remote if it already exists on the path', async () => {
     const path = new FilePath('/cat.png');
-    const existingFile = FileMother.fromPath(path.value);
+    const existingFile = FileMother.fromPartial({ path: path.value });
     const contents = FileContentsMother.random();
     const fileAttributes = FileMother.fromPartial({
       path: path.value,
diff --git a/tests/context/virtual-drive/files/domain/FileMother.ts b/tests/context/virtual-drive/files/domain/FileMother.ts
index fc60a91ac..834894883 100644
--- a/tests/context/virtual-drive/files/domain/FileMother.ts
+++ b/tests/context/virtual-drive/files/domain/FileMother.ts
@@ -3,10 +3,14 @@ import { FileStatuses } from '../../../../../src/context/virtual-drive/files/dom
 import { File } from '../../../../../src/context/virtual-drive/files/domain/File';
 import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
 import { FilePathMother } from './FilePathMother';
+import Chance from 'chance';
+
+const chance = new Chance();
 
 export class FileMother {
   static onFolderName(path: string) {
     return File.from({
+      id: chance.integer({ min: 1000 }),
       contentsId: ContentsIdMother.random().value,
       folderId: 3972,
       createdAt: new Date().toISOString(),
@@ -20,6 +24,7 @@ export class FileMother {
 
   static fromPath(path: string) {
     return File.from({
+      id: chance.integer({ min: 1000 }),
       contentsId: ContentsIdMother.random().value,
       folderId: 3972960,
       createdAt: new Date().toISOString(),
@@ -33,6 +38,7 @@ export class FileMother {
 
   static any() {
     return File.from({
+      id: chance.integer({ min: 1000 }),
       contentsId: ContentsIdMother.random().value,
       folderId: 3972960,
       createdAt: new Date().toISOString(),
@@ -46,6 +52,7 @@ export class FileMother {
 
   static fromPartial(partial: Partial<FileAttributes>) {
     return File.from({
+      id: chance.integer({ min: 1000 }),
       contentsId: ContentsIdMother.random().value,
       folderId: 3972960,
       createdAt: new Date().toISOString(),
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts
index 68827b525..c24ed74d1 100644
--- a/tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts
@@ -7,6 +7,7 @@ import { FolderRepository } from '../../../../../src/context/virtual-drive/folde
 export class FolderRepositoryMock implements FolderRepository {
   public readonly allMock = jest.fn();
   public readonly searchByPartialMock = jest.fn();
+  public readonly listByPartialMock = jest.fn();
   public readonly addMock = jest.fn();
   public readonly deleteMock = jest.fn();
   public readonly updateMock = jest.fn();
@@ -19,6 +20,10 @@ export class FolderRepositoryMock implements FolderRepository {
     return this.searchByPartialMock(partial);
   }
 
+  listByPartial(partial: Partial<FolderAttributes>): Promise<Array<Folder>> {
+    return this.listByPartialMock(partial);
+  }
+
   add(folder: Folder): Promise<void> {
     return this.addMock(folder);
   }
diff --git a/yarn.lock b/yarn.lock
index f345e2aa5..a41e5ecee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11512,11 +11512,16 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
-typescript@^4.5.2, typescript@^4.5.4:
+typescript@^4.5.2:
   version "4.9.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
   integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
+typescript@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
+  integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
+
 unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"

From 9c37bca5174fd54b70b834630fe754cf0cda47ab Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 20 Nov 2023 12:20:13 +0100
Subject: [PATCH 048/188] chore: extract local directory provider

---
 .../contents/ContentsContainer.ts                 |  4 ++--
 .../dependency-injection/contents/builder.ts      | 11 +++++++----
 .../contents/application/ContentsDownloader.ts    |  6 +++---
 .../application/temporalFolderProvider.ts         | 15 ---------------
 .../contents/infrastructure/FSLocalFileWriter.ts  |  9 +++++----
 .../application/ContentsDownloader._test.ts       |  7 +++++--
 6 files changed, 22 insertions(+), 30 deletions(-)
 delete mode 100644 src/context/virtual-drive/contents/application/temporalFolderProvider.ts

diff --git a/src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts b/src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts
index 047842c5d..8a865c17a 100644
--- a/src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts
+++ b/src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts
@@ -1,11 +1,11 @@
 import { ContentsDownloader } from '../../../../context/virtual-drive/contents/application/ContentsDownloader';
 import { NotifyMainProcessHydrationFinished } from '../../../../context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished';
 import { RetryContentsUploader } from '../../../../context/virtual-drive/contents/application/RetryContentsUploader';
-import { TemporalFolderProvider } from '../../../../context/virtual-drive/contents/application/temporalFolderProvider';
+import { LocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/contents/domain/LocalFileContentsDirectoryProvider';
 
 export interface ContentsContainer {
   contentsUploader: RetryContentsUploader;
   contentsDownloader: ContentsDownloader;
-  temporalFolderProvider: TemporalFolderProvider;
+  localFileContentsDirectoryProvider: LocalFileContentsDirectoryProvider;
   notifyMainProcessHydrationFinished: NotifyMainProcessHydrationFinished;
 }
diff --git a/src/apps/sync-engine/dependency-injection/contents/builder.ts b/src/apps/sync-engine/dependency-injection/contents/builder.ts
index e001458a3..d93e7788a 100644
--- a/src/apps/sync-engine/dependency-injection/contents/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/contents/builder.ts
@@ -9,11 +9,11 @@ import { ContentsDownloader } from '../../../../context/virtual-drive/contents/a
 import { ContentsUploader } from '../../../../context/virtual-drive/contents/application/ContentsUploader';
 import { NotifyMainProcessHydrationFinished } from '../../../../context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished';
 import { RetryContentsUploader } from '../../../../context/virtual-drive/contents/application/RetryContentsUploader';
-import { temporalFolderProvider } from '../../../../context/virtual-drive/contents/application/temporalFolderProvider';
 import { EnvironmentRemoteFileContentsManagersFactory } from '../../../../context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
 import { FSLocalFileProvider } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileProvider';
 import { FSLocalFileWriter } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileWriter';
 import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
+import { IPCLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/contents/infrastructure/IPCLocalFileContentsDirectoryProvider';
 
 export async function buildContentsContainer(
   sharedContainer: SharedContainer
@@ -43,13 +43,16 @@ export async function buildContentsContainer(
 
   const retryContentsUploader = new RetryContentsUploader(contentsUploader);
 
-  const localWriter = new FSLocalFileWriter(temporalFolderProvider);
+  const localFileContentsDirectoryProvider =
+    new IPCLocalFileContentsDirectoryProvider();
+
+  const localWriter = new FSLocalFileWriter(localFileContentsDirectoryProvider);
 
   const contentsDownloader = new ContentsDownloader(
     contentsManagerFactory,
     localWriter,
     ipcRendererSyncEngine,
-    temporalFolderProvider,
+    localFileContentsDirectoryProvider,
     eventBus
   );
 
@@ -62,7 +65,7 @@ export async function buildContentsContainer(
   return {
     contentsUploader: retryContentsUploader,
     contentsDownloader,
-    temporalFolderProvider,
+    localFileContentsDirectoryProvider,
     notifyMainProcessHydrationFinished,
   };
 }
diff --git a/src/context/virtual-drive/contents/application/ContentsDownloader.ts b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
index a9cc1cfd5..a6263f543 100644
--- a/src/context/virtual-drive/contents/application/ContentsDownloader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
@@ -10,7 +10,7 @@ import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
 import { LocalFileContents } from '../domain/LocalFileContents';
 import { LocalFileWriter } from '../domain/LocalFileWriter';
 import { ContentFileDownloader } from '../domain/contentHandlers/ContentFileDownloader';
-import { TemporalFolderProvider } from './temporalFolderProvider';
+import { LocalFileContentsDirectoryProvider } from '../domain/LocalFileContentsDirectoryProvider';
 
 export class ContentsDownloader {
   private readableDownloader: Readable | null;
@@ -18,7 +18,7 @@ export class ContentsDownloader {
     private readonly managerFactory: ContentsManagersFactory,
     private readonly localWriter: LocalFileWriter,
     private readonly ipc: SyncEngineIpc,
-    private readonly temporalFolderProvider: TemporalFolderProvider,
+    private readonly localFileContentsDirectoryProvider: LocalFileContentsDirectoryProvider,
     private readonly eventBus: EventBus
   ) {
     this.readableDownloader = null;
@@ -29,7 +29,7 @@ export class ContentsDownloader {
     file: File,
     cb: CallbackDownload
   ) {
-    const location = await this.temporalFolderProvider();
+    const location = await this.localFileContentsDirectoryProvider.provide();
     const folderPath = path.join(location, 'internxt');
     ensureFolderExists(folderPath);
     const filePath = path.join(folderPath, file.nameWithExtension);
diff --git a/src/context/virtual-drive/contents/application/temporalFolderProvider.ts b/src/context/virtual-drive/contents/application/temporalFolderProvider.ts
deleted file mode 100644
index f59cd3ccb..000000000
--- a/src/context/virtual-drive/contents/application/temporalFolderProvider.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { ipcRenderer } from 'electron';
-
-export const temporalFolderProvider = async (): Promise<string> => {
-  const temporalFilesFolder = await ipcRenderer.invoke(
-    'APP:TEMPORAL_FILES_FOLDER'
-  );
-
-  if (typeof temporalFilesFolder !== 'string') {
-    throw new Error('Temporal folder path is not a string ');
-  }
-
-  return temporalFilesFolder;
-};
-
-export type TemporalFolderProvider = typeof temporalFolderProvider;
diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
index 812f1d4b1..85c2d1220 100644
--- a/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
@@ -1,16 +1,17 @@
 import { ensureFolderExists } from '../../../../apps/shared/fs/ensure-folder-exists';
 import { WriteReadableToFile } from '../../../../apps/shared/fs/write-readable-to-file';
 import { LocalFileContents } from '../domain/LocalFileContents';
+import { LocalFileContentsDirectoryProvider } from '../domain/LocalFileContentsDirectoryProvider';
 import { LocalFileWriter } from '../domain/LocalFileWriter';
 import path from 'path';
 
-export type LocationProvider = () => Promise<string>;
-
 export class FSLocalFileWriter implements LocalFileWriter {
-  constructor(private readonly getLocation: LocationProvider) {}
+  constructor(
+    private readonly locationProvider: LocalFileContentsDirectoryProvider
+  ) {}
 
   async write(contents: LocalFileContents): Promise<string> {
-    const location = await this.getLocation();
+    const location = await this.locationProvider.provide();
 
     const folderPath = path.join(location, 'internxt');
     ensureFolderExists(folderPath);
diff --git a/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts b/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
index 10a2333ca..ea7fe61e2 100644
--- a/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
+++ b/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
@@ -1,9 +1,9 @@
 import { ContentsDownloader } from '../../../../../src/context/virtual-drive/contents/application/ContentsDownloader';
-import { temporalFolderProvider } from '../../../../../src/context/virtual-drive/contents/application/temporalFolderProvider';
 import { FileDownloadEvents } from '../../../../../src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader';
 import { FileMother } from '../../files/domain/FileMother';
 import { EventBusMock } from '../../shared/__mock__/EventBusMock';
 import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
+import { LocalFileContentsDirectoryProviderMock } from '../__mocks__/LocalFileContentsDirectoryProviderMock';
 import { LocalFileWriterMock } from '../__mocks__/LocalFileWriterMock';
 import { ReadableHelloWorld } from '../__mocks__/ReadableHelloWorld';
 import { RemoteFileContentsManagersFactoryMock } from '../__mocks__/RemoteFileContentsManagersFactoryMock';
@@ -11,6 +11,7 @@ import { RemoteFileContentsManagersFactoryMock } from '../__mocks__/RemoteFileCo
 describe.skip('Contents Downloader', () => {
   let localWriter: LocalFileWriterMock;
   let factory: RemoteFileContentsManagersFactoryMock;
+  let localFileContentsDirectoryProviderMock: LocalFileContentsDirectoryProviderMock;
   let ipc: IpcRendererSyncEngineMock;
   let eventBus: EventBusMock;
 
@@ -19,6 +20,8 @@ describe.skip('Contents Downloader', () => {
   beforeEach(() => {
     factory = new RemoteFileContentsManagersFactoryMock();
     localWriter = new LocalFileWriterMock();
+    localFileContentsDirectoryProviderMock =
+      new LocalFileContentsDirectoryProviderMock();
     ipc = new IpcRendererSyncEngineMock();
     eventBus = new EventBusMock();
 
@@ -26,7 +29,7 @@ describe.skip('Contents Downloader', () => {
       factory,
       localWriter,
       ipc,
-      temporalFolderProvider,
+      localFileContentsDirectoryProviderMock,
       eventBus
     );
   });

From 51ea1081a03c0c12c1446954d736592d5b34b0b9 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 20 Nov 2023 12:51:20 +0100
Subject: [PATCH 049/188] feat: download files

---
 src/apps/fuse/FuseApp.ts                      | 33 ++-------------
 src/apps/fuse/callbacks/Read.ts               | 42 +++++++++++++++++++
 .../DependencyContainer.ts                    |  4 +-
 .../DependencyContainerFactory.ts             |  3 ++
 .../dependency-injection/contents/builder.ts  | 12 +++---
 .../shared/SharedContainer.ts                 |  5 +++
 .../dependency-injection/shared/builder.ts    | 21 ++++++++++
 .../contents/ContentsContainer.ts             |  2 +-
 .../dependency-injection/contents/builder.ts  |  7 +++-
 .../application/ContentsDownloader.ts         |  2 +-
 .../infrastructure/FSLocalFileWriter.ts       |  7 ++--
 .../LocalFileContentsDirectoryProvider.ts     |  3 ++
 ...pDataLocalFileContentsDirectoryProvider.ts | 20 +++++++++
 .../IPCLocalFileContentsDirectoryProvider.ts  | 18 ++++++++
 .../LocalFileContentsDirectoryProviderMock.ts | 11 +++++
 15 files changed, 147 insertions(+), 43 deletions(-)
 create mode 100644 src/apps/fuse/callbacks/Read.ts
 create mode 100644 src/apps/fuse/dependency-injection/shared/SharedContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/shared/builder.ts
 create mode 100644 src/context/virtual-drive/shared/domain/LocalFileContentsDirectoryProvider.ts
 create mode 100644 src/context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider.ts
 create mode 100644 src/context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/IPCLocalFileContentsDirectoryProvider.ts
 create mode 100644 tests/context/virtual-drive/contents/__mocks__/LocalFileContentsDirectoryProviderMock.ts

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index de42d65f3..0fe806a7f 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -5,6 +5,7 @@ import { DependencyContainer } from './dependency-injection/DependencyContainer'
 import { Readdir } from './callbacks/Readdir';
 import { Getattr } from './callbacks/Getattr';
 import { Open } from './callbacks/Open';
+import { Read } from './callbacks/Read';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
@@ -62,6 +63,7 @@ export class FuseApp {
     const readdir = new Readdir(this.container);
     const getattr = new Getattr(this.container);
     const open = new Open(this.container);
+    const read = new Read(this.container);
 
     return {
       listxattr: (path: string, cb: (err: number, list?: string[]) => void) => {
@@ -80,36 +82,7 @@ export class FuseApp {
       getattr: getattr.execute.bind(getattr),
       readdir: readdir.execute.bind(readdir),
       open: open.execute.bind(open),
-      read: (
-        path: string,
-        fd: any,
-        buf: Buffer,
-        len: number,
-        pos: number,
-        cb: (code: number, params?: any) => void
-      ) => {
-        Logger.debug(`READ ${path}`);
-        const fullPath = _path.join(this.paths.local, path);
-
-        fs.readFile(fullPath, (err, data) => {
-          if (err) {
-            console.error(`Error reading file: ${err}`);
-            cb(fuse.ENOENT); // Indicate an error code, e.g., if the file doesn't exist
-            return;
-          }
-
-          // Convert the data to a Buffer
-          const dataBuffer = Buffer.from(data);
-
-          // Determine the number of bytes to read based on the length and position
-          const bytesRead = Math.min(dataBuffer.length - pos, len);
-
-          // Copy the data to the provided buffer
-          dataBuffer.copy(buf, 0, pos, pos + bytesRead);
-
-          cb(bytesRead); // Indicate the number of bytes read
-        });
-      },
+      read: read.execute.bind(read),
       rename: async (src: string, dest: string, cb: any) => {
         Logger.debug(`RENAME ${src} -> ${dest}`);
         // ALSO HANDLES THE MOVE ACTION
diff --git a/src/apps/fuse/callbacks/Read.ts b/src/apps/fuse/callbacks/Read.ts
new file mode 100644
index 000000000..98e26d800
--- /dev/null
+++ b/src/apps/fuse/callbacks/Read.ts
@@ -0,0 +1,42 @@
+import Logger from 'electron-log';
+import fs from 'fs';
+import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const fuse = require('@gcas/fuse');
+
+export class Read {
+  constructor(private readonly container: DependencyContainer) {}
+
+  async execute(
+    path: string,
+    fd: any,
+    buf: Buffer,
+    len: number,
+    pos: number,
+    cb: (code: number, params?: any) => void
+  ) {
+    Logger.debug(`READ ${path}`);
+
+    const filePath = this.container.relativePathToAbsoluteConverter.run(path);
+
+    fs.readFile(filePath, (err, data) => {
+      if (err) {
+        console.error(`Error reading file: ${err}`);
+        cb(fuse.ENOENT); // Indicate an error code, e.g., if the file doesn't exist
+        return;
+      }
+
+      // Convert the data to a Buffer
+      const dataBuffer = Buffer.from(data);
+
+      // Determine the number of bytes to read based on the length and position
+      const bytesRead = Math.min(dataBuffer.length - pos, len);
+
+      // Copy the data to the provided buffer
+      dataBuffer.copy(buf, 0, pos, pos + bytesRead);
+
+      cb(bytesRead); // Indicate the number of bytes read}
+    });
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/DependencyContainer.ts b/src/apps/fuse/dependency-injection/DependencyContainer.ts
index 30f2d98ee..65c6cbab3 100644
--- a/src/apps/fuse/dependency-injection/DependencyContainer.ts
+++ b/src/apps/fuse/dependency-injection/DependencyContainer.ts
@@ -1,10 +1,12 @@
 import { ContentsContainer } from './contents/ContentsContainer';
 import { FilesContainer } from './files/FilesContainer';
 import { FoldersContainer } from './folders/FoldersContainer';
+import { SharedContainer } from './shared/SharedContainer';
 import { TreeContainer } from './tree/TreeContainer';
 
 export interface DependencyContainer
   extends TreeContainer,
     FilesContainer,
     FoldersContainer,
-    ContentsContainer {}
+    ContentsContainer,
+    SharedContainer {}
diff --git a/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts b/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts
index f02879a8b..cfbb63326 100644
--- a/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts
+++ b/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts
@@ -2,6 +2,7 @@ import { DependencyContainer } from './DependencyContainer';
 import { buildContentsContainer } from './contents/builder';
 import { buildFilesContainer } from './files/builder';
 import { buildFoldersContainer } from './folders/builder';
+import { buildSharedContainer } from './shared/builder';
 import { buildTreeContainer } from './tree/builder';
 
 export class DependencyContainerFactory {
@@ -32,12 +33,14 @@ export class DependencyContainerFactory {
       folderContainer
     );
     const contentsContainer = await buildContentsContainer();
+    const sharedContainer = await buildSharedContainer();
 
     const container = {
       ...treeContainer,
       ...folderContainer,
       ...filesContainer,
       ...contentsContainer,
+      ...sharedContainer,
     };
 
     return container;
diff --git a/src/apps/fuse/dependency-injection/contents/builder.ts b/src/apps/fuse/dependency-injection/contents/builder.ts
index 2e901cb39..3dc57c693 100644
--- a/src/apps/fuse/dependency-injection/contents/builder.ts
+++ b/src/apps/fuse/dependency-injection/contents/builder.ts
@@ -5,8 +5,8 @@ import { DependencyInjectionUserProvider } from '../common/user';
 import { DependencyInjectionMnemonicProvider } from '../common/mnemonic';
 import { EnvironmentRemoteFileContentsManagersFactory } from '../../../../context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
 import { FSLocalFileWriter } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileWriter';
-import { app } from 'electron';
 import { DependencyInjectionEventBus } from '../common/eventBus';
+import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
 
 export async function buildContentsContainer(): Promise<ContentsContainer> {
   const user = DependencyInjectionUserProvider.get();
@@ -23,11 +23,13 @@ export async function buildContentsContainer(): Promise<ContentsContainer> {
   const contentsManagerFactory =
     new EnvironmentRemoteFileContentsManagersFactory(environment, user.bucket);
 
-  const temporalFolderProvider = () => {
-    return Promise.resolve(app.getPath('temp'));
-  };
+  const localFileContentsDirectoryProvider =
+    new FuseAppDataLocalFileContentsDirectoryProvider();
 
-  const localWriter = new FSLocalFileWriter(temporalFolderProvider);
+  const localWriter = new FSLocalFileWriter(
+    localFileContentsDirectoryProvider,
+    'downloaded'
+  );
 
   const downloadContentsToPlainFile = new DownloadContentsToPlainFile(
     contentsManagerFactory,
diff --git a/src/apps/fuse/dependency-injection/shared/SharedContainer.ts b/src/apps/fuse/dependency-injection/shared/SharedContainer.ts
new file mode 100644
index 000000000..bbd756a66
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/shared/SharedContainer.ts
@@ -0,0 +1,5 @@
+import { RelativePathToAbsoluteConverter } from '../../../../context/virtual-drive/shared/application/RelativePathToAbsoluteConverter';
+
+export interface SharedContainer {
+  relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter;
+}
diff --git a/src/apps/fuse/dependency-injection/shared/builder.ts b/src/apps/fuse/dependency-injection/shared/builder.ts
new file mode 100644
index 000000000..ed840797e
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/shared/builder.ts
@@ -0,0 +1,21 @@
+import path from 'path';
+import { RelativePathToAbsoluteConverter } from '../../../../context/virtual-drive/shared/application/RelativePathToAbsoluteConverter';
+import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
+import { SharedContainer } from './SharedContainer';
+
+export async function buildSharedContainer(): Promise<SharedContainer> {
+  const localFileContentsDirectoryProvider =
+    new FuseAppDataLocalFileContentsDirectoryProvider();
+
+  const dir = await localFileContentsDirectoryProvider.provide();
+
+  const base = path.join(dir, 'downloaded');
+
+  const relativePathToAbsoluteConverter = new RelativePathToAbsoluteConverter(
+    base
+  );
+
+  return {
+    relativePathToAbsoluteConverter,
+  };
+}
diff --git a/src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts b/src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts
index 8a865c17a..3baa37b03 100644
--- a/src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts
+++ b/src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts
@@ -1,7 +1,7 @@
 import { ContentsDownloader } from '../../../../context/virtual-drive/contents/application/ContentsDownloader';
 import { NotifyMainProcessHydrationFinished } from '../../../../context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished';
 import { RetryContentsUploader } from '../../../../context/virtual-drive/contents/application/RetryContentsUploader';
-import { LocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/contents/domain/LocalFileContentsDirectoryProvider';
+import { LocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/domain/LocalFileContentsDirectoryProvider';
 
 export interface ContentsContainer {
   contentsUploader: RetryContentsUploader;
diff --git a/src/apps/sync-engine/dependency-injection/contents/builder.ts b/src/apps/sync-engine/dependency-injection/contents/builder.ts
index d93e7788a..19f047679 100644
--- a/src/apps/sync-engine/dependency-injection/contents/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/contents/builder.ts
@@ -13,7 +13,7 @@ import { EnvironmentRemoteFileContentsManagersFactory } from '../../../../contex
 import { FSLocalFileProvider } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileProvider';
 import { FSLocalFileWriter } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileWriter';
 import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
-import { IPCLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/contents/infrastructure/IPCLocalFileContentsDirectoryProvider';
+import { IPCLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/IPCLocalFileContentsDirectoryProvider';
 
 export async function buildContentsContainer(
   sharedContainer: SharedContainer
@@ -46,7 +46,10 @@ export async function buildContentsContainer(
   const localFileContentsDirectoryProvider =
     new IPCLocalFileContentsDirectoryProvider();
 
-  const localWriter = new FSLocalFileWriter(localFileContentsDirectoryProvider);
+  const localWriter = new FSLocalFileWriter(
+    localFileContentsDirectoryProvider,
+    'internxt'
+  );
 
   const contentsDownloader = new ContentsDownloader(
     contentsManagerFactory,
diff --git a/src/context/virtual-drive/contents/application/ContentsDownloader.ts b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
index a6263f543..f306122db 100644
--- a/src/context/virtual-drive/contents/application/ContentsDownloader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
@@ -10,7 +10,7 @@ import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
 import { LocalFileContents } from '../domain/LocalFileContents';
 import { LocalFileWriter } from '../domain/LocalFileWriter';
 import { ContentFileDownloader } from '../domain/contentHandlers/ContentFileDownloader';
-import { LocalFileContentsDirectoryProvider } from '../domain/LocalFileContentsDirectoryProvider';
+import { LocalFileContentsDirectoryProvider } from '../../shared/domain/LocalFileContentsDirectoryProvider';
 
 export class ContentsDownloader {
   private readableDownloader: Readable | null;
diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
index 85c2d1220..be34b1fd3 100644
--- a/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
@@ -1,19 +1,20 @@
 import { ensureFolderExists } from '../../../../apps/shared/fs/ensure-folder-exists';
 import { WriteReadableToFile } from '../../../../apps/shared/fs/write-readable-to-file';
 import { LocalFileContents } from '../domain/LocalFileContents';
-import { LocalFileContentsDirectoryProvider } from '../domain/LocalFileContentsDirectoryProvider';
+import { LocalFileContentsDirectoryProvider } from '../../shared/domain/LocalFileContentsDirectoryProvider';
 import { LocalFileWriter } from '../domain/LocalFileWriter';
 import path from 'path';
 
 export class FSLocalFileWriter implements LocalFileWriter {
   constructor(
-    private readonly locationProvider: LocalFileContentsDirectoryProvider
+    private readonly locationProvider: LocalFileContentsDirectoryProvider,
+    private readonly subfolder: string
   ) {}
 
   async write(contents: LocalFileContents): Promise<string> {
     const location = await this.locationProvider.provide();
 
-    const folderPath = path.join(location, 'internxt');
+    const folderPath = path.join(location, this.subfolder);
     ensureFolderExists(folderPath);
 
     const filePath = path.join(folderPath, contents.nameWithExtension);
diff --git a/src/context/virtual-drive/shared/domain/LocalFileContentsDirectoryProvider.ts b/src/context/virtual-drive/shared/domain/LocalFileContentsDirectoryProvider.ts
new file mode 100644
index 000000000..38c792417
--- /dev/null
+++ b/src/context/virtual-drive/shared/domain/LocalFileContentsDirectoryProvider.ts
@@ -0,0 +1,3 @@
+export interface LocalFileContentsDirectoryProvider {
+  provide(): Promise<string>;
+}
diff --git a/src/context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider.ts b/src/context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider.ts
new file mode 100644
index 000000000..0f33da651
--- /dev/null
+++ b/src/context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider.ts
@@ -0,0 +1,20 @@
+import { app } from 'electron';
+import { LocalFileContentsDirectoryProvider } from '../../domain/LocalFileContentsDirectoryProvider';
+import path from 'path';
+
+export class FuseAppDataLocalFileContentsDirectoryProvider
+  implements LocalFileContentsDirectoryProvider
+{
+  private static readonly APP_FOLDER_NAME = 'internxt-drive';
+
+  provide(): Promise<string> {
+    const appData = app.getPath('appData');
+
+    const interxtDriveFolder = path.join(
+      appData,
+      FuseAppDataLocalFileContentsDirectoryProvider.APP_FOLDER_NAME
+    );
+
+    return Promise.resolve(interxtDriveFolder);
+  }
+}
diff --git a/src/context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/IPCLocalFileContentsDirectoryProvider.ts b/src/context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/IPCLocalFileContentsDirectoryProvider.ts
new file mode 100644
index 000000000..37ef2d54d
--- /dev/null
+++ b/src/context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/IPCLocalFileContentsDirectoryProvider.ts
@@ -0,0 +1,18 @@
+import { ipcRenderer } from 'electron';
+import { LocalFileContentsDirectoryProvider } from '../../domain/LocalFileContentsDirectoryProvider';
+
+export class IPCLocalFileContentsDirectoryProvider
+  implements LocalFileContentsDirectoryProvider
+{
+  async provide(): Promise<string> {
+    const temporalFilesFolder = await ipcRenderer.invoke(
+      'APP:TEMPORAL_FILES_FOLDER'
+    );
+
+    if (typeof temporalFilesFolder !== 'string') {
+      throw new Error('Temporal folder path is not a string ');
+    }
+
+    return temporalFilesFolder;
+  }
+}
diff --git a/tests/context/virtual-drive/contents/__mocks__/LocalFileContentsDirectoryProviderMock.ts b/tests/context/virtual-drive/contents/__mocks__/LocalFileContentsDirectoryProviderMock.ts
new file mode 100644
index 000000000..28344e8fe
--- /dev/null
+++ b/tests/context/virtual-drive/contents/__mocks__/LocalFileContentsDirectoryProviderMock.ts
@@ -0,0 +1,11 @@
+import { LocalFileContentsDirectoryProvider } from '../../../../../src/context/virtual-drive/shared/domain/LocalFileContentsDirectoryProvider';
+
+export class LocalFileContentsDirectoryProviderMock
+  implements LocalFileContentsDirectoryProvider
+{
+  readonly provideMock = jest.fn();
+
+  provide(): Promise<string> {
+    return this.provideMock();
+  }
+}

From 8557a8485869df0128087a66fd33a3ad6f033ff4 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 20 Nov 2023 13:09:33 +0100
Subject: [PATCH 050/188] wip

---
 src/apps/fuse/index.ts | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/apps/fuse/index.ts b/src/apps/fuse/index.ts
index 2dd85a5a7..c5347f519 100644
--- a/src/apps/fuse/index.ts
+++ b/src/apps/fuse/index.ts
@@ -1,39 +1,16 @@
 import Logger from 'electron-log';
 
-import fs, { unlink } from 'fs';
 import _path from 'path';
 import { app } from 'electron';
 import { getRootVirtualDrive } from '../main/virutal-root-folder/service';
 import eventBus from '../main/event-bus';
 import { FuseApp } from './FuseApp';
 import { DependencyContainerFactory } from './dependency-injection/DependencyContainerFactory';
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-// const fuse = require('@cocalc/fuse-native');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-// const fuse = require('@gcas/fuse');
-
-// let _fuse: {
-//   unmount(arg0: (err: any) => void): unknown;
-//   mount: (arg0: (err: any) => void) => void;
-// };
-
-const temp = app.getPath('temp');
-
-const tempFolder = _path.join(temp, 'internxt');
+import path from 'path';
 
 let fuseApp: FuseApp;
 
 async function spawnSyncEngineWorker() {
-  await new Promise<void>((resolve) =>
-    fs.stat(tempFolder, (err) => {
-      if (err) {
-        fs.mkdirSync(tempFolder);
-      }
-      resolve();
-    })
-  );
-
   const root = getRootVirtualDrive();
 
   Logger.debug('ROOT FOLDER: ', root);
@@ -42,7 +19,10 @@ async function spawnSyncEngineWorker() {
 
   const container = await containerFactory.build();
 
-  fuseApp = new FuseApp(container, { root, local: tempFolder });
+  const appData = app.getPath('appData');
+  const local = path.join(appData, 'internxt-drive', 'downloaded');
+
+  fuseApp = new FuseApp(container, { root, local });
 
   await fuseApp.start();
 

From aa764813777d5f685fd0bd73af653d99610815de Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 20 Nov 2023 13:10:11 +0100
Subject: [PATCH 051/188] clear comments

---
 src/apps/fuse/index.ts | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/apps/fuse/index.ts b/src/apps/fuse/index.ts
index c5347f519..cf7145d15 100644
--- a/src/apps/fuse/index.ts
+++ b/src/apps/fuse/index.ts
@@ -25,20 +25,6 @@ async function spawnSyncEngineWorker() {
   fuseApp = new FuseApp(container, { root, local });
 
   await fuseApp.start();
-
-  // fuse.isConfigured((err: Error | null, isConfigured: boolean) => {
-  //   if (err) {
-  //     Logger.error('FUSE ERROR: ', err);
-  //   }
-
-  //   Logger.info(`FUSE is configured: ${isConfigured}`);
-
-  //   if (!isConfigured) {
-  //     fuse.configure((...params: any[]) => {
-  //       Logger.debug(`FUSE configure cb params: ${{ params }}`);
-  //     });
-  //   }
-  // });
 }
 
 export async function stopSyncEngineWatcher() {

From ee296a56fee4879a80e77b0ff4f754ffb3d42adc Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 20 Nov 2023 13:24:33 +0100
Subject: [PATCH 052/188] wip

---
 src/apps/sync-engine/index.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/apps/sync-engine/index.ts b/src/apps/sync-engine/index.ts
index c96e8457a..c5ea70358 100644
--- a/src/apps/sync-engine/index.ts
+++ b/src/apps/sync-engine/index.ts
@@ -1,8 +1,10 @@
 import Logger from 'electron-log';
 import { ipcRenderer } from 'electron';
+import { DependencyContainerFactory } from './dependency-injection/DependencyContainerFactory';
 import packageJson from '../../../package.json';
 import { BindingsManager } from './BindingManager';
 import fs from 'fs/promises';
+import { iconPath } from '../utils/icon';
 
 async function ensureTheFolderExist(path: string) {
   try {
@@ -22,9 +24,12 @@ async function setUp() {
 
   await ensureTheFolderExist(virtualDrivePath);
 
-  const bindings = new BindingsManager({
+  const factory = new DependencyContainerFactory();
+  const container = await factory.build();
+
+  const bindings = new BindingsManager(container, {
     root: virtualDrivePath,
-    icon: '',
+    icon: iconPath,
   });
 
   ipcRenderer.on('STOP_SYNC_ENGINE_PROCESS', async (event) => {

From fad167bf8bb09d9af51a4a42bd3cf2416e6b2d5e Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Mon, 20 Nov 2023 16:12:52 -0500
Subject: [PATCH 053/188] modified the logic to try again the upload when the
 file is busy

---
 .../infrastructure/FSLocalFileProvider.ts     | 61 +++++++++++--------
 1 file changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileProvider.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileProvider.ts
index 279f8b71d..1b5c373aa 100644
--- a/src/context/virtual-drive/contents/infrastructure/FSLocalFileProvider.ts
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileProvider.ts
@@ -19,32 +19,45 @@ export class FSLocalFileProvider implements LocalContentsProvider {
   private static readonly TIMEOUT_BUSY_CHECK = 10_000;
   private reading = new Map<string, AbortController>();
 
-  private async untilIsNotBusy(filePath: string): Promise<void> {
-    const readable = createReadStream(filePath);
-
-    return new Promise((resolve, reject) => {
-      readable.on('error', async (err: NodeJS.ErrnoException) => {
-        if (err.code === 'EBUSY') {
-          Logger.debug(
-            `File is busy, will wait ${FSLocalFileProvider.TIMEOUT_BUSY_CHECK} ms and try it again`
-          );
-
-          await new Promise((next) => {
-            setTimeout(next, FSLocalFileProvider.TIMEOUT_BUSY_CHECK);
+  private async untilIsNotBusy(
+    filePath: string,
+    retriesLeft = 5
+  ): Promise<void> {
+    let isResolved = false;
+
+    const attemptRead = async () => {
+      try {
+        const readable = createReadStream(filePath);
+
+        return new Promise<void>((resolve, reject) => {
+          readable.once('data', () => {
+            isResolved = true;
+            readable.close();
+            resolve();
           });
 
-          readable.read();
-        }
-      });
-
-      readable.on('data', () => {
-        Logger.debug('data!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
-        readable.close();
-        resolve();
-      });
+          readable.on('error', async (err: NodeJS.ErrnoException) => {
+            if (err.code === 'EBUSY' && retriesLeft > 0 && !isResolved) {
+              Logger.debug(
+                `File is busy, will wait ${FSLocalFileProvider.TIMEOUT_BUSY_CHECK} ms and try it again. Retries left: ${retriesLeft}`
+              );
+              setTimeout(async () => {
+                await attemptRead();
+                // TODO: perhaps, we should reject here when isResolved is false
+                resolve();
+              }, FSLocalFileProvider.TIMEOUT_BUSY_CHECK);
+            } else {
+              reject(err);
+            }
+          });
+        });
+      } catch (error) {
+        Logger.error(`Error reading file: ${error}`);
+        throw error;
+      }
+    };
 
-      readable.read();
-    });
+    await attemptRead();
   }
 
   private async createAbortableStream(filePath: string): Promise<{
@@ -58,9 +71,7 @@ export class FSLocalFileProvider implements LocalContentsProvider {
     }
 
     await this.untilIsNotBusy(filePath);
-
     const readStream = createReadStream(filePath);
-
     const controller = new AbortController();
 
     this.reading.set(filePath, controller);

From 8bbd75347e776c028976fb1b28c16490b88ff4f8 Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Tue, 21 Nov 2023 13:53:28 +0100
Subject: [PATCH 054/188] removed finish notification before hidrating file

---
 .../contents/application/ContentsDownloader.ts             | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/context/virtual-drive/contents/application/ContentsDownloader.ts b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
index d5e49fd6d..833886af7 100644
--- a/src/context/virtual-drive/contents/application/ContentsDownloader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
@@ -86,13 +86,6 @@ export class ContentsDownloader {
     downloader.on('finish', () => {
       // The file download being finished does not mean it has been hidratated
       // TODO: We might want to track this time instead of the whole completion time
-      this.ipc.send('FILE_DOWNLOADED', {
-        name: file.name,
-        extension: file.type,
-        nameWithExtension: file.nameWithExtension,
-        size: file.size,
-        processInfo: { elapsedTime: downloader.elapsedTime() },
-      });
     });
   }
 

From 773b44726246174248f5820747c0fc2675e1ac8b Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Tue, 21 Nov 2023 13:54:08 +0100
Subject: [PATCH 055/188] feat: add hydratation api

---
 .erb/configs/webpack.config.api.ts            | 63 +++++++++++++++++++
 .erb/configs/webpack.paths.ts                 |  4 ++
 package.json                                  |  7 ++-
 src/apps/fuse/index.ts                        |  5 ++
 src/apps/hydratation-api/HidratationApi.ts    | 42 +++++++++++++
 .../controllers/contents/download.ts          | 26 ++++++++
 .../DependencyContainer.ts                    | 10 +++
 .../DependencyContainerFactory.ts             | 45 +++++++++++++
 .../dependency-injection/common/clients.ts    | 18 ++++++
 .../dependency-injection/common/crypt.ts      |  0
 .../dependency-injection/common/eventBus.ts   | 24 +++++++
 .../common/eventRepository.ts                 | 16 +++++
 .../common/localRootFolderPath.ts             | 15 +++++
 .../dependency-injection/common/mnemonic.ts   | 20 ++++++
 .../dependency-injection/common/sdk.ts        | 35 +++++++++++
 .../dependency-injection/common/traverser.ts  | 21 +++++++
 .../dependency-injection/common/user.ts       | 20 ++++++
 .../common/virtualDrive.ts                    | 20 ++++++
 .../contents/ContentsContainer.ts             |  5 ++
 .../dependency-injection/contents/builder.ts  | 43 +++++++++++++
 .../files/FilesContainer.ts                   |  7 +++
 .../dependency-injection/files/builder.ts     | 30 +++++++++
 .../folders/FoldersContainer.ts               |  9 +++
 .../dependency-injection/folders/builder.ts   | 32 ++++++++++
 .../tree/TreeContainer.ts                     |  5 ++
 .../dependency-injection/tree/builder.ts      | 32 ++++++++++
 src/apps/hydratation-api/routes/contents.ts   | 12 ++++
 yarn.lock                                     |  2 +-
 28 files changed, 565 insertions(+), 3 deletions(-)
 create mode 100644 .erb/configs/webpack.config.api.ts
 create mode 100644 src/apps/hydratation-api/HidratationApi.ts
 create mode 100644 src/apps/hydratation-api/controllers/contents/download.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/DependencyContainer.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/DependencyContainerFactory.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/common/clients.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/common/crypt.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/common/eventBus.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/common/eventRepository.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/common/localRootFolderPath.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/common/mnemonic.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/common/sdk.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/common/traverser.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/common/user.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/common/virtualDrive.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/contents/ContentsContainer.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/contents/builder.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/files/FilesContainer.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/files/builder.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/folders/FoldersContainer.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/folders/builder.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/tree/TreeContainer.ts
 create mode 100644 src/apps/hydratation-api/dependency-injection/tree/builder.ts
 create mode 100644 src/apps/hydratation-api/routes/contents.ts

diff --git a/.erb/configs/webpack.config.api.ts b/.erb/configs/webpack.config.api.ts
new file mode 100644
index 000000000..4c6f15bf3
--- /dev/null
+++ b/.erb/configs/webpack.config.api.ts
@@ -0,0 +1,63 @@
+/**
+ * Build config for electron renderer process
+ */
+
+import path from 'path';
+import webpack from 'webpack';
+import HtmlWebpackPlugin from 'html-webpack-plugin';
+import { merge } from 'webpack-merge';
+import TerserPlugin from 'terser-webpack-plugin';
+import baseConfig from './webpack.config.base';
+import webpackPaths from './webpack.paths';
+import Dotenv from 'dotenv-webpack';
+
+const configuration: webpack.Configuration = {
+  mode: process.env.NODE_ENV,
+
+  target: 'electron-renderer',
+
+  module: {
+    rules: [{ test: /\.node$/, loader: 'node-loader' }],
+  },
+
+  entry: [
+    'core-js',
+    'regenerator-runtime/runtime',
+    path.join(webpackPaths.apiSyncEnginePath, 'index.ts'),
+  ],
+
+  output: {
+    path: webpackPaths.distAPIPath,
+    publicPath: './',
+    filename: 'renderer.js',
+    library: {
+      type: 'umd',
+    },
+  },
+
+  optimization: {
+    minimize: true,
+    minimizer: [
+      new TerserPlugin({
+        parallel: true,
+      }),
+    ],
+  },
+
+  plugins: [
+    new Dotenv({ ignoreStub: true }),
+
+    new HtmlWebpackPlugin({
+      filename: 'index.html',
+      minify: {
+        collapseWhitespace: true,
+        removeAttributeQuotes: true,
+        removeComments: true,
+      },
+      isBrowser: false,
+      isDevelopment: process.env.NODE_ENV !== 'production',
+    }),
+  ],
+};
+
+export default merge(baseConfig, configuration);
diff --git a/.erb/configs/webpack.paths.ts b/.erb/configs/webpack.paths.ts
index 4de2a5a95..2f813389e 100644
--- a/.erb/configs/webpack.paths.ts
+++ b/.erb/configs/webpack.paths.ts
@@ -10,6 +10,7 @@ const srcRendererPath = path.join(srcPath, 'renderer');
 const srcSyncPath = path.join(srcPath, 'workers', 'sync');
 const srcBackupsPath = path.join(srcPath, 'workers', 'backups');
 const srcSyncEnginePath = path.join(srcPath, 'sync-engine');
+const apiSyncEnginePath = path.join(srcPath, 'api');
 
 const releasePath = path.join(rootPath, 'release');
 const appPath = path.join(releasePath, 'app');
@@ -23,6 +24,7 @@ const distRendererPath = path.join(distPath, 'renderer');
 const distSyncPath = path.join(distPath, 'sync');
 const distBackupsPath = path.join(distPath, 'backups');
 const distSyncEnginePath = path.join(distPath, 'sync-engine');
+const distAPIPath = path.join(distPath, 'api');
 
 const buildPath = path.join(releasePath, 'build');
 
@@ -47,4 +49,6 @@ export default {
   distBackupsPath,
   srcSyncEnginePath,
   distSyncEnginePath,
+  apiSyncEnginePath,
+  distAPIPath,
 };
diff --git a/package.json b/package.json
index 742e74576..08c6dc669 100644
--- a/package.json
+++ b/package.json
@@ -8,20 +8,22 @@
     "url": "https://github.com/internxt/drive-desktop"
   },
   "scripts": {
-    "build": "concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:sync-engine\"",
+    "build": "concurrently \"npm run build:main\" \"npm run build:api\" \"npm run build:renderer\" \"npm run build:sync-engine\"",
     "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
     "build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts",
     "build:sync-engine": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync-engine.ts",
+    "build:api": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.api.ts",
     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
     "lint": "cross-env NODE_ENV=development eslint . --ext .ts,.tsx",
     "lint:fix": "yarn run lint --fix",
     "package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never",
     "publish": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish always",
     "postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts && opencollective-postinstall",
-    "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:renderer",
+    "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:api && npm run start:renderer",
     "start:main": "cross-env NODE_ENV=development electron -r ts-node/register/transpile-only ./src/apps/main/main.ts",
     "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
     "start:sync": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync.ts",
+    "start:api": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.api.ts",
     "start:sync-engine": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync-engine.ts",
     "test": "jest && playwright test --config=src/test",
     "test:unit": "jest --silent",
@@ -280,6 +282,7 @@
     "electron-log": "^4.4.4",
     "electron-store": "^8.0.1",
     "electron-updater": "^4.6.4",
+    "express": "^4.18.2",
     "form-data": "^4.0.0",
     "framer-motion": "^5.6.0",
     "gm": "^1.25.0",
diff --git a/src/apps/fuse/index.ts b/src/apps/fuse/index.ts
index cf7145d15..3fcd1f7a8 100644
--- a/src/apps/fuse/index.ts
+++ b/src/apps/fuse/index.ts
@@ -7,10 +7,15 @@ import eventBus from '../main/event-bus';
 import { FuseApp } from './FuseApp';
 import { DependencyContainerFactory } from './dependency-injection/DependencyContainerFactory';
 import path from 'path';
+import { HidratationApi } from '../hydratation-api/HidratationApi';
 
 let fuseApp: FuseApp;
 
 async function spawnSyncEngineWorker() {
+  const api = new HidratationApi();
+
+  await api.start();
+
   const root = getRootVirtualDrive();
 
   Logger.debug('ROOT FOLDER: ', root);
diff --git a/src/apps/hydratation-api/HidratationApi.ts b/src/apps/hydratation-api/HidratationApi.ts
new file mode 100644
index 000000000..ae1ebae74
--- /dev/null
+++ b/src/apps/hydratation-api/HidratationApi.ts
@@ -0,0 +1,42 @@
+import express, { Router } from 'express';
+import Logger from 'electron-log';
+
+import { buildContentsRouter } from './routes/contents';
+import { DependencyContainerFactory } from './dependency-injection/DependencyContainerFactory';
+
+export class HidratationApi {
+  private static readonly PORT = 4567;
+  private readonly app;
+
+  constructor() {
+    this.app = express();
+  }
+
+  private async buildRouters() {
+    const containerFactory = new DependencyContainerFactory();
+    const container = await containerFactory.build();
+
+    const routers = {
+      contents: buildContentsRouter(container),
+    };
+
+    return routers;
+  }
+
+  async start(): Promise<void> {
+    const routers = await this.buildRouters();
+
+    Object.entries(routers).forEach(([route, router]: [string, Router]) => {
+      this.app.use(`/${route}`, router);
+    });
+
+    return new Promise((resolve) => {
+      this.app.listen(HidratationApi.PORT, () => {
+        Logger.info(
+          `Hidratation Api is running on port ${HidratationApi.PORT}`
+        );
+        resolve();
+      });
+    });
+  }
+}
diff --git a/src/apps/hydratation-api/controllers/contents/download.ts b/src/apps/hydratation-api/controllers/contents/download.ts
new file mode 100644
index 000000000..b8e7b4bf2
--- /dev/null
+++ b/src/apps/hydratation-api/controllers/contents/download.ts
@@ -0,0 +1,26 @@
+import { Request, Response } from 'express';
+import { DependencyContainer } from '../../dependency-injection/DependencyContainer';
+import Logger from 'electron-log';
+
+export function buildContentsController(container: DependencyContainer) {
+  const download = async (req: Request, res: Response) => {
+    const id = req.params.id;
+
+    Logger.info('DOWNLOAD PETICION TO:', id);
+
+    const file = await container.filesSearcher.run({ contentsId: id });
+
+    if (!file) {
+      res.status(404).send();
+      return;
+    }
+
+    await container.downloadContentsToPlainFile.run(file);
+
+    res.send(`Contents ID: ${req.params.id}`);
+  };
+
+  return {
+    download,
+  };
+}
diff --git a/src/apps/hydratation-api/dependency-injection/DependencyContainer.ts b/src/apps/hydratation-api/dependency-injection/DependencyContainer.ts
new file mode 100644
index 000000000..2b1cdf832
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/DependencyContainer.ts
@@ -0,0 +1,10 @@
+import { ContentsContainer } from './contents/ContentsContainer';
+import { FilesContainer } from './files/FilesContainer';
+import { FoldersContainer } from './folders/FoldersContainer';
+import { TreeContainer } from './tree/TreeContainer';
+
+export interface DependencyContainer
+  extends TreeContainer,
+    ContentsContainer,
+    FilesContainer,
+    FoldersContainer {}
diff --git a/src/apps/hydratation-api/dependency-injection/DependencyContainerFactory.ts b/src/apps/hydratation-api/dependency-injection/DependencyContainerFactory.ts
new file mode 100644
index 000000000..2235a4030
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/DependencyContainerFactory.ts
@@ -0,0 +1,45 @@
+import { DependencyContainer } from './DependencyContainer';
+import { buildContentsContainer } from './contents/builder';
+import { buildFilesContainer } from './files/builder';
+import { buildFoldersContainer } from './folders/builder';
+import { buildTreeContainer } from './tree/builder';
+
+export class DependencyContainerFactory {
+  private static _container: DependencyContainer | undefined;
+
+  static readonly subscribers: Array<keyof DependencyContainer> = [];
+
+  eventSubscribers(
+    key: keyof DependencyContainer
+  ): DependencyContainer[keyof DependencyContainer] | undefined {
+    if (!DependencyContainerFactory._container) return undefined;
+
+    return DependencyContainerFactory._container[key];
+  }
+
+  async build(): Promise<DependencyContainer> {
+    if (DependencyContainerFactory._container !== undefined) {
+      return DependencyContainerFactory._container;
+    }
+
+    const treeContainer = buildTreeContainer();
+
+    const tree = await treeContainer.existingNodesTreeBuilder.run();
+
+    const contentsContainer = await buildContentsContainer();
+    const foldersContainer = await buildFoldersContainer(tree.folders);
+    const filesContainer = await buildFilesContainer(
+      tree.files,
+      foldersContainer
+    );
+
+    const container = {
+      ...treeContainer,
+      ...contentsContainer,
+      ...foldersContainer,
+      ...filesContainer,
+    };
+
+    return container;
+  }
+}
diff --git a/src/apps/hydratation-api/dependency-injection/common/clients.ts b/src/apps/hydratation-api/dependency-injection/common/clients.ts
new file mode 100644
index 000000000..61d2b7f88
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/common/clients.ts
@@ -0,0 +1,18 @@
+import { AuthorizedClients } from '../../../shared/HttpClient/Clients';
+import { getClients } from '../../../shared/HttpClient/background-process-clients';
+
+export class DependencyInjectionHttpClientsProvider {
+  private static clients: AuthorizedClients;
+
+  static get(): AuthorizedClients {
+    if (DependencyInjectionHttpClientsProvider.clients) {
+      return DependencyInjectionHttpClientsProvider.clients;
+    }
+
+    const clients = getClients();
+
+    DependencyInjectionHttpClientsProvider.clients = clients;
+
+    return clients;
+  }
+}
diff --git a/src/apps/hydratation-api/dependency-injection/common/crypt.ts b/src/apps/hydratation-api/dependency-injection/common/crypt.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/apps/hydratation-api/dependency-injection/common/eventBus.ts b/src/apps/hydratation-api/dependency-injection/common/eventBus.ts
new file mode 100644
index 000000000..4958886ca
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/common/eventBus.ts
@@ -0,0 +1,24 @@
+import { EventBus } from '../../../../context/virtual-drive/shared/domain/EventBus';
+import { EventRecorder } from '../../../../context/virtual-drive/shared/infrastructure/EventRecorder';
+import { NodeJsEventBus } from '../../../../context/virtual-drive/shared/infrastructure/NodeJsEventBus';
+import { DependencyInjectionEventRepository } from './eventRepository';
+
+export class DependencyInjectionEventBus {
+  private static _bus: EventBus;
+
+  static get bus(): EventBus {
+    if (DependencyInjectionEventBus._bus) {
+      return DependencyInjectionEventBus._bus;
+    }
+
+    const eventBus = new NodeJsEventBus();
+
+    const eventHistory = DependencyInjectionEventRepository.get();
+
+    const bus = new EventRecorder(eventHistory, eventBus);
+
+    DependencyInjectionEventBus._bus = bus;
+
+    return DependencyInjectionEventBus._bus;
+  }
+}
diff --git a/src/apps/hydratation-api/dependency-injection/common/eventRepository.ts b/src/apps/hydratation-api/dependency-injection/common/eventRepository.ts
new file mode 100644
index 000000000..485237051
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/common/eventRepository.ts
@@ -0,0 +1,16 @@
+import { EventRepository } from '../../../../context/virtual-drive/shared/domain/EventRepository';
+import { InMemoryEventRepository } from '../../../../context/virtual-drive/shared/infrastructure/InMemoryEventHistory';
+
+export class DependencyInjectionEventRepository {
+  private static history: EventRepository;
+
+  static get(): EventRepository {
+    if (DependencyInjectionEventRepository.history) {
+      return DependencyInjectionEventRepository.history;
+    }
+
+    DependencyInjectionEventRepository.history = new InMemoryEventRepository();
+
+    return DependencyInjectionEventRepository.history;
+  }
+}
diff --git a/src/apps/hydratation-api/dependency-injection/common/localRootFolderPath.ts b/src/apps/hydratation-api/dependency-injection/common/localRootFolderPath.ts
new file mode 100644
index 000000000..c8f34a324
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/common/localRootFolderPath.ts
@@ -0,0 +1,15 @@
+import configStore from '../../../main/config';
+
+export class DependencyInjectionLocalRootFolderPath {
+  private static path: string;
+
+  static get(): string {
+    if (DependencyInjectionLocalRootFolderPath.path) {
+      return DependencyInjectionLocalRootFolderPath.path;
+    }
+
+    DependencyInjectionLocalRootFolderPath.path = configStore.get('syncRoot');
+
+    return DependencyInjectionLocalRootFolderPath.path;
+  }
+}
diff --git a/src/apps/hydratation-api/dependency-injection/common/mnemonic.ts b/src/apps/hydratation-api/dependency-injection/common/mnemonic.ts
new file mode 100644
index 000000000..24100430b
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/common/mnemonic.ts
@@ -0,0 +1,20 @@
+import configStore from '../../../main/config';
+
+export class DependencyInjectionMnemonicProvider {
+  private static _: string;
+
+  static get() {
+    if (DependencyInjectionMnemonicProvider._) {
+      return DependencyInjectionMnemonicProvider._;
+    }
+
+    const mnemonic = configStore.get('mnemonic');
+
+    if (mnemonic) {
+      DependencyInjectionMnemonicProvider._ = mnemonic;
+      return mnemonic;
+    }
+
+    throw new Error('Could not get mnemonic in dependency injection');
+  }
+}
diff --git a/src/apps/hydratation-api/dependency-injection/common/sdk.ts b/src/apps/hydratation-api/dependency-injection/common/sdk.ts
new file mode 100644
index 000000000..84437b858
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/common/sdk.ts
@@ -0,0 +1,35 @@
+import { Storage } from '@internxt/sdk/dist/drive/storage';
+import { ipcRenderer } from 'electron';
+import { onUserUnauthorized } from '../../../shared/HttpClient/background-process-clients';
+import packageJson from '../../../../../package.json';
+
+export class DependencyInjectionStorageSdk {
+  private static sdk: Storage;
+
+  static async get(): Promise<any> {
+    if (DependencyInjectionStorageSdk.sdk) {
+      return DependencyInjectionStorageSdk.sdk;
+    }
+
+    const url = `${process.env.API_URL}/api`;
+    const { name: clientName, version: clientVersion } = packageJson;
+
+    const token = await ipcRenderer.invoke('get-token');
+
+    const sdk = Storage.client(
+      url,
+      {
+        clientName,
+        clientVersion,
+      },
+      {
+        token,
+        unauthorizedCallback: onUserUnauthorized,
+      }
+    );
+
+    DependencyInjectionStorageSdk.sdk = sdk;
+
+    return DependencyInjectionStorageSdk.sdk;
+  }
+}
diff --git a/src/apps/hydratation-api/dependency-injection/common/traverser.ts b/src/apps/hydratation-api/dependency-injection/common/traverser.ts
new file mode 100644
index 000000000..b25de6491
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/common/traverser.ts
@@ -0,0 +1,21 @@
+import crypt from '../../../../context/shared/infrastructure/crypt';
+import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
+import { DependencyInjectionUserProvider } from './user';
+
+export class DependencyInjectionTraverserProvider {
+  private static traverser: Traverser;
+
+  static get(): Traverser {
+    if (DependencyInjectionTraverserProvider.traverser) {
+      return DependencyInjectionTraverserProvider.traverser;
+    }
+
+    const user = DependencyInjectionUserProvider.get();
+
+    const traverser = Traverser.existingItems(crypt, user.root_folder_id);
+
+    DependencyInjectionTraverserProvider.traverser = traverser;
+
+    return traverser;
+  }
+}
diff --git a/src/apps/hydratation-api/dependency-injection/common/user.ts b/src/apps/hydratation-api/dependency-injection/common/user.ts
new file mode 100644
index 000000000..fddca6487
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/common/user.ts
@@ -0,0 +1,20 @@
+import { getUser } from '../../../main/auth/service';
+import { User } from '../../../main/types';
+
+export class DependencyInjectionUserProvider {
+  private static _user: User;
+
+  static get() {
+    if (DependencyInjectionUserProvider._user)
+      return DependencyInjectionUserProvider._user;
+
+    const user = getUser();
+
+    if (user) {
+      DependencyInjectionUserProvider._user = user;
+      return user;
+    }
+
+    throw new Error('Could not get user in dependency injection');
+  }
+}
diff --git a/src/apps/hydratation-api/dependency-injection/common/virtualDrive.ts b/src/apps/hydratation-api/dependency-injection/common/virtualDrive.ts
new file mode 100644
index 000000000..e74b97645
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/common/virtualDrive.ts
@@ -0,0 +1,20 @@
+import { VirtualDrive } from 'virtual-drive/dist';
+import { DependencyInjectionLocalRootFolderPath } from './localRootFolderPath';
+
+export class DependencyInjectionVirtualDrive {
+  private static _vd: VirtualDrive;
+
+  static get virtualDrive(): VirtualDrive {
+    if (DependencyInjectionVirtualDrive._vd) {
+      return DependencyInjectionVirtualDrive._vd;
+    }
+
+    const root = DependencyInjectionLocalRootFolderPath.get();
+
+    const vd = new VirtualDrive(root);
+
+    DependencyInjectionVirtualDrive._vd = vd;
+
+    return DependencyInjectionVirtualDrive._vd;
+  }
+}
diff --git a/src/apps/hydratation-api/dependency-injection/contents/ContentsContainer.ts b/src/apps/hydratation-api/dependency-injection/contents/ContentsContainer.ts
new file mode 100644
index 000000000..ce302ba79
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/contents/ContentsContainer.ts
@@ -0,0 +1,5 @@
+import { DownloadContentsToPlainFile } from '../../../../context/virtual-drive/contents/application/DownloadContentsToPlainFile';
+
+export interface ContentsContainer {
+  downloadContentsToPlainFile: DownloadContentsToPlainFile;
+}
diff --git a/src/apps/hydratation-api/dependency-injection/contents/builder.ts b/src/apps/hydratation-api/dependency-injection/contents/builder.ts
new file mode 100644
index 000000000..3dc57c693
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/contents/builder.ts
@@ -0,0 +1,43 @@
+import { Environment } from '@internxt/inxt-js';
+import { DownloadContentsToPlainFile } from '../../../../context/virtual-drive/contents/application/DownloadContentsToPlainFile';
+import { ContentsContainer } from './ContentsContainer';
+import { DependencyInjectionUserProvider } from '../common/user';
+import { DependencyInjectionMnemonicProvider } from '../common/mnemonic';
+import { EnvironmentRemoteFileContentsManagersFactory } from '../../../../context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
+import { FSLocalFileWriter } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileWriter';
+import { DependencyInjectionEventBus } from '../common/eventBus';
+import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
+
+export async function buildContentsContainer(): Promise<ContentsContainer> {
+  const user = DependencyInjectionUserProvider.get();
+  const mnemonic = DependencyInjectionMnemonicProvider.get();
+  const { bus: eventBus } = DependencyInjectionEventBus;
+
+  const environment = new Environment({
+    bridgeUrl: process.env.BRIDGE_URL,
+    bridgeUser: user.bridgeUser,
+    bridgePass: user.userId,
+    encryptionKey: mnemonic,
+  });
+
+  const contentsManagerFactory =
+    new EnvironmentRemoteFileContentsManagersFactory(environment, user.bucket);
+
+  const localFileContentsDirectoryProvider =
+    new FuseAppDataLocalFileContentsDirectoryProvider();
+
+  const localWriter = new FSLocalFileWriter(
+    localFileContentsDirectoryProvider,
+    'downloaded'
+  );
+
+  const downloadContentsToPlainFile = new DownloadContentsToPlainFile(
+    contentsManagerFactory,
+    localWriter,
+    eventBus
+  );
+
+  return {
+    downloadContentsToPlainFile,
+  };
+}
diff --git a/src/apps/hydratation-api/dependency-injection/files/FilesContainer.ts b/src/apps/hydratation-api/dependency-injection/files/FilesContainer.ts
new file mode 100644
index 000000000..f45310bee
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/files/FilesContainer.ts
@@ -0,0 +1,7 @@
+import { FilesSearcher } from '../../../../context/virtual-drive/files/application/FilesSearcher';
+import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
+
+export interface FilesContainer {
+  filesByFolderPathNameLister: FilesByFolderPathSearcher;
+  filesSearcher: FilesSearcher;
+}
diff --git a/src/apps/hydratation-api/dependency-injection/files/builder.ts b/src/apps/hydratation-api/dependency-injection/files/builder.ts
new file mode 100644
index 000000000..ff222e458
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/files/builder.ts
@@ -0,0 +1,30 @@
+import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
+import { FilesSearcher } from '../../../../context/virtual-drive/files/application/FilesSearcher';
+import { RepositoryPopulator } from '../../../../context/virtual-drive/files/application/RepositoryPopulator';
+import { File } from '../../../../context/virtual-drive/files/domain/File';
+import { InMemoryFileRepository } from '../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
+import { FoldersContainer } from '../folders/FoldersContainer';
+import { FilesContainer } from './FilesContainer';
+
+export async function buildFilesContainer(
+  initialFiles: Array<File>,
+  folderContainer: FoldersContainer
+): Promise<FilesContainer> {
+  const repository = new InMemoryFileRepository();
+
+  const repositoryPopulator = new RepositoryPopulator(repository);
+
+  await repositoryPopulator.run(initialFiles);
+
+  const filesByFolderPathNameLister = new FilesByFolderPathSearcher(
+    repository,
+    folderContainer.folderFinder
+  );
+
+  const filesSearcher = new FilesSearcher(repository);
+
+  return {
+    filesByFolderPathNameLister,
+    filesSearcher,
+  };
+}
diff --git a/src/apps/hydratation-api/dependency-injection/folders/FoldersContainer.ts b/src/apps/hydratation-api/dependency-injection/folders/FoldersContainer.ts
new file mode 100644
index 000000000..a87567c8e
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/folders/FoldersContainer.ts
@@ -0,0 +1,9 @@
+import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
+import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
+import { FoldersByParentPathSearcher } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
+
+export interface FoldersContainer {
+  folderFinder: FolderFinder;
+  folderSearcher: FolderSearcher;
+  foldersByParentPathSearcher: FoldersByParentPathSearcher;
+}
diff --git a/src/apps/hydratation-api/dependency-injection/folders/builder.ts b/src/apps/hydratation-api/dependency-injection/folders/builder.ts
new file mode 100644
index 000000000..130dff0d0
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/folders/builder.ts
@@ -0,0 +1,32 @@
+import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
+import { FolderRepositoryInitiator } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
+import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
+import { FoldersByParentPathSearcher } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
+import { Folder } from '../../../../context/virtual-drive/folders/domain/Folder';
+import { InMemoryFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
+import { FoldersContainer } from './FoldersContainer';
+
+export async function buildFoldersContainer(
+  initialFolders: Array<Folder>
+): Promise<FoldersContainer> {
+  const repository = new InMemoryFolderRepository();
+
+  const folderRepositoryInitiator = new FolderRepositoryInitiator(repository);
+
+  await folderRepositoryInitiator.run(initialFolders);
+
+  const folderFinder = new FolderFinder(repository);
+
+  const folderSearcher = new FolderSearcher(repository);
+
+  const foldersByParentPathSearcher = new FoldersByParentPathSearcher(
+    folderFinder,
+    repository
+  );
+
+  return {
+    folderFinder,
+    folderSearcher,
+    foldersByParentPathSearcher,
+  };
+}
diff --git a/src/apps/hydratation-api/dependency-injection/tree/TreeContainer.ts b/src/apps/hydratation-api/dependency-injection/tree/TreeContainer.ts
new file mode 100644
index 000000000..599d00b4e
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/tree/TreeContainer.ts
@@ -0,0 +1,5 @@
+import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
+
+export interface TreeContainer {
+  existingNodesTreeBuilder: TreeBuilder;
+}
diff --git a/src/apps/hydratation-api/dependency-injection/tree/builder.ts b/src/apps/hydratation-api/dependency-injection/tree/builder.ts
new file mode 100644
index 000000000..018c5a2be
--- /dev/null
+++ b/src/apps/hydratation-api/dependency-injection/tree/builder.ts
@@ -0,0 +1,32 @@
+import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
+import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
+import { CryptoJsNameDecrypt } from '../../../../context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt';
+import { getUser } from '../../../main/auth/service';
+import { TreeContainer } from './TreeContainer';
+import { SQLiteRemoteItemsGenerator } from '../../../../context/virtual-drive/items/infrastructure/SQLiteRemoteItemsGenerator';
+
+export function buildTreeContainer(): TreeContainer {
+  const user = getUser();
+
+  if (!user) {
+    throw new Error('Could not get user when building Items dependencies');
+  }
+
+  const remoteItemsGenerator = new SQLiteRemoteItemsGenerator();
+
+  const nameDecryptor = new CryptoJsNameDecrypt();
+
+  const existingItemsTraverser = Traverser.existingItems(
+    nameDecryptor,
+    user.root_folder_id
+  );
+
+  const existingNodesTreeBuilder = new TreeBuilder(
+    remoteItemsGenerator,
+    existingItemsTraverser
+  );
+
+  return {
+    existingNodesTreeBuilder,
+  };
+}
diff --git a/src/apps/hydratation-api/routes/contents.ts b/src/apps/hydratation-api/routes/contents.ts
new file mode 100644
index 000000000..92c377011
--- /dev/null
+++ b/src/apps/hydratation-api/routes/contents.ts
@@ -0,0 +1,12 @@
+import express, { Router } from 'express';
+import { buildContentsController } from '../controllers/contents/download';
+import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+
+export function buildContentsRouter(container: DependencyContainer): Router {
+  const controllers = buildContentsController(container);
+  const router = express.Router();
+
+  router.post('/download/:id', controllers.download);
+
+  return router;
+}
diff --git a/yarn.lock b/yarn.lock
index a41e5ecee..1037e1373 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5985,7 +5985,7 @@ exponential-backoff@^3.1.1:
   resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
   integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
 
-express@^4.17.3:
+express@^4.17.3, express@^4.18.2:
   version "4.18.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
   integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==

From aee444cee8916bb14f752975f8f7b792834bda77 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 22 Nov 2023 10:38:34 +0100
Subject: [PATCH 056/188] fix

---
 .erb/configs/webpack.config.api.ts | 63 ------------------------------
 package.json                       |  6 +--
 2 files changed, 2 insertions(+), 67 deletions(-)
 delete mode 100644 .erb/configs/webpack.config.api.ts

diff --git a/.erb/configs/webpack.config.api.ts b/.erb/configs/webpack.config.api.ts
deleted file mode 100644
index 4c6f15bf3..000000000
--- a/.erb/configs/webpack.config.api.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Build config for electron renderer process
- */
-
-import path from 'path';
-import webpack from 'webpack';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-import { merge } from 'webpack-merge';
-import TerserPlugin from 'terser-webpack-plugin';
-import baseConfig from './webpack.config.base';
-import webpackPaths from './webpack.paths';
-import Dotenv from 'dotenv-webpack';
-
-const configuration: webpack.Configuration = {
-  mode: process.env.NODE_ENV,
-
-  target: 'electron-renderer',
-
-  module: {
-    rules: [{ test: /\.node$/, loader: 'node-loader' }],
-  },
-
-  entry: [
-    'core-js',
-    'regenerator-runtime/runtime',
-    path.join(webpackPaths.apiSyncEnginePath, 'index.ts'),
-  ],
-
-  output: {
-    path: webpackPaths.distAPIPath,
-    publicPath: './',
-    filename: 'renderer.js',
-    library: {
-      type: 'umd',
-    },
-  },
-
-  optimization: {
-    minimize: true,
-    minimizer: [
-      new TerserPlugin({
-        parallel: true,
-      }),
-    ],
-  },
-
-  plugins: [
-    new Dotenv({ ignoreStub: true }),
-
-    new HtmlWebpackPlugin({
-      filename: 'index.html',
-      minify: {
-        collapseWhitespace: true,
-        removeAttributeQuotes: true,
-        removeComments: true,
-      },
-      isBrowser: false,
-      isDevelopment: process.env.NODE_ENV !== 'production',
-    }),
-  ],
-};
-
-export default merge(baseConfig, configuration);
diff --git a/package.json b/package.json
index 08c6dc669..d7728f635 100644
--- a/package.json
+++ b/package.json
@@ -8,22 +8,20 @@
     "url": "https://github.com/internxt/drive-desktop"
   },
   "scripts": {
-    "build": "concurrently \"npm run build:main\" \"npm run build:api\" \"npm run build:renderer\" \"npm run build:sync-engine\"",
+    "build": "concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:sync-engine\"",
     "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
     "build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts",
     "build:sync-engine": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync-engine.ts",
-    "build:api": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.api.ts",
     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
     "lint": "cross-env NODE_ENV=development eslint . --ext .ts,.tsx",
     "lint:fix": "yarn run lint --fix",
     "package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never",
     "publish": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish always",
     "postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts && opencollective-postinstall",
-    "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:api && npm run start:renderer",
+    "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:renderer",
     "start:main": "cross-env NODE_ENV=development electron -r ts-node/register/transpile-only ./src/apps/main/main.ts",
     "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
     "start:sync": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync.ts",
-    "start:api": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.api.ts",
     "start:sync-engine": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync-engine.ts",
     "test": "jest && playwright test --config=src/test",
     "test:unit": "jest --silent",

From 3368fb6a9f7200a1299a84e2724ab4a7f4bfd050 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 22 Nov 2023 10:39:12 +0100
Subject: [PATCH 057/188] chore: version bump

---
 package.json             | 2 +-
 release/app/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 66ad6cb43..e45027c46 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "author": "Internxt <hello@internxt.com>",
   "description": "Internxt Drive client UI",
   "license": "AGPL-3.0",
diff --git a/release/app/package.json b/release/app/package.json
index b61502429..7b17b894d 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Internxt Drive client UI",
   "main": "./dist/main/main.js",
   "author": "Internxt <hello@internxt.com>",

From 0baedcf7cfbcef70d91ae422bf581446aaf94673 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 22 Nov 2023 12:20:37 +0100
Subject: [PATCH 058/188] feat: use path to find file

---
 .../hydratation-api/controllers/contents/download.ts   | 10 ++++++----
 src/apps/hydratation-api/routes/contents.ts            |  2 +-
 .../application/DownloadContentsToPlainFile.ts         |  2 +-
 .../virtual-drive/contents/domain/LocalFileWriter.ts   |  2 +-
 .../contents/infrastructure/FSLocalFileWriter.ts       |  6 ++++--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/apps/hydratation-api/controllers/contents/download.ts b/src/apps/hydratation-api/controllers/contents/download.ts
index b8e7b4bf2..a41c8cf87 100644
--- a/src/apps/hydratation-api/controllers/contents/download.ts
+++ b/src/apps/hydratation-api/controllers/contents/download.ts
@@ -4,11 +4,13 @@ import Logger from 'electron-log';
 
 export function buildContentsController(container: DependencyContainer) {
   const download = async (req: Request, res: Response) => {
-    const id = req.params.id;
+    const decodedBuffer = Buffer.from(req.params.path, 'base64');
 
-    Logger.info('DOWNLOAD PETICION TO:', id);
+    const path = decodedBuffer.toString('utf-8').replaceAll('%20', ' ');
 
-    const file = await container.filesSearcher.run({ contentsId: id });
+    Logger.info('DOWNLOAD PETICION TO:', path);
+
+    const file = await container.filesSearcher.run({ path: `/${path}` });
 
     if (!file) {
       res.status(404).send();
@@ -17,7 +19,7 @@ export function buildContentsController(container: DependencyContainer) {
 
     await container.downloadContentsToPlainFile.run(file);
 
-    res.send(`Contents ID: ${req.params.id}`);
+    res.json({ id: file.contentsId });
   };
 
   return {
diff --git a/src/apps/hydratation-api/routes/contents.ts b/src/apps/hydratation-api/routes/contents.ts
index 92c377011..4434f6570 100644
--- a/src/apps/hydratation-api/routes/contents.ts
+++ b/src/apps/hydratation-api/routes/contents.ts
@@ -6,7 +6,7 @@ export function buildContentsRouter(container: DependencyContainer): Router {
   const controllers = buildContentsController(container);
   const router = express.Router();
 
-  router.post('/download/:id', controllers.download);
+  router.post('/download/:path', controllers.download);
 
   return router;
 }
diff --git a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
index 340dc3065..137097d66 100644
--- a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
+++ b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
@@ -21,7 +21,7 @@ export class DownloadContentsToPlainFile {
       downloader.elapsedTime()
     );
 
-    const write = await this.localWriter.write(localContents);
+    const write = await this.localWriter.write(localContents, file.contentsId);
 
     const events = localContents.pullDomainEvents();
     await this.eventBus.publish(events);
diff --git a/src/context/virtual-drive/contents/domain/LocalFileWriter.ts b/src/context/virtual-drive/contents/domain/LocalFileWriter.ts
index 8ba39b899..c9831ae85 100644
--- a/src/context/virtual-drive/contents/domain/LocalFileWriter.ts
+++ b/src/context/virtual-drive/contents/domain/LocalFileWriter.ts
@@ -3,5 +3,5 @@ import { LocalFileContents } from './LocalFileContents';
 type ResultFilePath = string;
 
 export interface LocalFileWriter {
-  write(contents: LocalFileContents): Promise<ResultFilePath>;
+  write(contents: LocalFileContents, name?: string): Promise<ResultFilePath>;
 }
diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
index be34b1fd3..c5953922b 100644
--- a/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
@@ -11,13 +11,15 @@ export class FSLocalFileWriter implements LocalFileWriter {
     private readonly subfolder: string
   ) {}
 
-  async write(contents: LocalFileContents): Promise<string> {
+  async write(contents: LocalFileContents, name?: string): Promise<string> {
     const location = await this.locationProvider.provide();
 
     const folderPath = path.join(location, this.subfolder);
     ensureFolderExists(folderPath);
 
-    const filePath = path.join(folderPath, contents.nameWithExtension);
+    const fileName = name || contents.nameWithExtension;
+
+    const filePath = path.join(folderPath, fileName);
 
     await WriteReadableToFile.write(contents.stream, filePath);
 

From b73eec59658fb5d9cc63ef33deada2cab4c8fca1 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 22 Nov 2023 12:42:53 +0100
Subject: [PATCH 059/188] feat: use path to find file

---
 .../dependency-injection/contents/builder.ts  |  4 +--
 .../controllers/contents/download.ts          | 28 -------------------
 .../contents/ContentsContainer.ts             |  2 ++
 .../dependency-injection/contents/builder.ts  | 10 +++++--
 src/apps/hydratation-api/routes/contents.ts   |  3 +-
 .../dependency-injection/contents/builder.ts  |  4 +--
 .../application/ContentsDownloader.ts         |  4 +--
 .../DownloadContentsToPlainFile.ts            |  4 +--
 .../contents/domain/LocalFileWriter.ts        |  7 -----
 .../infrastructure/FSLocalFileWriter.ts       | 28 -------------------
 .../contents/__mocks__/LocalFileWriterMock.ts |  4 +--
 .../__mocks__/LocationProviderMock.ts         |  2 +-
 12 files changed, 22 insertions(+), 78 deletions(-)
 delete mode 100644 src/apps/hydratation-api/controllers/contents/download.ts
 delete mode 100644 src/context/virtual-drive/contents/domain/LocalFileWriter.ts
 delete mode 100644 src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts

diff --git a/src/apps/fuse/dependency-injection/contents/builder.ts b/src/apps/fuse/dependency-injection/contents/builder.ts
index 3dc57c693..56e224aab 100644
--- a/src/apps/fuse/dependency-injection/contents/builder.ts
+++ b/src/apps/fuse/dependency-injection/contents/builder.ts
@@ -4,7 +4,7 @@ import { ContentsContainer } from './ContentsContainer';
 import { DependencyInjectionUserProvider } from '../common/user';
 import { DependencyInjectionMnemonicProvider } from '../common/mnemonic';
 import { EnvironmentRemoteFileContentsManagersFactory } from '../../../../context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
-import { FSLocalFileWriter } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileWriter';
+import { FSLocalFileSystem } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileSystem';
 import { DependencyInjectionEventBus } from '../common/eventBus';
 import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
 
@@ -26,7 +26,7 @@ export async function buildContentsContainer(): Promise<ContentsContainer> {
   const localFileContentsDirectoryProvider =
     new FuseAppDataLocalFileContentsDirectoryProvider();
 
-  const localWriter = new FSLocalFileWriter(
+  const localWriter = new FSLocalFileSystem(
     localFileContentsDirectoryProvider,
     'downloaded'
   );
diff --git a/src/apps/hydratation-api/controllers/contents/download.ts b/src/apps/hydratation-api/controllers/contents/download.ts
deleted file mode 100644
index a41c8cf87..000000000
--- a/src/apps/hydratation-api/controllers/contents/download.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Request, Response } from 'express';
-import { DependencyContainer } from '../../dependency-injection/DependencyContainer';
-import Logger from 'electron-log';
-
-export function buildContentsController(container: DependencyContainer) {
-  const download = async (req: Request, res: Response) => {
-    const decodedBuffer = Buffer.from(req.params.path, 'base64');
-
-    const path = decodedBuffer.toString('utf-8').replaceAll('%20', ' ');
-
-    Logger.info('DOWNLOAD PETICION TO:', path);
-
-    const file = await container.filesSearcher.run({ path: `/${path}` });
-
-    if (!file) {
-      res.status(404).send();
-      return;
-    }
-
-    await container.downloadContentsToPlainFile.run(file);
-
-    res.json({ id: file.contentsId });
-  };
-
-  return {
-    download,
-  };
-}
diff --git a/src/apps/hydratation-api/dependency-injection/contents/ContentsContainer.ts b/src/apps/hydratation-api/dependency-injection/contents/ContentsContainer.ts
index ce302ba79..c1b293613 100644
--- a/src/apps/hydratation-api/dependency-injection/contents/ContentsContainer.ts
+++ b/src/apps/hydratation-api/dependency-injection/contents/ContentsContainer.ts
@@ -1,5 +1,7 @@
 import { DownloadContentsToPlainFile } from '../../../../context/virtual-drive/contents/application/DownloadContentsToPlainFile';
+import { LocalContentsDeleter } from '../../../../context/virtual-drive/contents/application/LocalContentsDeleter';
 
 export interface ContentsContainer {
   downloadContentsToPlainFile: DownloadContentsToPlainFile;
+  localContentsDeleter: LocalContentsDeleter;
 }
diff --git a/src/apps/hydratation-api/dependency-injection/contents/builder.ts b/src/apps/hydratation-api/dependency-injection/contents/builder.ts
index 3dc57c693..32e6826c9 100644
--- a/src/apps/hydratation-api/dependency-injection/contents/builder.ts
+++ b/src/apps/hydratation-api/dependency-injection/contents/builder.ts
@@ -4,9 +4,10 @@ import { ContentsContainer } from './ContentsContainer';
 import { DependencyInjectionUserProvider } from '../common/user';
 import { DependencyInjectionMnemonicProvider } from '../common/mnemonic';
 import { EnvironmentRemoteFileContentsManagersFactory } from '../../../../context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
-import { FSLocalFileWriter } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileWriter';
+import { FSLocalFileSystem } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileSystem';
 import { DependencyInjectionEventBus } from '../common/eventBus';
 import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
+import { LocalContentsDeleter } from '../../../../context/virtual-drive/contents/application/LocalContentsDeleter';
 
 export async function buildContentsContainer(): Promise<ContentsContainer> {
   const user = DependencyInjectionUserProvider.get();
@@ -26,18 +27,21 @@ export async function buildContentsContainer(): Promise<ContentsContainer> {
   const localFileContentsDirectoryProvider =
     new FuseAppDataLocalFileContentsDirectoryProvider();
 
-  const localWriter = new FSLocalFileWriter(
+  const localFS = new FSLocalFileSystem(
     localFileContentsDirectoryProvider,
     'downloaded'
   );
 
   const downloadContentsToPlainFile = new DownloadContentsToPlainFile(
     contentsManagerFactory,
-    localWriter,
+    localFS,
     eventBus
   );
 
+  const localContentsDeleter = new LocalContentsDeleter(localFS);
+
   return {
     downloadContentsToPlainFile,
+    localContentsDeleter,
   };
 }
diff --git a/src/apps/hydratation-api/routes/contents.ts b/src/apps/hydratation-api/routes/contents.ts
index 4434f6570..db4649c3b 100644
--- a/src/apps/hydratation-api/routes/contents.ts
+++ b/src/apps/hydratation-api/routes/contents.ts
@@ -1,5 +1,5 @@
 import express, { Router } from 'express';
-import { buildContentsController } from '../controllers/contents/download';
+import { buildContentsController } from '../controllers/contents';
 import { DependencyContainer } from '../dependency-injection/DependencyContainer';
 
 export function buildContentsRouter(container: DependencyContainer): Router {
@@ -7,6 +7,7 @@ export function buildContentsRouter(container: DependencyContainer): Router {
   const router = express.Router();
 
   router.post('/download/:path', controllers.download);
+  router.delete('/download/:path', controllers.remove);
 
   return router;
 }
diff --git a/src/apps/sync-engine/dependency-injection/contents/builder.ts b/src/apps/sync-engine/dependency-injection/contents/builder.ts
index 19f047679..fffdc3775 100644
--- a/src/apps/sync-engine/dependency-injection/contents/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/contents/builder.ts
@@ -11,7 +11,7 @@ import { NotifyMainProcessHydrationFinished } from '../../../../context/virtual-
 import { RetryContentsUploader } from '../../../../context/virtual-drive/contents/application/RetryContentsUploader';
 import { EnvironmentRemoteFileContentsManagersFactory } from '../../../../context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
 import { FSLocalFileProvider } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileProvider';
-import { FSLocalFileWriter } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileWriter';
+import { FSLocalFileSystem } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileSystem';
 import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
 import { IPCLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/IPCLocalFileContentsDirectoryProvider';
 
@@ -46,7 +46,7 @@ export async function buildContentsContainer(
   const localFileContentsDirectoryProvider =
     new IPCLocalFileContentsDirectoryProvider();
 
-  const localWriter = new FSLocalFileWriter(
+  const localWriter = new FSLocalFileSystem(
     localFileContentsDirectoryProvider,
     'internxt'
   );
diff --git a/src/context/virtual-drive/contents/application/ContentsDownloader.ts b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
index f306122db..e16ac956a 100644
--- a/src/context/virtual-drive/contents/application/ContentsDownloader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
@@ -8,7 +8,7 @@ import { File } from '../../files/domain/File';
 import { EventBus } from '../../shared/domain/EventBus';
 import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
 import { LocalFileContents } from '../domain/LocalFileContents';
-import { LocalFileWriter } from '../domain/LocalFileWriter';
+import { LocalFileSystem } from '../domain/LocalFileSystem';
 import { ContentFileDownloader } from '../domain/contentHandlers/ContentFileDownloader';
 import { LocalFileContentsDirectoryProvider } from '../../shared/domain/LocalFileContentsDirectoryProvider';
 
@@ -16,7 +16,7 @@ export class ContentsDownloader {
   private readableDownloader: Readable | null;
   constructor(
     private readonly managerFactory: ContentsManagersFactory,
-    private readonly localWriter: LocalFileWriter,
+    private readonly localWriter: LocalFileSystem,
     private readonly ipc: SyncEngineIpc,
     private readonly localFileContentsDirectoryProvider: LocalFileContentsDirectoryProvider,
     private readonly eventBus: EventBus
diff --git a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
index 137097d66..669728229 100644
--- a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
+++ b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
@@ -2,12 +2,12 @@ import { File } from '../../files/domain/File';
 import { EventBus } from '../../shared/domain/EventBus';
 import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
 import { LocalFileContents } from '../domain/LocalFileContents';
-import { LocalFileWriter } from '../domain/LocalFileWriter';
+import { LocalFileSystem } from '../domain/LocalFileSystem';
 
 export class DownloadContentsToPlainFile {
   constructor(
     private readonly managerFactory: ContentsManagersFactory,
-    private readonly localWriter: LocalFileWriter,
+    private readonly localWriter: LocalFileSystem,
     private readonly eventBus: EventBus
   ) {}
 
diff --git a/src/context/virtual-drive/contents/domain/LocalFileWriter.ts b/src/context/virtual-drive/contents/domain/LocalFileWriter.ts
deleted file mode 100644
index c9831ae85..000000000
--- a/src/context/virtual-drive/contents/domain/LocalFileWriter.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { LocalFileContents } from './LocalFileContents';
-
-type ResultFilePath = string;
-
-export interface LocalFileWriter {
-  write(contents: LocalFileContents, name?: string): Promise<ResultFilePath>;
-}
diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
deleted file mode 100644
index c5953922b..000000000
--- a/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { ensureFolderExists } from '../../../../apps/shared/fs/ensure-folder-exists';
-import { WriteReadableToFile } from '../../../../apps/shared/fs/write-readable-to-file';
-import { LocalFileContents } from '../domain/LocalFileContents';
-import { LocalFileContentsDirectoryProvider } from '../../shared/domain/LocalFileContentsDirectoryProvider';
-import { LocalFileWriter } from '../domain/LocalFileWriter';
-import path from 'path';
-
-export class FSLocalFileWriter implements LocalFileWriter {
-  constructor(
-    private readonly locationProvider: LocalFileContentsDirectoryProvider,
-    private readonly subfolder: string
-  ) {}
-
-  async write(contents: LocalFileContents, name?: string): Promise<string> {
-    const location = await this.locationProvider.provide();
-
-    const folderPath = path.join(location, this.subfolder);
-    ensureFolderExists(folderPath);
-
-    const fileName = name || contents.nameWithExtension;
-
-    const filePath = path.join(folderPath, fileName);
-
-    await WriteReadableToFile.write(contents.stream, filePath);
-
-    return filePath;
-  }
-}
diff --git a/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts b/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
index 063fa606a..fc8caf20e 100644
--- a/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
+++ b/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
@@ -1,7 +1,7 @@
 import { LocalFileContents } from '../../../../../src/context/virtual-drive/contents/domain/LocalFileContents';
-import { LocalFileWriter } from '../../../../../src/context/virtual-drive/contents/domain/LocalFileWriter';
+import { LocalFileSystem } from '../../../../../src/context/virtual-drive/contents/domain/LocalFileSystem';
 
-export class LocalFileWriterMock implements LocalFileWriter {
+export class LocalFileWriterMock implements LocalFileSystem {
   public writeMock = jest.fn();
 
   write(contents: LocalFileContents): Promise<string> {
diff --git a/tests/context/virtual-drive/contents/__mocks__/LocationProviderMock.ts b/tests/context/virtual-drive/contents/__mocks__/LocationProviderMock.ts
index 57f78c551..4adc6cd82 100644
--- a/tests/context/virtual-drive/contents/__mocks__/LocationProviderMock.ts
+++ b/tests/context/virtual-drive/contents/__mocks__/LocationProviderMock.ts
@@ -1,4 +1,4 @@
-import { LocationProvider } from '../../../../../src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter';
+import { LocationProvider } from '../../../../../src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem';
 
 export class LocationProviderMock {
   public mock = jest.fn();

From 3f9226488dbe6a1d6448aa1f897ffa20980d0314 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 22 Nov 2023 16:24:20 +0100
Subject: [PATCH 060/188] wip

---
 src/apps/fuse/callbacks/Open.ts                   | 14 ++++++++++----
 src/apps/fuse/callbacks/Read.ts                   | 11 ++++++++++-
 .../contents/ContentsContainer.ts                 |  2 ++
 .../fuse/dependency-injection/contents/builder.ts |  8 ++++++--
 src/apps/fuse/index.ts                            |  4 +++-
 src/apps/hydratation-api/HidratationApi.ts        | 15 ++++++++++++++-
 src/apps/hydratation-api/routes/contents.ts       |  4 ++--
 7 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/src/apps/fuse/callbacks/Open.ts b/src/apps/fuse/callbacks/Open.ts
index 07b9eff3c..ee137d054 100644
--- a/src/apps/fuse/callbacks/Open.ts
+++ b/src/apps/fuse/callbacks/Open.ts
@@ -16,14 +16,20 @@ export class Open {
       return cb(fuse.ENOENT);
     }
 
-    Logger.debug(path, ' FOUNDED', file.contentsId);
+    const alreadyDownloaded = await this.container.localContentChecker.run(
+      file
+    );
 
-    try {
-      Logger.info('[FUSE] Starting the download of ', path);
+    if (alreadyDownloaded) {
+      Logger.debug('[FUSE] File contents already in local');
+      cb(0, file.id);
+      return;
+    }
 
+    try {
+      Logger.debug('[FUSE] File contents not in local');
       await this.container.downloadContentsToPlainFile.run(file);
 
-      Logger.info('[FUSE] Download ended ', path);
       cb(0, file.id);
     } catch (err: unknown) {
       Logger.error('[FUSE] Error downloading file: ', err);
diff --git a/src/apps/fuse/callbacks/Read.ts b/src/apps/fuse/callbacks/Read.ts
index 98e26d800..823599f06 100644
--- a/src/apps/fuse/callbacks/Read.ts
+++ b/src/apps/fuse/callbacks/Read.ts
@@ -18,7 +18,16 @@ export class Read {
   ) {
     Logger.debug(`READ ${path}`);
 
-    const filePath = this.container.relativePathToAbsoluteConverter.run(path);
+    const file = await this.container.filesSearcher.run({ path });
+
+    if (!file) {
+      cb(fuse.ENOENT);
+      return;
+    }
+
+    const filePath = this.container.relativePathToAbsoluteConverter.run(
+      file.contentsId
+    );
 
     fs.readFile(filePath, (err, data) => {
       if (err) {
diff --git a/src/apps/fuse/dependency-injection/contents/ContentsContainer.ts b/src/apps/fuse/dependency-injection/contents/ContentsContainer.ts
index ce302ba79..da7c526e2 100644
--- a/src/apps/fuse/dependency-injection/contents/ContentsContainer.ts
+++ b/src/apps/fuse/dependency-injection/contents/ContentsContainer.ts
@@ -1,5 +1,7 @@
 import { DownloadContentsToPlainFile } from '../../../../context/virtual-drive/contents/application/DownloadContentsToPlainFile';
+import { LocalContentChecker } from '../../../../context/virtual-drive/contents/application/LocalContentChecker';
 
 export interface ContentsContainer {
   downloadContentsToPlainFile: DownloadContentsToPlainFile;
+  localContentChecker: LocalContentChecker;
 }
diff --git a/src/apps/fuse/dependency-injection/contents/builder.ts b/src/apps/fuse/dependency-injection/contents/builder.ts
index 56e224aab..201f53847 100644
--- a/src/apps/fuse/dependency-injection/contents/builder.ts
+++ b/src/apps/fuse/dependency-injection/contents/builder.ts
@@ -7,6 +7,7 @@ import { EnvironmentRemoteFileContentsManagersFactory } from '../../../../contex
 import { FSLocalFileSystem } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileSystem';
 import { DependencyInjectionEventBus } from '../common/eventBus';
 import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
+import { LocalContentChecker } from '../../../../context/virtual-drive/contents/application/LocalContentChecker';
 
 export async function buildContentsContainer(): Promise<ContentsContainer> {
   const user = DependencyInjectionUserProvider.get();
@@ -26,18 +27,21 @@ export async function buildContentsContainer(): Promise<ContentsContainer> {
   const localFileContentsDirectoryProvider =
     new FuseAppDataLocalFileContentsDirectoryProvider();
 
-  const localWriter = new FSLocalFileSystem(
+  const localFS = new FSLocalFileSystem(
     localFileContentsDirectoryProvider,
     'downloaded'
   );
 
   const downloadContentsToPlainFile = new DownloadContentsToPlainFile(
     contentsManagerFactory,
-    localWriter,
+    localFS,
     eventBus
   );
 
+  const localContentChecker = new LocalContentChecker(localFS);
+
   return {
     downloadContentsToPlainFile,
+    localContentChecker,
   };
 }
diff --git a/src/apps/fuse/index.ts b/src/apps/fuse/index.ts
index 3fcd1f7a8..5debce2f6 100644
--- a/src/apps/fuse/index.ts
+++ b/src/apps/fuse/index.ts
@@ -14,7 +14,9 @@ let fuseApp: FuseApp;
 async function spawnSyncEngineWorker() {
   const api = new HidratationApi();
 
-  await api.start();
+  await api.start({
+    debug: false,
+  });
 
   const root = getRootVirtualDrive();
 
diff --git a/src/apps/hydratation-api/HidratationApi.ts b/src/apps/hydratation-api/HidratationApi.ts
index ae1ebae74..4305abe67 100644
--- a/src/apps/hydratation-api/HidratationApi.ts
+++ b/src/apps/hydratation-api/HidratationApi.ts
@@ -4,6 +4,10 @@ import Logger from 'electron-log';
 import { buildContentsRouter } from './routes/contents';
 import { DependencyContainerFactory } from './dependency-injection/DependencyContainerFactory';
 
+export interface HidratationApiOptions {
+  debug: boolean;
+}
+
 export class HidratationApi {
   private static readonly PORT = 4567;
   private readonly app;
@@ -23,9 +27,18 @@ export class HidratationApi {
     return routers;
   }
 
-  async start(): Promise<void> {
+  async start(options: HidratationApiOptions): Promise<void> {
     const routers = await this.buildRouters();
 
+    if (options.debug) {
+      this.app.use((req, _res, next) => {
+        Logger.debug(
+          `[${new Date().toLocaleString()}] ${req.method} ${req.url}`
+        );
+        next();
+      });
+    }
+
     Object.entries(routers).forEach(([route, router]: [string, Router]) => {
       this.app.use(`/${route}`, router);
     });
diff --git a/src/apps/hydratation-api/routes/contents.ts b/src/apps/hydratation-api/routes/contents.ts
index db4649c3b..092bb249d 100644
--- a/src/apps/hydratation-api/routes/contents.ts
+++ b/src/apps/hydratation-api/routes/contents.ts
@@ -6,8 +6,8 @@ export function buildContentsRouter(container: DependencyContainer): Router {
   const controllers = buildContentsController(container);
   const router = express.Router();
 
-  router.post('/download/:path', controllers.download);
-  router.delete('/download/:path', controllers.remove);
+  router.post('/:path', controllers.download);
+  router.delete('/:path', controllers.remove);
 
   return router;
 }

From 9cf74930480b60a19cfa958193c51e640c5a23fb Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 22 Nov 2023 16:29:22 +0100
Subject: [PATCH 061/188] wip

---
 .../hydratation-api/controllers/contents.ts   | 50 +++++++++++++++++
 .../application/LocalContentChecker.ts        | 10 ++++
 .../application/LocalContentsDeleter.ts       | 15 +++++
 .../contents/domain/LocalFileSystem.ts        | 11 ++++
 .../infrastructure/FSLocalFileSystem.ts       | 56 +++++++++++++++++++
 5 files changed, 142 insertions(+)
 create mode 100644 src/apps/hydratation-api/controllers/contents.ts
 create mode 100644 src/context/virtual-drive/contents/application/LocalContentChecker.ts
 create mode 100644 src/context/virtual-drive/contents/application/LocalContentsDeleter.ts
 create mode 100644 src/context/virtual-drive/contents/domain/LocalFileSystem.ts
 create mode 100644 src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts

diff --git a/src/apps/hydratation-api/controllers/contents.ts b/src/apps/hydratation-api/controllers/contents.ts
new file mode 100644
index 000000000..9719e1939
--- /dev/null
+++ b/src/apps/hydratation-api/controllers/contents.ts
@@ -0,0 +1,50 @@
+import { Request, Response } from 'express';
+import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import Logger from 'electron-log';
+
+export function buildContentsController(container: DependencyContainer) {
+  const download = async (req: Request, res: Response) => {
+    const decodedBuffer = Buffer.from(req.params.path, 'base64');
+
+    const path = decodedBuffer.toString('utf-8').replaceAll('%20', ' ');
+
+    Logger.info('DOWNLOAD:', path);
+
+    const file = await container.filesSearcher.run({ path });
+
+    if (!file) {
+      res.status(404).send();
+      return;
+    }
+
+    await container.downloadContentsToPlainFile.run(file);
+
+    res.status(201).send();
+  };
+
+  const remove = async (req: Request, res: Response) => {
+    const decodedBuffer = Buffer.from(req.params.path, 'base64');
+
+    const path = decodedBuffer.toString('utf-8').replaceAll('%20', ' ');
+
+    Logger.info('REMOVE:', path);
+
+    const file = await container.filesSearcher.run({
+      path,
+    });
+
+    if (!file) {
+      res.status(404).send();
+      return;
+    }
+
+    await container.localContentsDeleter.run(file);
+
+    res.status(201).send();
+  };
+
+  return {
+    download,
+    remove,
+  };
+}
diff --git a/src/context/virtual-drive/contents/application/LocalContentChecker.ts b/src/context/virtual-drive/contents/application/LocalContentChecker.ts
new file mode 100644
index 000000000..0977d2cc8
--- /dev/null
+++ b/src/context/virtual-drive/contents/application/LocalContentChecker.ts
@@ -0,0 +1,10 @@
+import { File } from '../../files/domain/File';
+import { LocalFileSystem } from '../domain/LocalFileSystem';
+
+export class LocalContentChecker {
+  constructor(private readonly local: LocalFileSystem) {}
+
+  run(file: File): Promise<boolean> {
+    return this.local.exists(file.contentsId);
+  }
+}
diff --git a/src/context/virtual-drive/contents/application/LocalContentsDeleter.ts b/src/context/virtual-drive/contents/application/LocalContentsDeleter.ts
new file mode 100644
index 000000000..67c8d37b4
--- /dev/null
+++ b/src/context/virtual-drive/contents/application/LocalContentsDeleter.ts
@@ -0,0 +1,15 @@
+import { File } from '../../files/domain/File';
+import { LocalFileSystem } from '../domain/LocalFileSystem';
+import Logger from 'electron-log';
+
+export class LocalContentsDeleter {
+  constructor(private readonly local: LocalFileSystem) {}
+
+  async run(file: File): Promise<void> {
+    try {
+      await this.local.remove(file.contentsId);
+    } catch (err) {
+      Logger.error(err);
+    }
+  }
+}
diff --git a/src/context/virtual-drive/contents/domain/LocalFileSystem.ts b/src/context/virtual-drive/contents/domain/LocalFileSystem.ts
new file mode 100644
index 000000000..e3808ffb2
--- /dev/null
+++ b/src/context/virtual-drive/contents/domain/LocalFileSystem.ts
@@ -0,0 +1,11 @@
+import { LocalFileContents } from './LocalFileContents';
+
+type ResultFilePath = string;
+
+export interface LocalFileSystem {
+  write(contents: LocalFileContents, name?: string): Promise<ResultFilePath>;
+
+  remove(path: string): Promise<void>;
+
+  exists(path: string): Promise<boolean>;
+}
diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
new file mode 100644
index 000000000..65d52dc5c
--- /dev/null
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
@@ -0,0 +1,56 @@
+import { ensureFolderExists } from '../../../../apps/shared/fs/ensure-folder-exists';
+import { WriteReadableToFile } from '../../../../apps/shared/fs/write-readable-to-file';
+import { LocalFileContents } from '../domain/LocalFileContents';
+import { LocalFileContentsDirectoryProvider } from '../../shared/domain/LocalFileContentsDirectoryProvider';
+import { LocalFileSystem } from '../domain/LocalFileSystem';
+import path from 'path';
+import fs from 'fs/promises';
+import Logger from 'electron-log';
+
+export class FSLocalFileSystem implements LocalFileSystem {
+  constructor(
+    private readonly locationProvider: LocalFileContentsDirectoryProvider,
+    private readonly subfolder: string
+  ) {}
+
+  private async baseFolder(): Promise<string> {
+    const location = await this.locationProvider.provide();
+
+    return path.join(location, this.subfolder);
+  }
+
+  async write(contents: LocalFileContents, name?: string): Promise<string> {
+    const folderPath = await this.baseFolder();
+    ensureFolderExists(folderPath);
+
+    const fileName = name || contents.nameWithExtension;
+
+    const filePath = path.join(folderPath, fileName);
+
+    await WriteReadableToFile.write(contents.stream, filePath);
+
+    return filePath;
+  }
+
+  async remove(relativePath: string): Promise<void> {
+    const folder = await this.baseFolder();
+
+    const absolutePath = path.join(folder, relativePath);
+    Logger.debug(' delete path,', absolutePath);
+    return fs.rm(absolutePath);
+  }
+
+  async exists(relativePath: string): Promise<boolean> {
+    const folder = await this.baseFolder();
+
+    const absolutePath = path.join(folder, relativePath);
+
+    try {
+      Logger.debug(' exists path,', absolutePath);
+      await fs.stat(absolutePath);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}

From 75b5ce725db50c7c659cc10f9a39181fb56a1db2 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 22 Nov 2023 16:41:00 +0100
Subject: [PATCH 062/188] chore: remove unused dep

---
 release/app/package.json |   1 -
 release/app/yarn.lock    | 540 +--------------------------------------
 2 files changed, 4 insertions(+), 537 deletions(-)

diff --git a/release/app/package.json b/release/app/package.json
index 2662032e5..c6b4e8016 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -11,7 +11,6 @@
     "reload-virtual-drive": "yarn add  --ignore-scripts ../../../node-win && npm run link-modules"
   },
   "dependencies": {
-    "@cocalc/fuse-native": "^2.4.0",
     "@gcas/fuse": "^2.4.2",
     "@rudderstack/rudder-sdk-node": "^1.1.4",
     "better-sqlite3": "^8.3.0",
diff --git a/release/app/yarn.lock b/release/app/yarn.lock
index fead08ea2..81352052d 100644
--- a/release/app/yarn.lock
+++ b/release/app/yarn.lock
@@ -16,16 +16,6 @@
   dependencies:
     regenerator-runtime "^0.13.11"
 
-"@cocalc/fuse-native@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@cocalc/fuse-native/-/fuse-native-2.4.0.tgz#feee5b75fef36a1b1b37135d8ccdc28d5dacf1e8"
-  integrity sha512-mhg+JZZkGq6cGN9Icy7Uu1J5/M1gR44t38DpxjZlRH4oyFcwpH2090/CFv2jGVaTOPrjgvxlb0jHNx9J7WUing==
-  dependencies:
-    nanoresource "^1.3.0"
-    napi-macros "^2.0.0"
-    node-gyp "^9.4.0"
-    node-gyp-build "^4.6.0"
-
 "@colors/colors@1.5.0":
   version "1.5.0"
   resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"
@@ -40,11 +30,6 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
-"@gar/promisify@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
-  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
-
 "@gcas/fuse@^2.4.2":
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/@gcas/fuse/-/fuse-2.4.2.tgz#149bd97ec8a60988f4868bacd719c7e8a1c41876"
@@ -88,22 +73,6 @@
   resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.2.0.tgz#016d855b6bc459fd908095811f6826e45dd4ba64"
   integrity sha512-XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA==
 
-"@npmcli/fs@^2.1.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
-  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
-  dependencies:
-    "@gar/promisify" "^1.1.3"
-    semver "^7.3.5"
-
-"@npmcli/move-file@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
-  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@rudderstack/rudder-sdk-node@^1.1.4":
   version "1.1.4"
   resolved "https://registry.npmjs.org/@rudderstack/rudder-sdk-node/-/rudder-sdk-node-1.1.4.tgz"
@@ -135,38 +104,6 @@
   resolved "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.5.tgz"
   integrity sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==
 
-"@tootallnate/once@2":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
-  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
-
-abbrev@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
-  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-
-agent-base@6, agent-base@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
-  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
-  dependencies:
-    debug "4"
-
-agentkeepalive@^4.2.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
-  integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
-  dependencies:
-    humanize-ms "^1.2.1"
-
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
@@ -189,19 +126,6 @@ app-root-path@^3.1.0:
   resolved "https://registry.npmjs.org/app-root-path/-/app-root-path-3.1.0.tgz"
   integrity sha512-biN3PwB2gUtjaYy/isrU3aNWI5w+fAfvHkSvCKeQGxhmYpwKFUxudR3Yya+KqVRHBmEDYh+/lTozYCFbmzX4nA==
 
-"aproba@^1.0.3 || ^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
-  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
-
-are-we-there-yet@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd"
-  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^3.6.0"
-
 async@^3.2.3:
   version "3.2.4"
   resolved "https://registry.npmjs.org/async/-/async-3.2.4.tgz"
@@ -256,14 +180,6 @@ bl@^4.0.3:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
 brace-expansion@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"
@@ -302,30 +218,6 @@ bull@^4.7.0:
     semver "^7.3.2"
     uuid "^8.3.0"
 
-cacache@^16.1.0:
-  version "16.1.3"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
-  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
-  dependencies:
-    "@npmcli/fs" "^2.1.0"
-    "@npmcli/move-file" "^2.0.0"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    glob "^8.0.1"
-    infer-owner "^1.0.4"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    mkdirp "^1.0.4"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^9.0.0"
-    tar "^6.1.11"
-    unique-filename "^2.0.0"
-
 chalk@^4.0.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
@@ -344,16 +236,6 @@ chownr@^1.1.1:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
 
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
-
 cli-highlight@^2.1.11:
   version "2.1.11"
   resolved "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz"
@@ -421,11 +303,6 @@ color-string@^1.6.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
 color@^3.1.3:
   version "3.2.1"
   resolved "https://registry.npmjs.org/color/-/color-3.2.1.tgz"
@@ -447,16 +324,6 @@ component-type@^1.2.1:
   resolved "https://registry.npmjs.org/component-type/-/component-type-1.2.1.tgz"
   integrity sha512-Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg==
 
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
-console-control-strings@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
-
 cron-parser@^4.2.1:
   version "4.7.1"
   resolved "https://registry.npmjs.org/cron-parser/-/cron-parser-4.7.1.tgz"
@@ -476,7 +343,7 @@ date-fns@^2.29.3:
   dependencies:
     "@babel/runtime" "^7.21.0"
 
-debug@4, debug@^4.3.3, debug@^4.3.4:
+debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -500,11 +367,6 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
-
 denque@^2.0.1:
   version "2.1.0"
   resolved "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz"
@@ -530,13 +392,6 @@ enabled@2.0.x:
   resolved "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz"
   integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==
 
-encoding@^0.1.13:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
-  integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
-  dependencies:
-    iconv-lite "^0.6.2"
-
 end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -544,16 +399,6 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
   dependencies:
     once "^1.4.0"
 
-env-paths@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
-  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
-
-err-code@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
-  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
-
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
@@ -564,11 +409,6 @@ expand-template@^2.0.3:
   resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
   integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
 
-exponential-backoff@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/exponential-backoff/-/exponential-backoff-3.1.1.tgz#64ac7526fe341ab18a39016cd22c787d01e00bf6"
-  integrity sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==
-
 fecha@^4.2.0:
   version "4.2.3"
   resolved "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz"
@@ -594,32 +434,11 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
-fs-minipass@^2.0.0, fs-minipass@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
-  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-  dependencies:
-    minipass "^3.0.0"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-gauge@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce"
-  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
-  dependencies:
-    aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.3"
-    console-control-strings "^1.1.0"
-    has-unicode "^2.0.1"
-    signal-exit "^3.0.7"
-    string-width "^4.2.3"
-    strip-ansi "^6.0.1"
-    wide-align "^1.1.5"
-
 get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
@@ -635,19 +454,7 @@ github-from-package@0.0.0:
   resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
   integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==
 
-glob@^7.1.3, glob@^7.1.4:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^8.0.1, glob@^8.1.0:
+glob@^8.1.0:
   version "8.1.0"
   resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"
   integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
@@ -658,82 +465,21 @@ glob@^8.0.1, glob@^8.1.0:
     minimatch "^5.0.1"
     once "^1.3.0"
 
-graceful-fs@^4.2.6:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
 has-flag@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-unicode@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
-
 highlight.js@^10.7.1:
   version "10.7.3"
   resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz"
   integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==
 
-http-cache-semantics@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
-  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
-
-http-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
-  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
-  dependencies:
-    "@tootallnate/once" "2"
-    agent-base "6"
-    debug "4"
-
-https-proxy-agent@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
-  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
-humanize-ms@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
-  dependencies:
-    ms "^2.0.0"
-
-iconv-lite@^0.6.2:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
-  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3.0.0"
-
 ieee754@^1.1.13, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-imurmurhash@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
-
-indent-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
-  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
-
-infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
@@ -767,11 +513,6 @@ ioredis@^5.0.0:
     redis-parser "^3.0.0"
     standard-as-callback "^2.1.0"
 
-ip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
-  integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
-
 is-arrayish@^0.3.1:
   version "0.3.2"
   resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"
@@ -787,11 +528,6 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-lambda@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
-  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
-
 is-retry-allowed@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz"
@@ -802,11 +538,6 @@ is-stream@^2.0.0:
   resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
 join-component@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz"
@@ -860,38 +591,11 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.7.1:
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89"
-  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
-
 luxon@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/luxon/-/luxon-3.2.1.tgz"
   integrity sha512-QrwPArQCNLAKGO/C+ZIilgIuDnEnKx5QYODdDtbFaxzsbZcc/a7WFq7MhsVYgRlwawLtvOUESTlfJ+hc/USqPg==
 
-make-fetch-happen@^10.0.3:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164"
-  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
-  dependencies:
-    agentkeepalive "^4.2.1"
-    cacache "^16.1.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^7.7.1"
-    minipass "^3.1.6"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.3"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.3"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^7.0.0"
-    ssri "^9.0.0"
-
 md5@^2.3.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz"
@@ -906,13 +610,6 @@ mimic-response@^3.1.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
   integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
 
-minimatch@^3.1.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
 minimatch@^5.0.1:
   version "5.1.6"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"
@@ -925,75 +622,11 @@ minimist@^1.2.0, minimist@^1.2.3:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-fetch@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
-  integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
-  dependencies:
-    minipass "^3.1.6"
-    minipass-sized "^1.0.3"
-    minizlib "^2.1.2"
-  optionalDependencies:
-    encoding "^0.1.13"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-sized@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
-  integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
-  version "3.3.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
-  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
-  dependencies:
-    yallist "^4.0.0"
-
-minipass@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
-  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
-
-minizlib@^2.1.1, minizlib@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
-  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-  dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
-
 mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp@^1.0.3, mkdirp@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-
 mkdirp@^2.1.3:
   version "2.1.6"
   resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz"
@@ -1004,7 +637,7 @@ ms@2.1.2:
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
+ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -1056,11 +689,6 @@ napi-macros@^2.0.0:
   resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.2.2.tgz#817fef20c3e0e40a963fbf7b37d1600bd0201044"
   integrity sha512-hmEVtAGYzVQpCKdbQea4skABsdXW4RUh5t5mJ2zzqowJS2OyXZTU1KhDVFhx+NlWZ4ap9mqR9TcDO3LTTttd+g==
 
-negotiator@^0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
-  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
-
 node-abi@^3.3.0:
   version "3.51.0"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d"
@@ -1073,45 +701,6 @@ node-gyp-build-optional-packages@5.0.3:
   resolved "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz"
   integrity sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==
 
-node-gyp-build@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.1.tgz#24b6d075e5e391b8d5539d98c7fc5c210cac8a3e"
-  integrity sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==
-
-node-gyp@^9.4.0:
-  version "9.4.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.4.1.tgz#8a1023e0d6766ecb52764cc3a734b36ff275e185"
-  integrity sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==
-  dependencies:
-    env-paths "^2.2.0"
-    exponential-backoff "^3.1.1"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^10.0.3"
-    nopt "^6.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
-nopt@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
-  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
-  dependencies:
-    abbrev "^1.0.0"
-
-npmlog@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830"
-  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
-  dependencies:
-    are-we-there-yet "^3.0.0"
-    console-control-strings "^1.1.0"
-    gauge "^4.0.3"
-    set-blocking "^2.0.0"
-
 object-assign@^4.0.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
@@ -1136,13 +725,6 @@ p-finally@^1.0.0:
   resolved "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"
   integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
 p-timeout@^3.2.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz"
@@ -1167,11 +749,6 @@ parse5@^6.0.1:
   resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
 prebuild-install@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
@@ -1190,19 +767,6 @@ prebuild-install@^7.1.1:
     tar-fs "^2.0.0"
     tunnel-agent "^0.6.0"
 
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
-
-promise-retry@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
-  integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
-  dependencies:
-    err-code "^2.0.2"
-    retry "^0.12.0"
-
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -1278,18 +842,6 @@ require-directory@^2.1.1:
   resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
   integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
-retry@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
-
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
@@ -1300,11 +852,6 @@ safe-stable-stringify@^2.3.1:
   resolved "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz"
   integrity sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA==
 
-"safer-buffer@>= 2.1.2 < 3.0.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
-  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
-
 semver@^7.3.2, semver@^7.3.5:
   version "7.5.4"
   resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"
@@ -1319,11 +866,6 @@ serialize-javascript@^6.0.0:
   dependencies:
     randombytes "^2.1.0"
 
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
-
 sha.js@^2.4.11:
   version "2.4.11"
   resolved "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"
@@ -1332,11 +874,6 @@ sha.js@^2.4.11:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-signal-exit@^3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
-  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-
 simple-concat@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
@@ -1358,35 +895,6 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
-smart-buffer@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
-  integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
-
-socks-proxy-agent@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
-  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
-
-socks@^2.6.2:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
-  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
-  dependencies:
-    ip "^2.0.0"
-    smart-buffer "^4.2.0"
-
-ssri@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
-  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
-  dependencies:
-    minipass "^3.1.1"
-
 stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"
@@ -1397,7 +905,7 @@ standard-as-callback@^2.1.0:
   resolved "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz"
   integrity sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -1453,18 +961,6 @@ tar-stream@^2.1.4:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@^6.1.11, tar@^6.1.2:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73"
-  integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^5.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
 text-hex@1.0.x:
   version "1.0.0"
   resolved "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz"
@@ -1522,20 +1018,6 @@ typeorm@^0.3.16:
     uuid "^9.0.0"
     yargs "^17.6.2"
 
-unique-filename@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
-  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
-  dependencies:
-    unique-slug "^3.0.0"
-
-unique-slug@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
-  integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
 util-deprecate@^1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
@@ -1551,20 +1033,6 @@ uuid@^9.0.0:
   resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"
   integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
 
-which@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
-wide-align@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
-  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
-  dependencies:
-    string-width "^1.0.2 || 2 || 3 || 4"
-
 winston-transport@^4.5.0:
   version "4.5.0"
   resolved "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"

From 4b2d0060752ebac383e7cbdcb4afc04d8ad024ce Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 22 Nov 2023 16:49:31 +0100
Subject: [PATCH 063/188] fix: dont build sync engine on linux

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d7728f635..1697711f3 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "url": "https://github.com/internxt/drive-desktop"
   },
   "scripts": {
-    "build": "concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:sync-engine\"",
+    "build": "concurrently \"npm run build:main\" \"npm run build:renderer\"",
     "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
     "build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts",
     "build:sync-engine": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync-engine.ts",

From ab924e2a52a4cf330bd80a354cee961675901e8d Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 23 Nov 2023 10:55:33 +0100
Subject: [PATCH 064/188] feat: send download events to ui

---
 .../DownloadContentsToPlainFile.ts            | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
index 669728229..0c091b32b 100644
--- a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
+++ b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
@@ -1,8 +1,10 @@
+import { broadcastToWindows } from '../../../../apps/main/windows';
 import { File } from '../../files/domain/File';
 import { EventBus } from '../../shared/domain/EventBus';
 import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
 import { LocalFileContents } from '../domain/LocalFileContents';
 import { LocalFileSystem } from '../domain/LocalFileSystem';
+import { ContentFileDownloader } from '../domain/contentHandlers/ContentFileDownloader';
 
 export class DownloadContentsToPlainFile {
   constructor(
@@ -11,9 +13,43 @@ export class DownloadContentsToPlainFile {
     private readonly eventBus: EventBus
   ) {}
 
+  private async registerEvents(downloader: ContentFileDownloader, file: File) {
+    downloader.on('start', () => {
+      broadcastToWindows('sync-info-update', {
+        action: 'DOWNLOADING',
+        name: file.nameWithExtension,
+        progress: 0,
+      });
+    });
+
+    downloader.on('progress', (progress: number) => {
+      broadcastToWindows('sync-info-update', {
+        action: 'DOWNLOADING',
+        name: file.nameWithExtension,
+        progress: progress,
+      });
+    });
+
+    downloader.on('error', () => {
+      broadcastToWindows('sync-info-update', {
+        action: 'DOWNLOAD_ERROR',
+        name: file.nameWithExtension,
+      });
+    });
+
+    downloader.on('finish', () => {
+      broadcastToWindows('sync-info-update', {
+        action: 'DOWNLOADED',
+        name: file.nameWithExtension,
+      });
+    });
+  }
+
   async run(file: File): Promise<string> {
     const downloader = this.managerFactory.downloader();
 
+    this.registerEvents(downloader, file);
+
     const readable = await downloader.download(file);
     const localContents = LocalFileContents.downloadedFrom(
       file,

From cf658fd3b56a28805c54f4f3b7f2bdcda1f243e1 Mon Sep 17 00:00:00 2001
From: Joan Vicens <joanvicens@proton.me>
Date: Fri, 24 Nov 2023 10:01:34 +0100
Subject: [PATCH 065/188] [_] chore/merge back windows (#426)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [_] Sync engine bindings (#347)

Implements
 - notifyDeleteCompletionCallback
 - notifyRenameCallback

* fix: set tooltip as standbay on window load

* fix: disable backups

* fix: spawn sync engine when firts sync ends

* fix: recreate widget after logout login secuence

* feat: version bump

* [_] test: make test work on windows (#348)

* [PB-942] fix: system language not selected (#350)

* fix: set system default as preferred language if not present

* fix: ensure sync engine is running to wait for it to stop

* fix: avoid recreating widget on login after a logut

* [🧪] run test on ci (#355)

* chore: undo type overwrite

* chore: clean up unused code

* fix

* [PB-944] Feat: include file size on placeholder (#352)

* feat: add size to placholder data

* feat: use all files listener

* feat: added tree builder service

* feat: use tree builder

* [_] feat: create folder placeholders (#357)

* feat: add field folder uuid

* feat: added tree builder service

* feat: add slash to folders path when creating its placeholder

* chore: clean unused code

* chore: remove unused imports

* [_] feat: block deletion until is finished (#351)

* feat: add file finder

* feat: block deletion util is done

* chore: rename

* feat: return result via callback

* feat: upload files

* [_] feat: separate callbacks (#360)

* [_] chore: refactor (#361)

* chore: open root folder when onboarding is finished

* fix: avoid destroying the tray

* chore: run test on ubuntu

* chore: add script to install only virtual drive

* chore: enforce type safety

* fix: precommit script

* [_] fix: thumbnail resize (#370)

* chore(deps-dev): bump electron from 25.1.0 to 25.8.1 (#371)

Bumps [electron](https://github.com/electron/electron) from 25.1.0 to 25.8.1.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v25.1.0...v25.8.1)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: refactor

* fix

* [_] feat: download on fetch data (#367)

* feat: set icon for root folder (#368)

* [_] fix: app crashes loading the localhost (#364)

* feat: retry file search

* lint fixes

* [_] chore: rename webdav worker to sync-engine (#373)

* chore: rename

* chore: reuse trim logic

* [_] update upload (#376)

* feat: update icons (#377)

* chore: version 2.0.0-a06

* chore: delete cached content file uploader

* chore: remove local cache and cloner

* fix: if the sync root is not the new one set it

* [PB-1011] chore: ignore file and folder creation error on traverser (#380)

* chore: register the provider with a correct guid

* [PB-1012] feat: reupload on change (#378)

* feat: reupload file when edited

* feat: add initial delay to upload

* chore: add todo

* fix: default system theme

* re-enabled realtime sockets

* fix rename problem when having two disks

* added file rename reporting

* fixed reporting changes events

* added tray icon changes by events

* [_] feat: folders placeholders (#383)

* feat: create empty folders

* feat: upload folders with contents

* feat: delete folder flattering the contents on trash

* fix: update updated at on trash

* chore: rename delete controller

* feat: delete files with a delay

* feat: block file deletion there is a folder being deleted

* fix: normalize path on http foler reposiotry

* feat: queue folder deletion

* feat: delete only the deleted folder

* feat: recreate file placeholder on delete error

* feat: create folder plachedor when deletion fails

* feat: folder rename

* test: fix folder deleter

* test: folder deletion fallback

* test: fix http file repo test

* test: update folder path creator

* fix: ts fixes

* [_] feat: add time metadata to placeholders (#379)

* feat: add tiem metadata to placeholder

* chore: use PlaceholderCreator on files module

* feat: use use case to print the placeholder tree

* chor: comment sync manager logs

* fix: file upload on existing path (#384)

* feat: uregister when user logs out (#385)

* test: added override file on creation test

* test: file deleter

* chore: veresio bump

* fix: folder deletion trashed check

* fix: notify widget file upload has finished after its being added

* add callback in progress event

* remove code smell and async unnecessary

* add path in callback progress event

* remove sync unnecessary

* [PB-1029] fix: folder creation with name (#387)

* fixes

* add chunksize with a new verion

* chore: use file and folder specific method to create placeholders

* feat: show internxt window when a download starts

* add status callback in fetch data

* rollback

* wip: add download final cycle

* fix: final download cycle

* fix test

* [] fix: ignore file creation after move (#389)

* fix: move files

* feat: use event history

* []: Feat: update local folder with remote changes (#381)

* chore: remove log

* fix: update the files when the path changes

* chore: version bump

* fix: download race condition

* chore: add trash logs

* [_] feat: delete file on remote update (#393)


* feat: delete files and folders

* fixes

* fix: throw error when creating a file that was moved

* fix: await for unregister sync root (#395)

* chore: store events before publication (#396)

* chore: notify file downloaded when it finishes

* fix: notify downloaded once

* chore: remove console.log

* fix: relaunch-when-closed-unexpectedly

* fix: show file deletion errors in issues window

* chore: disable report button on issues

* chore: version bump

* fix: increase the dealay on realtime updates

* fix: skip traverse deleted or trashed folders

* fix: test

* fix: tsc

* added placeholder trim id

* added refresh placeholders on real time sync

* wip: abort progresss

* fixed errordetails and types check

* Revert "fixed errordetails and types check"

This reverts commit 80fe3782dfc1e8d74de8793be08247aa6120b8a3.

* fix: revert cancel management

* fix: revert cancel management

* feat/break-stopped-hydration

* wip

* feat: release 2.0.0

* chore: add certificate

* feat: add retrive all files use case

* feat: add retrive all files use case

* feat: include start with bindings reloading

* fix: logout management

* fix: include unsync items deletion

* fix: ignore files missing folder id

* fix: ignore remote folders

* chore: version bump

* changed tray icons with white-filled new ones

* fixed some file download envent calls

* fixed tray status event listeners

* remove progress when file download starts

* [PB-1151] fix: improve malicious file name detection (#413)

* feat: unify traverser in one use case

* fix: traverser instantacion

* [_] chore: generate trees (#414)

* add notificationCallback, show error size limit from node-win in client

* chore: use fileRepositoryFactory

* fix: import missing functions

* feat: delet downloaded files from temp folder

* add icon path

* removed finish notification before hidrating file

* chore: version bump

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: larry-internxt <larry@internxt.com>
Co-authored-by: Larry <larry.internxt@gmail.com>
Co-authored-by: migueldev01 <miguel.ram.dev01@gmail.com>
Co-authored-by: Andres Pinto <andres.pintosantiso@gmail.com>
Co-authored-by: Carlos González <cgonzalez@shokworks.io>
Co-authored-by: Carlos González <117672238+cg27shokworks@users.noreply.github.com>
Co-authored-by: miguelsw <92745882+miguelsw@users.noreply.github.com>
---
 ...ebdav.ts => webpack.config.sync-engine.ts} |   8 +-
 .erb/configs/webpack.paths.ts                 |  10 +-
 .eslintignore                                 |   5 +
 .github/workflows/build-linux.yml             |  65 --
 .github/workflows/build-mac-arm.yml           |  86 ---
 .github/workflows/build-mac.yml               |  86 ---
 .github/workflows/build.yml                   | 157 ----
 .github/workflows/test.yml                    |  17 +-
 .husky/pre-commit                             |   1 +
 .vscode/settings.json                         |   3 +
 assets/icon.ico                               | Bin 105540 -> 285478 bytes
 assets/icon.png                               | Bin 5480 -> 0 bytes
 assets/icons/256x256.png                      | Bin 5480 -> 91753 bytes
 assets/tray/alert.png                         | Bin 0 -> 1504 bytes
 assets/tray/alert@2x.png                      | Bin 752 -> 3984 bytes
 assets/tray/alert@3x.png                      | Bin 0 -> 7059 bytes
 assets/tray/alertTemplate@2x.png              | Bin 752 -> 0 bytes
 assets/tray/idle.png                          | Bin 0 -> 1432 bytes
 assets/tray/idle@2x.png                       | Bin 0 -> 3906 bytes
 assets/tray/idle@3x.png                       | Bin 0 -> 7050 bytes
 assets/tray/loading.png                       | Bin 0 -> 1171 bytes
 assets/tray/loading@2x.png                    | Bin 704 -> 2778 bytes
 assets/tray/loading@3x.png                    | Bin 0 -> 4910 bytes
 assets/tray/loadingTemplate@2x.png            | Bin 704 -> 0 bytes
 assets/tray/standby@2x.png                    | Bin 668 -> 0 bytes
 assets/tray/standbyTemplate@2x.png            | Bin 668 -> 0 bytes
 assets/tray/syncing.png                       | Bin 0 -> 1649 bytes
 assets/tray/syncing@2x.png                    | Bin 883 -> 4277 bytes
 assets/tray/syncing@3x.png                    | Bin 0 -> 7487 bytes
 assets/tray/syncingTemplate@2x.png            | Bin 883 -> 0 bytes
 package.json                                  |  29 +-
 release/app/package-lock.json                 | 240 +-----
 release/app/package.json                      |   9 +-
 release/app/yarn.lock                         | 104 +--
 .../main/analytics/drive-handlers.ts          |  24 +-
 src/{ => apps}/main/analytics/handlers.ts     |   1 -
 .../main/analytics/rudderstack-client.ts      |   4 +-
 src/{ => apps}/main/analytics/service.ts      |  18 +-
 .../main/analytics/user-handlers.ts           |   0
 src/{ => apps}/main/app-info/app-info.ts      |   2 +-
 src/apps/main/app-info/handlers.ts            |  22 +
 src/{ => apps}/main/auth/handlers.ts          |   6 +-
 src/{ => apps}/main/auth/refresh-token.ts     |   0
 src/{ => apps}/main/auth/service.ts           |   2 +-
 src/{ => apps}/main/auto-launch/handlers.ts   |   0
 .../main/auto-launch/linux-desktop-entry.ts   |   2 +-
 src/{ => apps}/main/auto-launch/service.ts    |   0
 .../background-processes/process-issues.ts    |   9 +-
 .../main/background-processes/sync-engine.ts  | 172 +++++
 .../main/bug-report/BugReportResult.ts        |   0
 src/{ => apps}/main/bug-report/handlers.ts    |   0
 src/{ => apps}/main/bug-report/service.ts     |   5 +-
 src/{ => apps}/main/config.ts                 |   0
 src/{ => apps}/main/config/handlers.ts        |   0
 src/{ => apps}/main/config/service.ts         |   0
 src/{ => apps}/main/database/adapters/base.ts |   0
 .../collections/DriveFileCollection.ts        |   0
 .../collections/DriveFolderCollection.ts      |   0
 src/{ => apps}/main/database/data-source.ts   |   0
 .../main/database/entities/DriveFile.ts       |   0
 .../main/database/entities/DriveFolder.ts     |   0
 src/{ => apps}/main/device/handlers.ts        |   6 +-
 src/{ => apps}/main/device/service.ts         |   0
 src/{ => apps}/main/event-bus.ts              |   2 +
 src/{ => apps}/main/fordwardToWindows.ts      |  37 +-
 src/{ => apps}/main/ipcs/NoEvents.ts          |   0
 src/apps/main/ipcs/ipcMainSyncEngine.ts       |   8 +
 src/{ => apps}/main/ipcs/mainDrive.ts         |   4 +-
 src/{ => apps}/main/ipcs/mainVirtualDrive.ts  |   0
 src/{ => apps}/main/logger.ts                 |   0
 src/{ => apps}/main/main.ts                   |  62 +-
 src/{ => apps}/main/migration/handlers.ts     |   0
 src/{ => apps}/main/migration/service.ts      |   0
 .../main/platform/DesktopPlatform.ts          |   0
 src/{ => apps}/main/platform/handlers.ts      |   0
 src/{ => apps}/main/preload.d.ts              | 101 +--
 src/{ => apps}/main/preload.js                |  20 +-
 src/apps/main/quit.ts                         |  21 +
 src/{ => apps}/main/realtime.ts               |   0
 .../remote-sync/RemoteSyncManager.test.ts     |   7 +-
 .../main/remote-sync/RemoteSyncManager.ts     |  50 +-
 src/{ => apps}/main/remote-sync/handlers.ts   |  22 +-
 src/{ => apps}/main/remote-sync/helpers.ts    |   0
 .../create-and-upload-thumbnail.ts            |   0
 .../application/extract-pdf-page.ts           |  13 +
 .../obtain-image-to-thumbnail-it.ts           |   0
 .../thumbnails/application/resize-image.ts    |  17 +
 .../thumbnails/domain/ThumbnableExtension.ts  |   0
 .../thumbnails/domain/ThumbnailProperties.ts  |   0
 .../thumbnails/domain/ThumbnailUploader.ts    |   0
 .../main/thumbnails/handlers/index.ts         |   0
 .../handlers/remote-file-pull-completed.ts    |   0
 .../EnvironmentAndStorageThumbnailUploader.ts |   0
 .../ThumbnailUploaderFactory.ts               |   0
 .../main/token-scheduler/TokenScheduler.ts    |   0
 .../token-scheduler/token-scheduler.test.ts   |   0
 src/{ => apps}/main/tray/handlers.ts          |  22 +-
 src/{ => apps}/main/tray/tray.ts              |  34 +-
 src/{ => apps}/main/types.ts                  |   0
 src/{ => apps}/main/usage/Usage.ts            |   0
 src/{ => apps}/main/usage/handlers.ts         |   0
 src/{ => apps}/main/usage/service.ts          |   0
 src/{ => apps}/main/usage/serviceBuilder.ts   |   0
 src/{ => apps}/main/util.ts                   |   0
 src/apps/main/virutal-root-folder/handlers.ts |  15 +
 .../main/virutal-root-folder}/service.ts      |  23 +-
 src/{ => apps}/main/windows/auth.ts           |   1 -
 src/{ => apps}/main/windows/feedback.ts       |   0
 src/{ => apps}/main/windows/index.ts          |  10 +-
 src/{ => apps}/main/windows/migration.ts      |   0
 src/{ => apps}/main/windows/onboarding.ts     |   0
 src/{ => apps}/main/windows/process-issues.ts |   0
 src/{ => apps}/main/windows/settings.ts       |   0
 src/{ => apps}/main/windows/widget.ts         |  23 +-
 src/{ => apps}/renderer/App.css               |   0
 src/{ => apps}/renderer/App.tsx               |   0
 .../renderer/actions/shared-actions.ts        |   0
 .../renderer/actions/sync-error-actions.ts    |   0
 src/apps/renderer/actions/types.ts            |   8 +
 src/{ => apps}/renderer/assets/error.svg      |   0
 src/{ => apps}/renderer/assets/file.svg       |   0
 src/{ => apps}/renderer/assets/folder.svg     |   0
 .../InstrumentSans/InstrumentSans-Bold.woff2  | Bin
 .../InstrumentSans-Medium.woff2               | Bin
 .../InstrumentSans-Regular.woff2              | Bin
 .../InstrumentSans-SemiBold.woff2             | Bin
 .../InstrumentSans[wdth,wght].woff2           | Bin
 .../assets/fonts/InstrumentSans/OFL.txt       |   0
 .../assets/fonts/InstrumentSans/font.css      |   0
 .../renderer/assets/icons/audio.svg           |   0
 src/{ => apps}/renderer/assets/icons/code.svg |   0
 src/{ => apps}/renderer/assets/icons/csv.svg  |   0
 .../renderer/assets/icons/default.svg         |   0
 .../renderer/assets/icons/excel.svg           |   0
 .../renderer/assets/icons/figma.svg           |   0
 .../renderer/assets/icons/folder.svg          |   0
 .../renderer/assets/icons/getIcon.tsx         |   0
 .../renderer/assets/icons/illustrator.svg     |   0
 .../renderer/assets/icons/image.svg           |   0
 .../renderer/assets/icons/indesign.svg        |   0
 src/{ => apps}/renderer/assets/icons/pdf.svg  |   0
 .../renderer/assets/icons/photoshop.svg       |   0
 .../renderer/assets/icons/powerpoint.svg      |   0
 src/{ => apps}/renderer/assets/icons/ppt.svg  |   0
 .../renderer/assets/icons/sketch.svg          |   0
 src/{ => apps}/renderer/assets/icons/txt.svg  |   0
 .../renderer/assets/icons/video.svg           |   0
 src/{ => apps}/renderer/assets/icons/word.svg |   0
 src/{ => apps}/renderer/assets/icons/zip.svg  |   0
 .../assets/illustrations/syncedStack-dark.png | Bin
 .../illustrations/syncedStack-light.png       | Bin
 src/{ => apps}/renderer/assets/index.d.ts     |   0
 .../assets/migration/upload-error.svg         |   0
 .../renderer/assets/migration/widget.svg      |   0
 .../assets/onboarding/context-menu.svg        |   0
 .../assets/onboarding/finder/linux.svg        |   0
 .../assets/onboarding/finder/macos.svg        |   0
 .../assets/onboarding/finder/windows.svg      |   0
 .../folder-with-overlay-icons/offline/en.svg  |   0
 .../folder-with-overlay-icons/offline/es.svg  |   0
 .../folder-with-overlay-icons/offline/fr.svg  |   0
 .../folder-with-overlay-icons/online/en.svg   |   0
 .../folder-with-overlay-icons/online/es.svg   |   0
 .../folder-with-overlay-icons/online/fr.svg   |   0
 .../renderer/assets/onboarding/logo.svg       |   0
 .../assets/onboarding/mac-finder-widget.png   | Bin
 .../renderer/assets/onboarding/widget.png     | Bin
 src/{ => apps}/renderer/assets/play.svg       |   0
 src/{ => apps}/renderer/assets/spinner.svg    |   0
 src/{ => apps}/renderer/assets/stop.svg       |   0
 src/{ => apps}/renderer/assets/success.svg    |   0
 src/{ => apps}/renderer/assets/warn.svg       |   0
 .../Backups/BackupsFoldersSelector.tsx        |   4 +-
 .../components/Backups/FatalError.tsx         |   7 +-
 src/{ => apps}/renderer/components/Button.tsx |   0
 .../renderer/components/Checkbox.tsx          |   0
 .../renderer/components/FileWithOperation.tsx |   0
 .../renderer/components/PasswordInput.tsx     |   0
 src/{ => apps}/renderer/components/Select.tsx |   0
 .../renderer/components/TextArea.tsx          |   0
 .../renderer/components/TextInput.tsx         |   0
 .../renderer/components/WindowTopBar.tsx      |   0
 .../renderer/context/DeviceContext.tsx        |   0
 .../renderer/context/LocalContext.tsx         |   0
 src/apps/renderer/hooks/BackupFatalErrors.tsx |  13 +
 .../renderer/hooks/ClientPlatform.tsx         |   0
 .../renderer/hooks/FatalErrorActions.ts       |   2 -
 .../renderer/hooks/GeneralIssues.tsx          |   3 +-
 .../renderer/hooks/ProcessIssues.tsx          |   3 +-
 .../renderer/hooks/VirtualDriveStatus.tsx     |  23 +
 src/{ => apps}/renderer/hooks/useBackups.tsx  |   0
 src/{ => apps}/renderer/hooks/useConfig.tsx   |   0
 src/{ => apps}/renderer/hooks/useLanguage.tsx |   0
 src/apps/renderer/hooks/useOnSyncRunning.tsx  |  14 +
 src/apps/renderer/hooks/useOnSyncStopped.tsx  |  12 +
 .../renderer/hooks/useSyncInfoSubscriber.tsx  |  66 ++
 .../renderer/hooks/useSyncStatus.tsx}         |  27 +-
 .../renderer/hooks/useSyncStopped.tsx}        |   3 +-
 src/{ => apps}/renderer/hooks/useUsage.tsx    |   2 +-
 src/{ => apps}/renderer/index.ejs             |   0
 src/{ => apps}/renderer/index.tsx             |   0
 .../renderer/localize/i18n.service.ts         |  20 +-
 .../renderer/localize/locales/en.json         |   4 +-
 .../renderer/localize/locales/es.json         |   4 +-
 .../renderer/localize/locales/fr.json         |   4 +-
 .../messages/backups/backups-actions-map.ts   |   2 +-
 .../messages/backups/backups-fatal-errors.ts  |   2 +-
 .../renderer/messages/general-error.ts        |   2 +-
 .../renderer/messages/process-error.ts        |   2 +-
 .../renderer/messages/process-fatal-error.ts  |   2 +-
 .../renderer/pages/Feedback/index.tsx         |   6 +-
 .../renderer/pages/Login/ErrorBanner.tsx      |   0
 src/{ => apps}/renderer/pages/Login/TwoFA.tsx |   0
 .../renderer/pages/Login/WarningBanner.tsx    |   2 -
 src/{ => apps}/renderer/pages/Login/index.tsx |  11 +-
 .../renderer/pages/Login/service.ts           |   2 +-
 src/{ => apps}/renderer/pages/Login/types.ts  |   0
 .../renderer/pages/Migration/config.tsx       |   4 +-
 .../renderer/pages/Migration/helpers.tsx      |   2 +-
 .../renderer/pages/Migration/index.tsx        |   7 +-
 .../slides/DeleteOldDriveFolderSlide.tsx      |   2 +-
 .../Migration/slides/MigrationFailedSlide.tsx |   4 +-
 .../renderer/pages/Onboarding/config.tsx      |   8 +-
 .../renderer/pages/Onboarding/helpers.tsx     |   2 +-
 .../renderer/pages/Onboarding/index.tsx       |   5 +-
 .../slides/AvailableOfflineSlide.tsx          |   2 +-
 .../slides/AvailableOnlineSlide.tsx           |   3 +-
 .../pages/Onboarding/slides/BackupsSlide.tsx  |   2 +-
 .../Onboarding/slides/ContextMenuSlide.tsx    |   3 +-
 .../slides/FilesOrganizationSlide.tsx         |   2 +-
 .../slides/OnboardingCompletedSlide.tsx       |   2 +-
 .../pages/Onboarding/slides/WelcomeSlide.tsx  |   2 +-
 .../renderer/pages/ProcessIssues/List.tsx     |  65 +-
 .../pages/ProcessIssues/ReportModal.tsx       |  30 +-
 .../renderer/pages/ProcessIssues/index.tsx    |  32 +-
 .../renderer/pages/Settings/Account/Usage.tsx |   0
 .../pages/Settings/Account/UserInfo.tsx       |   2 +-
 .../renderer/pages/Settings/Account/index.tsx |   4 +-
 .../pages/Settings/General/AppInfo.tsx        |   2 +-
 .../pages/Settings/General/DeviceName.tsx     |   4 +-
 .../pages/Settings/General/LanguagePicker.tsx |   2 +-
 .../Settings/General/StartAutomatically.tsx   |   0
 .../pages/Settings/General/ThemePicker.tsx    |   2 +-
 .../renderer/pages/Settings/General/index.tsx |   0
 .../renderer/pages/Settings/Header.tsx        |  59 +-
 .../renderer/pages/Settings/index.tsx         |   2 -
 .../pages/Widget/AnimationWrapper.tsx         |  21 +
 .../renderer/pages/Widget/Header.tsx          |   8 +-
 src/apps/renderer/pages/Widget/Item.tsx       | 133 ++++
 .../renderer/pages/Widget/NoInfoToShow.tsx    |  46 ++
 .../renderer/pages/Widget/SyncAction.tsx      |  25 +-
 .../renderer/pages/Widget/SyncErrorBanner.tsx |  13 +-
 .../renderer/pages/Widget/SyncFailed.tsx      |   0
 src/apps/renderer/pages/Widget/SyncInfo.tsx   |  30 +
 .../pages/Widget/VirtualDriveError.tsx        |   0
 src/apps/renderer/pages/Widget/index.tsx      |  34 +
 src/{ => apps}/renderer/utils/errors.ts       |   0
 src/{ => apps}/renderer/utils/http-request.ts |   0
 src/{ => apps}/renderer/utils/path.ts         |   0
 src/apps/renderer/utils/query.ts              |   5 +
 src/{ => apps}/renderer/utils/usage.ts        |   0
 src/{ => apps}/shared/FileTypes/FileTypes.ts  |   0
 src/{ => apps}/shared/HttpClient/Clients.ts   |   0
 .../shared/HttpClient/HttpClient.ts           |   0
 .../HttpClient/background-process-clients.ts} |   3 +-
 .../HttpClient/http-client.test.skip.ts       |   0
 .../shared/HttpClient/main-process-client.ts  |   8 +
 .../HttpClient/responses/file-created.ts      |   0
 src/{ => apps}/shared/IPC/IPCs.ts             |  14 +-
 src/{ => apps}/shared/IPC/events/drive.ts     |   3 +-
 src/apps/shared/IPC/events/sync-engine.ts     | 140 ++++
 .../shared/IPC/events/virtual-drive.ts        |   0
 src/{ => apps}/shared/ItemKind.ts             |   0
 src/{ => apps}/shared/Locale/DayJsLocales.ts  |   0
 src/{ => apps}/shared/Locale/Language.ts      |   0
 src/apps/shared/fs/PathTypeChecker .ts        |  21 +
 src/apps/shared/fs/ReadStreamToBuffer.ts      |  20 +
 src/apps/shared/fs/ensure-folder-exists.ts    |   5 +
 src/apps/shared/fs/write-readable-to-file.ts  |  15 +
 src/{workers => apps/shared}/types.ts         |   1 -
 src/{ => apps}/shared/types/Nullable.ts       |   0
 src/apps/shared/types/Primitives.ts           |   1 +
 src/apps/shared/types/Process.ts              |   1 +
 src/{ => apps}/shared/types/Stopwatch.ts      |   0
 src/{ => apps}/shared/types/Theme.ts          |   0
 src/apps/shared/types/VirtualDriveStatus.ts   |   4 +
 src/apps/sync-engine/BindingManager.ts        | 286 +++++++
 .../callbacks-controllers/buildControllers.ts |  54 ++
 .../controllers/AddController.ts              | 142 ++++
 .../controllers/CallbackController.ts         |  36 +
 .../controllers/DeleteController.ts           |  63 ++
 .../controllers/DownloadFileController.ts     |  55 ++
 .../NotifyPlaceholderHydrationFinished.ts     |  18 +
 .../controllers/RenameOrMoveController.ts     |  57 ++
 .../offline/OfflineRenameOrMoveController.ts  |  53 ++
 .../helpers/rawPathIsFolder.ts                |   3 +
 .../executeControllerWithFallback.ts          |  32 +
 .../DependencyContainer.ts                    |  18 +
 .../DependencyContainerFactory.ts             |  71 ++
 .../boundaryBridge/BoundaryBridgeContainer.ts |   5 +
 .../boundaryBridge/build.ts                   |  19 +
 .../dependency-injection/common/clients.ts    |  18 +
 .../dependency-injection/common/crypt.ts      |   0
 .../dependency-injection/common/eventBus.ts   |  24 +
 .../common/eventRepository.ts                 |  16 +
 .../common/localRootFolderPath.ts             |  15 +
 .../dependency-injection/common/mnemonic.ts   |  20 +
 .../dependency-injection/common/sdk.ts        |  35 +
 .../dependency-injection/common/traverser.ts  |  21 +
 .../dependency-injection/common/user.ts       |  20 +
 .../common/virtualDrive.ts                    |  20 +
 .../contents/ContentsContainer.ts             |  11 +
 .../dependency-injection/contents/builder.ts  |  68 ++
 .../files/FilesContainer.ts                   |  25 +
 .../dependency-injection/files/builder.ts     | 126 ++++
 .../folders/FoldersContainer.ts               |  33 +
 .../dependency-injection/folders/builder.ts   | 145 ++++
 .../items/ItemsContainer.ts                   |   6 +
 .../dependency-injection/items/builder.ts     |  42 ++
 .../shared/SharedContainer.ts                 |   7 +
 .../dependency-injection/shared/builder.ts    |  20 +
 src/apps/sync-engine/index.ts                 |  85 +++
 src/apps/sync-engine/ipcRendererSyncEngine.ts |   7 +
 src/{workers => apps}/utils/date.ts           |   0
 .../utils/file-is-on-folder.ts                |   0
 src/{workers => apps}/utils/http-request.ts   |   2 +-
 src/apps/utils/icon.ts                        |   6 +
 src/{workers => apps}/utils/is-online.ts      |   0
 .../utils/name-verification.ts                |   6 +-
 src/{workers => apps}/utils/reporting.ts      |   2 +-
 .../utils/test/file-is-on-folder.test.ts      |   0
 .../utils/test/name-verification.test.ts      |   0
 .../utils/test/sensible-files.json            |   0
 src/{workers => apps}/utils/types/Tuple.ts    |   0
 src/context/desktop/app/domain/AppIssue.ts    |  10 +
 src/context/desktop/sync/domain/SyncStatus.ts |   1 +
 .../desktop/sync/domain/SyncStoppedPayload.ts |   8 +
 .../shared/domain/AggregateRoot.ts            |   4 +-
 .../shared/domain/DomainEvent.ts              |   6 +-
 .../shared/domain/DomainEventSubscriber.ts}   |   2 +-
 src/context/shared/domain/Either.ts           |  47 ++
 .../shared/domain/EnumValueObject.ts          |   0
 .../shared/domain/InvalidArgumentError.ts     |   0
 .../shared}/domain/ServerFile.ts              |   1 +
 .../shared}/domain/ServerFolder.ts            |   1 +
 .../shared/domain/ValueObject.ts              |   6 +-
 .../shared/infrastructure}/crypt.ts           |   0
 .../application/FileCreationOrchestrator.ts   |  31 +
 .../application/ContentsDownloader.ts         | 112 +++
 .../contents/application/ContentsUploader.ts  |  86 +++
 .../NotifyMainProcessHydrationFinished.ts     |  34 +
 .../ReadLocalFileContentsToBuffer.ts          |  23 +
 .../application/RetryContentsUploader.ts      |  53 ++
 .../application/temporalFolderProvider.ts     |  15 +
 .../contents/domain/ContentsId.ts             |   4 +-
 .../domain/ContentsManagersFactory.ts         |  12 +
 .../contents/domain/ContentsSize.ts           |   3 +
 .../contents/domain/LocalFileContents.ts      |  97 +++
 .../contents/domain/LocalFileProvider.ts      |   8 +
 .../contents/domain/LocalFileWriter.ts        |   7 +
 .../contents/domain/RemoteFileContents.ts     |  43 ++
 .../contentHandlers}/ContentFileDownloader.ts |   6 +-
 .../contentHandlers}/ContentFileUploader.ts   |   7 +-
 .../events/ContentsDownloadedDomainEvent.ts   |  53 ++
 ...onmentRemoteFileContentsManagersFactory.ts |  39 +
 .../infrastructure/FSLocalFileProvider.ts     |  86 +++
 .../infrastructure/FSLocalFileWriter.ts       |  24 +
 .../EnvironmentContentFileDownloader.ts}      |  31 +-
 .../upload/EnvironmentContentFileUploader.ts} |  29 +-
 .../CreateFilePlaceholderOnDeletionFailed.ts  |  18 +
 .../files/application/FileCreator.ts          |  65 ++
 .../application/FileCreatorFromServerFile.ts  |  18 +
 .../files/application/FileDeleter.ts          |  87 +++
 .../application/FileFinderByContentsId.ts     |  17 +
 .../files/application/FilePathUpdater.ts      |  89 +++
 .../FilePlaceholderCreatorFromContentsId.ts   |  16 +
 .../application/FilesPlaceholderUpdater.ts    |  89 +++
 .../application/FilesPlaceholdersCreator.ts   |  14 +
 .../files/application/RepositoryPopulator.ts  |  12 +
 .../files/application/RetrieveAllFiles.ts     |  10 +
 .../files/application/SameFileWasMoved.ts     |  58 ++
 .../application/WebdavFileMimeTypeResolver.ts |   0
 .../virtual-drive}/files/domain/File.ts       | 145 +---
 .../virtual-drive/files/domain/FilePath.ts    |  58 ++
 .../files/domain/FileRepository.ts            |  13 +
 .../virtual-drive/files/domain/FileSize.ts    |   3 +
 .../virtual-drive}/files/domain/FileStatus.ts |  11 +-
 .../files/domain/MimeTypesMap.ts              |   0
 .../virtual-drive/files/domain/OfflineFile.ts | 110 +++
 .../files/domain/OldFileRepository.ts         |  24 +
 .../files/domain/PlaceholderId.ts             |  25 +
 .../domain/errors/ActionNotPermittedError.ts  |   5 +
 .../errors/FileActionCannotModifyExtension.ts |   0
 .../FileActionOnlyCanAffectOneLevelError.ts   |   0
 .../domain/errors/FileAlreadyExistsError.ts   |   0
 ...leCannotBeMovedToTheOriginalFolderError.ts |   0
 .../FileNameShouldBeEqualToOriginalError.ts   |   0
 .../FileNameShouldDifferFromOriginalError.ts  |   0
 .../files/domain/errors/FileNotFoundError.ts  |   5 +
 .../domain/errors/UnknownFileActionError.ts   |   0
 .../domain/events}/FileCreatedDomainEvent.ts  |   2 +-
 .../domain/events}/FileDeletedDomainEvent.ts  |   2 +-
 .../domain/events/FileMovedDomainEvent.ts     |  29 +
 .../domain/events/FileRenamedDomainEvent.ts   |  18 +
 .../events/OptimisticFileDeletionFailed.ts    |  18 +
 .../domain/file-systems/LocalFileSystem.ts    |   7 +
 .../domain/file-systems/RemoteFileSystem.ts   |  12 +
 .../infrastructure/InMemoryFileRepository.ts  |  63 ++
 .../infrastructure/NodeWinLocalFileSystem.ts  |  37 +
 .../infrastructure/SDKRemoteFileSystem.ts     |  77 ++
 .../files/infrastructure}/dtos/AddFileDTO.ts  |   0
 .../infrastructure}/dtos/UpdateFileNameDTO.ts |   0
 .../dtos/UpdateFileParentDirDTO.ts            |   0
 .../AllParentFoldersStatusIsExists.ts         |  26 +
 .../application/FolderByPartialSearcher.ts    |  10 +
 .../folders/application/FolderCreator.ts      |  36 +
 .../FolderCreatorFromServerFolder.ts          |  19 +
 .../folders/application/FolderDeleter.ts      |  52 ++
 .../folders/application/FolderFinder.ts}      |  15 +-
 .../folders/application/FolderMover.ts        |  37 +
 .../folders/application/FolderPathUpdater.ts  |  47 ++
 .../folders/application/FolderRenamer.ts      |  30 +
 .../application/FolderRepositoryInitiator.ts  |  14 +
 .../application/FoldersPlaceholderCreator.ts  |  14 +
 .../Offline/OfflineFolderCreator.ts           |  33 +
 .../application/Offline/OfflineFolderMover.ts |  29 +
 .../Offline/OfflineFolderPathUpdater.ts       |  42 ++
 .../Offline/OfflineFolderRenamer.ts           |  12 +
 .../application/RetrieveAllFolders.ts}        |   7 +-
 .../SynchronizeOfflineModifications.ts        |  58 ++
 ...nizeOfflineModificationsOnFolderCreated.ts |  19 +
 .../application/UpdatePlaceholderFolder.ts    | 144 ++++
 .../virtual-drive}/folders/domain/Folder.ts   |  63 +-
 .../folders/domain/FolderPath.ts              |  30 +
 .../folders/domain/FolderPlaceholderId.ts     |  28 +
 .../folders/domain/FolderRepository.ts        |  13 +
 .../folders/domain/FolderStatus.ts            |   9 +-
 .../folders/domain/FolderUuid.ts              |  20 +
 .../folders/domain/ManagedFolderRepository.ts |   7 +
 .../folders/domain/OfflineFolder.ts           | 126 ++++
 .../folders/domain/OfflineFolderRepository.ts |   9 +
 .../folders/domain/OldFolderRepository.ts}    |  15 +-
 .../domain/errors/ActionNotPermittedError.ts  |   5 +
 .../domain/errors/FolderNotFoundError.ts      |   0
 .../domain/events/FolderCreatedDomainEvent.ts |  18 +
 .../domain/events/FolderRenamedDomainEvent.ts |  34 +
 .../domain/file-systems/LocalFileSystem.ts    |   5 +
 .../domain/file-systems/RemoteFileSystem.ts   |  12 +
 .../infrastructure/HttpRemoteFileSystem.ts    | 104 +++
 .../InMemoryFolderRepository.ts               |  58 ++
 .../InMemoryOfflineFolderRepository.ts        |  47 ++
 .../infrastructure/NodeWinLocalFileSystem.ts  |  24 +
 .../infrastructure/dtos/CreateFolderDTO.ts    |   5 +
 .../dtos/UpdateFolderNameDTO.ts               |   0
 .../application/FileCreatorFromServerFile.ts  |  18 +
 .../FolderCreatorFromServerFolder.ts          |  17 +
 .../items/application/ItemsSearcher.ts        |  26 +
 .../items/application/RemoteItemsGenerator.ts |  11 +-
 .../items/application/Traverser.ts            | 154 ++++
 .../items/application/TreeBuilder.ts          |  16 +
 .../virtual-drive/items/domain/FileNode.ts    |  22 +
 .../virtual-drive/items/domain/FolderNode.ts  |  33 +
 .../items/domain/ItemsIndexedByPath.ts        |   0
 .../virtual-drive/items/domain/NameDecrypt.ts |   7 +
 .../virtual-drive/items/domain/Node.ts        |   4 +
 .../virtual-drive/items/domain/Tree.ts        |  77 ++
 .../infrastructure/CryptoJsNameDecrypt.ts     |  12 +
 .../AbsolutePathToRelativeConverter.ts        |  20 +
 .../application/AllWebdavItemsSearcher.ts     |  12 +-
 .../shared/application/EitherTransformer.ts   |  15 +
 .../shared/application/LocalFileIdProvider.ts |  16 +
 .../application/PlatformPathConverter.ts      |  21 +
 .../RelativePathToAbsoluteConverter.ts        |   9 +
 .../WebdavUnknownItemTypeSearcher.ts          |   8 +-
 .../shared/domain/BucketEntry.ts              |  20 +
 .../shared/domain/BucketEntryId.ts            |  17 +
 .../virtual-drive}/shared/domain/Crypt.ts     |   4 +-
 .../virtual-drive/shared/domain/DelayQueue.ts |  59 ++
 .../virtual-drive/shared/domain/EventBus.ts}  |   4 +-
 .../shared/domain/EventRepository.ts          |   6 +
 .../shared/domain/MapObserver.ts              |  26 +
 .../virtual-drive/shared/domain/Path.ts       |  62 ++
 .../infrastructure/DomainEventSubscribers.ts  |  18 +
 .../infrastructure/EnvironmentDownloader.ts   |  69 ++
 .../shared/infrastructure/EventRecorder.ts    |  22 +
 .../infrastructure/InMemoryEventHistory.ts    |  36 +
 .../shared/infrastructure/NodeJsEventBus.ts}  |  11 +-
 .../thumbnails/domain/ThumbanailContentId.ts  |   3 +
 .../thumbnails/domain/Thumbnail.ts            |  45 ++
 .../thumbnails/domain/ThumbnailDownloader.ts  |  20 +
 .../EnvironmentThumbnailDownloader.ts         |  12 +
 .../BytesInBinaryToInternacionalSystem.ts     |   0
 .../DecrementDriveUsageOnFileDeleted.ts       |  19 +
 .../FreeSpacePerEnvironmentCalculator.ts      |   0
 .../IncrementDriveUsageOnFileCreated.ts       |   8 +-
 .../application/UsedSpaceCalculator.ts        |   0
 .../application/UserUsageDecrementer.ts       |   0
 .../application/UserUsageIncrementer.ts       |   0
 .../userUsage/domain/UserUsage.ts             |   0
 .../userUsage/domain/UserUsageRepository.ts   |   0
 .../CachedHttpUserUsageRepository.ts          |   0
 .../infrastrucutre/dtos/UserUsageLimitDTO.ts  |   0
 src/main/analytics/backup-handlers.ts         |  84 ---
 src/main/app-info/AvaliableAppQuery.ts        |   3 -
 src/main/app-info/handlers.ts                 |  17 -
 src/main/app-info/service.ts                  |  21 -
 src/main/background-processes/backups.ts      | 298 --------
 src/main/background-processes/sync.ts         |  50 --
 .../types/BackupFatalError.ts                 |   7 -
 src/main/background-processes/webdav.ts       |  70 --
 src/main/ipcs/webdav.ts                       |  19 -
 src/main/sync-root-folder/handlers.ts         |  19 -
 .../application/extract-pdf-page.ts           |  26 -
 .../thumbnails/application/resize-image.ts    |  27 -
 src/main/virtual-drive/handlers.ts            |  29 -
 .../actions/backsups-error-actions.ts         |  26 -
 src/renderer/actions/types.ts                 |   9 -
 src/renderer/hooks/BackupFatalErrors.tsx      |  25 -
 src/renderer/hooks/BackupStatus.tsx           |  17 -
 src/renderer/hooks/VirtualDriveStatus.tsx     |  25 -
 .../Settings/Backups/BackupsFolderList.tsx    | 254 -------
 .../Settings/Backups/BackupsPreferences.tsx   | 227 ------
 src/renderer/pages/Settings/Backups/index.tsx |  41 -
 .../pages/Widget/BackupsErrorBanner.tsx       |  48 --
 .../Widget/MacOSVersionAvailableBanner.tsx    |  44 --
 src/renderer/pages/Widget/SyncInfo.tsx        | 525 -------------
 src/renderer/pages/Widget/index.tsx           |  65 --
 src/renderer/utils/backups-progress.ts        |  11 -
 src/renderer/utils/query.ts                   |  18 -
 src/shared/IPC/events/webdav.ts               | 176 -----
 src/shared/types/Primitives.ts                |   1 -
 src/shared/types/Process.ts                   |   1 -
 src/shared/types/VirtualDriveStatus.ts        |   6 -
 src/workers/backups/backups.ts                | 149 ----
 src/workers/backups/index.ts                  | 252 -------
 src/workers/backups/test/backups.test.ts      | 191 -----
 src/workers/filesystems/domain/FileSystem.ts  |  93 ---
 src/workers/filesystems/domain/Transfer.ts    |   4 -
 src/workers/filesystems/local-filesystem.ts   | 362 ---------
 src/workers/filesystems/remote-filesystem.ts  | 698 ------------------
 .../test/__mocks__/FileSystemMock.ts          | 109 ---
 src/workers/process.ts                        | 439 -----------
 src/workers/sync/Listings/domain/Listing.ts   |  11 -
 src/workers/webdav/VirtualDrive.ts            | 558 --------------
 .../DependencyContainer.ts                    |  56 --
 .../DependencyContainerFactory.ts             | 232 ------
 src/workers/webdav/index.ts                   |  91 ---
 src/workers/webdav/ipc.ts                     |  10 -
 .../contents/domain/ContentFileClonner.ts     |  24 -
 .../modules/contents/domain/Contents.ts       |  35 -
 .../domain/ContentsCacheRepository.ts         |  13 -
 .../domain/ContentsManagersFactory.ts         |  13 -
 .../events/FileDownloadedDomainEvent.ts       |  26 -
 ...CachedRemoteFileContentsManagersFactory.ts |  36 -
 .../EnvironmentContentFileClonner.ts          | 104 ---
 ...onmentRemoteFileContentsManagersFactory.ts |  55 --
 .../FSContentsCacheRepository.ts              | 119 ---
 .../download/CachedContentFileDownloader.ts   |  45 --
 .../upload/CachedContentFileUploader.ts       |  35 -
 .../test/__mocks__/ContentFileClonnerMock.ts  |  30 -
 .../__mocks__/ContentsCacheRepositoryMock.ts  |  26 -
 .../RemoteFileContentsManagersFactoryMock.ts  |  29 -
 .../EnvironmentContentFileClonner.test.ts     | 464 ------------
 .../FSContentsCacheRepository.test.ts         | 203 -----
 .../CachedContentFileDownloader.test.ts       | 114 ---
 .../upload/CachedContentFileUploader.test.ts  |  47 --
 .../files/application/WebdavFileClonner.ts    | 106 ---
 .../files/application/WebdavFileCreator.ts    | 145 ----
 .../files/application/WebdavFileDeleter.ts    |  33 -
 .../files/application/WebdavFileDownloader.ts |  83 ---
 .../files/application/WebdavFileMover.ts      |  84 ---
 .../files/application/WebdavFileRenamer.ts    |  78 --
 .../files/application/WebdavFileValidator.ts  |  19 -
 .../files/domain/FileMetadataCollection.ts    |   8 -
 .../webdav/modules/files/domain/FilePath.ts   |  77 --
 .../modules/files/domain/FileRepository.ts    |  18 -
 .../webdav/modules/files/domain/FileSize.ts   |  21 -
 .../domain/errors/ActionNotPermitedError.ts   |   5 -
 .../files/domain/errors/FileNotFoundError.ts  |   5 -
 .../persistance/HttpFileRepository.ts         | 182 -----
 .../InMemoryTemporalFileMetadataCollection.ts |  28 -
 .../test/__mocks__/FileRepositoryMock.ts      |  40 -
 .../application/WebdavFileClonner.test.ts     | 115 ---
 .../application/WebdavFileCreator.test.ts     | 127 ----
 .../application/WebdavFileDownloader.test.ts  |  60 --
 .../test/application/WebdavFileMover.test.ts  | 184 -----
 .../application/WebdavFileRenamer.test.ts     | 103 ---
 .../persistance/HttpFileRepository.test.ts    |  73 --
 .../application/WebdavFolderCreator.ts        |  27 -
 .../folders/application/WebdavFolderMover.ts  |  40 -
 .../application/WebdavFolderRenamer.ts        |  29 -
 .../modules/folders/domain/FolderPath.ts      |  38 -
 .../domain/errors/ActionNotPermitedError.ts   |   5 -
 .../infrastructure/HttpFolderRepository.ts    | 149 ----
 .../test/__mocks__/FolderRepositoryMock.ts    |  46 --
 .../application/WebdavFolderDeleter.test.ts   |  36 -
 .../application/WebdavFolderMover.test.ts     |  76 --
 .../folders/test/domain/FolderPath.test.ts    |  21 -
 .../HttpFolderRepository.test.ts              |  49 --
 .../modules/items/application/Traverser.ts    | 144 ----
 .../items/test/application/Traverser.test.ts  | 144 ----
 .../WebdavUnkownItemMetadataDealer.ts         |  38 -
 .../modules/shared/domain/ItemMetadata.ts     |  55 --
 .../webdav/modules/shared/domain/Path.ts      |  21 -
 .../modules/shared/domain/WebdavItem.ts       |  21 -
 .../infrastructure/DomainEventSubscribers.ts  |  18 -
 .../DecrementDriveUsageOnFileDeleted.ts       |  19 -
 .../InternxtFileSystem/InternxtFileSystem.ts  | 448 -----------
 .../InternxtFileSystemFactory.ts              |  10 -
 .../worker/InternxtFileSystem/Serializer.ts   |  35 -
 .../InternxtSotrageManagerFactory.ts          |  10 -
 .../InternxtStorageManager.ts                 |  84 ---
 src/workers/webdav/worker/error-handling.ts   |  28 -
 src/workers/webdav/worker/server.ts           |  83 ---
 {src/test => tests}/LanguagePicker.e2e.ts     |   0
 .../__mocks__/ContentFileDownloaderMock.ts    |   6 +-
 .../__mocks__/ContentFileUploaderMock.ts      |   6 +-
 .../contents/__mocks__/LocalFileWriterMock.ts |  10 +
 .../__mocks__/LocationProviderMock.ts         |   7 +
 .../contents/__mocks__/ReadableHelloWorld.ts  |  19 +
 .../RemoteFileContentsManagersFactoryMock.ts  |  24 +
 .../DownloadStrategyFunctionMock.ts           |   2 +-
 .../environment/UploadStrategyFunctionMock.ts |   2 +-
 .../application/ContentsDownloader._test.ts   |  72 ++
 .../contents}/domain/ContentsIdMother.ts      |   3 +-
 .../contents/domain/ContentsSizeMother.ts     |  14 +
 .../contents/domain/FileContentsMother.ts     |  12 +
 .../EnvironmentContentFileDownloader.test.ts  |  47 +-
 .../EnvironmentContentFileUploader.test.ts    |  51 +-
 .../files/__mocks__/FileDeleterFactory.ts     |  12 +
 .../files/__mocks__/FileRepositoryMock.ts     |  30 +
 .../files/__mocks__/LocalFileSystemMock.ts    |  15 +
 .../files/__mocks__/RemoteFileSystemMock.ts   |  29 +
 .../files/application/FileCreator.test.ts     | 123 +++
 .../files/application/FileDeleter.test.ts     |  87 +++
 .../files/application/FilePathUpdater.test.ts | 120 +++
 .../virtual-drive/files}/domain/FileMother.ts |  14 +-
 .../files}/domain/FilePath.test.ts            |  22 +-
 .../files/domain/FilePathMother.ts            |  22 +
 .../files}/domain/FileSize.test.ts            |   2 +-
 .../files/infrastructure}/ServerFileMother.ts |   4 +-
 .../folders/__mocks__/FolderFinderFactory.ts  |  16 +
 .../folders/__mocks__/FolderFinderMock.ts     |   6 +
 .../__mocks__/FolderLocalFileSystemMock.ts    |  10 +
 .../__mocks__/FolderRemoteFileSystemMock.ts   |  26 +
 .../folders/__mocks__/FolderRepositoryMock.ts |  33 +
 .../folders/application/FolderCreator.test.ts |  82 ++
 .../folders/application/FolderDeleter.test.ts |  83 +++
 .../folders/application/FolderMover.test.ts   |  55 ++
 .../SynchronizeOfflineModifications.test.ts   | 160 ++++
 .../folders}/domain/FolderMother.ts           |  37 +-
 .../folders/domain/FolderPath.test.ts         |  14 +
 .../folders/domain/OfflineFolderMother.ts     |  30 +
 .../items/application/Traverser.test.ts       | 307 ++++++++
 .../items/infrastructure/FakeNameDecrypt.ts   |  13 +
 .../items}/persistance/ServerFolderMother.ts  |   5 +-
 .../shared}/__mock__/EventBusMock.ts          |  10 +-
 .../shared/__mock__/EventRepositoryMock.ts    |  14 +
 .../__mock__/IpcRendererSyncEngineMock.ts     |  22 +-
 .../AbsolutePathToRelativeConverter.test.ts   |  15 +
 .../application/PlatformPathConverter.test.ts |  18 +
 .../virtual-drive/shared}/domain/FakeCrypt.ts |   2 +-
 .../virtual-drive/shared/domain/Path.test.ts  |  29 +
 ...BytesInBinaryToInternacionalSystem.test.ts |   2 +-
 .../fixtures/AccessResponse.json              |   0
 {src/test => tests}/fixtures/errors.ts        |  21 +-
 {src/test => tests}/issues.e2e.ts             |  27 +-
 tests/main/thumbnails/fixtures/1000x1000.jpg  | Bin 0 -> 105501 bytes
 tests/main/thumbnails/fixtures/result.png     | Bin 0 -> 45113 bytes
 tests/main/thumbnails/fixtures/source.pdf     | Bin 0 -> 6044 bytes
 tests/main/thumbnails/helpers.ts              |  37 +
 tests/main/thumbnails/resize-image.test.ts    |  37 +
 {src/test => tests}/onboarding.e2e.ts         |   0
 {src/test => tests}/playwright.config.ts      |   0
 {src/test => tests}/selectors.ts              |   0
 {src/test => tests}/unauthorized.e2e.ts       |   0
 {src/test => tests}/utils.ts                  |   0
 tsconfig.json                                 |   9 +-
 yarn.lock                                     |  47 +-
 679 files changed, 8899 insertions(+), 11766 deletions(-)
 rename .erb/configs/{webpack.config.webdav.ts => webpack.config.sync-engine.ts} (86%)
 delete mode 100644 .github/workflows/build-linux.yml
 delete mode 100644 .github/workflows/build-mac-arm.yml
 delete mode 100644 .github/workflows/build-mac.yml
 delete mode 100644 .github/workflows/build.yml
 delete mode 100644 assets/icon.png
 create mode 100644 assets/tray/alert.png
 create mode 100644 assets/tray/alert@3x.png
 delete mode 100644 assets/tray/alertTemplate@2x.png
 create mode 100644 assets/tray/idle.png
 create mode 100644 assets/tray/idle@2x.png
 create mode 100644 assets/tray/idle@3x.png
 create mode 100644 assets/tray/loading.png
 create mode 100644 assets/tray/loading@3x.png
 delete mode 100644 assets/tray/loadingTemplate@2x.png
 delete mode 100644 assets/tray/standby@2x.png
 delete mode 100644 assets/tray/standbyTemplate@2x.png
 create mode 100644 assets/tray/syncing.png
 create mode 100644 assets/tray/syncing@3x.png
 delete mode 100644 assets/tray/syncingTemplate@2x.png
 rename src/{ => apps}/main/analytics/drive-handlers.ts (78%)
 rename src/{ => apps}/main/analytics/handlers.ts (65%)
 rename src/{ => apps}/main/analytics/rudderstack-client.ts (73%)
 rename src/{ => apps}/main/analytics/service.ts (94%)
 rename src/{ => apps}/main/analytics/user-handlers.ts (100%)
 rename src/{ => apps}/main/app-info/app-info.ts (76%)
 create mode 100644 src/apps/main/app-info/handlers.ts
 rename src/{ => apps}/main/auth/handlers.ts (93%)
 rename src/{ => apps}/main/auth/refresh-token.ts (100%)
 rename src/{ => apps}/main/auth/service.ts (98%)
 rename src/{ => apps}/main/auto-launch/handlers.ts (100%)
 rename src/{ => apps}/main/auto-launch/linux-desktop-entry.ts (94%)
 rename src/{ => apps}/main/auto-launch/service.ts (100%)
 rename src/{ => apps}/main/background-processes/process-issues.ts (97%)
 create mode 100644 src/apps/main/background-processes/sync-engine.ts
 rename src/{ => apps}/main/bug-report/BugReportResult.ts (100%)
 rename src/{ => apps}/main/bug-report/handlers.ts (100%)
 rename src/{ => apps}/main/bug-report/service.ts (96%)
 rename src/{ => apps}/main/config.ts (100%)
 rename src/{ => apps}/main/config/handlers.ts (100%)
 rename src/{ => apps}/main/config/service.ts (100%)
 rename src/{ => apps}/main/database/adapters/base.ts (100%)
 rename src/{ => apps}/main/database/collections/DriveFileCollection.ts (100%)
 rename src/{ => apps}/main/database/collections/DriveFolderCollection.ts (100%)
 rename src/{ => apps}/main/database/data-source.ts (100%)
 rename src/{ => apps}/main/database/entities/DriveFile.ts (100%)
 rename src/{ => apps}/main/database/entities/DriveFolder.ts (100%)
 rename src/{ => apps}/main/device/handlers.ts (80%)
 rename src/{ => apps}/main/device/service.ts (100%)
 rename src/{ => apps}/main/event-bus.ts (96%)
 rename src/{ => apps}/main/fordwardToWindows.ts (78%)
 rename src/{ => apps}/main/ipcs/NoEvents.ts (100%)
 create mode 100644 src/apps/main/ipcs/ipcMainSyncEngine.ts
 rename src/{ => apps}/main/ipcs/mainDrive.ts (100%)
 rename src/{ => apps}/main/ipcs/mainVirtualDrive.ts (100%)
 rename src/{ => apps}/main/logger.ts (100%)
 rename src/{ => apps}/main/main.ts (76%)
 rename src/{ => apps}/main/migration/handlers.ts (100%)
 rename src/{ => apps}/main/migration/service.ts (100%)
 rename src/{ => apps}/main/platform/DesktopPlatform.ts (100%)
 rename src/{ => apps}/main/platform/handlers.ts (100%)
 rename src/{ => apps}/main/preload.d.ts (67%)
 rename src/{ => apps}/main/preload.js (95%)
 create mode 100644 src/apps/main/quit.ts
 rename src/{ => apps}/main/realtime.ts (100%)
 rename src/{ => apps}/main/remote-sync/RemoteSyncManager.test.ts (97%)
 rename src/{ => apps}/main/remote-sync/RemoteSyncManager.ts (93%)
 rename src/{ => apps}/main/remote-sync/handlers.ts (84%)
 rename src/{ => apps}/main/remote-sync/helpers.ts (100%)
 rename src/{ => apps}/main/thumbnails/application/create-and-upload-thumbnail.ts (100%)
 create mode 100644 src/apps/main/thumbnails/application/extract-pdf-page.ts
 rename src/{ => apps}/main/thumbnails/application/obtain-image-to-thumbnail-it.ts (100%)
 create mode 100644 src/apps/main/thumbnails/application/resize-image.ts
 rename src/{ => apps}/main/thumbnails/domain/ThumbnableExtension.ts (100%)
 rename src/{ => apps}/main/thumbnails/domain/ThumbnailProperties.ts (100%)
 rename src/{ => apps}/main/thumbnails/domain/ThumbnailUploader.ts (100%)
 rename src/{ => apps}/main/thumbnails/handlers/index.ts (100%)
 rename src/{ => apps}/main/thumbnails/handlers/remote-file-pull-completed.ts (100%)
 rename src/{ => apps}/main/thumbnails/infrastructure/EnvironmentAndStorageThumbnailUploader.ts (100%)
 rename src/{ => apps}/main/thumbnails/infrastructure/ThumbnailUploaderFactory.ts (100%)
 rename src/{ => apps}/main/token-scheduler/TokenScheduler.ts (100%)
 rename src/{ => apps}/main/token-scheduler/token-scheduler.test.ts (100%)
 rename src/{ => apps}/main/tray/handlers.ts (78%)
 rename src/{ => apps}/main/tray/tray.ts (81%)
 rename src/{ => apps}/main/types.ts (100%)
 rename src/{ => apps}/main/usage/Usage.ts (100%)
 rename src/{ => apps}/main/usage/handlers.ts (100%)
 rename src/{ => apps}/main/usage/service.ts (100%)
 rename src/{ => apps}/main/usage/serviceBuilder.ts (100%)
 rename src/{ => apps}/main/util.ts (100%)
 create mode 100644 src/apps/main/virutal-root-folder/handlers.ts
 rename src/{main/sync-root-folder => apps/main/virutal-root-folder}/service.ts (73%)
 rename src/{ => apps}/main/windows/auth.ts (97%)
 rename src/{ => apps}/main/windows/feedback.ts (100%)
 rename src/{ => apps}/main/windows/index.ts (87%)
 rename src/{ => apps}/main/windows/migration.ts (100%)
 rename src/{ => apps}/main/windows/onboarding.ts (100%)
 rename src/{ => apps}/main/windows/process-issues.ts (100%)
 rename src/{ => apps}/main/windows/settings.ts (100%)
 rename src/{ => apps}/main/windows/widget.ts (80%)
 rename src/{ => apps}/renderer/App.css (100%)
 rename src/{ => apps}/renderer/App.tsx (100%)
 rename src/{ => apps}/renderer/actions/shared-actions.ts (100%)
 rename src/{ => apps}/renderer/actions/sync-error-actions.ts (100%)
 create mode 100644 src/apps/renderer/actions/types.ts
 rename src/{ => apps}/renderer/assets/error.svg (100%)
 rename src/{ => apps}/renderer/assets/file.svg (100%)
 rename src/{ => apps}/renderer/assets/folder.svg (100%)
 rename src/{ => apps}/renderer/assets/fonts/InstrumentSans/InstrumentSans-Bold.woff2 (100%)
 rename src/{ => apps}/renderer/assets/fonts/InstrumentSans/InstrumentSans-Medium.woff2 (100%)
 rename src/{ => apps}/renderer/assets/fonts/InstrumentSans/InstrumentSans-Regular.woff2 (100%)
 rename src/{ => apps}/renderer/assets/fonts/InstrumentSans/InstrumentSans-SemiBold.woff2 (100%)
 rename src/{ => apps}/renderer/assets/fonts/InstrumentSans/InstrumentSans[wdth,wght].woff2 (100%)
 rename src/{ => apps}/renderer/assets/fonts/InstrumentSans/OFL.txt (100%)
 rename src/{ => apps}/renderer/assets/fonts/InstrumentSans/font.css (100%)
 rename src/{ => apps}/renderer/assets/icons/audio.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/code.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/csv.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/default.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/excel.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/figma.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/folder.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/getIcon.tsx (100%)
 rename src/{ => apps}/renderer/assets/icons/illustrator.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/image.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/indesign.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/pdf.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/photoshop.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/powerpoint.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/ppt.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/sketch.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/txt.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/video.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/word.svg (100%)
 rename src/{ => apps}/renderer/assets/icons/zip.svg (100%)
 rename src/{ => apps}/renderer/assets/illustrations/syncedStack-dark.png (100%)
 rename src/{ => apps}/renderer/assets/illustrations/syncedStack-light.png (100%)
 rename src/{ => apps}/renderer/assets/index.d.ts (100%)
 rename src/{ => apps}/renderer/assets/migration/upload-error.svg (100%)
 rename src/{ => apps}/renderer/assets/migration/widget.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/context-menu.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/finder/linux.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/finder/macos.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/finder/windows.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/folder-with-overlay-icons/offline/en.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/folder-with-overlay-icons/offline/es.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/folder-with-overlay-icons/offline/fr.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/folder-with-overlay-icons/online/en.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/folder-with-overlay-icons/online/es.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/folder-with-overlay-icons/online/fr.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/logo.svg (100%)
 rename src/{ => apps}/renderer/assets/onboarding/mac-finder-widget.png (100%)
 rename src/{ => apps}/renderer/assets/onboarding/widget.png (100%)
 rename src/{ => apps}/renderer/assets/play.svg (100%)
 rename src/{ => apps}/renderer/assets/spinner.svg (100%)
 rename src/{ => apps}/renderer/assets/stop.svg (100%)
 rename src/{ => apps}/renderer/assets/success.svg (100%)
 rename src/{ => apps}/renderer/assets/warn.svg (100%)
 rename src/{ => apps}/renderer/components/Backups/BackupsFoldersSelector.tsx (97%)
 rename src/{ => apps}/renderer/components/Backups/FatalError.tsx (85%)
 rename src/{ => apps}/renderer/components/Button.tsx (100%)
 rename src/{ => apps}/renderer/components/Checkbox.tsx (100%)
 rename src/{ => apps}/renderer/components/FileWithOperation.tsx (100%)
 rename src/{ => apps}/renderer/components/PasswordInput.tsx (100%)
 rename src/{ => apps}/renderer/components/Select.tsx (100%)
 rename src/{ => apps}/renderer/components/TextArea.tsx (100%)
 rename src/{ => apps}/renderer/components/TextInput.tsx (100%)
 rename src/{ => apps}/renderer/components/WindowTopBar.tsx (100%)
 rename src/{ => apps}/renderer/context/DeviceContext.tsx (100%)
 rename src/{ => apps}/renderer/context/LocalContext.tsx (100%)
 create mode 100644 src/apps/renderer/hooks/BackupFatalErrors.tsx
 rename src/{ => apps}/renderer/hooks/ClientPlatform.tsx (100%)
 rename src/{ => apps}/renderer/hooks/FatalErrorActions.ts (84%)
 rename src/{ => apps}/renderer/hooks/GeneralIssues.tsx (88%)
 rename src/{ => apps}/renderer/hooks/ProcessIssues.tsx (88%)
 create mode 100644 src/apps/renderer/hooks/VirtualDriveStatus.tsx
 rename src/{ => apps}/renderer/hooks/useBackups.tsx (100%)
 rename src/{ => apps}/renderer/hooks/useConfig.tsx (100%)
 rename src/{ => apps}/renderer/hooks/useLanguage.tsx (100%)
 create mode 100644 src/apps/renderer/hooks/useOnSyncRunning.tsx
 create mode 100644 src/apps/renderer/hooks/useOnSyncStopped.tsx
 create mode 100644 src/apps/renderer/hooks/useSyncInfoSubscriber.tsx
 rename src/{renderer/hooks/SyncStatus.tsx => apps/renderer/hooks/useSyncStatus.tsx} (52%)
 rename src/{renderer/hooks/SyncStopped.tsx => apps/renderer/hooks/useSyncStopped.tsx} (82%)
 rename src/{ => apps}/renderer/hooks/useUsage.tsx (94%)
 rename src/{ => apps}/renderer/index.ejs (100%)
 rename src/{ => apps}/renderer/index.tsx (100%)
 rename src/{ => apps}/renderer/localize/i18n.service.ts (73%)
 rename src/{ => apps}/renderer/localize/locales/en.json (99%)
 rename src/{ => apps}/renderer/localize/locales/es.json (99%)
 rename src/{ => apps}/renderer/localize/locales/fr.json (99%)
 rename src/{ => apps}/renderer/messages/backups/backups-actions-map.ts (86%)
 rename src/{ => apps}/renderer/messages/backups/backups-fatal-errors.ts (88%)
 rename src/{ => apps}/renderer/messages/general-error.ts (88%)
 rename src/{ => apps}/renderer/messages/process-error.ts (95%)
 rename src/{ => apps}/renderer/messages/process-fatal-error.ts (92%)
 rename src/{ => apps}/renderer/pages/Feedback/index.tsx (95%)
 rename src/{ => apps}/renderer/pages/Login/ErrorBanner.tsx (100%)
 rename src/{ => apps}/renderer/pages/Login/TwoFA.tsx (100%)
 rename src/{ => apps}/renderer/pages/Login/WarningBanner.tsx (93%)
 rename src/{ => apps}/renderer/pages/Login/index.tsx (95%)
 rename src/{ => apps}/renderer/pages/Login/service.ts (97%)
 rename src/{ => apps}/renderer/pages/Login/types.ts (100%)
 rename src/{ => apps}/renderer/pages/Migration/config.tsx (99%)
 rename src/{ => apps}/renderer/pages/Migration/helpers.tsx (99%)
 rename src/{ => apps}/renderer/pages/Migration/index.tsx (96%)
 rename src/{ => apps}/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx (96%)
 rename src/{ => apps}/renderer/pages/Migration/slides/MigrationFailedSlide.tsx (92%)
 rename src/{ => apps}/renderer/pages/Onboarding/config.tsx (97%)
 rename src/{ => apps}/renderer/pages/Onboarding/helpers.tsx (99%)
 rename src/{ => apps}/renderer/pages/Onboarding/index.tsx (95%)
 rename src/{ => apps}/renderer/pages/Onboarding/slides/AvailableOfflineSlide.tsx (91%)
 rename src/{ => apps}/renderer/pages/Onboarding/slides/AvailableOnlineSlide.tsx (91%)
 rename src/{ => apps}/renderer/pages/Onboarding/slides/BackupsSlide.tsx (92%)
 rename src/{ => apps}/renderer/pages/Onboarding/slides/ContextMenuSlide.tsx (93%)
 rename src/{ => apps}/renderer/pages/Onboarding/slides/FilesOrganizationSlide.tsx (92%)
 rename src/{ => apps}/renderer/pages/Onboarding/slides/OnboardingCompletedSlide.tsx (97%)
 rename src/{ => apps}/renderer/pages/Onboarding/slides/WelcomeSlide.tsx (91%)
 rename src/{ => apps}/renderer/pages/ProcessIssues/List.tsx (79%)
 rename src/{ => apps}/renderer/pages/ProcessIssues/ReportModal.tsx (89%)
 rename src/{ => apps}/renderer/pages/ProcessIssues/index.tsx (80%)
 rename src/{ => apps}/renderer/pages/Settings/Account/Usage.tsx (100%)
 rename src/{ => apps}/renderer/pages/Settings/Account/UserInfo.tsx (96%)
 rename src/{ => apps}/renderer/pages/Settings/Account/index.tsx (93%)
 rename src/{ => apps}/renderer/pages/Settings/General/AppInfo.tsx (96%)
 rename src/{ => apps}/renderer/pages/Settings/General/DeviceName.tsx (97%)
 rename src/{ => apps}/renderer/pages/Settings/General/LanguagePicker.tsx (96%)
 rename src/{ => apps}/renderer/pages/Settings/General/StartAutomatically.tsx (100%)
 rename src/{ => apps}/renderer/pages/Settings/General/ThemePicker.tsx (96%)
 rename src/{ => apps}/renderer/pages/Settings/General/index.tsx (100%)
 rename src/{ => apps}/renderer/pages/Settings/Header.tsx (91%)
 rename src/{ => apps}/renderer/pages/Settings/index.tsx (92%)
 create mode 100644 src/apps/renderer/pages/Widget/AnimationWrapper.tsx
 rename src/{ => apps}/renderer/pages/Widget/Header.tsx (97%)
 create mode 100644 src/apps/renderer/pages/Widget/Item.tsx
 create mode 100644 src/apps/renderer/pages/Widget/NoInfoToShow.tsx
 rename src/{ => apps}/renderer/pages/Widget/SyncAction.tsx (83%)
 rename src/{ => apps}/renderer/pages/Widget/SyncErrorBanner.tsx (86%)
 rename src/{ => apps}/renderer/pages/Widget/SyncFailed.tsx (100%)
 create mode 100644 src/apps/renderer/pages/Widget/SyncInfo.tsx
 rename src/{ => apps}/renderer/pages/Widget/VirtualDriveError.tsx (100%)
 create mode 100644 src/apps/renderer/pages/Widget/index.tsx
 rename src/{ => apps}/renderer/utils/errors.ts (100%)
 rename src/{ => apps}/renderer/utils/http-request.ts (100%)
 rename src/{ => apps}/renderer/utils/path.ts (100%)
 create mode 100644 src/apps/renderer/utils/query.ts
 rename src/{ => apps}/renderer/utils/usage.ts (100%)
 rename src/{ => apps}/shared/FileTypes/FileTypes.ts (100%)
 rename src/{ => apps}/shared/HttpClient/Clients.ts (100%)
 rename src/{ => apps}/shared/HttpClient/HttpClient.ts (100%)
 rename src/{shared/HttpClient/backgroud-process-clients.ts => apps/shared/HttpClient/background-process-clients.ts} (88%)
 rename src/{ => apps}/shared/HttpClient/http-client.test.skip.ts (100%)
 rename src/{ => apps}/shared/HttpClient/main-process-client.ts (82%)
 rename src/{ => apps}/shared/HttpClient/responses/file-created.ts (100%)
 rename src/{ => apps}/shared/IPC/IPCs.ts (78%)
 rename src/{ => apps}/shared/IPC/events/drive.ts (93%)
 create mode 100644 src/apps/shared/IPC/events/sync-engine.ts
 rename src/{ => apps}/shared/IPC/events/virtual-drive.ts (100%)
 rename src/{ => apps}/shared/ItemKind.ts (100%)
 rename src/{ => apps}/shared/Locale/DayJsLocales.ts (100%)
 rename src/{ => apps}/shared/Locale/Language.ts (100%)
 create mode 100644 src/apps/shared/fs/PathTypeChecker .ts
 create mode 100644 src/apps/shared/fs/ReadStreamToBuffer.ts
 create mode 100644 src/apps/shared/fs/ensure-folder-exists.ts
 create mode 100644 src/apps/shared/fs/write-readable-to-file.ts
 rename src/{workers => apps/shared}/types.ts (99%)
 rename src/{ => apps}/shared/types/Nullable.ts (100%)
 create mode 100644 src/apps/shared/types/Primitives.ts
 create mode 100644 src/apps/shared/types/Process.ts
 rename src/{ => apps}/shared/types/Stopwatch.ts (100%)
 rename src/{ => apps}/shared/types/Theme.ts (100%)
 create mode 100644 src/apps/shared/types/VirtualDriveStatus.ts
 create mode 100644 src/apps/sync-engine/BindingManager.ts
 create mode 100644 src/apps/sync-engine/callbacks-controllers/buildControllers.ts
 create mode 100644 src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
 create mode 100644 src/apps/sync-engine/callbacks-controllers/controllers/CallbackController.ts
 create mode 100644 src/apps/sync-engine/callbacks-controllers/controllers/DeleteController.ts
 create mode 100644 src/apps/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts
 create mode 100644 src/apps/sync-engine/callbacks-controllers/controllers/NotifyPlaceholderHydrationFinished.ts
 create mode 100644 src/apps/sync-engine/callbacks-controllers/controllers/RenameOrMoveController.ts
 create mode 100644 src/apps/sync-engine/callbacks-controllers/controllers/offline/OfflineRenameOrMoveController.ts
 create mode 100644 src/apps/sync-engine/callbacks-controllers/helpers/rawPathIsFolder.ts
 create mode 100644 src/apps/sync-engine/callbacks-controllers/middlewares/executeControllerWithFallback.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/DependencyContainer.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/DependencyContainerFactory.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/boundaryBridge/build.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/common/clients.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/common/crypt.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/common/eventBus.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/common/eventRepository.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/common/localRootFolderPath.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/common/mnemonic.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/common/sdk.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/common/traverser.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/common/user.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/common/virtualDrive.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/contents/builder.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/files/FilesContainer.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/files/builder.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/folders/builder.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/items/ItemsContainer.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/items/builder.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/shared/SharedContainer.ts
 create mode 100644 src/apps/sync-engine/dependency-injection/shared/builder.ts
 create mode 100644 src/apps/sync-engine/index.ts
 create mode 100644 src/apps/sync-engine/ipcRendererSyncEngine.ts
 rename src/{workers => apps}/utils/date.ts (100%)
 rename src/{workers => apps}/utils/file-is-on-folder.ts (100%)
 rename src/{workers => apps}/utils/http-request.ts (91%)
 create mode 100644 src/apps/utils/icon.ts
 rename src/{workers => apps}/utils/is-online.ts (100%)
 rename src/{workers => apps}/utils/name-verification.ts (76%)
 rename src/{workers => apps}/utils/reporting.ts (91%)
 rename src/{workers => apps}/utils/test/file-is-on-folder.test.ts (100%)
 rename src/{workers => apps}/utils/test/name-verification.test.ts (100%)
 rename src/{workers => apps}/utils/test/sensible-files.json (100%)
 rename src/{workers => apps}/utils/types/Tuple.ts (100%)
 create mode 100644 src/context/desktop/app/domain/AppIssue.ts
 create mode 100644 src/context/desktop/sync/domain/SyncStatus.ts
 create mode 100644 src/context/desktop/sync/domain/SyncStoppedPayload.ts
 rename src/{workers/webdav/modules => context}/shared/domain/AggregateRoot.ts (76%)
 rename src/{workers/webdav/modules => context}/shared/domain/DomainEvent.ts (82%)
 rename src/{workers/webdav/modules/shared/domain/WebdavDomainEventSubscriber.ts => context/shared/domain/DomainEventSubscriber.ts} (67%)
 create mode 100644 src/context/shared/domain/Either.ts
 rename src/{workers => context}/shared/domain/EnumValueObject.ts (100%)
 rename src/{workers => context}/shared/domain/InvalidArgumentError.ts (100%)
 rename src/{workers/filesystems => context/shared}/domain/ServerFile.ts (94%)
 rename src/{workers/filesystems => context/shared}/domain/ServerFolder.ts (95%)
 rename src/{workers => context}/shared/domain/ValueObject.ts (82%)
 rename src/{workers/utils => context/shared/infrastructure}/crypt.ts (100%)
 create mode 100644 src/context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator.ts
 create mode 100644 src/context/virtual-drive/contents/application/ContentsDownloader.ts
 create mode 100644 src/context/virtual-drive/contents/application/ContentsUploader.ts
 create mode 100644 src/context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished.ts
 create mode 100644 src/context/virtual-drive/contents/application/ReadLocalFileContentsToBuffer.ts
 create mode 100644 src/context/virtual-drive/contents/application/RetryContentsUploader.ts
 create mode 100644 src/context/virtual-drive/contents/application/temporalFolderProvider.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/contents/domain/ContentsId.ts (68%)
 create mode 100644 src/context/virtual-drive/contents/domain/ContentsManagersFactory.ts
 create mode 100644 src/context/virtual-drive/contents/domain/ContentsSize.ts
 create mode 100644 src/context/virtual-drive/contents/domain/LocalFileContents.ts
 create mode 100644 src/context/virtual-drive/contents/domain/LocalFileProvider.ts
 create mode 100644 src/context/virtual-drive/contents/domain/LocalFileWriter.ts
 create mode 100644 src/context/virtual-drive/contents/domain/RemoteFileContents.ts
 rename src/{workers/webdav/modules/contents/domain => context/virtual-drive/contents/domain/contentHandlers}/ContentFileDownloader.ts (72%)
 rename src/{workers/webdav/modules/contents/domain => context/virtual-drive/contents/domain/contentHandlers}/ContentFileUploader.ts (65%)
 create mode 100644 src/context/virtual-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts
 create mode 100644 src/context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
 create mode 100644 src/context/virtual-drive/contents/infrastructure/FSLocalFileProvider.ts
 create mode 100644 src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
 rename src/{workers/webdav/modules/contents/infrastructure/download/EnvironmentContnetFileDownloader.ts => context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.ts} (66%)
 rename src/{workers/webdav/modules/contents/infrastructure/upload/EnvironmentContentFileUpoader.ts => context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader.ts} (56%)
 create mode 100644 src/context/virtual-drive/files/application/CreateFilePlaceholderOnDeletionFailed.ts
 create mode 100644 src/context/virtual-drive/files/application/FileCreator.ts
 create mode 100644 src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts
 create mode 100644 src/context/virtual-drive/files/application/FileDeleter.ts
 create mode 100644 src/context/virtual-drive/files/application/FileFinderByContentsId.ts
 create mode 100644 src/context/virtual-drive/files/application/FilePathUpdater.ts
 create mode 100644 src/context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId.ts
 create mode 100644 src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts
 create mode 100644 src/context/virtual-drive/files/application/FilesPlaceholdersCreator.ts
 create mode 100644 src/context/virtual-drive/files/application/RepositoryPopulator.ts
 create mode 100644 src/context/virtual-drive/files/application/RetrieveAllFiles.ts
 create mode 100644 src/context/virtual-drive/files/application/SameFileWasMoved.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/files/application/WebdavFileMimeTypeResolver.ts (100%)
 rename src/{workers/webdav/modules => context/virtual-drive}/files/domain/File.ts (58%)
 create mode 100644 src/context/virtual-drive/files/domain/FilePath.ts
 create mode 100644 src/context/virtual-drive/files/domain/FileRepository.ts
 create mode 100644 src/context/virtual-drive/files/domain/FileSize.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/files/domain/FileStatus.ts (72%)
 rename src/{workers/webdav/modules => context/virtual-drive}/files/domain/MimeTypesMap.ts (100%)
 create mode 100644 src/context/virtual-drive/files/domain/OfflineFile.ts
 create mode 100644 src/context/virtual-drive/files/domain/OldFileRepository.ts
 create mode 100644 src/context/virtual-drive/files/domain/PlaceholderId.ts
 create mode 100644 src/context/virtual-drive/files/domain/errors/ActionNotPermittedError.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/files/domain/errors/FileActionCannotModifyExtension.ts (100%)
 rename src/{workers/webdav/modules => context/virtual-drive}/files/domain/errors/FileActionOnlyCanAffectOneLevelError.ts (100%)
 rename src/{workers/webdav/modules => context/virtual-drive}/files/domain/errors/FileAlreadyExistsError.ts (100%)
 rename src/{workers/webdav/modules => context/virtual-drive}/files/domain/errors/FileCannotBeMovedToTheOriginalFolderError.ts (100%)
 rename src/{workers/webdav/modules => context/virtual-drive}/files/domain/errors/FileNameShouldBeEqualToOriginalError.ts (100%)
 rename src/{workers/webdav/modules => context/virtual-drive}/files/domain/errors/FileNameShouldDifferFromOriginalError.ts (100%)
 create mode 100644 src/context/virtual-drive/files/domain/errors/FileNotFoundError.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/files/domain/errors/UnknownFileActionError.ts (100%)
 rename src/{workers/webdav/modules/files/domain => context/virtual-drive/files/domain/events}/FileCreatedDomainEvent.ts (91%)
 rename src/{workers/webdav/modules/files/domain => context/virtual-drive/files/domain/events}/FileDeletedDomainEvent.ts (89%)
 create mode 100644 src/context/virtual-drive/files/domain/events/FileMovedDomainEvent.ts
 create mode 100644 src/context/virtual-drive/files/domain/events/FileRenamedDomainEvent.ts
 create mode 100644 src/context/virtual-drive/files/domain/events/OptimisticFileDeletionFailed.ts
 create mode 100644 src/context/virtual-drive/files/domain/file-systems/LocalFileSystem.ts
 create mode 100644 src/context/virtual-drive/files/domain/file-systems/RemoteFileSystem.ts
 create mode 100644 src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
 create mode 100644 src/context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem.ts
 create mode 100644 src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts
 rename src/{workers/webdav/modules/files/infrastructure/persistance => context/virtual-drive/files/infrastructure}/dtos/AddFileDTO.ts (100%)
 rename src/{workers/webdav/modules/files/infrastructure/persistance => context/virtual-drive/files/infrastructure}/dtos/UpdateFileNameDTO.ts (100%)
 rename src/{workers/webdav/modules/files/infrastructure/persistance => context/virtual-drive/files/infrastructure}/dtos/UpdateFileParentDirDTO.ts (100%)
 create mode 100644 src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists.ts
 create mode 100644 src/context/virtual-drive/folders/application/FolderByPartialSearcher.ts
 create mode 100644 src/context/virtual-drive/folders/application/FolderCreator.ts
 create mode 100644 src/context/virtual-drive/folders/application/FolderCreatorFromServerFolder.ts
 create mode 100644 src/context/virtual-drive/folders/application/FolderDeleter.ts
 rename src/{workers/webdav/modules/folders/application/WebdavFolderFinder.ts => context/virtual-drive/folders/application/FolderFinder.ts} (50%)
 create mode 100644 src/context/virtual-drive/folders/application/FolderMover.ts
 create mode 100644 src/context/virtual-drive/folders/application/FolderPathUpdater.ts
 create mode 100644 src/context/virtual-drive/folders/application/FolderRenamer.ts
 create mode 100644 src/context/virtual-drive/folders/application/FolderRepositoryInitiator.ts
 create mode 100644 src/context/virtual-drive/folders/application/FoldersPlaceholderCreator.ts
 create mode 100644 src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts
 create mode 100644 src/context/virtual-drive/folders/application/Offline/OfflineFolderMover.ts
 create mode 100644 src/context/virtual-drive/folders/application/Offline/OfflineFolderPathUpdater.ts
 create mode 100644 src/context/virtual-drive/folders/application/Offline/OfflineFolderRenamer.ts
 rename src/{workers/webdav/modules/folders/application/WebdavFolderDeleter.ts => context/virtual-drive/folders/application/RetrieveAllFolders.ts} (55%)
 create mode 100644 src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts
 create mode 100644 src/context/virtual-drive/folders/application/SynchronizeOfflineModificationsOnFolderCreated.ts
 create mode 100644 src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/folders/domain/Folder.ts (68%)
 create mode 100644 src/context/virtual-drive/folders/domain/FolderPath.ts
 create mode 100644 src/context/virtual-drive/folders/domain/FolderPlaceholderId.ts
 create mode 100644 src/context/virtual-drive/folders/domain/FolderRepository.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/folders/domain/FolderStatus.ts (75%)
 create mode 100644 src/context/virtual-drive/folders/domain/FolderUuid.ts
 create mode 100644 src/context/virtual-drive/folders/domain/ManagedFolderRepository.ts
 create mode 100644 src/context/virtual-drive/folders/domain/OfflineFolder.ts
 create mode 100644 src/context/virtual-drive/folders/domain/OfflineFolderRepository.ts
 rename src/{workers/webdav/modules/folders/domain/FolderRepository.ts => context/virtual-drive/folders/domain/OldFolderRepository.ts} (53%)
 create mode 100644 src/context/virtual-drive/folders/domain/errors/ActionNotPermittedError.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/folders/domain/errors/FolderNotFoundError.ts (100%)
 create mode 100644 src/context/virtual-drive/folders/domain/events/FolderCreatedDomainEvent.ts
 create mode 100644 src/context/virtual-drive/folders/domain/events/FolderRenamedDomainEvent.ts
 create mode 100644 src/context/virtual-drive/folders/domain/file-systems/LocalFileSystem.ts
 create mode 100644 src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem.ts
 create mode 100644 src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
 create mode 100644 src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts
 create mode 100644 src/context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository.ts
 create mode 100644 src/context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem.ts
 create mode 100644 src/context/virtual-drive/folders/infrastructure/dtos/CreateFolderDTO.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/folders/infrastructure/dtos/UpdateFolderNameDTO.ts (100%)
 create mode 100644 src/context/virtual-drive/items/application/FileCreatorFromServerFile.ts
 create mode 100644 src/context/virtual-drive/items/application/FolderCreatorFromServerFolder.ts
 create mode 100644 src/context/virtual-drive/items/application/ItemsSearcher.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/items/application/RemoteItemsGenerator.ts (82%)
 create mode 100644 src/context/virtual-drive/items/application/Traverser.ts
 create mode 100644 src/context/virtual-drive/items/application/TreeBuilder.ts
 create mode 100644 src/context/virtual-drive/items/domain/FileNode.ts
 create mode 100644 src/context/virtual-drive/items/domain/FolderNode.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/items/domain/ItemsIndexedByPath.ts (100%)
 create mode 100644 src/context/virtual-drive/items/domain/NameDecrypt.ts
 create mode 100644 src/context/virtual-drive/items/domain/Node.ts
 create mode 100644 src/context/virtual-drive/items/domain/Tree.ts
 create mode 100644 src/context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt.ts
 create mode 100644 src/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/shared/application/AllWebdavItemsSearcher.ts (56%)
 create mode 100644 src/context/virtual-drive/shared/application/EitherTransformer.ts
 create mode 100644 src/context/virtual-drive/shared/application/LocalFileIdProvider.ts
 create mode 100644 src/context/virtual-drive/shared/application/PlatformPathConverter.ts
 create mode 100644 src/context/virtual-drive/shared/application/RelativePathToAbsoluteConverter.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/shared/application/WebdavUnknownItemTypeSearcher.ts (62%)
 create mode 100644 src/context/virtual-drive/shared/domain/BucketEntry.ts
 create mode 100644 src/context/virtual-drive/shared/domain/BucketEntryId.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/shared/domain/Crypt.ts (86%)
 create mode 100644 src/context/virtual-drive/shared/domain/DelayQueue.ts
 rename src/{workers/webdav/modules/shared/domain/WebdavServerEventBus.ts => context/virtual-drive/shared/domain/EventBus.ts} (68%)
 create mode 100644 src/context/virtual-drive/shared/domain/EventRepository.ts
 create mode 100644 src/context/virtual-drive/shared/domain/MapObserver.ts
 create mode 100644 src/context/virtual-drive/shared/domain/Path.ts
 create mode 100644 src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers.ts
 create mode 100644 src/context/virtual-drive/shared/infrastructure/EnvironmentDownloader.ts
 create mode 100644 src/context/virtual-drive/shared/infrastructure/EventRecorder.ts
 create mode 100644 src/context/virtual-drive/shared/infrastructure/InMemoryEventHistory.ts
 rename src/{workers/webdav/modules/shared/infrastructure/DuplexEventBus.ts => context/virtual-drive/shared/infrastructure/NodeJsEventBus.ts} (60%)
 create mode 100644 src/context/virtual-drive/thumbnails/domain/ThumbanailContentId.ts
 create mode 100644 src/context/virtual-drive/thumbnails/domain/Thumbnail.ts
 create mode 100644 src/context/virtual-drive/thumbnails/domain/ThumbnailDownloader.ts
 create mode 100644 src/context/virtual-drive/thumbnails/infrastructrue/EnvironmentThumbnailDownloader.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/userUsage/application/BytesInBinaryToInternacionalSystem.ts (100%)
 create mode 100644 src/context/virtual-drive/userUsage/application/DecrementDriveUsageOnFileDeleted.ts
 rename src/{workers/webdav/modules => context/virtual-drive}/userUsage/application/FreeSpacePerEnvironmentCalculator.ts (100%)
 rename src/{workers/webdav/modules => context/virtual-drive}/userUsage/application/IncrementDriveUsageOnFileCreated.ts (54%)
 rename src/{workers/webdav/modules => context/virtual-drive}/userUsage/application/UsedSpaceCalculator.ts (100%)
 rename src/{workers/webdav/modules => context/virtual-drive}/userUsage/application/UserUsageDecrementer.ts (100%)
 rename src/{workers/webdav/modules => context/virtual-drive}/userUsage/application/UserUsageIncrementer.ts (100%)
 rename src/{workers/webdav/modules => context/virtual-drive}/userUsage/domain/UserUsage.ts (100%)
 rename src/{workers/webdav/modules => context/virtual-drive}/userUsage/domain/UserUsageRepository.ts (100%)
 rename src/{workers/webdav/modules => context/virtual-drive}/userUsage/infrastrucutre/CachedHttpUserUsageRepository.ts (100%)
 rename src/{workers/webdav/modules => context/virtual-drive}/userUsage/infrastrucutre/dtos/UserUsageLimitDTO.ts (100%)
 delete mode 100644 src/main/analytics/backup-handlers.ts
 delete mode 100644 src/main/app-info/AvaliableAppQuery.ts
 delete mode 100644 src/main/app-info/handlers.ts
 delete mode 100644 src/main/app-info/service.ts
 delete mode 100644 src/main/background-processes/backups.ts
 delete mode 100644 src/main/background-processes/sync.ts
 delete mode 100644 src/main/background-processes/types/BackupFatalError.ts
 delete mode 100644 src/main/background-processes/webdav.ts
 delete mode 100644 src/main/ipcs/webdav.ts
 delete mode 100644 src/main/sync-root-folder/handlers.ts
 delete mode 100644 src/main/thumbnails/application/extract-pdf-page.ts
 delete mode 100644 src/main/thumbnails/application/resize-image.ts
 delete mode 100644 src/main/virtual-drive/handlers.ts
 delete mode 100644 src/renderer/actions/backsups-error-actions.ts
 delete mode 100644 src/renderer/actions/types.ts
 delete mode 100644 src/renderer/hooks/BackupFatalErrors.tsx
 delete mode 100644 src/renderer/hooks/BackupStatus.tsx
 delete mode 100644 src/renderer/hooks/VirtualDriveStatus.tsx
 delete mode 100644 src/renderer/pages/Settings/Backups/BackupsFolderList.tsx
 delete mode 100644 src/renderer/pages/Settings/Backups/BackupsPreferences.tsx
 delete mode 100644 src/renderer/pages/Settings/Backups/index.tsx
 delete mode 100644 src/renderer/pages/Widget/BackupsErrorBanner.tsx
 delete mode 100644 src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx
 delete mode 100644 src/renderer/pages/Widget/SyncInfo.tsx
 delete mode 100644 src/renderer/pages/Widget/index.tsx
 delete mode 100644 src/renderer/utils/backups-progress.ts
 delete mode 100644 src/renderer/utils/query.ts
 delete mode 100644 src/shared/IPC/events/webdav.ts
 delete mode 100644 src/shared/types/Primitives.ts
 delete mode 100644 src/shared/types/Process.ts
 delete mode 100644 src/shared/types/VirtualDriveStatus.ts
 delete mode 100644 src/workers/backups/backups.ts
 delete mode 100644 src/workers/backups/index.ts
 delete mode 100644 src/workers/backups/test/backups.test.ts
 delete mode 100644 src/workers/filesystems/domain/FileSystem.ts
 delete mode 100644 src/workers/filesystems/domain/Transfer.ts
 delete mode 100644 src/workers/filesystems/local-filesystem.ts
 delete mode 100644 src/workers/filesystems/remote-filesystem.ts
 delete mode 100644 src/workers/filesystems/test/__mocks__/FileSystemMock.ts
 delete mode 100644 src/workers/process.ts
 delete mode 100644 src/workers/sync/Listings/domain/Listing.ts
 delete mode 100644 src/workers/webdav/VirtualDrive.ts
 delete mode 100644 src/workers/webdav/dependencyInjection/DependencyContainer.ts
 delete mode 100644 src/workers/webdav/dependencyInjection/DependencyContainerFactory.ts
 delete mode 100644 src/workers/webdav/index.ts
 delete mode 100644 src/workers/webdav/ipc.ts
 delete mode 100644 src/workers/webdav/modules/contents/domain/ContentFileClonner.ts
 delete mode 100644 src/workers/webdav/modules/contents/domain/Contents.ts
 delete mode 100644 src/workers/webdav/modules/contents/domain/ContentsCacheRepository.ts
 delete mode 100644 src/workers/webdav/modules/contents/domain/ContentsManagersFactory.ts
 delete mode 100644 src/workers/webdav/modules/contents/domain/events/FileDownloadedDomainEvent.ts
 delete mode 100644 src/workers/webdav/modules/contents/infrastructure/CachedRemoteFileContentsManagersFactory.ts
 delete mode 100644 src/workers/webdav/modules/contents/infrastructure/EnvironmentContentFileClonner.ts
 delete mode 100644 src/workers/webdav/modules/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
 delete mode 100644 src/workers/webdav/modules/contents/infrastructure/FSContentsCacheRepository.ts
 delete mode 100644 src/workers/webdav/modules/contents/infrastructure/download/CachedContentFileDownloader.ts
 delete mode 100644 src/workers/webdav/modules/contents/infrastructure/upload/CachedContentFileUploader.ts
 delete mode 100644 src/workers/webdav/modules/contents/test/__mocks__/ContentFileClonnerMock.ts
 delete mode 100644 src/workers/webdav/modules/contents/test/__mocks__/ContentsCacheRepositoryMock.ts
 delete mode 100644 src/workers/webdav/modules/contents/test/__mocks__/RemoteFileContentsManagersFactoryMock.ts
 delete mode 100644 src/workers/webdav/modules/contents/test/infrastructure/EnvironmentContentFileClonner.test.ts
 delete mode 100644 src/workers/webdav/modules/contents/test/infrastructure/FSContentsCacheRepository.test.ts
 delete mode 100644 src/workers/webdav/modules/contents/test/infrastructure/download/CachedContentFileDownloader.test.ts
 delete mode 100644 src/workers/webdav/modules/contents/test/infrastructure/upload/CachedContentFileUploader.test.ts
 delete mode 100644 src/workers/webdav/modules/files/application/WebdavFileClonner.ts
 delete mode 100644 src/workers/webdav/modules/files/application/WebdavFileCreator.ts
 delete mode 100644 src/workers/webdav/modules/files/application/WebdavFileDeleter.ts
 delete mode 100644 src/workers/webdav/modules/files/application/WebdavFileDownloader.ts
 delete mode 100644 src/workers/webdav/modules/files/application/WebdavFileMover.ts
 delete mode 100644 src/workers/webdav/modules/files/application/WebdavFileRenamer.ts
 delete mode 100644 src/workers/webdav/modules/files/application/WebdavFileValidator.ts
 delete mode 100644 src/workers/webdav/modules/files/domain/FileMetadataCollection.ts
 delete mode 100644 src/workers/webdav/modules/files/domain/FilePath.ts
 delete mode 100644 src/workers/webdav/modules/files/domain/FileRepository.ts
 delete mode 100644 src/workers/webdav/modules/files/domain/FileSize.ts
 delete mode 100644 src/workers/webdav/modules/files/domain/errors/ActionNotPermitedError.ts
 delete mode 100644 src/workers/webdav/modules/files/domain/errors/FileNotFoundError.ts
 delete mode 100644 src/workers/webdav/modules/files/infrastructure/persistance/HttpFileRepository.ts
 delete mode 100644 src/workers/webdav/modules/files/infrastructure/persistance/InMemoryTemporalFileMetadataCollection.ts
 delete mode 100644 src/workers/webdav/modules/files/test/__mocks__/FileRepositoryMock.ts
 delete mode 100644 src/workers/webdav/modules/files/test/application/WebdavFileClonner.test.ts
 delete mode 100644 src/workers/webdav/modules/files/test/application/WebdavFileCreator.test.ts
 delete mode 100644 src/workers/webdav/modules/files/test/application/WebdavFileDownloader.test.ts
 delete mode 100644 src/workers/webdav/modules/files/test/application/WebdavFileMover.test.ts
 delete mode 100644 src/workers/webdav/modules/files/test/application/WebdavFileRenamer.test.ts
 delete mode 100644 src/workers/webdav/modules/files/test/infrastructure/persistance/HttpFileRepository.test.ts
 delete mode 100644 src/workers/webdav/modules/folders/application/WebdavFolderCreator.ts
 delete mode 100644 src/workers/webdav/modules/folders/application/WebdavFolderMover.ts
 delete mode 100644 src/workers/webdav/modules/folders/application/WebdavFolderRenamer.ts
 delete mode 100644 src/workers/webdav/modules/folders/domain/FolderPath.ts
 delete mode 100644 src/workers/webdav/modules/folders/domain/errors/ActionNotPermitedError.ts
 delete mode 100644 src/workers/webdav/modules/folders/infrastructure/HttpFolderRepository.ts
 delete mode 100644 src/workers/webdav/modules/folders/test/__mocks__/FolderRepositoryMock.ts
 delete mode 100644 src/workers/webdav/modules/folders/test/application/WebdavFolderDeleter.test.ts
 delete mode 100644 src/workers/webdav/modules/folders/test/application/WebdavFolderMover.test.ts
 delete mode 100644 src/workers/webdav/modules/folders/test/domain/FolderPath.test.ts
 delete mode 100644 src/workers/webdav/modules/folders/test/infrastructure/HttpFolderRepository.test.ts
 delete mode 100644 src/workers/webdav/modules/items/application/Traverser.ts
 delete mode 100644 src/workers/webdav/modules/items/test/application/Traverser.test.ts
 delete mode 100644 src/workers/webdav/modules/shared/application/WebdavUnkownItemMetadataDealer.ts
 delete mode 100644 src/workers/webdav/modules/shared/domain/ItemMetadata.ts
 delete mode 100644 src/workers/webdav/modules/shared/domain/Path.ts
 delete mode 100644 src/workers/webdav/modules/shared/domain/WebdavItem.ts
 delete mode 100644 src/workers/webdav/modules/shared/infrastructure/DomainEventSubscribers.ts
 delete mode 100644 src/workers/webdav/modules/userUsage/application/DecrementDriveUsageOnFileDeleted.ts
 delete mode 100644 src/workers/webdav/worker/InternxtFileSystem/InternxtFileSystem.ts
 delete mode 100644 src/workers/webdav/worker/InternxtFileSystem/InternxtFileSystemFactory.ts
 delete mode 100644 src/workers/webdav/worker/InternxtFileSystem/Serializer.ts
 delete mode 100644 src/workers/webdav/worker/InternxtStorageManager/InternxtSotrageManagerFactory.ts
 delete mode 100644 src/workers/webdav/worker/InternxtStorageManager/InternxtStorageManager.ts
 delete mode 100644 src/workers/webdav/worker/error-handling.ts
 delete mode 100644 src/workers/webdav/worker/server.ts
 rename {src/test => tests}/LanguagePicker.e2e.ts (100%)
 rename {src/workers/webdav/modules/contents/test => tests/context/virtual-drive/contents}/__mocks__/ContentFileDownloaderMock.ts (80%)
 rename {src/workers/webdav/modules/contents/test => tests/context/virtual-drive/contents}/__mocks__/ContentFileUploaderMock.ts (68%)
 create mode 100644 tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
 create mode 100644 tests/context/virtual-drive/contents/__mocks__/LocationProviderMock.ts
 create mode 100644 tests/context/virtual-drive/contents/__mocks__/ReadableHelloWorld.ts
 create mode 100644 tests/context/virtual-drive/contents/__mocks__/RemoteFileContentsManagersFactoryMock.ts
 rename src/workers/webdav/modules/contents/test/__mocks__/environment/DownloadStratgeyFunctionMock.ts => tests/context/virtual-drive/contents/__mocks__/environment/DownloadStrategyFunctionMock.ts (83%)
 rename src/workers/webdav/modules/contents/test/__mocks__/environment/UploadStrategyFunciontMock.ts => tests/context/virtual-drive/contents/__mocks__/environment/UploadStrategyFunctionMock.ts (86%)
 create mode 100644 tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
 rename {src/workers/webdav/modules/contents/test => tests/context/virtual-drive/contents}/domain/ContentsIdMother.ts (76%)
 create mode 100644 tests/context/virtual-drive/contents/domain/ContentsSizeMother.ts
 create mode 100644 tests/context/virtual-drive/contents/domain/FileContentsMother.ts
 rename {src/workers/webdav/modules/contents/test => tests/context/virtual-drive/contents}/infrastructure/download/EnvironmentContentFileDownloader.test.ts (61%)
 rename {src/workers/webdav/modules/contents/test => tests/context/virtual-drive/contents}/infrastructure/upload/EnvironmentContentFileUploader.test.ts (63%)
 create mode 100644 tests/context/virtual-drive/files/__mocks__/FileDeleterFactory.ts
 create mode 100644 tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts
 create mode 100644 tests/context/virtual-drive/files/__mocks__/LocalFileSystemMock.ts
 create mode 100644 tests/context/virtual-drive/files/__mocks__/RemoteFileSystemMock.ts
 create mode 100644 tests/context/virtual-drive/files/application/FileCreator.test.ts
 create mode 100644 tests/context/virtual-drive/files/application/FileDeleter.test.ts
 create mode 100644 tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
 rename {src/workers/webdav/modules/files/test => tests/context/virtual-drive/files}/domain/FileMother.ts (72%)
 rename {src/workers/webdav/modules/files/test => tests/context/virtual-drive/files}/domain/FilePath.test.ts (64%)
 create mode 100644 tests/context/virtual-drive/files/domain/FilePathMother.ts
 rename {src/workers/webdav/modules/files/test => tests/context/virtual-drive/files}/domain/FileSize.test.ts (88%)
 rename {src/workers/webdav/modules/files/test/infrastructure/persistance => tests/context/virtual-drive/files/infrastructure}/ServerFileMother.ts (81%)
 create mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderFinderFactory.ts
 create mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts
 create mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderLocalFileSystemMock.ts
 create mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderRemoteFileSystemMock.ts
 create mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts
 create mode 100644 tests/context/virtual-drive/folders/application/FolderCreator.test.ts
 create mode 100644 tests/context/virtual-drive/folders/application/FolderDeleter.test.ts
 create mode 100644 tests/context/virtual-drive/folders/application/FolderMover.test.ts
 create mode 100644 tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
 rename {src/workers/webdav/modules/folders/test => tests/context/virtual-drive/folders}/domain/FolderMother.ts (57%)
 create mode 100644 tests/context/virtual-drive/folders/domain/FolderPath.test.ts
 create mode 100644 tests/context/virtual-drive/folders/domain/OfflineFolderMother.ts
 create mode 100644 tests/context/virtual-drive/items/application/Traverser.test.ts
 create mode 100644 tests/context/virtual-drive/items/infrastructure/FakeNameDecrypt.ts
 rename {src/workers/webdav/modules/items/test => tests/context/virtual-drive/items}/persistance/ServerFolderMother.ts (77%)
 rename {src/workers/webdav/modules/shared/test => tests/context/virtual-drive/shared}/__mock__/EventBusMock.ts (64%)
 create mode 100644 tests/context/virtual-drive/shared/__mock__/EventRepositoryMock.ts
 rename src/workers/webdav/modules/shared/test/__mock__/WebdavIPC.ts => tests/context/virtual-drive/shared/__mock__/IpcRendererSyncEngineMock.ts (54%)
 create mode 100644 tests/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.test.ts
 create mode 100644 tests/context/virtual-drive/shared/application/PlatformPathConverter.test.ts
 rename {src/workers/webdav/modules/shared/test => tests/context/virtual-drive/shared}/domain/FakeCrypt.ts (80%)
 create mode 100644 tests/context/virtual-drive/shared/domain/Path.test.ts
 rename {src/workers/webdav/modules/userUsage/test => tests/context/virtual-drive/user-usage}/application/BytesInBinaryToInternacionalSystem.test.ts (89%)
 rename {src/test => tests}/fixtures/AccessResponse.json (100%)
 rename {src/test => tests}/fixtures/errors.ts (65%)
 rename {src/test => tests}/issues.e2e.ts (92%)
 create mode 100644 tests/main/thumbnails/fixtures/1000x1000.jpg
 create mode 100644 tests/main/thumbnails/fixtures/result.png
 create mode 100644 tests/main/thumbnails/fixtures/source.pdf
 create mode 100644 tests/main/thumbnails/helpers.ts
 create mode 100644 tests/main/thumbnails/resize-image.test.ts
 rename {src/test => tests}/onboarding.e2e.ts (100%)
 rename {src/test => tests}/playwright.config.ts (100%)
 rename {src/test => tests}/selectors.ts (100%)
 rename {src/test => tests}/unauthorized.e2e.ts (100%)
 rename {src/test => tests}/utils.ts (100%)

diff --git a/.erb/configs/webpack.config.webdav.ts b/.erb/configs/webpack.config.sync-engine.ts
similarity index 86%
rename from .erb/configs/webpack.config.webdav.ts
rename to .erb/configs/webpack.config.sync-engine.ts
index 32ffc21fe..e704bc883 100644
--- a/.erb/configs/webpack.config.webdav.ts
+++ b/.erb/configs/webpack.config.sync-engine.ts
@@ -16,14 +16,18 @@ const configuration: webpack.Configuration = {
 
   target: 'electron-renderer',
 
+  module: {
+    rules: [{ test: /\.node$/, loader: 'node-loader' }],
+  },
+
   entry: [
     'core-js',
     'regenerator-runtime/runtime',
-    path.join(webpackPaths.srcWebdavPath, 'index.ts'),
+    path.join(webpackPaths.srcSyncEnginePath, 'index.ts'),
   ],
 
   output: {
-    path: webpackPaths.distWebdavPath,
+    path: webpackPaths.distSyncEnginePath,
     publicPath: './',
     filename: 'renderer.js',
     library: {
diff --git a/.erb/configs/webpack.paths.ts b/.erb/configs/webpack.paths.ts
index d451cdeca..4de2a5a95 100644
--- a/.erb/configs/webpack.paths.ts
+++ b/.erb/configs/webpack.paths.ts
@@ -4,12 +4,12 @@ const rootPath = path.join(__dirname, '../..');
 
 const dllPath = path.join(__dirname, '../dll');
 
-const srcPath = path.join(rootPath, 'src');
+const srcPath = path.join(rootPath, 'src', 'apps');
 const srcMainPath = path.join(srcPath, 'main');
 const srcRendererPath = path.join(srcPath, 'renderer');
 const srcSyncPath = path.join(srcPath, 'workers', 'sync');
 const srcBackupsPath = path.join(srcPath, 'workers', 'backups');
-const srcWebdavPath = path.join(srcPath, 'workers', 'webdav');
+const srcSyncEnginePath = path.join(srcPath, 'sync-engine');
 
 const releasePath = path.join(rootPath, 'release');
 const appPath = path.join(releasePath, 'app');
@@ -22,7 +22,7 @@ const distMainPath = path.join(distPath, 'main');
 const distRendererPath = path.join(distPath, 'renderer');
 const distSyncPath = path.join(distPath, 'sync');
 const distBackupsPath = path.join(distPath, 'backups');
-const distWebdavPath = path.join(distPath, 'webdav');
+const distSyncEnginePath = path.join(distPath, 'sync-engine');
 
 const buildPath = path.join(releasePath, 'build');
 
@@ -45,6 +45,6 @@ export default {
   distSyncPath,
   srcBackupsPath,
   distBackupsPath,
-  srcWebdavPath,
-  distWebdavPath,
+  srcSyncEnginePath,
+  distSyncEnginePath,
 };
diff --git a/.eslintignore b/.eslintignore
index da1343076..b3cadd6a6 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -27,3 +27,8 @@ npm-debug.log.*
 *.css.d.ts
 *.sass.d.ts
 *.scss.d.ts
+
+src/workers/backups/process.ts
+src/workers/backups/*
+src/workers/filesystems/*
+src/test/*
\ No newline at end of file
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
deleted file mode 100644
index 53421262b..000000000
--- a/.github/workflows/build-linux.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-name: Build Ubuntu
-
-#on:
-#  create:
-#    tags:
-#      - '*'
-on:
-  workflow_dispatch:
-
-jobs:
-  build-ubuntu:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Create .npmrc file
-        run: |
-          echo "registry=https://registry.yarnpkg.com/" > .npmrc
-          echo "@internxt:registry=https://npm.pkg.github.com" >> .npmrc
-          # You cannot read packages from other private repos with GITHUB_TOKEN
-          # You have to use a PAT instead https://github.com/actions/setup-node/issues/49
-          echo //npm.pkg.github.com/:_authToken=${{ secrets.PERSONAL_ACCESS_TOKEN }} >> .npmrc
-          echo "always-auth=true" >> .npmrc
-      - name: Create .env file
-        run: |
-          touch .env
-          echo "CRYPTO_KEY=${{ secrets.CRYPTO_KEY }}" >> .env
-          echo "MAGIC_IV=${{ secrets.MAGIC_IV }}" >> .env
-          echo "MAGIC_SALT=${{ secrets.MAGIC_SALT }}" >> .env
-          echo "NEW_CRYPTO_KEY=${{ secrets.NEW_CRYPTO_KEY }}" >> .env
-          echo "API_URL=https://desktop.internxt.com" >> .env
-          echo "NEW_DRIVE_URL=https://api.internxt.com" >> .env
-          echo "DRIVE_URL=https://drive.internxt.com" >> .env
-          echo "BRIDGE_URL=https://api.internxt.com" >> .env
-          echo "APP_SEGMENT_KEY=${{ secrets.APP_SEGMENT_KEY }}" >> .env
-          echo "APP_SEGMENT_KEY_TEST=${{ secrets.APP_SEGMENT_KEY_TEST }}" >> .env
-          echo "BUG_REPORTING_URL=https://desktop-bug-reporting.inxt.workers.dev" >> .env
-          echo "NOTIFICATIONS_URL=https://notifications.internxt.com" >> .env
-          echo "LOCK_REFRESH_INTERVAL=20000" >> .env
-          echo "PHOTOS_URL=https://photos.internxt.com/api" >> .env
-          echo "DRIVE_API_URL=https://drive.internxt.com/api" >> .env
-          echo "RUDDERSTACK_KEY=${{ secrets.RUDDERSTACK_KEY }}" >> .env
-          echo "RUDDERSTACK_DATA_PLANE_URL=${{ secrets.RUDDERSTACK_DATA_PLANE_URL }}" >> .env
-          echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-      - name: Install graphicsmagick
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y graphicsmagick
-      - name: Install dependencies
-        run: |
-          yarn install
-      - name: Publish releases
-        env:
-          # These values are used for auto updates signing
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
-          CSC_LINK: ${{ secrets.CSC_LINK }}
-          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-          # This is used for uploading release assets to github
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          yarn run postinstall
-          yarn run build
-          yarn run publish
-          ls release/build
diff --git a/.github/workflows/build-mac-arm.yml b/.github/workflows/build-mac-arm.yml
deleted file mode 100644
index b9a3d93e4..000000000
--- a/.github/workflows/build-mac-arm.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-name: Build Mac ARM
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build-macos:
-    runs-on: macos-arm64
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Create .npmrc file
-        run: |
-          echo "registry=https://registry.yarnpkg.com/" > .npmrc
-          echo "@internxt:registry=https://npm.pkg.github.com" >> .npmrc
-          # You cannot read packages from other private repos with GITHUB_TOKEN
-          # You have to use a PAT instead https://github.com/actions/setup-node/issues/49
-          echo //npm.pkg.github.com/:_authToken=${{ secrets.PERSONAL_ACCESS_TOKEN }} >> .npmrc
-          echo "always-auth=true" >> .npmrc
-      - name: Create .env file
-        run: |
-          touch .env
-          echo "CRYPTO_KEY=${{ secrets.CRYPTO_KEY }}" >> .env
-          echo "MAGIC_IV=${{ secrets.MAGIC_IV }}" >> .env
-          echo "MAGIC_SALT=${{ secrets.MAGIC_SALT }}" >> .env
-          echo "NEW_CRYPTO_KEY=${{ secrets.NEW_CRYPTO_KEY }}" >> .env
-          echo "API_URL=https://desktop.internxt.com" >> .env
-          echo "NEW_DRIVE_URL=https://api.internxt.com" >> .env
-          echo "DRIVE_URL=https://drive.internxt.com" >> .env
-          echo "BRIDGE_URL=https://api.internxt.com" >> .env
-          echo "APP_SEGMENT_KEY=${{ secrets.APP_SEGMENT_KEY }}" >> .env
-          echo "APP_SEGMENT_KEY_TEST=${{ secrets.APP_SEGMENT_KEY_TEST }}" >> .env
-          echo "BUG_REPORTING_URL=https://desktop-bug-reporting.inxt.workers.dev" >> .env
-          echo "NOTIFICATIONS_URL=https://notifications.internxt.com" >> .env
-          echo "LOCK_REFRESH_INTERVAL=20000" >> .env
-          echo "PHOTOS_URL=https://photos.internxt.com/api" >> .env
-          echo "DRIVE_API_URL=https://drive.internxt.com/api" >> .env
-          echo "RUDDERSTACK_KEY=${{ secrets.RUDDERSTACK_KEY }}" >> .env
-          echo "RUDDERSTACK_DATA_PLANE_URL=${{ secrets.RUDDERSTACK_DATA_PLANE_URL }}" >> .env
-          echo "APPLE_ID=${{ secrets.APPLE_ID }}" >> .env
-          echo "APPLE_ID_PASS=${{ secrets.APPLE_ID_PASS }}" >> .env
-          echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-      - name: Install the Apple certificate and provisioning profile
-        env:
-          BUILD_CERTIFICATE_BASE64: ${{ secrets.CERT_DEVELOPER_ID_APPLICATION }}
-          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
-          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
-          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-        run: |
-          # create variables
-          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
-          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
-
-          # import certificate and provisioning profile from secrets
-          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
-          echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH
-
-          # create temporary keychain
-          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
-          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-
-          # import certificate to keychain
-          security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
-          security list-keychain -d user -s $KEYCHAIN_PATH
-
-          # apply provisioning profile
-          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
-          cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
-      - name: Install graphicsmagick
-        run: |
-          brew install graphicsmagick
-          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-      - name: Install Start Run
-        run: |
-          yarn install
-      - name: Publish releases
-        env:
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: |
-          yarn run del-cli ./node_modules/sharp && del-cli ./release/app/node_modules/sharp && cd ./release/app && platform=darwin arch=x64 yarn add sharp && npm rebuild --platform=darwin --arch=arm64 sharp
-          yarn run publish
-          ls release/build
diff --git a/.github/workflows/build-mac.yml b/.github/workflows/build-mac.yml
deleted file mode 100644
index 090374f3a..000000000
--- a/.github/workflows/build-mac.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-name: Build Mac
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build-macos:
-    runs-on: macos-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Create .npmrc file
-        run: |
-          echo "registry=https://registry.yarnpkg.com/" > .npmrc
-          echo "@internxt:registry=https://npm.pkg.github.com" >> .npmrc
-          # You cannot read packages from other private repos with GITHUB_TOKEN
-          # You have to use a PAT instead https://github.com/actions/setup-node/issues/49
-          echo //npm.pkg.github.com/:_authToken=${{ secrets.PERSONAL_ACCESS_TOKEN }} >> .npmrc
-          echo "always-auth=true" >> .npmrc
-      - name: Create .env file
-        run: |
-          touch .env
-          echo "CRYPTO_KEY=${{ secrets.CRYPTO_KEY }}" >> .env
-          echo "MAGIC_IV=${{ secrets.MAGIC_IV }}" >> .env
-          echo "MAGIC_SALT=${{ secrets.MAGIC_SALT }}" >> .env
-          echo "NEW_CRYPTO_KEY=${{ secrets.NEW_CRYPTO_KEY }}" >> .env
-          echo "API_URL=https://desktop.internxt.com" >> .env
-          echo "NEW_DRIVE_URL=https://api.internxt.com" >> .env
-          echo "DRIVE_URL=https://drive.internxt.com" >> .env
-          echo "BRIDGE_URL=https://api.internxt.com" >> .env
-          echo "APP_SEGMENT_KEY=${{ secrets.APP_SEGMENT_KEY }}" >> .env
-          echo "APP_SEGMENT_KEY_TEST=${{ secrets.APP_SEGMENT_KEY_TEST }}" >> .env
-          echo "BUG_REPORTING_URL=https://desktop-bug-reporting.inxt.workers.dev" >> .env
-          echo "NOTIFICATIONS_URL=https://notifications.internxt.com" >> .env
-          echo "LOCK_REFRESH_INTERVAL=20000" >> .env
-          echo "PHOTOS_URL=https://photos.internxt.com/api" >> .env
-          echo "DRIVE_API_URL=https://drive.internxt.com/api" >> .env
-          echo "RUDDERSTACK_KEY=${{ secrets.RUDDERSTACK_KEY }}" >> .env
-          echo "RUDDERSTACK_DATA_PLANE_URL=${{ secrets.RUDDERSTACK_DATA_PLANE_URL }}" >> .env
-          echo "APPLE_ID=${{ secrets.APPLE_ID }}" >> .env
-          echo "APPLE_ID_PASS=${{ secrets.APPLE_ID_PASS }}" >> .env
-          echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
-      - name: Install the Apple certificate and provisioning profile
-        env:
-          BUILD_CERTIFICATE_BASE64: ${{ secrets.CERT_DEVELOPER_ID_APPLICATION }}
-          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
-          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
-          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-        run: |
-          # create variables
-          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
-          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
-
-          # import certificate and provisioning profile from secrets
-          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
-          echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH
-
-          # create temporary keychain
-          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
-          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-
-          # import certificate to keychain
-          security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
-          security list-keychain -d user -s $KEYCHAIN_PATH
-
-          # apply provisioning profile
-          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
-          cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
-      - name: Install graphicsmagick
-        run: |
-          brew install graphicsmagick
-          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-      - name: Install Start Run
-        run: |
-          yarn install
-      - name: Publish releases
-        env:
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: |
-          yarn run del-cli ./node_modules/sharp && del-cli ./release/app/node_modules/sharp && cd ./release/app && platform=darwin arch=x64 yarn add sharp && npm rebuild --platform=darwin --arch=arm64 sharp
-          yarn run publish
-          ls release/build
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
deleted file mode 100644
index a6ce2d326..000000000
--- a/.github/workflows/build.yml
+++ /dev/null
@@ -1,157 +0,0 @@
-name: Build Linux Mac Windows
-
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  create-release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1.0.6
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          draft: true
-
-  build-ubuntu:
-    runs-on: ubuntu-18.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Create .npmrc file
-        run: |
-          echo "registry=https://registry.yarnpkg.com/" > .npmrc
-          echo "@internxt:registry=https://npm.pkg.github.com" >> .npmrc
-          # You cannot read packages from other private repos with GITHUB_TOKEN
-          # You have to use a PAT instead https://github.com/actions/setup-node/issues/49
-          echo //npm.pkg.github.com/:_authToken=${{ secrets.PERSONAL_ACCESS_TOKEN }} >> .npmrc
-          echo "always-auth=true" >> .npmrc
-      - name: Create .env file
-        run: |
-          touch .env
-          echo "CRYPTO_KEY=${{ secrets.CRYPTO_KEY }}" >> .env
-          echo "MAGIC_IV=${{ secrets.MAGIC_IV }}" >> .env
-          echo "MAGIC_SALT=${{ secrets.MAGIC_SALT }}" >> .env
-          echo "NEW_CRYPTO_KEY=${{ secrets.NEW_CRYPTO_KEY }}" >> .env
-          echo "API_URL=https://desktop.internxt.com" >> .env
-          echo "NEW_DRIVE_URL=https://api.internxt.com" >> .env
-          echo "DRIVE_URL=https://drive.internxt.com" >> .env
-          echo "BRIDGE_URL=https://api.internxt.com" >> .env
-          echo "APP_SEGMENT_KEY=${{ secrets.APP_SEGMENT_KEY }}" >> .env
-          echo "APP_SEGMENT_KEY_TEST=${{ secrets.APP_SEGMENT_KEY_TEST }}" >> .env
-          echo "BUG_REPORTING_URL=https://desktop-bug-reporting.inxt.workers.dev" >> .env
-          echo "NOTIFICATIONS_URL=https://notifications.internxt.com" >> .env
-          echo "LOCK_REFRESH_INTERVAL=20000" >> .env
-          echo "PHOTOS_URL=https://photos.internxt.com/api" >> .env
-          echo "DRIVE_API_URL=https://drive.internxt.com/api" >> .env
-          echo "RUDDERSTACK_KEY=${{ secrets.RUDDERSTACK_KEY }}" >> .env
-          echo "RUDDERSTACK_DATA_PLANE_URL=${{ secrets.RUDDERSTACK_DATA_PLANE_URL }}" >> .env
-      - name: Install graphicsmagick
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y graphicsmagick
-      - name: Install dependencies
-        run: |
-          yarn install
-      - name: Publish releases
-        env:
-          # These values are used for auto updates signing
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
-          CSC_LINK: ${{ secrets.CSC_LINK }}
-          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-          # This is used for uploading release assets to github
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          yarn run postinstall
-          yarn run build
-          yarn run publish
-          ls release/build
-
-  build-macos:
-    runs-on: macos-latest
-    needs: create-release
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Create .npmrc file
-        run: |
-          echo "registry=https://registry.yarnpkg.com/" > .npmrc
-          echo "@internxt:registry=https://npm.pkg.github.com" >> .npmrc
-          # You cannot read packages from other private repos with GITHUB_TOKEN
-          # You have to use a PAT instead https://github.com/actions/setup-node/issues/49
-          echo //npm.pkg.github.com/:_authToken=${{ secrets.PERSONAL_ACCESS_TOKEN }} >> .npmrc
-          echo "always-auth=true" >> .npmrc
-      - name: Create .env file
-        run: |
-          touch .env
-          echo "CRYPTO_KEY=${{ secrets.CRYPTO_KEY }}" >> .env
-          echo "MAGIC_IV=${{ secrets.MAGIC_IV }}" >> .env
-          echo "MAGIC_SALT=${{ secrets.MAGIC_SALT }}" >> .env
-          echo "NEW_CRYPTO_KEY=${{ secrets.NEW_CRYPTO_KEY }}" >> .env
-          echo "API_URL=https://desktop.internxt.com" >> .env
-          echo "NEW_DRIVE_URL=https://api.internxt.com" >> .env
-          echo "DRIVE_URL=https://drive.internxt.com" >> .env
-          echo "BRIDGE_URL=https://api.internxt.com" >> .env
-          echo "APP_SEGMENT_KEY=${{ secrets.APP_SEGMENT_KEY }}" >> .env
-          echo "APP_SEGMENT_KEY_TEST=${{ secrets.APP_SEGMENT_KEY_TEST }}" >> .env
-          echo "BUG_REPORTING_URL=https://desktop-bug-reporting.inxt.workers.dev" >> .env
-          echo "NOTIFICATIONS_URL=https://notifications.internxt.com" >> .env
-          echo "LOCK_REFRESH_INTERVAL=20000" >> .env
-          echo "PHOTOS_URL=https://photos.internxt.com/api" >> .env
-          echo "DRIVE_API_URL=https://drive.internxt.com/api" >> .env
-          echo "RUDDERSTACK_KEY=${{ secrets.RUDDERSTACK_KEY }}" >> .env
-          echo "RUDDERSTACK_DATA_PLANE_URL=${{ secrets.RUDDERSTACK_DATA_PLANE_URL }}" >> .env
-          echo "APPLE_ID: ${{ secrets.APPLE_ID }}" >> .env
-          echo "APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}" >> .env
-      - name: Install the Apple certificate and provisioning profile
-        env:
-          BUILD_CERTIFICATE_BASE64: ${{ secrets.CERT_DEVELOPER_ID_APPLICATION }}
-          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
-          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
-          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-        run: |
-          # create variables
-          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
-          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
-
-          # import certificate and provisioning profile from secrets
-          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
-          echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH
-
-          # create temporary keychain
-          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
-          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
-
-          # import certificate to keychain
-          security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
-          security list-keychain -d user -s $KEYCHAIN_PATH
-
-          # apply provisioning profile
-          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
-          cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
-      - name: Install graphicsmagick
-        run: |
-          brew install graphicsmagick
-          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-      - name: Install Start Run
-        run: |
-          yarn install
-      - name: Publish releases
-        env:
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_ID_PASS: ${{ secrets.APPLE_ID_PASS }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
-        run: |
-          yarn run del-cli ./node_modules/sharp && del-cli ./release/app/node_modules/sharp && cd ./release/app && platform=darwin arch=x64 yarn add sharp && npm rebuild --platform=darwin --arch=arm64 sharp
-          yarn run publish
-          ls release/build
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8d2632bce..cf8d99f13 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,15 +5,16 @@ on: [pull_request]
 jobs:
   test:
     name: 🧪 Lint and test
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v2
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
+          cache: 'yarn'
       - name: Create .npmrc file
         run: |
           echo "registry=https://registry.yarnpkg.com/" > .npmrc
@@ -22,11 +23,13 @@ jobs:
           # You have to use a PAT instead https://github.com/actions/setup-node/issues/49
           echo //npm.pkg.github.com/:_authToken=${{ secrets.PERSONAL_ACCESS_TOKEN }} >> .npmrc
           echo "always-auth=true" >> .npmrc
-      - name: Install dependenciies
-        run: yarn --ignore-scripts
+      - name: Install dependencies
+        uses: bahmutov/npm-install@v1
+        with:
+          install-command: yarn --ignore-scripts --frozen-lockfile
       - name: Lint
         run: yarn run lint
-      - name: Build process
-        run: yarn build
+      - name: Build processes
+        run: yarn build:main && yarn build:renderer
       - name: Run test
         run: yarn test:unit
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 0d96c842c..198ed4726 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -2,3 +2,4 @@
 . "$(dirname "$0")/_/husky.sh"
 
 npx yarn run lint
+npx yarn run type-check
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f35b8aa67..f5184f683 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -31,5 +31,8 @@
   },
   "[jsonc]": {
     "editor.defaultFormatter": "vscode.json-language-features"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   }
 }
diff --git a/assets/icon.ico b/assets/icon.ico
index 0b025a73c83026f2c60a971935ba85f4e0b1869d..b0ff735f73829ae1c1fecc292c48524bee6f091a 100644
GIT binary patch
literal 285478
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
S1`izkc`AJ4e@`ev?*9Xz+GG|0

literal 105540
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

diff --git a/assets/icon.png b/assets/icon.png
deleted file mode 100644
index 23184b971b5de5e2839c7a1b95ec66bbd86bb661..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5480
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
IT6*31KZnu)9RL6T

diff --git a/assets/icons/256x256.png b/assets/icons/256x256.png
index 23184b971b5de5e2839c7a1b95ec66bbd86bb661..0d91d51e3e5b628c455a472e2495d8a9308a2ded 100644
GIT binary patch
literal 91753
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
WA2ZB@36S*PpRT5nM!A}O)c*l|;M4g4

literal 5480
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
IT6*31KZnu)9RL6T

diff --git a/assets/tray/alert.png b/assets/tray/alert.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb3bb83e0a851709924f7d29932f438650e4368f
GIT binary patch
literal 1504
zcmV<61t0o}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000H2Nkl<Zcmb7{
z1C(Ul6@|b3#;%z-Y1B;Y&O(g(V|RD#bmzBi41U|j#I`+FY-6|-)x_v}J8zQr&N{s+
z{07hW?6c3k_pB0$*2vW@%5uUbPeU4!X@d+F2rwW60)qsuj~Lv%TOVswXs1i>M1Bi1
ziuJ(Gcvb}kfT^jD(FZY01-KqW1Q-yqDFpz9!3Y#$62=ITuR%Li_D%#o44~FSF9mvI
zE@phF$v^_fxv)u@LH{{4?}a;oEFp)udR#LOd|0iAT->H$olP4c1Ut^LqXtolI41f{
zkekf=zDHgC>Cek60T)h`cr9UXol#aIg^=c%DOJDY_)v&&A(tS|!%74;tF+|7Yt|V$
z0vuMFejkGW@GO<3@0}1xs_puj&}&1~S+;DTepy2UEx?U!-o3A@uo08z-;%|1)LJ|b
zV`{W}?|vF=$jUHnEq>s+4pCvLWE%k=f7>KadE9auZhG@J&b;VTjYrDP-F(S7uNfbq
zp%Tj@4!R0WpCl%&Z7qJl**4QHughS7;eln^{E?%p?B>$&g4f-_rX4#Yb1*M_)<b#c
zO|K*Kh|ZOjW4}><wIWZn=>BJvfau5695wkQU2^sdQ)a*6NiVvN{lERQ0ktY|n?HIS
zLjy}`xcIuySO2~cN%b9Tv}na?SwNn_E>x&=iI6|>j>Gko$FCqtv33h*T<}o<Uvln?
zbkxL?34wcm%_E+6DS6rDb7Kn$K#P{2V)8zfzA(gm9IUe2`tcL1Qp}^_`LDUT3icbm
zv+*oyDp&qgxpOtU_WU}QU>@7p)Cg&&-6LCW5Cm%KynD|tx#-%@aOt^YG+c7di)qz@
z!usl+UAuotP9P2fj8Z^r;qdYC9$`~1S71P&eD^Ut<?#;$`q{MoCp`bvH>{`R8!EKH
z&`lqY2u5+)$>V9^&@m>FH~Unp&@(i!jIEzKBTA82f59~$Uk$A1KXB!>UugfW?5zY(
z2&{#JN0}N|)TWbn)hx({V-9(`E?xOD5+?%J@PDvy=;#UK(RvOf-<_P0z-4nCca|)g
zOJWjuGl@lmM|O}$4K15iA$AIH06t7j0dEH0tOfTwv@|BHCP@7=`VGSach~o}Urfzv
zU{z!_aM%d=YM|4kBNWRTYnR08ELijJ`=-8qKnMi>CrBZV@9(&jp@F+oXERO&Kje)r
z%e6G`MmeJk<QS{#f0cmyOq3Bf;fgwNaMsDAoPBaE!^Z&M0GM~5$#x<CjI=ou>n`Ol
z;+|Yi0B@Ozdm@v@unC3-@1BEyqy7hg=&iFYA#8&HV^tVT<6>IyHrLFaH{&Ckcdyr4
zqz6O-&9y;%|I62?646)tMfZ7qr?l6RzcsEuPpb(7aiI!Ro_N3k6H<vTWtTSS0B4;%
zP6|%WzSsNPSX3{P$g3$31__n6F{V&wCN5>;+@tLni=n}LaQ3M$BXhwO@9)y!au^d6
z&UyEMbS~^VCy*;BdGrAXx}a8`HO5hdPk(6T^x&7hmkTd{AA!7IMi`uCf13C8Ss5-g
ziDJ4l?Xn9j38ATeLqqrE?eF@cjl<F#Z~FwLr&`p^DCr^*!K3bAL&Qo;3tJWz>T2H7
z(GOYF)7zmq8`%E?ql~Rrr8^YGx_D+xv#}}73KRYZB@>#n>_sPFUoEDu1#)8wRl$1T
zAOii|F54*0dgFLnk?tv$DYI6H)>vx}fBiYo0xTiBuNeVhuZ$61o_^zXjKT%N#}ETd
zw^8UHOIdSU&j-qm?R8<n|A5V#fk|qLLaS`AjOgT<kD?ktAzcfc0HArT=K#=SYD{Hu
zHPAMWos8+LB09EhF{2ot-r+pql9k|g?f`Lwu3&X;-I}xbnKY=FYSSw^MsKv-#<XMm
zb}k?oqsW9{UeRm)p;wFvMs2r?LM@wbNNku_ly3&QB>oQO(=7n(0BA-40000<MNUMn
GLSTYJMAM1@

literal 0
HcmV?d00001

diff --git a/assets/tray/alert@2x.png b/assets/tray/alert@2x.png
index 9705e1df9942dcd7ee3f8f87cf66f760db2c2056..33fa7ece9cffb8348b35c426cf096559ecb7240b 100644
GIT binary patch
literal 3984
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

literal 752
zcmV<M0uTL(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0)<ILK~#7F#h1Hl
zR6!KRzm-J|h_7N5QHU0TifQ61O28x-@dbjFrC_HJABc?z;vZlsSO}K33JMxc6x~7u
zQ5PRkWVJDcAW4%K8<OwroguTcJF_zrl6>&H+{c-7&Yj1(b8~1^H|Zru$U3spc(y{}
zQ`I=1B~xUSydzJ^psV3l^>B8P86Z3C;M>XHB?zt=A=}IZ9xq{V%@D~+@WaaxT+<^H
z>J*kw$MQTJXkj#JU9b1p%8Z|gu$R?_GTdD>BUvgZnu{L$E0*m+_=jK^>fkf_NH!W-
z%fxB6T%TEQS0KMy_^u$pNVsP?Zzq#hPuXkxMu6X10+j$mq0b6%4fS1bYJZ^5s06-}
z4MvbP<TZIuRvY&V5k8|55bj%Vx(AJ2e>cKkC8rW-N4R7tUO1lhsstXAALJjh`LULC
zk>g~yVgDP5>jB{p+2lxIGg@mOd4j|t&^*Axb(P%8BTd7eXKl#3Tj(Sb<1=|ho@0K$
za7Q<Y?E$G91xN5hq~vKURkvt2ib+5w)GkNxe)V=CKKfG=xa|mDRE|UaR8?=)^fR#0
z7t|LVEg9o-L~xA^Ra;B~uC70k5M0yOYKN;OOXi#7SvS(v6_UUw)PD`7jahIykgiT~
zHtjKxPwp8qZrr<0_8Qk!q$@8IXv|~qpWL+Woh9du>ks54(o~iNULxB%HPaSyuF3tK
z#`znhYe)_~h@ZXR4JWdcN(nw>>DE34Ih9GQ19LYmMJ1#Pn$@tbB+Gx{NMr(oDtWC-
z2&;xwW!oUx*$hM`al!IYgug15V3c53Z=fZ+n$yTWrLrAg1@|xcBXZfgC*yh)S%K<M
iZ!9ZCChJ>RKQ40~&mGyXB09kU0000<MNUMnLSTY#k3y>e

diff --git a/assets/tray/alert@3x.png b/assets/tray/alert@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8d7ea97c59ea3104c0a5ec64749840e35f156b6
GIT binary patch
literal 7059
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

literal 0
HcmV?d00001

diff --git a/assets/tray/alertTemplate@2x.png b/assets/tray/alertTemplate@2x.png
deleted file mode 100644
index 9705e1df9942dcd7ee3f8f87cf66f760db2c2056..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 752
zcmV<M0uTL(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0)<ILK~#7F#h1Hl
zR6!KRzm-J|h_7N5QHU0TifQ61O28x-@dbjFrC_HJABc?z;vZlsSO}K33JMxc6x~7u
zQ5PRkWVJDcAW4%K8<OwroguTcJF_zrl6>&H+{c-7&Yj1(b8~1^H|Zru$U3spc(y{}
zQ`I=1B~xUSydzJ^psV3l^>B8P86Z3C;M>XHB?zt=A=}IZ9xq{V%@D~+@WaaxT+<^H
z>J*kw$MQTJXkj#JU9b1p%8Z|gu$R?_GTdD>BUvgZnu{L$E0*m+_=jK^>fkf_NH!W-
z%fxB6T%TEQS0KMy_^u$pNVsP?Zzq#hPuXkxMu6X10+j$mq0b6%4fS1bYJZ^5s06-}
z4MvbP<TZIuRvY&V5k8|55bj%Vx(AJ2e>cKkC8rW-N4R7tUO1lhsstXAALJjh`LULC
zk>g~yVgDP5>jB{p+2lxIGg@mOd4j|t&^*Axb(P%8BTd7eXKl#3Tj(Sb<1=|ho@0K$
za7Q<Y?E$G91xN5hq~vKURkvt2ib+5w)GkNxe)V=CKKfG=xa|mDRE|UaR8?=)^fR#0
z7t|LVEg9o-L~xA^Ra;B~uC70k5M0yOYKN;OOXi#7SvS(v6_UUw)PD`7jahIykgiT~
zHtjKxPwp8qZrr<0_8Qk!q$@8IXv|~qpWL+Woh9du>ks54(o~iNULxB%HPaSyuF3tK
z#`znhYe)_~h@ZXR4JWdcN(nw>>DE34Ih9GQ19LYmMJ1#Pn$@tbB+Gx{NMr(oDtWC-
z2&;xwW!oUx*$hM`al!IYgug15V3c53Z=fZ+n$yTWrLrAg1@|xcBXZfgC*yh)S%K<M
iZ!9ZCChJ>RKQ40~&mGyXB09kU0000<MNUMnLSTY#k3y>e

diff --git a/assets/tray/idle.png b/assets/tray/idle.png
new file mode 100644
index 0000000000000000000000000000000000000000..d31b7f2000d6da63340f224506ef3fae5a5d7e3e
GIT binary patch
literal 1432
zcmV;J1!ww+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000GFNkl<ZcmbV}
z1C(po5{CCv)Je{{w$*&L-?eSqwr|^fwr$(PrLlEwd$DT%z0aw1O|piy*4KaGuiELv
z=<wg$;`{Gz+UgZI{l+V4KI#`YvtQgop>n2{yd<MQdjl0Zyt~ET`j21Iv=ndj2Sx}J
zP~7lYuekAwSJcQp@QRv9a>3QE-@rgT<mSaq;uEYVr-uKiUr;v{7>fy#>Zx8)9eaiK
z<Q3Mztn+%wL(R>#53uyaXJ@*$Dj&l5`8ECh!kVLAK@B?!19YA)s3ASqs_}DrwPeZK
zm)TXnf2ofTP_;CjU&$6Pzlu~Ig1i6<(wJMk{AyAjk{Q(1vMU~)2m6_OM~pYD{6Fbo
z<?I2c`4v_Ll3erZvkJ1jiU$wlzT|kvzKsuX<Y;<WDW`{)QhMkSrzsHjxOjLgXyM||
zSz5{Vvi$6Y-aa3!;gZlVpf8Z~N*?SSHR&OTI5p%DrG^}2n*$gR+n%fc|KLlk<4fPU
z-+59%JWjFmqhCMFI*y;Z8q5TEpcL!`YSM!baBA>=fdEXdN0#ExHuAOWcUi~y1>eB@
zK<Eqh=dJqzXGhUz8cF6>HS&&04cbe96#@x+D*ur6pIzbJ?<*A#_d$OA<Q3LY-S!WC
zCr1U78n~MPTXdcrxQo(*_E>fO|3B~|>-f^Q@6GId={xu65kAainc)$ja=9%%lNzv-
z19or{gt^oty~0mb;itI6I>ycWG8dt*!+MH7T_v}2ZbM11wMq8h#vv5K3M{qfyUTyW
zIv#!Ul>2XW?14w$40Nl$r6H5-w}q4aHglk$zp9}MvikoAp5s>u%$|39dGI>zyUFh8
z`#JYavhPOL<ONWWZ*c197ii(f59^;o|L%5{*^@g!?vh2n10|E}vz~>#-s>pOYM*sM
z4Yf6(u%-k&yGwt;*|BE(_d>tBf#d7hdacS$fIF(j+~oCMgJdm3$>o|puAe=ls-{11
zcG#ZwSWQ4xjmOvOn`~>7*J~9edaWcVXF(y1Ig790BYXMP;$x%BWY_Iv?)G*yfne6t
z<?g;o^juDWEt2Q;Tmj<>SI2uS({udR7x~rV*olkWBY&g5^=f%g<F-lkSW1Z=O9;xE
zc=z01W#eyH$N%no+M(kMU;mr+=HAn9^la~&ME6CkKy$Ivc=tsFSjhj-HqH+899OU3
zW*uXuS8=@CLdx9fw#en}EY7HjcU!;-(5~|>x+dggzg``c4Zq@e*ZE{U$a8;+A*<wu
zzT;H(Y;EFQ=c1U$iLUcF4p3vkDM?;g|BF{XaQuSvCIY|X(Z`Qw{S<!*X3CRwo9w=c
zcbUzAtj0ps<bPm8?pOc*4YDJC8a=f%$2SH&bqn`rk<MdK6YD(VR=o2})}ZG=j<53q
z>!_&vnRqB3dW0{0?T^~(cDoN+j7KwfMM-u{tkblkfB-u>w&%m%w}vb0eo7T}KjDhn
zfbIhqvdrUI+HK%MvL5U(cAS3XGutqqE;|G=Ir^tetmBlw0uGpLAzfRI2AT`J*?xE_
z+5tV;>7?%lJ*D@UXy=K$q8%o3tivRr6hs3k2B5l6lFN?s>OFq~K^^**^GNPb+H8zJ
z)sOn)uL1@zTOG$SKTy{Xa<XLlUQnyP>}09hS2yv_shB^uzri09O^+KF^~NwDt8bmL
z0lJqSLy;_B44$|*b`~%Oe;g5S)U2pC>SQ!MiX-Wf97&BNn@bIBPGKJ!)Bs1FPa}J|
zz0{~Hac}fYU@Y#B5c5CVKbjt~Ihq=N@4HeX&P7tgIhq=QMSxstpmJfj^aY9}hm+mK
mt@HT6527yh{m=Tq2rmOSHghY#gx1gi0000<MNUMnLSTX#^6YB>

literal 0
HcmV?d00001

diff --git a/assets/tray/idle@2x.png b/assets/tray/idle@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9c2dbd36ce8e2da89a5dc0dc7b60eb993476ec3
GIT binary patch
literal 3906
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
Qn*aa+07*qoM6N<$f*1n#1^@s6

literal 0
HcmV?d00001

diff --git a/assets/tray/idle@3x.png b/assets/tray/idle@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0fcb2f0830983240f414befe051f95c86ef4484
GIT binary patch
literal 7050
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

literal 0
HcmV?d00001

diff --git a/assets/tray/loading.png b/assets/tray/loading.png
new file mode 100644
index 0000000000000000000000000000000000000000..b58c1b1f0133e66b3f186c17f5de319173bdd669
GIT binary patch
literal 1171
zcmV;E1Z?|>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000D9Nkl<ZcmcJS
z1#IL<5Jg**cr3^13oSFvd1jfJnVFe+w9MVPk(WZp%*@OuI0nHnGc%)juS!#Kx~6A&
z*V5CkuK&BbV=oHxX+G#W$L~<p>zoeNvt);=luTCXhz>PW^B!NL+7xxDNy+wAi)5mv
zlk8L@MXm>o=7ovM9Wq&=&nk(ERB`*tI6E90GB~7VP@!ZJ6bT5bPZ*x3nYJHY0$+(d
z_fSd(2lUbKgAf!saFT?u7dfD^`-O>vJMfbWnFu@i@w5iOK&3h!0-y+8Ao57L7b;Zh
z;eK-t%{O{bd-3!jA>-#Q^5f-N0-zM8n)GN$wvVlew35fl!`Z@br&E4gt+N0#qaB9S
zFrW|Q&Nl6Fz{=;I3xML;!f(4zXV^o^dG3|Z^pPV+A}+b%rK9F=x#u;O{o<?Nc!r};
zh2I(mwcZ5{pf!QRsh=EDq5t^fKQ?&GysOZM909pGYi>f1ksMTko&n{JGvNX|^l?x-
z(hpfbS>rC{Q3mTTzWI%1!V8|tInT>l3%}(yC<v?xkNO_1pL^*O{wc0|t~RHjwk~MR
zrFAr$fD3HVwRk|*TGjS~0ipdV=3Jta&^LRK!Ja+KP(tBac+FGVYraX7A`k=xvg;k?
z_p!s?c;_4VX@6n8ZIFR1k%IlvY^qICc!3SNjuf%MP|kBNeME=ZfXDMqH>g~*3H0y+
z>mYanP%h}B`KKV@O@OygQJ$+kCqj5l*XW4GsK>@_yhiQNcUc!$wdsbOS$hUQPk4=2
z!2$p!Xnpj4SoM%~0q9wK+{P=6HP(DK0vA}OT>t{aGKT4+2EBIBp*Fonlt(jMK9{ZC
zhExN>ZMZ}mKocO7ddl>_`0A&lUI4v@!8$%Kdp4h`-~x*@;*mzwN9Cle_;17KUU*MG
z^U`~)chOZ(&^&9V%5|1->o3p|4T<_TL61$=PaKCH^2Z<lu>PniA?%r_>^U|9f;z(-
zR2%G<&9Pp6SaA>b6=tBeKSkSRd?wZi?m?(0+_G6@q5@@xl9#Ty%Q^stpdazZTc7by
zam6F#VUEuORpj9XW@ra6lo9W;&U*FG%j8Sya-$~c>>TvU$+zd@UR(>eboy?$Y?^jU
z>TnRMzxaZ``t+eYuunecqRX=W+Wz7PUBC4LIIwPR_E{poXiCZ{nFQvP3`LW)OLe@{
zDmd^qM*Wua(9<sA7>XWdLL=W}&?fS2VkJ{I38#3{e5YuFcHv-90&2DfpLwt@iG0Pf
zQIE2eI|@rgtY~5%r)Zoe$S~Ft^<<b(yH6q9<8x!h6MN!+2%T8rm>rHBqX95c&pxrD
zF`J~EBn3YCrNi4ea+J>VM}c`pfte#zUao%8=s=iHo;NzkFBrbb@khX>VTi^$dkv}_
z<^z(H_gNkF3Wn|Qibf_xu1Cs2GUgBK<rEBEnqM$%Yo0$uI|vQ}WouRgR7V-idzl{2
latenncjT}^_{q&P{|5}*hl=UOqg((0002ovPDHLkV1gl#I=cV>

literal 0
HcmV?d00001

diff --git a/assets/tray/loading@2x.png b/assets/tray/loading@2x.png
index d588079896dce96861420215610dd4347daf3c35..2c58b8e7735d9281c33432cd33557d1b7e5adca7 100644
GIT binary patch
literal 2778
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

literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0#!*wK~#7F#a7vB
z6j2a8nM}rg15pe<NQ{CJamNS6l|1;Gf6arwC>l`QL48nSM3azY2-){#l5^;L!|j`%
z?%PAUbKneAb<uOW>fWkqLmUUlOJp~Bl&q2MUQ8R(vE|vD<T^P+{vrR7i%BoLKt3Q3
zqgc$71LUv_`*oe<bFu@)!)AF}tRPDDBb1N(5~B=s8%1S9*<Mx#E@J<1xyqjtDFF>~
z!}HblF#bq2BS2T`1v%#URI;Z{;@^`$9Qzd6huv3sM_eW4A<Q!!(5mAb^aNQ9dw(wU
zX1u>rK{k$)H$C4ga?P=o_5m;E9(fWOkbtbt1|y);u@}fMj{Ol)gRwYGUPAyvGGL*)
zyXWOQqEd_^o_c*yZ|J*KpW6t7?UJL8Z=C#3t~x%o^YaKqo(u>#5HH1?p~V@p2RV>e
zfbf_+nBbT18FHc(0h%3m68!QVLkR+eg#_OUT0koTblrX?_&<>oC|H1ceLtcNCkby5
zZ9s(y_=@<cKS!Q*Y%LidkOLC16&S13e|BtbHkuO;5#OZLl<EjXXa<z>e$S^?t2v>G
z=iUl^kY+_tDMAJKsn?(0a_k=CvzSF-DMAEHk>4C!z5a<8({6n3*w(BVL4bfp%5#m}
zm!9uBqG{(tzAK*Z9pYo#N26*24mAl_Mtot_*Iz|*+{Nw<YYxeRg>}8KFD0O8)K!8(
z>>vJ0z;AL1<wNsiNT+wh7+okAugSXISk*!&5w+GDiiHmLTXIN-zmRIycNuD<?LgSl
mng(@7-87Z?7ow8yjP7lZ_inZOK!}b20000<MNUMnLSTYrA~W0o

diff --git a/assets/tray/loading@3x.png b/assets/tray/loading@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..7729e9662ee2c1272e6e7f414e2e0d872a2223b1
GIT binary patch
literal 4910
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

literal 0
HcmV?d00001

diff --git a/assets/tray/loadingTemplate@2x.png b/assets/tray/loadingTemplate@2x.png
deleted file mode 100644
index d588079896dce96861420215610dd4347daf3c35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0#!*wK~#7F#a7vB
z6j2a8nM}rg15pe<NQ{CJamNS6l|1;Gf6arwC>l`QL48nSM3azY2-){#l5^;L!|j`%
z?%PAUbKneAb<uOW>fWkqLmUUlOJp~Bl&q2MUQ8R(vE|vD<T^P+{vrR7i%BoLKt3Q3
zqgc$71LUv_`*oe<bFu@)!)AF}tRPDDBb1N(5~B=s8%1S9*<Mx#E@J<1xyqjtDFF>~
z!}HblF#bq2BS2T`1v%#URI;Z{;@^`$9Qzd6huv3sM_eW4A<Q!!(5mAb^aNQ9dw(wU
zX1u>rK{k$)H$C4ga?P=o_5m;E9(fWOkbtbt1|y);u@}fMj{Ol)gRwYGUPAyvGGL*)
zyXWOQqEd_^o_c*yZ|J*KpW6t7?UJL8Z=C#3t~x%o^YaKqo(u>#5HH1?p~V@p2RV>e
zfbf_+nBbT18FHc(0h%3m68!QVLkR+eg#_OUT0koTblrX?_&<>oC|H1ceLtcNCkby5
zZ9s(y_=@<cKS!Q*Y%LidkOLC16&S13e|BtbHkuO;5#OZLl<EjXXa<z>e$S^?t2v>G
z=iUl^kY+_tDMAJKsn?(0a_k=CvzSF-DMAEHk>4C!z5a<8({6n3*w(BVL4bfp%5#m}
zm!9uBqG{(tzAK*Z9pYo#N26*24mAl_Mtot_*Iz|*+{Nw<YYxeRg>}8KFD0O8)K!8(
z>>vJ0z;AL1<wNsiNT+wh7+okAugSXISk*!&5w+GDiiHmLTXIN-zmRIycNuD<?LgSl
mng(@7-87Z?7ow8yjP7lZ_inZOK!}b20000<MNUMnLSTYrA~W0o

diff --git a/assets/tray/standby@2x.png b/assets/tray/standby@2x.png
deleted file mode 100644
index 9a5c39596dc824e1ca7a10bc11e60694c2b90d16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 668
zcmV;N0%QG&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0x?NMK~#7F#h1BC
z1VIo$YgN1uuV4l5Gw=vZ6wEw948+iX5JbU15Ca1Zj0{9E5d8*4K@?e!L`(#4Q5F-$
zL{>pmP}i#M8R)H@>6sq(D0stmcWqToA5}d*h?P#H$Djbol*ZBwRPrPJ4kO=42suHv
zk$t;AmK%fN1hb3Oa_2S3Qxcq;JR=oy0Gmm4ZV~`vIXhF}+@y;l7=+ZxKn6bA9h5?>
zU8vBd9sjAJ-$joLu%Dt|q~9=NGNRBQXSyArUV=L?9xA0Xq*#jD2iC`RhrOL2d2p~D
z1Q$xg3Nv1fe6gA0XM4(p-ADjI7m7q5b1(tXQ!h)qOPg8&Tp>l0lRV@AIYqLie!qrI
ztpJEs_NL7cJM~K%_Ot^adcj`0HEnqc;1MaYa9-uXmZt!Sb&CMjJlF|3)pk3%wdi{R
zkD@yRlsEhqcJh&9O<USaKnbT2?4=1rElAiB%p%uPo33r$Qk!zc0%*!TxQq4@q7zOj
zh}olJCMT#Y5DCil61WY3PyLKEw#ddBK$PaV1;BHC3mgAK+L+E*yaJ$doGTfoeRFQ1
zM<*ah(xcx2a6VCyO=YJ*JDTVENrnC#(=9{Z6#6%GC3^>Zc}1pK->^b|6vXBXOMP^u
z%U9Tkd2oMj<IOUy=Psm9Ht3NK&YL9>9D%rBMx+u%F-ewl@>S2LqYgPtf^*7}Ri;xP
z3xeA89WaEng1Fn$N%2~?N$7L^!+5zZWDi79i^xBb9(=52HHyOk0000<MNUMnLSTaW
C%@KJ3

diff --git a/assets/tray/standbyTemplate@2x.png b/assets/tray/standbyTemplate@2x.png
deleted file mode 100644
index 9a5c39596dc824e1ca7a10bc11e60694c2b90d16..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 668
zcmV;N0%QG&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0x?NMK~#7F#h1BC
z1VIo$YgN1uuV4l5Gw=vZ6wEw948+iX5JbU15Ca1Zj0{9E5d8*4K@?e!L`(#4Q5F-$
zL{>pmP}i#M8R)H@>6sq(D0stmcWqToA5}d*h?P#H$Djbol*ZBwRPrPJ4kO=42suHv
zk$t;AmK%fN1hb3Oa_2S3Qxcq;JR=oy0Gmm4ZV~`vIXhF}+@y;l7=+ZxKn6bA9h5?>
zU8vBd9sjAJ-$joLu%Dt|q~9=NGNRBQXSyArUV=L?9xA0Xq*#jD2iC`RhrOL2d2p~D
z1Q$xg3Nv1fe6gA0XM4(p-ADjI7m7q5b1(tXQ!h)qOPg8&Tp>l0lRV@AIYqLie!qrI
ztpJEs_NL7cJM~K%_Ot^adcj`0HEnqc;1MaYa9-uXmZt!Sb&CMjJlF|3)pk3%wdi{R
zkD@yRlsEhqcJh&9O<USaKnbT2?4=1rElAiB%p%uPo33r$Qk!zc0%*!TxQq4@q7zOj
zh}olJCMT#Y5DCil61WY3PyLKEw#ddBK$PaV1;BHC3mgAK+L+E*yaJ$doGTfoeRFQ1
zM<*ah(xcx2a6VCyO=YJ*JDTVENrnC#(=9{Z6#6%GC3^>Zc}1pK->^b|6vXBXOMP^u
z%U9Tkd2oMj<IOUy=Psm9Ht3NK&YL9>9D%rBMx+u%F-ewl@>S2LqYgPtf^*7}Ri;xP
z3xeA89WaEng1Fn$N%2~?N$7L^!+5zZWDi79i^xBb9(=52HHyOk0000<MNUMnLSTaW
C%@KJ3

diff --git a/assets/tray/syncing.png b/assets/tray/syncing.png
new file mode 100644
index 0000000000000000000000000000000000000000..ded996464f28adf64b37a521028890f20f6a7545
GIT binary patch
literal 1649
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

literal 0
HcmV?d00001

diff --git a/assets/tray/syncing@2x.png b/assets/tray/syncing@2x.png
index ac8f8dd54fea59f3fc6630bc2a94eae42805a57e..effea034c147718f58f780690ae3e892143702c7 100644
GIT binary patch
literal 4277
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
XD=wVnBde;400000NkvXXu0mjfdw*qP

literal 883
zcmV-(1C0EMP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0|-e(K~#7F#g|QN
zOi>iaPia&|d@ag?nA!+JBvlO&re(xe2rEm89f_)l4U(21kzj>bNV>EoNGL7QE<`F+
zh!UCF=t4q8QpGg&|IfQOJ@0njn|DXrp5!-q@7;6HIrrn7d#6msN*XkPEnqg7rrM?$
z;v}b@N5F3|0G@;UpgpSNLen@h&a{CguJdZ}WdfXA`oSU{z?}(nZs`DJbiQd4oLlO-
zp?1mS$+mL*)D=-0aNg&{=yJ#Z^3Z3t$s38DqG3j9j93oG=r=jK>m+^&dd2+2DZK*o
zRMgx!h0^tbGrB79sfg{YBv2wZ9OEf4<jj<t+b0v)%?FT8phz-~gX0pOdM#@c+Vl$G
z9hj?}%mh!t3ou=Mukx_z6#%*EjC6&Jo%(AY_OfLrfRrQ`F2$pWwgwZxE${(+m0*9&
z0vo_~uw3c)iTKR``3&Yq1h7Dg%NlS`N?Za<tNgzl1I^`9n)JrBRZ1}3qz2GO4|oC|
z%IJOJvhCnI1FRcW5zg0xu9&{8y0va6p8&X_mPI%}Vn%0mFM<69><=5=k^(pr;k?!u
zwtAglwP{-nt~hpbX14P3F`@If5-vDaxW@WGJ1@a`VNbydDSUu&sVaQ}h?@ExN~ha=
zy8v3iQVDK8Z2K$0-J?_KXOafcB++tF>Fowv%`@)?Lyny^*sI=Kie0fOuO)mMvX3q}
ztJHHAY&Orl&R00LSSfqddku~Kk!axv_JKk5?F3k<-u3^0!6Nn;&<yon&JFY<ro%UI
z+WE%RI;h@Xf}Q4>v+)?5QtjWtR0+-lwpFV(ZeBSneuaoMD<c^Rryn;OH{4HfU4mn~
zRf3I4=~nvOz*1jA0Pj@*OeMGau_kO(Iw=WK^PGgMV*V&#Lq`cg=-V`lO3rD&Dx=4I
zorKem0ftI4{}=Xq2GDMTx6&x#YDoIP0dQBsRj^SC2yZrRo<SUPY;aU@*ZeL~C0Lvh
zSYfX2k>Duhb)2aaRWELXqs}+3D~nNDf~??(nJLdCSccFamw(G9HPcEUi0l9W002ov
JPDHLkV1iiXk<I`B

diff --git a/assets/tray/syncing@3x.png b/assets/tray/syncing@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c58f9a2feead5963c5323b288ee726edb74d3b7e
GIT binary patch
literal 7487
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
JPDHLkV1iil5_JFo

literal 0
HcmV?d00001

diff --git a/assets/tray/syncingTemplate@2x.png b/assets/tray/syncingTemplate@2x.png
deleted file mode 100644
index ac8f8dd54fea59f3fc6630bc2a94eae42805a57e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 883
zcmV-(1C0EMP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0|-e(K~#7F#g|QN
zOi>iaPia&|d@ag?nA!+JBvlO&re(xe2rEm89f_)l4U(21kzj>bNV>EoNGL7QE<`F+
zh!UCF=t4q8QpGg&|IfQOJ@0njn|DXrp5!-q@7;6HIrrn7d#6msN*XkPEnqg7rrM?$
z;v}b@N5F3|0G@;UpgpSNLen@h&a{CguJdZ}WdfXA`oSU{z?}(nZs`DJbiQd4oLlO-
zp?1mS$+mL*)D=-0aNg&{=yJ#Z^3Z3t$s38DqG3j9j93oG=r=jK>m+^&dd2+2DZK*o
zRMgx!h0^tbGrB79sfg{YBv2wZ9OEf4<jj<t+b0v)%?FT8phz-~gX0pOdM#@c+Vl$G
z9hj?}%mh!t3ou=Mukx_z6#%*EjC6&Jo%(AY_OfLrfRrQ`F2$pWwgwZxE${(+m0*9&
z0vo_~uw3c)iTKR``3&Yq1h7Dg%NlS`N?Za<tNgzl1I^`9n)JrBRZ1}3qz2GO4|oC|
z%IJOJvhCnI1FRcW5zg0xu9&{8y0va6p8&X_mPI%}Vn%0mFM<69><=5=k^(pr;k?!u
zwtAglwP{-nt~hpbX14P3F`@If5-vDaxW@WGJ1@a`VNbydDSUu&sVaQ}h?@ExN~ha=
zy8v3iQVDK8Z2K$0-J?_KXOafcB++tF>Fowv%`@)?Lyny^*sI=Kie0fOuO)mMvX3q}
ztJHHAY&Orl&R00LSSfqddku~Kk!axv_JKk5?F3k<-u3^0!6Nn;&<yon&JFY<ro%UI
z+WE%RI;h@Xf}Q4>v+)?5QtjWtR0+-lwpFV(ZeBSneuaoMD<c^Rryn;OH{4HfU4mn~
zRf3I4=~nvOz*1jA0Pj@*OeMGau_kO(Iw=WK^PGgMV*V&#Lq`cg=-V`lO3rD&Dx=4I
zorKem0ftI4{}=Xq2GDMTx6&x#YDoIP0dQBsRj^SC2yZrRo<SUPY;aU@*ZeL~C0Lvh
zSYfX2k>Duhb)2aaRWELXqs}+3D~nNDf~??(nJLdCSccFamw(G9HPcEUi0l9W002ov
JPDHLkV1iiXk<I`B

diff --git a/package.json b/package.json
index fef01ee80..e45027c46 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.0",
+  "version": "2.0.3",
   "author": "Internxt <hello@internxt.com>",
   "description": "Internxt Drive client UI",
   "license": "AGPL-3.0",
@@ -8,28 +8,28 @@
     "url": "https://github.com/internxt/drive-desktop"
   },
   "scripts": {
-    "build": "concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:sync\" \"npm run build:backups\" \"npm run build:webdav\"",
+    "build": "concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:sync-engine\"",
     "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
     "build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts",
-    "build:sync": "echo '-- WARNING --: Sync worker has been removed, skipping build'",
-    "build:backups": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.backups.ts",
-    "build:webdav": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.webdav.ts",
+    "build:sync-engine": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync-engine.ts",
     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
     "lint": "cross-env NODE_ENV=development eslint . --ext .ts,.tsx",
     "lint:fix": "yarn run lint --fix",
     "package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never",
     "publish": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish always",
     "postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts && opencollective-postinstall",
-    "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:backups && npm run start:webdav && npm run start:renderer",
-    "start:main": "cross-env NODE_ENV=development electron -r ts-node/register/transpile-only ./src/main/main.ts",
+    "start": "ts-node ./.erb/scripts/check-port-in-use.js && npm run start:sync-engine && npm run start:renderer",
+    "start:main": "cross-env NODE_ENV=development electron -r ts-node/register/transpile-only ./src/apps/main/main.ts",
     "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
     "start:sync": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync.ts",
-    "start:backups": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.backups.ts",
-    "start:webdav": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.webdav.ts",
+    "start:sync-engine": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.sync-engine.ts",
     "test": "jest && playwright test --config=src/test",
     "test:unit": "jest --silent",
     "test:e2e": "playwright test --config=src/test",
-    "prepare": "husky install"
+    "type-check": "tsc --noEmit --pretty --skipLibCheck",
+    "prepare": "husky install",
+    "reload-virtual-drive": "cd release/app && yarn reload-virtual-drive && cd ../.. && yarn",
+    "start:reload-bindings": "npm run reload-virtual-drive && npm run start"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
@@ -118,6 +118,9 @@
     }
   },
   "jest": {
+    "setupFilesAfterEnv": [
+      "jest-extended/all"
+    ],
     "globals": {
       "ts-jest": {
         "tsconfig": "tsconfig.test.json"
@@ -198,7 +201,7 @@
     "detect-port": "^1.3.0",
     "dotenv": "^10.0.0",
     "dotenv-webpack": "^7.0.3",
-    "electron": "^25.1.0",
+    "electron": "^25.8.1",
     "electron-builder": "^23.6.0",
     "electron-devtools-installer": "^3.2.0",
     "electron-notarize": "^1.1.1",
@@ -229,6 +232,7 @@
     "lint-staged": "^12.1.4",
     "mini-css-extract-plugin": "^2.4.5",
     "ms": "^2.1.3",
+    "node-loader": "^2.0.0",
     "opencollective-postinstall": "^2.0.3",
     "playwright": "1.26.1",
     "postcss": "^8.4.5",
@@ -258,10 +262,9 @@
   "dependencies": {
     "@headlessui/react": "^1.4.2",
     "@iconscout/react-unicons": "^1.1.6",
-    "@internxt/inxt-js": "^2.0.7",
+    "@internxt/inxt-js": "^2.0.8",
     "@internxt/lib": "^1.1.6",
     "@internxt/sdk": "^1.4.33",
-    "@internxt/webdav-server": "^1.0.0",
     "@phosphor-icons/react": "2.0.9",
     "@radix-ui/react-select": "^1.2.2",
     "@sentry/electron": "^4.5.0",
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 24541ebea..ba155ba1c 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,19 +1,33 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.8",
+  "version": "2.0.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "internxt-drive",
-      "version": "2.0.8",
+      "version": "2.0.2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@parcel/watcher": "^2.0.5",
         "@rudderstack/rudder-sdk-node": "^1.1.4",
         "better-sqlite3": "^8.3.0",
-        "typeorm": "^0.3.16"
+        "typeorm": "^0.3.16",
+        "virtual-drive": "../../../node-win"
+      }
+    },
+    "../../../node-win": {
+      "name": "virtual-drive",
+      "version": "1.0.1",
+      "hasInstallScript": true,
+      "license": "ISC",
+      "dependencies": {
+        "tsconfig-paths": "^4.2.0"
+      },
+      "devDependencies": {
+        "@types/node": "^20.5.0",
+        "node-gyp": "^9.4.0",
+        "typescript": "^5.1.6"
       }
     },
     "node_modules/@babel/runtime": {
@@ -67,26 +81,6 @@
         "darwin"
       ]
     },
-    "node_modules/@parcel/watcher": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.1.0.tgz",
-      "integrity": "sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^3.2.1",
-        "node-gyp-build": "^4.3.0"
-      },
-      "engines": {
-        "node": ">= 10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
     "node_modules/@rudderstack/rudder-sdk-node": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@rudderstack/rudder-sdk-node/-/rudder-sdk-node-1.1.4.tgz",
@@ -278,18 +272,6 @@
         "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "license": "MIT",
-      "dependencies": {
-        "fill-range": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/buffer": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
@@ -699,18 +681,6 @@
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
       "license": "MIT"
     },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "license": "MIT",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/fn.name": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
@@ -891,15 +861,6 @@
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "license": "MIT"
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -909,27 +870,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
     "node_modules/is-retry-allowed": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz",
@@ -1041,19 +981,6 @@
         "is-buffer": "~1.1.6"
       }
     },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "license": "MIT",
-      "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
     "node_modules/mimic-response": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
@@ -1174,23 +1101,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
-      "license": "MIT"
-    },
-    "node_modules/node-gyp-build": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz",
-      "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==",
-      "license": "MIT",
-      "bin": {
-        "node-gyp-build": "bin.js",
-        "node-gyp-build-optional": "optional.js",
-        "node-gyp-build-test": "build-test.js"
-      }
-    },
     "node_modules/node-gyp-build-optional-packages": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz",
@@ -1272,18 +1182,6 @@
       "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
       "license": "MIT"
     },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/prebuild-install": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
@@ -1651,18 +1549,6 @@
         "node": ">=0.8"
       }
     },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "license": "MIT",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
     "node_modules/triple-beam": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
@@ -1817,6 +1703,10 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/virtual-drive": {
+      "resolved": "../../../node-win",
+      "link": true
+    },
     "node_modules/winston": {
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/winston/-/winston-3.8.2.tgz",
@@ -1954,17 +1844,6 @@
       "integrity": "sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==",
       "optional": true
     },
-    "@parcel/watcher": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.1.0.tgz",
-      "integrity": "sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==",
-      "requires": {
-        "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^3.2.1",
-        "node-gyp-build": "^4.3.0"
-      }
-    },
     "@rudderstack/rudder-sdk-node": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@rudderstack/rudder-sdk-node/-/rudder-sdk-node-1.1.4.tgz",
@@ -2099,14 +1978,6 @@
         "balanced-match": "^1.0.0"
       }
     },
-    "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "requires": {
-        "fill-range": "^7.0.1"
-      }
-    },
     "buffer": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
@@ -2387,14 +2258,6 @@
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
       "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
     },
-    "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
     "fn.name": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
@@ -2502,29 +2365,11 @@
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
-    },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
     },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-    },
     "is-retry-allowed": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz",
@@ -2605,15 +2450,6 @@
         "is-buffer": "~1.1.6"
       }
     },
-    "micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-      "requires": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
-      }
-    },
     "mimic-response": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
@@ -2693,16 +2529,6 @@
         "semver": "^7.3.5"
       }
     },
-    "node-addon-api": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
-      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="
-    },
-    "node-gyp-build": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz",
-      "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="
-    },
     "node-gyp-build-optional-packages": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz",
@@ -2763,11 +2589,6 @@
         }
       }
     },
-    "picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
-    },
     "prebuild-install": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
@@ -3009,14 +2830,6 @@
         "thenify": ">= 3.1.0 < 4"
       }
     },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
     "triple-beam": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
@@ -3074,6 +2887,15 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
     },
+    "virtual-drive": {
+      "version": "file:../../../node-win",
+      "requires": {
+        "@types/node": "^20.5.0",
+        "node-gyp": "^9.4.0",
+        "tsconfig-paths": "^4.2.0",
+        "typescript": "^5.1.6"
+      }
+    },
     "winston": {
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/winston/-/winston-3.8.2.tgz",
diff --git a/release/app/package.json b/release/app/package.json
index ef47159ae..7b17b894d 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -1,19 +1,20 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.0",
+  "version": "2.0.3",
   "description": "Internxt Drive client UI",
   "main": "./dist/main/main.js",
   "author": "Internxt <hello@internxt.com>",
   "scripts": {
     "electron-rebuild": "node -r ts-node/register ../../.erb/scripts/electron-rebuild.js",
     "link-modules": "node -r ts-node/register ../../.erb/scripts/link-modules.ts",
-    "postinstall": "npm run electron-rebuild --sequential && npm run link-modules"
+    "postinstall": "npm run electron-rebuild --sequential && npm run link-modules",
+    "reload-virtual-drive": "yarn add  --ignore-scripts ../../../node-win && npm run link-modules"
   },
   "dependencies": {
-    "@parcel/watcher": "^2.0.5",
     "@rudderstack/rudder-sdk-node": "^1.1.4",
     "better-sqlite3": "^8.3.0",
-    "typeorm": "^0.3.16"
+    "typeorm": "^0.3.16",
+    "virtual-drive": "../../../node-win"
   },
   "license": "MIT"
 }
diff --git a/release/app/yarn.lock b/release/app/yarn.lock
index 78675bc4b..b4f8416f3 100644
--- a/release/app/yarn.lock
+++ b/release/app/yarn.lock
@@ -37,7 +37,7 @@
 
 "@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0":
   version "2.2.0"
-  resolved "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz#901c5937e1441572ea23e631fe6deca68482fe76"
   integrity sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==
 
 "@msgpackr-extract/msgpackr-extract-darwin-x64@2.2.0":
@@ -65,16 +65,6 @@
   resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.2.0.tgz#016d855b6bc459fd908095811f6826e45dd4ba64"
   integrity sha512-XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA==
 
-"@parcel/watcher@^2.0.5":
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.1.0.tgz"
-  integrity sha512-8s8yYjd19pDSsBpbkOHnT6Z2+UJSuLQx61pCFM0s5wSRvKCEMDjd/cHY3/GI1szHIWbpXpsJdg3V6ISGGx9xDw==
-  dependencies:
-    is-glob "^4.0.3"
-    micromatch "^4.0.5"
-    node-addon-api "^3.2.1"
-    node-gyp-build "^4.3.0"
-
 "@rudderstack/rudder-sdk-node@^1.1.4":
   version "1.1.4"
   resolved "https://registry.npmjs.org/@rudderstack/rudder-sdk-node/-/rudder-sdk-node-1.1.4.tgz"
@@ -189,13 +179,6 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
 buffer@^5.5.0:
   version "5.7.1"
   resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"
@@ -428,13 +411,6 @@ file-uri-to-path@1.0.0:
   resolved "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
-  dependencies:
-    to-regex-range "^5.0.1"
-
 fn.name@1.x.x:
   version "1.1.0"
   resolved "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz"
@@ -539,28 +515,11 @@ is-buffer@~1.1.6:
   resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-extglob@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
-  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
-
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-glob@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
-  dependencies:
-    is-extglob "^2.1.1"
-
-is-number@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
-  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
-
 is-retry-allowed@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz"
@@ -576,6 +535,11 @@ join-component@^1.1.0:
   resolved "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz"
   integrity sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==
 
+json5@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
 kuler@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz"
@@ -638,14 +602,6 @@ md5@^2.3.0:
     crypt "0.0.2"
     is-buffer "~1.1.6"
 
-micromatch@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
-  dependencies:
-    braces "^3.0.2"
-    picomatch "^2.3.1"
-
 mimic-response@^3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz"
@@ -663,6 +619,11 @@ minimist@^1.2.0, minimist@^1.2.3:
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
+minimist@^1.2.6:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
 mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   version "0.5.3"
   resolved "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"
@@ -725,21 +686,11 @@ node-abi@^3.3.0:
   dependencies:
     semver "^7.3.5"
 
-node-addon-api@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz"
-  integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
-
 node-gyp-build-optional-packages@5.0.3:
   version "5.0.3"
   resolved "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz"
   integrity sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==
 
-node-gyp-build@^4.3.0:
-  version "4.6.0"
-  resolved "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz"
-  integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==
-
 object-assign@^4.0.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
@@ -788,11 +739,6 @@ parse5@^6.0.1:
   resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-picomatch@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
-
 prebuild-install@^7.1.0:
   version "7.1.1"
   resolved "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz"
@@ -889,7 +835,7 @@ safe-stable-stringify@^2.3.1:
 
 semver@^7.3.2, semver@^7.3.5:
   version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
@@ -963,6 +909,11 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
+strip-bom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
+
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"
@@ -1015,18 +966,20 @@ thenify-all@^1.0.0:
   dependencies:
     any-promise "^1.0.0"
 
-to-regex-range@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
-  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
-  dependencies:
-    is-number "^7.0.0"
-
 triple-beam@^1.3.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz"
   integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
 
+tsconfig-paths@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
+  integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
+  dependencies:
+    json5 "^2.2.2"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
 tslib@^2.5.0:
   version "2.5.0"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"
@@ -1075,6 +1028,11 @@ uuid@^9.0.0:
   resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"
   integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
 
+virtual-drive@../../../node-win:
+  version "1.0.1"
+  dependencies:
+    tsconfig-paths "^4.2.0"
+
 winston-transport@^4.5.0:
   version "4.5.0"
   resolved "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"
diff --git a/src/main/analytics/drive-handlers.ts b/src/apps/main/analytics/drive-handlers.ts
similarity index 78%
rename from src/main/analytics/drive-handlers.ts
rename to src/apps/main/analytics/drive-handlers.ts
index 00fcc24e4..f0ed61122 100644
--- a/src/main/analytics/drive-handlers.ts
+++ b/src/apps/main/analytics/drive-handlers.ts
@@ -1,10 +1,10 @@
 import { ipcMainDrive } from '../ipcs/mainDrive';
-import { trackWebdavError, trackWebdavEvent } from './service';
+import { trackError, trackEvent } from './service';
 
 ipcMainDrive.on('FILE_DELETED', (_, payload) => {
   const { name, extension, size } = payload;
 
-  trackWebdavEvent('Delete Completed', {
+  trackEvent('Delete Completed', {
     file_name: name,
     file_extension: extension,
     file_size: size,
@@ -15,7 +15,7 @@ ipcMainDrive.on('FILE_DOWNLOADING', (_, payload) => {
   const { name, size, extension, processInfo } = payload;
 
   if (!processInfo.progress) {
-    trackWebdavEvent('Download Started', {
+    trackEvent('Download Started', {
       file_name: name,
       file_extension: extension,
       file_size: size,
@@ -27,7 +27,7 @@ ipcMainDrive.on('FILE_DOWNLOADING', (_, payload) => {
 ipcMainDrive.on('FILE_DOWNLOADED', (_, payload) => {
   const { name, extension, size, processInfo } = payload;
 
-  trackWebdavEvent('Download Completed', {
+  trackEvent('Download Completed', {
     file_name: name,
     file_extension: extension,
     file_size: size,
@@ -38,7 +38,7 @@ ipcMainDrive.on('FILE_DOWNLOADED', (_, payload) => {
 ipcMainDrive.on('FILE_CLONNED', (_, payload) => {
   const { name, extension, size, processInfo } = payload;
 
-  trackWebdavEvent('Upload Completed', {
+  trackEvent('Upload Completed', {
     file_name: name,
     file_extension: extension,
     file_size: size,
@@ -51,7 +51,7 @@ ipcMainDrive.on('FILE_UPLOADING', (_, payload) => {
   const { name, size, extension, processInfo } = payload;
 
   if (!processInfo.progress) {
-    trackWebdavEvent('Upload Started', {
+    trackEvent('Upload Started', {
       file_name: name,
       file_extension: extension,
       file_size: size,
@@ -63,7 +63,7 @@ ipcMainDrive.on('FILE_UPLOADING', (_, payload) => {
 ipcMainDrive.on('FILE_UPLOADED', (_, payload) => {
   const { name, extension, size, processInfo } = payload;
 
-  trackWebdavEvent('Upload Completed', {
+  trackEvent('Upload Completed', {
     file_name: name,
     file_extension: extension,
     file_size: size,
@@ -74,7 +74,7 @@ ipcMainDrive.on('FILE_UPLOADED', (_, payload) => {
 ipcMainDrive.on('FILE_UPLOAD_ERROR', (_, payload) => {
   const { name, error } = payload;
 
-  trackWebdavError('Upload Error', new Error(error), {
+  trackError('Upload Error', new Error(error), {
     itemType: 'File',
     root: '',
     from: name,
@@ -85,7 +85,7 @@ ipcMainDrive.on('FILE_UPLOAD_ERROR', (_, payload) => {
 ipcMainDrive.on('FILE_DOWNLOAD_ERROR', (_, payload) => {
   const { name, error } = payload;
 
-  trackWebdavError('Download Error', new Error(error), {
+  trackError('Download Error', new Error(error), {
     itemType: 'File',
     root: '',
     from: name,
@@ -96,7 +96,7 @@ ipcMainDrive.on('FILE_DOWNLOAD_ERROR', (_, payload) => {
 ipcMainDrive.on('FILE_RENAME_ERROR', (_, payload) => {
   const { name, error } = payload;
 
-  trackWebdavError('Rename Error', new Error(error), {
+  trackError('Rename Error', new Error(error), {
     itemType: 'File',
     root: '',
     from: name,
@@ -104,10 +104,10 @@ ipcMainDrive.on('FILE_RENAME_ERROR', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_DELETE_ERROR', (_, payload) => {
+ipcMainDrive.on('FILE_DELETION_ERROR', (_, payload) => {
   const { name, error } = payload;
 
-  trackWebdavError('Delete Error', new Error(error), {
+  trackError('Delete Error', new Error(error), {
     itemType: 'File',
     root: '',
     from: name,
diff --git a/src/main/analytics/handlers.ts b/src/apps/main/analytics/handlers.ts
similarity index 65%
rename from src/main/analytics/handlers.ts
rename to src/apps/main/analytics/handlers.ts
index 20ad76e7c..d0655aafe 100644
--- a/src/main/analytics/handlers.ts
+++ b/src/apps/main/analytics/handlers.ts
@@ -1,3 +1,2 @@
 import './user-handlers';
-import './backup-handlers';
 import './drive-handlers';
diff --git a/src/main/analytics/rudderstack-client.ts b/src/apps/main/analytics/rudderstack-client.ts
similarity index 73%
rename from src/main/analytics/rudderstack-client.ts
rename to src/apps/main/analytics/rudderstack-client.ts
index 9a324d532..d6cd52af8 100644
--- a/src/main/analytics/rudderstack-client.ts
+++ b/src/apps/main/analytics/rudderstack-client.ts
@@ -4,11 +4,11 @@ const WRITE_KEY = process.env.RUDDERSTACK_KEY;
 const DATA_PLANE_URL = process.env.RUDDERSTACK_DATA_PLANE_URL;
 
 if (!WRITE_KEY) {
-  throw Error('[CONFIG] Missing ANALITICS WRITE KEY');
+  throw Error('[CONFIG] Missing ANALYTICS WRITE KEY');
 }
 
 if (!DATA_PLANE_URL) {
-  throw Error('[CONFIG] Missing ANALITICS URL');
+  throw Error('[CONFIG] Missing ANALYTICS URL');
 }
 
 const client = new Analytics(WRITE_KEY, `${DATA_PLANE_URL}`);
diff --git a/src/main/analytics/service.ts b/src/apps/main/analytics/service.ts
similarity index 94%
rename from src/main/analytics/service.ts
rename to src/apps/main/analytics/service.ts
index e2b1cd27f..4cc906c6d 100644
--- a/src/main/analytics/service.ts
+++ b/src/apps/main/analytics/service.ts
@@ -1,12 +1,12 @@
-import packageJson from '../../../package.json';
+import packageJson from '../../../../package.json';
 import ConfigStore from '../config';
 import { client } from './rudderstack-client';
 import os from 'os';
 import Logger from 'electron-log';
 import {
-  TrackedWebdavServerEventsActions,
-  WebdavErrorContext,
-} from '../../shared/IPC/events/webdav';
+  TrackedActions,
+  ErrorContext,
+} from '../../shared/IPC/events/sync-engine';
 
 function platformShortName(platform: string) {
   switch (platform) {
@@ -252,8 +252,8 @@ export function backupError(
   });
 }
 
-export function trackWebdavEvent(
-  event: TrackedWebdavServerEventsActions,
+export function trackEvent(
+  event: TrackedActions,
   properties: Record<string, any>
 ) {
   const userData = ConfigStore.get('userData');
@@ -271,10 +271,10 @@ export function trackWebdavEvent(
   client.track(payload);
 }
 
-export function trackWebdavError(
-  event: TrackedWebdavServerEventsActions,
+export function trackError(
+  event: TrackedActions,
   error: Error,
-  context?: WebdavErrorContext
+  context?: ErrorContext
 ) {
   const userData = ConfigStore.get('userData');
   const clientId = ConfigStore.get('clientId');
diff --git a/src/main/analytics/user-handlers.ts b/src/apps/main/analytics/user-handlers.ts
similarity index 100%
rename from src/main/analytics/user-handlers.ts
rename to src/apps/main/analytics/user-handlers.ts
diff --git a/src/main/app-info/app-info.ts b/src/apps/main/app-info/app-info.ts
similarity index 76%
rename from src/main/app-info/app-info.ts
rename to src/apps/main/app-info/app-info.ts
index 64eb91053..d7fbf1a6f 100644
--- a/src/main/app-info/app-info.ts
+++ b/src/apps/main/app-info/app-info.ts
@@ -1,4 +1,4 @@
-import packageJson from '../../../package.json';
+import packageJson from '../../../../package.json';
 
 export type AppInfo = {
   name: 'drive-desktop';
diff --git a/src/apps/main/app-info/handlers.ts b/src/apps/main/app-info/handlers.ts
new file mode 100644
index 000000000..0f0b19fce
--- /dev/null
+++ b/src/apps/main/app-info/handlers.ts
@@ -0,0 +1,22 @@
+import { ipcMain, app } from 'electron';
+
+ipcMain.handle('get-path', (_, path) => {
+  const result = app.getPath(path);
+  return result;
+});
+
+ipcMain.handle('APP:TEMPORAL_FILES_FOLDER', () => {
+  return app.getPath('temp');
+});
+
+ipcMain.handle('APP:PREFERRED_LANGUAGE', (): Array<string> => {
+  const canObtainPreferredLanguage = Object.keys(app).includes(
+    'getPreferredSystemLanguage'
+  );
+
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  if (canObtainPreferredLanguage) return app.getPreferredSystemLanguage();
+
+  return ['en'];
+});
diff --git a/src/main/auth/handlers.ts b/src/apps/main/auth/handlers.ts
similarity index 93%
rename from src/main/auth/handlers.ts
rename to src/apps/main/auth/handlers.ts
index 03c0e27ba..47e102e47 100644
--- a/src/main/auth/handlers.ts
+++ b/src/apps/main/auth/handlers.ts
@@ -4,7 +4,7 @@ import Logger from 'electron-log';
 import { AccessResponse } from '../../renderer/pages/Login/service';
 import { applicationOpened } from '../analytics/service';
 import eventBus from '../event-bus';
-import { setupRootFolder } from '../sync-root-folder/service';
+import { setupRootFolder } from '../virutal-root-folder/service';
 import { getWidget } from '../windows/widget';
 import { createTokenSchedule } from './refresh-token';
 import {
@@ -43,6 +43,10 @@ ipcMain.handle('get-headers-for-new-api', () => getNewApiHeaders());
 
 ipcMain.handle('get-new-token', () => obtainToken('newToken'));
 
+ipcMain.handle('get-token', () => {
+  return obtainToken('bearerToken');
+});
+
 export function onUserUnauthorized() {
   eventBus.emit('USER_WAS_UNAUTHORIZED');
 
diff --git a/src/main/auth/refresh-token.ts b/src/apps/main/auth/refresh-token.ts
similarity index 100%
rename from src/main/auth/refresh-token.ts
rename to src/apps/main/auth/refresh-token.ts
diff --git a/src/main/auth/service.ts b/src/apps/main/auth/service.ts
similarity index 98%
rename from src/main/auth/service.ts
rename to src/apps/main/auth/service.ts
index 1fa695f4a..57c110a03 100644
--- a/src/main/auth/service.ts
+++ b/src/apps/main/auth/service.ts
@@ -1,7 +1,7 @@
 import { safeStorage } from 'electron';
 import Logger from 'electron-log';
 
-import packageConfig from '../../../package.json';
+import packageConfig from '../../../../package.json';
 import ConfigStore, { defaults, fieldsToSave } from '../config';
 import { User } from '../types';
 
diff --git a/src/main/auto-launch/handlers.ts b/src/apps/main/auto-launch/handlers.ts
similarity index 100%
rename from src/main/auto-launch/handlers.ts
rename to src/apps/main/auto-launch/handlers.ts
diff --git a/src/main/auto-launch/linux-desktop-entry.ts b/src/apps/main/auto-launch/linux-desktop-entry.ts
similarity index 94%
rename from src/main/auto-launch/linux-desktop-entry.ts
rename to src/apps/main/auto-launch/linux-desktop-entry.ts
index 223256409..afba1ab0e 100644
--- a/src/main/auto-launch/linux-desktop-entry.ts
+++ b/src/apps/main/auto-launch/linux-desktop-entry.ts
@@ -1,7 +1,7 @@
 import fs from 'fs';
 import os from 'os';
 
-import packageJson from '../../../package.json';
+import packageJson from '../../../../package.json';
 
 const fileName = `${packageJson.name}.desktop`;
 const desktopFilePath = `${os.homedir()}/.config/autostart`;
diff --git a/src/main/auto-launch/service.ts b/src/apps/main/auto-launch/service.ts
similarity index 100%
rename from src/main/auto-launch/service.ts
rename to src/apps/main/auto-launch/service.ts
diff --git a/src/main/background-processes/process-issues.ts b/src/apps/main/background-processes/process-issues.ts
similarity index 97%
rename from src/main/background-processes/process-issues.ts
rename to src/apps/main/background-processes/process-issues.ts
index cdec67929..f62c58376 100644
--- a/src/main/background-processes/process-issues.ts
+++ b/src/apps/main/background-processes/process-issues.ts
@@ -1,12 +1,12 @@
 import { ipcMain } from 'electron';
 
+import eventBus from '../event-bus';
+import { broadcastToWindows } from '../windows';
 import {
+  ProcessIssue,
   GeneralIssue,
   ProcessInfoUpdatePayload,
-  ProcessIssue,
-} from '../../workers/types';
-import eventBus from '../event-bus';
-import { broadcastToWindows } from '../windows';
+} from '../../shared/types';
 
 let processIssues: ProcessIssue[] = [];
 let generalIssues: GeneralIssue[] = [];
@@ -65,6 +65,7 @@ ipcMain.on('SYNC_INFO_UPDATE', (_, payload: ProcessInfoUpdatePayload) => {
       'RENAME_ERROR',
       'DELETE_ERROR',
       'METADATA_READ_ERROR',
+      'UPLOAD_ERROR',
     ].includes(payload.action)
   ) {
     addProcessIssue(payload as ProcessIssue);
diff --git a/src/apps/main/background-processes/sync-engine.ts b/src/apps/main/background-processes/sync-engine.ts
new file mode 100644
index 000000000..0149fcbb3
--- /dev/null
+++ b/src/apps/main/background-processes/sync-engine.ts
@@ -0,0 +1,172 @@
+import { BrowserWindow, ipcMain } from 'electron';
+import path from 'path';
+import Logger from 'electron-log';
+import eventBus from '../event-bus';
+
+let worker: BrowserWindow | null = null;
+let workerIsRunning = false;
+let startingWorker = false;
+
+function spawnSyncEngineWorker() {
+  if (startingWorker) {
+    Logger.info('[MAIN] Worker is already starting');
+    return;
+  }
+  if (workerIsRunning) {
+    Logger.info('[MAIN] Worker is already running');
+    return;
+  }
+
+  startingWorker = true;
+
+  worker = new BrowserWindow({
+    webPreferences: {
+      nodeIntegration: true,
+      contextIsolation: false,
+      backgroundThrottling: false,
+    },
+    show: false,
+  });
+  worker
+    .loadFile(
+      process.env.NODE_ENV === 'development'
+        ? '../../../release/app/dist/sync-engine/index.html'
+        : `${path.join(__dirname, '..', 'sync-engine')}/index.html`
+    )
+    .then(() => {
+      Logger.info('[MAIN] Sync engine worker loaded');
+    })
+    .catch((err) => {
+      Logger.error('[MAIN] Error loading sync engine worker', err);
+    });
+
+  worker.on('close', () => {
+    worker?.destroy();
+
+    if (workerIsRunning) {
+      Logger.warn('The sync engine process ended unexpectedly, relaunching');
+      workerIsRunning = false;
+      spawnSyncEngineWorker();
+    }
+  });
+
+  ipcMain.once('SYNC_ENGINE_PROCESS_SETUP_SUCCESSFUL', () => {
+    Logger.debug('[MAIN] SYNC ENGINE RUNNING');
+    workerIsRunning = true;
+    startingWorker = false;
+  });
+
+  ipcMain.on('SYNC_ENGINE_PROCESS_SETUP_FAILED', () => {
+    Logger.debug('[MAIN] SYNC ENGINE NOT RUNNING');
+    workerIsRunning = false;
+    startingWorker = false;
+  });
+}
+
+export async function stopSyncEngineWatcher() {
+  Logger.info('[MAIN] STOPPING SYNC ENGINE WORKER...');
+
+  if (!workerIsRunning) {
+    Logger.info('[MAIN] WORKER WAS NOT RUNNING');
+    worker?.destroy();
+    worker = null;
+    return;
+  }
+
+  const stopPromise = new Promise<void>((resolve, reject) => {
+    ipcMain.once('SYNC_ENGINE_STOP_ERROR', (_, error: Error) => {
+      Logger.error('[MAIN] Error stopping sync engine worker', error);
+      reject(error);
+    });
+
+    ipcMain.once('SYNC_ENGINE_STOP_SUCCESS', () => {
+      resolve();
+      Logger.info('[MAIN] Sync engine stopped');
+    });
+
+    const millisecondsToWait = 10_000;
+
+    setTimeout(() => {
+      reject(
+        new Error(
+          `Timeout waiting for sync engine to stop after ${millisecondsToWait} milliseconds`
+        )
+      );
+    }, millisecondsToWait);
+  });
+
+  try {
+    worker?.webContents.send('STOP_SYNC_ENGINE_PROCESS');
+
+    await stopPromise;
+  } catch (err) {
+    // TODO: handle error
+    Logger.error(err);
+  } finally {
+    worker?.destroy();
+    workerIsRunning = false;
+    worker = null;
+  }
+}
+
+async function stopAndClearSyncEngineWatcher() {
+  Logger.info('[MAIN] STOPPING AND CLEAR SYNC ENGINE WORKER...');
+
+  if (!workerIsRunning) {
+    Logger.info('[MAIN] WORKER WAS NOT RUNNING');
+    worker?.destroy();
+    worker = null;
+    return;
+  }
+
+  const response = new Promise<void>((resolve, reject) => {
+    ipcMain.once(
+      'ERROR_ON_STOP_AND_CLEAR_SYNC_ENGINE_PROCESS',
+      (_, error: Error) => {
+        Logger.error('[MAIN] Error stopping sync engine worker', error);
+        reject(error);
+      }
+    );
+
+    ipcMain.once('SYNC_ENGINE_STOP_AND_CLEAR_SUCCESS', () => {
+      resolve();
+      Logger.info('[MAIN] Sync engine stopped and cleared');
+    });
+
+    const millisecondsToWait = 10_000;
+
+    setTimeout(() => {
+      reject(
+        new Error(
+          `Timeout waiting for sync engine to stop after ${millisecondsToWait} milliseconds`
+        )
+      );
+    }, millisecondsToWait);
+  });
+
+  try {
+    worker?.webContents.send('STOP_AND_CLEAR_SYNC_ENGINE_PROCESS');
+
+    await response;
+  } catch (err) {
+    // TODO: handle error
+    Logger.error(err);
+  } finally {
+    worker?.destroy();
+    workerIsRunning = false;
+    worker = null;
+  }
+}
+
+export function updateSyncEngine() {
+  try {
+    worker?.webContents.send('UPDATE_SYNC_ENGINE_PROCESS');
+  } catch (err) {
+    // TODO: handle error
+    Logger.error(err);
+  }
+}
+
+eventBus.on('USER_LOGGED_OUT', stopAndClearSyncEngineWatcher);
+eventBus.on('USER_WAS_UNAUTHORIZED', stopAndClearSyncEngineWatcher);
+eventBus.on('INITIAL_SYNC_READY', spawnSyncEngineWorker);
diff --git a/src/main/bug-report/BugReportResult.ts b/src/apps/main/bug-report/BugReportResult.ts
similarity index 100%
rename from src/main/bug-report/BugReportResult.ts
rename to src/apps/main/bug-report/BugReportResult.ts
diff --git a/src/main/bug-report/handlers.ts b/src/apps/main/bug-report/handlers.ts
similarity index 100%
rename from src/main/bug-report/handlers.ts
rename to src/apps/main/bug-report/handlers.ts
diff --git a/src/main/bug-report/service.ts b/src/apps/main/bug-report/service.ts
similarity index 96%
rename from src/main/bug-report/service.ts
rename to src/apps/main/bug-report/service.ts
index 14fca69bd..be6a87c3e 100644
--- a/src/main/bug-report/service.ts
+++ b/src/apps/main/bug-report/service.ts
@@ -5,13 +5,14 @@ import { createReadStream } from 'fs';
 import fs from 'fs/promises';
 import path from 'path';
 
-import packageJson from '../../../package.json';
-import { ErrorDetails } from '../../workers/types';
+import packageJson from '../../../../package.json';
 import { obtainToken } from '../auth/service';
 import { BugReportResult } from './BugReportResult';
 import * as Sentry from '@sentry/electron/main';
 import { User } from '../types';
 import Logger from 'electron-log';
+import { ErrorDetails } from '../../shared/types';
+
 /**
  * Reports an error to Sentry from the main process
  *
diff --git a/src/main/config.ts b/src/apps/main/config.ts
similarity index 100%
rename from src/main/config.ts
rename to src/apps/main/config.ts
diff --git a/src/main/config/handlers.ts b/src/apps/main/config/handlers.ts
similarity index 100%
rename from src/main/config/handlers.ts
rename to src/apps/main/config/handlers.ts
diff --git a/src/main/config/service.ts b/src/apps/main/config/service.ts
similarity index 100%
rename from src/main/config/service.ts
rename to src/apps/main/config/service.ts
diff --git a/src/main/database/adapters/base.ts b/src/apps/main/database/adapters/base.ts
similarity index 100%
rename from src/main/database/adapters/base.ts
rename to src/apps/main/database/adapters/base.ts
diff --git a/src/main/database/collections/DriveFileCollection.ts b/src/apps/main/database/collections/DriveFileCollection.ts
similarity index 100%
rename from src/main/database/collections/DriveFileCollection.ts
rename to src/apps/main/database/collections/DriveFileCollection.ts
diff --git a/src/main/database/collections/DriveFolderCollection.ts b/src/apps/main/database/collections/DriveFolderCollection.ts
similarity index 100%
rename from src/main/database/collections/DriveFolderCollection.ts
rename to src/apps/main/database/collections/DriveFolderCollection.ts
diff --git a/src/main/database/data-source.ts b/src/apps/main/database/data-source.ts
similarity index 100%
rename from src/main/database/data-source.ts
rename to src/apps/main/database/data-source.ts
diff --git a/src/main/database/entities/DriveFile.ts b/src/apps/main/database/entities/DriveFile.ts
similarity index 100%
rename from src/main/database/entities/DriveFile.ts
rename to src/apps/main/database/entities/DriveFile.ts
diff --git a/src/main/database/entities/DriveFolder.ts b/src/apps/main/database/entities/DriveFolder.ts
similarity index 100%
rename from src/main/database/entities/DriveFolder.ts
rename to src/apps/main/database/entities/DriveFolder.ts
diff --git a/src/main/device/handlers.ts b/src/apps/main/device/handlers.ts
similarity index 80%
rename from src/main/device/handlers.ts
rename to src/apps/main/device/handlers.ts
index a58d8ff1e..7fb0d3a3e 100644
--- a/src/main/device/handlers.ts
+++ b/src/apps/main/device/handlers.ts
@@ -1,4 +1,4 @@
-import { ipcMain, shell } from 'electron';
+import { ipcMain } from 'electron';
 
 import {
   addBackup,
@@ -12,7 +12,6 @@ import {
   renameDevice,
   createBackupsFromLocalPaths,
 } from './service';
-import { getVirtualDrivePath } from '../../workers/webdav/VirtualDrive';
 ipcMain.handle('get-or-create-device', getOrCreateDevice);
 
 ipcMain.handle('rename-device', (_, v) => renameDevice(v));
@@ -33,6 +32,3 @@ ipcMain.handle('change-backup-path', (_, v) => changeBackupPath(v));
 ipcMain.on('add-device-issue', (_, e) => addUnknownDeviceIssue(e));
 
 ipcMain.handle('get-folder-path', () => getPathFromDialog());
-ipcMain.handle('open-virtual-drive', () => {
-  return shell.openPath(getVirtualDrivePath());
-});
diff --git a/src/main/device/service.ts b/src/apps/main/device/service.ts
similarity index 100%
rename from src/main/device/service.ts
rename to src/apps/main/device/service.ts
diff --git a/src/main/event-bus.ts b/src/apps/main/event-bus.ts
similarity index 96%
rename from src/main/event-bus.ts
rename to src/apps/main/event-bus.ts
index 90d00e026..069f346b6 100644
--- a/src/main/event-bus.ts
+++ b/src/apps/main/event-bus.ts
@@ -39,4 +39,6 @@ declare interface EventBus {
 
 const eventBus = new EventBus();
 
+eventBus.setMaxListeners(20);
+
 export default eventBus;
diff --git a/src/main/fordwardToWindows.ts b/src/apps/main/fordwardToWindows.ts
similarity index 78%
rename from src/main/fordwardToWindows.ts
rename to src/apps/main/fordwardToWindows.ts
index de6814911..b0cc9f986 100644
--- a/src/main/fordwardToWindows.ts
+++ b/src/apps/main/fordwardToWindows.ts
@@ -1,7 +1,6 @@
-import { VirtualDriveStatus } from '../shared/types/VirtualDriveStatus';
-import { ipcMainDrive } from './ipcs/mainDrive';
-import { ipcMainVirtualDrive } from './ipcs/mainVirtualDrive';
 import { broadcastToWindows } from './windows';
+import { ipcMainDrive } from './ipcs/mainDrive';
+import { FileErrorInfo } from '../shared/IPC/events/drive';
 
 ipcMainDrive.on('FILE_DELETED', (_, payload) => {
   const { nameWithExtension } = payload;
@@ -49,6 +48,16 @@ ipcMainDrive.on('FILE_OVERWRITED', (_, payload) => {
   });
 });
 
+ipcMainDrive.on('FILE_RENAMING', (_, payload) => {
+  const { nameWithExtension, oldName } = payload;
+
+  broadcastToWindows('sync-info-update', {
+    action: 'RENAMING',
+    name: nameWithExtension,
+    oldName,
+  });
+});
+
 ipcMainDrive.on('FILE_RENAMED', (_, payload) => {
   const { nameWithExtension } = payload;
 
@@ -77,7 +86,7 @@ ipcMainDrive.on('FILE_UPLOADING', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_UPLOADED', (_, payload) => {
+ipcMainDrive.on('FILE_CREATED', (_, payload) => {
   const { nameWithExtension } = payload;
 
   broadcastToWindows('sync-info-update', {
@@ -113,7 +122,7 @@ ipcMainDrive.on('FILE_RENAME_ERROR', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_DELETE_ERROR', (_, payload) => {
+ipcMainDrive.on('FILE_DELETION_ERROR', (_, payload: FileErrorInfo) => {
   const { nameWithExtension } = payload;
 
   broadcastToWindows('sync-info-update', {
@@ -121,21 +130,3 @@ ipcMainDrive.on('FILE_DELETE_ERROR', (_, payload) => {
     name: nameWithExtension,
   });
 });
-
-ipcMainVirtualDrive.on('VIRTUAL_DRIVE_STARTING', () => {
-  broadcastToWindows('virtual-drive-status-change', {
-    status: VirtualDriveStatus.MOUNTING,
-  });
-});
-
-ipcMainVirtualDrive.on('VIRTUAL_DRIVE_MOUNTED_SUCCESSFULLY', () => {
-  broadcastToWindows('virtual-drive-status-change', {
-    status: VirtualDriveStatus.MOUNTED,
-  });
-});
-
-ipcMainVirtualDrive.on('VIRTUAL_DRIVE_MOUNT_ERROR', () => {
-  broadcastToWindows('virtual-drive-status-change', {
-    status: VirtualDriveStatus.FAILED_TO_MOUNT,
-  });
-});
diff --git a/src/main/ipcs/NoEvents.ts b/src/apps/main/ipcs/NoEvents.ts
similarity index 100%
rename from src/main/ipcs/NoEvents.ts
rename to src/apps/main/ipcs/NoEvents.ts
diff --git a/src/apps/main/ipcs/ipcMainSyncEngine.ts b/src/apps/main/ipcs/ipcMainSyncEngine.ts
new file mode 100644
index 000000000..fa6158b5c
--- /dev/null
+++ b/src/apps/main/ipcs/ipcMainSyncEngine.ts
@@ -0,0 +1,8 @@
+import { ipcMain } from 'electron';
+import { FromProcess, FromMain } from '../../shared/IPC/events/sync-engine';
+import { CustomIpc } from '../../shared/IPC/IPCs';
+
+export const ipcMainSyncEngine = ipcMain as unknown as CustomIpc<
+  FromMain,
+  FromProcess
+>;
diff --git a/src/main/ipcs/mainDrive.ts b/src/apps/main/ipcs/mainDrive.ts
similarity index 100%
rename from src/main/ipcs/mainDrive.ts
rename to src/apps/main/ipcs/mainDrive.ts
index 58cdcdd87..ffd4169ff 100644
--- a/src/main/ipcs/mainDrive.ts
+++ b/src/apps/main/ipcs/mainDrive.ts
@@ -1,7 +1,7 @@
 import { ipcMain } from 'electron';
-import { DriveEvents } from '../../shared/IPC/events/drive';
-import { CustomIpc } from '../../shared/IPC/IPCs';
 import { NoEvents } from './NoEvents';
+import { CustomIpc } from '../../shared/IPC/IPCs';
+import { DriveEvents } from '../../shared/IPC/events/drive';
 
 export type IpcMainDrive = CustomIpc<NoEvents, DriveEvents>;
 
diff --git a/src/main/ipcs/mainVirtualDrive.ts b/src/apps/main/ipcs/mainVirtualDrive.ts
similarity index 100%
rename from src/main/ipcs/mainVirtualDrive.ts
rename to src/apps/main/ipcs/mainVirtualDrive.ts
diff --git a/src/main/logger.ts b/src/apps/main/logger.ts
similarity index 100%
rename from src/main/logger.ts
rename to src/apps/main/logger.ts
diff --git a/src/main/main.ts b/src/apps/main/main.ts
similarity index 76%
rename from src/main/main.ts
rename to src/apps/main/main.ts
index 8a8578aac..29975eb81 100644
--- a/src/main/main.ts
+++ b/src/apps/main/main.ts
@@ -8,7 +8,7 @@ import 'regenerator-runtime/runtime';
 // via webpack in prod
 import 'dotenv/config';
 // ***** APP BOOTSTRAPPING ****************************************************** //
-import './sync-root-folder/handlers';
+import './virutal-root-folder/handlers';
 import './auto-launch/handlers';
 import './logger';
 import './bug-report/handlers';
@@ -16,16 +16,14 @@ import './auth/handlers';
 import './windows/settings';
 import './windows/process-issues';
 import './windows';
-import './background-processes/backups';
-import './background-processes/sync';
-import './background-processes/webdav';
+import './background-processes/sync-engine';
 import './background-processes/process-issues';
 import './device/handlers';
 import './usage/handlers';
 import './realtime';
 import './tray/tray';
+import './tray/handlers';
 import './fordwardToWindows';
-import './virtual-drive/handlers';
 import './analytics/handlers';
 import './platform/handlers';
 import './thumbnails/handlers';
@@ -33,25 +31,28 @@ import './migration/handlers';
 import './config/handlers';
 import './app-info/handlers';
 import './remote-sync/handlers';
-import { app, ipcMain, nativeTheme } from 'electron';
+
+import { app, nativeTheme } from 'electron';
 import Logger from 'electron-log';
 import { autoUpdater } from 'electron-updater';
-import packageJson from '../../package.json';
+import packageJson from '../../../package.json';
 import eventBus from './event-bus';
 import * as Sentry from '@sentry/electron/main';
 import { AppDataSource } from './database/data-source';
 import { getIsLoggedIn } from './auth/handlers';
 import {
-  createWidget,
+  getOrCreateWidged,
   getWidget,
   setBoundsOfWidgetByPath,
 } from './windows/widget';
 import { createAuthWindow, getAuthWindow } from './windows/auth';
 import configStore from './config';
-import { getTray } from './tray/tray';
+import { getTray, setTrayStatus } from './tray/tray';
 import { openOnboardingWindow } from './windows/onboarding';
 import { reportError } from './bug-report/service';
-import { Theme } from 'shared/types/Theme';
+import { setCleanUpFunction } from './quit';
+import { stopSyncEngineWatcher } from './background-processes/sync-engine';
+import { Theme } from '../shared/types/Theme';
 
 Logger.log(`Running ${packageJson.version}`);
 
@@ -87,38 +88,19 @@ if (process.env.NODE_ENV === 'development') {
   require('electron-debug')({ showDevTools: false });
 }
 
-const installExtensions = async () => {
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  const installer = require('electron-devtools-installer');
-  const forceDownload = !!process.env.UPGRADE_EXTENSIONS;
-  const extensions = ['REACT_DEVELOPER_TOOLS'];
-
-  return installer
-    .default(
-      extensions.map((name) => installer[name]),
-      forceDownload
-    )
-    .catch(console.log);
-};
-
-ipcMain.on('user-quit', () => {
-  app.quit();
-});
-
 app
   .whenReady()
   .then(async () => {
     if (!AppDataSource.isInitialized) {
       await AppDataSource.initialize();
     }
+
     eventBus.emit('APP_IS_READY');
     const isLoggedIn = getIsLoggedIn();
 
     if (!isLoggedIn) {
       await createAuthWindow();
-    }
-    if (process.env.NODE_ENV === 'development') {
-      await installExtensions();
+      setTrayStatus('IDLE');
     }
     checkForUpdates();
   })
@@ -129,15 +111,21 @@ eventBus.on('USER_LOGGED_IN', async () => {
     if (!AppDataSource.isInitialized) {
       await AppDataSource.initialize();
     }
-    getAuthWindow()?.destroy();
-    nativeTheme.themeSource = configStore.get('preferedTheme') as Theme;
-    await createWidget();
-    const widget = getWidget();
+
+    getAuthWindow()?.hide();
+
+    nativeTheme.themeSource = (configStore.get('preferedTheme') ||
+      'system') as Theme;
+
+    setTrayStatus('IDLE');
+    const widget = await getOrCreateWidged();
     const tray = getTray();
     if (widget && tray) {
       setBoundsOfWidgetByPath(widget, tray);
     }
 
+    getAuthWindow()?.destroy();
+
     const lastOnboardingShown = configStore.get('lastOnboardingShown');
 
     if (!lastOnboardingShown) {
@@ -145,12 +133,16 @@ eventBus.on('USER_LOGGED_IN', async () => {
     } else if (widget) {
       widget.show();
     }
+
+    setCleanUpFunction(stopSyncEngineWatcher);
   } catch (error) {
+    Logger.error(error);
     reportError(error as Error);
   }
 });
 
 eventBus.on('USER_LOGGED_OUT', async () => {
+  setTrayStatus('IDLE');
   const widget = getWidget();
   if (widget) {
     widget.hide();
diff --git a/src/main/migration/handlers.ts b/src/apps/main/migration/handlers.ts
similarity index 100%
rename from src/main/migration/handlers.ts
rename to src/apps/main/migration/handlers.ts
diff --git a/src/main/migration/service.ts b/src/apps/main/migration/service.ts
similarity index 100%
rename from src/main/migration/service.ts
rename to src/apps/main/migration/service.ts
diff --git a/src/main/platform/DesktopPlatform.ts b/src/apps/main/platform/DesktopPlatform.ts
similarity index 100%
rename from src/main/platform/DesktopPlatform.ts
rename to src/apps/main/platform/DesktopPlatform.ts
diff --git a/src/main/platform/handlers.ts b/src/apps/main/platform/handlers.ts
similarity index 100%
rename from src/main/platform/handlers.ts
rename to src/apps/main/platform/handlers.ts
diff --git a/src/main/preload.d.ts b/src/apps/main/preload.d.ts
similarity index 67%
rename from src/main/preload.d.ts
rename to src/apps/main/preload.d.ts
index 9436c7261..8acceb03b 100644
--- a/src/main/preload.d.ts
+++ b/src/apps/main/preload.d.ts
@@ -1,7 +1,5 @@
 declare interface Window {
   electron: {
-    query: typeof import('./app-info/service').executeQuery;
-
     getConfigKey(key: import('./config/service').StoredValues): Promise<any>;
 
     listenToConfigKeyChange<T>(
@@ -13,6 +11,32 @@ declare interface Window {
 
     pathChanged(path: string): void;
 
+    getGeneralIssues: () => Promise<
+      import('../../apps/shared/types').GeneralIssue[]
+    >;
+
+    onGeneralIssuesChanged: (
+      func: (value: import('../../apps/shared/types').GeneralIssue[]) => void
+    ) => () => void;
+
+    onSyncStopped: (
+      func: (
+        value: import('../../context/desktop/sync/domain/SyncStoppedPayload').SyncStoppedPayload
+      ) => void
+    ) => () => void;
+
+    getProcessIssues(): Promise<import('apps/shared/types').ProcessIssue[]>;
+
+    onProcessIssuesChanged(
+      func: (value: import('apps/shared/types').ProcessIssue[]) => void
+    ): () => void;
+
+    onSyncInfoUpdate(
+      func: (
+        value: import('apps/shared/types').ProcessInfoUpdatePayload
+      ) => void
+    ): () => void;
+
     userIsUnauthorized(): void;
 
     userLoggedIn(
@@ -29,7 +53,7 @@ declare interface Window {
 
     minimizeWindow(): void;
 
-    openSyncFolder(): Promise<void>;
+    openVirtualDriveFolder(): Promise<void>;
 
     finishOnboarding(): void;
 
@@ -49,38 +73,9 @@ declare interface Window {
 
     stopSyncProcess(): void;
 
-    getSyncStatus(): Promise<
-      import('main/background-processes/sync').SyncStatus
-    >;
-
-    onSyncStatusChanged(
-      func: (value: import('main/background-processes/sync').SyncStatus) => void
-    ): () => void;
-
-    onSyncStopped(
-      func: (
-        value: import('main/background-processes/sync').SyncStoppedPayload
-      ) => void
-    ): () => void;
-
-    onSyncInfoUpdate(
-      func: (value: import('../workers/types').ProcessInfoUpdatePayload) => void
-    ): () => void;
-
     moveSyncFolderToDesktop(): Promise<
       typeof import('../main/migration/service').moveSyncFolderToDesktop
     >;
-    getProcessIssues(): Promise<import('../workers/types').ProcessIssue[]>;
-
-    onProcessIssuesChanged(
-      func: (value: import('../workers/types').ProcessIssue[]) => void
-    ): () => void;
-
-    getGeneralIssues(): Promise<import('../workers/types').GeneralIssue[]>;
-
-    onGeneralIssuesChanged(
-      func: (value: import('../workers/types').GeneralIssue[]) => void
-    ): () => void;
 
     openProcessIssuesWindow(): void;
 
@@ -106,19 +101,9 @@ declare interface Window {
 
     stopBackupsProcess(): void;
 
-    getBackupsStatus(): Promise<
-      import('main/background-processes/backups').BackupsStatus
-    >;
-
-    onBackupsStatusChanged(
-      func: (
-        value: import('main/background-processes/backups').BackupsStatus
-      ) => void
-    ): () => void;
-
-    getSyncRoot(): Promise<string>;
+    getVirtualDriveRoot(): Promise<string>;
 
-    chooseSyncRootWithDialog: typeof import('./sync-root-folder/service').chooseSyncRootWithDialog;
+    chooseSyncRootWithDialog: typeof import('./virutal-root-folder/service').chooseSyncRootWithDialog;
 
     path: typeof import('path');
 
@@ -142,32 +127,8 @@ declare interface Window {
 
     getLastBackupTimestamp: () => Promise<number>;
 
-    getLastBackupExitReason: () => Promise<
-      import('../main/background-processes/backups').BackupExitReason | null
-    >;
-
-    onBackupProgress(
-      func: (
-        value: import('main/background-processes/backups').BackupProgress
-      ) => void
-    ): () => void;
-
-    getBackupFatalErrors(): Promise<
-      Array<
-        import('../main/background-processes/types/BackupFatalError').BackupFatalError
-      >
-    >;
-
     deleteBackupError(folderId: number): Promise<void>;
 
-    onBackupFatalErrorsChanged(
-      func: (
-        value: Array<
-          import('../main/background-processes/types/BackupFatalError').BackupFatalError
-        >
-      ) => void
-    ): () => void;
-
     changeBackupPath: typeof import('../main/device/service').changeBackupPath;
 
     getFolderPath: typeof import('../main/device/service').getPathFromDialog;
@@ -203,11 +164,9 @@ declare interface Window {
       }) => void
     ): () => void;
     retryVirtualDriveMount(): void;
-    unmountVirtualDriveAndQuit: () => Promise<boolean>;
     startRemoteSync: () => Promise<void>;
     getDownloadUrls: () => Promise<{ platforms: Record<string, string> }>;
     openUrl: (url: string) => Promise<void>;
-    // DEV
-    resizeWindow: () => typeof import('../main/dev/service').resizeCurrentWindow;
+    getPreferredAppLanguage: () => Promise<Array<string>>;
   };
 }
diff --git a/src/main/preload.js b/src/apps/main/preload.js
similarity index 95%
rename from src/main/preload.js
rename to src/apps/main/preload.js
index 40e40d7ed..e988efa87 100644
--- a/src/main/preload.js
+++ b/src/apps/main/preload.js
@@ -2,9 +2,6 @@ const { contextBridge, ipcRenderer } = require('electron');
 const path = require('path');
 
 contextBridge.exposeInMainWorld('electron', {
-  query(query) {
-    return ipcRenderer.invoke('execute-app-query', query);
-  },
   getConfigKey(key) {
     return ipcRenderer.invoke('get-config-key', key);
   },
@@ -46,8 +43,8 @@ contextBridge.exposeInMainWorld('electron', {
   minimizeWindow() {
     return ipcRenderer.send('user-minimized-window');
   },
-  openSyncFolder() {
-    return ipcRenderer.invoke('open-sync-folder');
+  openVirtualDriveFolder() {
+    return ipcRenderer.invoke('open-virtual-drive-folder');
   },
   quit() {
     return ipcRenderer.send('user-quit');
@@ -171,8 +168,8 @@ contextBridge.exposeInMainWorld('electron', {
     ipcRenderer.on(eventName, callback);
     return () => ipcRenderer.removeListener(eventName, callback);
   },
-  getSyncRoot() {
-    return ipcRenderer.invoke('get-sync-root');
+  getVirtualDriveRoot() {
+    return ipcRenderer.invoke('get-virtual-drive-root');
   },
   chooseSyncRootWithDialog() {
     return ipcRenderer.invoke('choose-sync-root-with-dialog');
@@ -284,12 +281,6 @@ contextBridge.exposeInMainWorld('electron', {
   retryVirtualDriveMount() {
     return ipcRenderer.invoke('retry-virtual-drive-mount');
   },
-  unmountVirtualDriveAndQuit() {
-    return ipcRenderer.invoke('unmount-virtual-drive-and-quit');
-  },
-  getDownloadUrls() {
-    return ipcRenderer.invoke('get-download-urls');
-  },
   onVirtualDriveStatusChange(callback) {
     const eventName = 'virtual-drive-status-change';
     const callbackWrapper = (_, v) => {
@@ -302,5 +293,8 @@ contextBridge.exposeInMainWorld('electron', {
   openUrl: (url) => {
     ipcRenderer.invoke('open-url', url);
   },
+  getPreferredAppLanguage() {
+    return ipcRenderer.invoke('APP:PREFERRED_LANGUAGE');
+  },
   path,
 });
diff --git a/src/apps/main/quit.ts b/src/apps/main/quit.ts
new file mode 100644
index 000000000..610122910
--- /dev/null
+++ b/src/apps/main/quit.ts
@@ -0,0 +1,21 @@
+import { app, ipcMain } from 'electron';
+
+let cleanUpFunction: () => Promise<void>;
+
+export function setCleanUpFunction(fn: () => Promise<void>) {
+  cleanUpFunction = fn;
+}
+
+export async function quitApp() {
+  // await stopVirtualDrive();
+
+  if (cleanUpFunction) {
+    await Promise.allSettled([cleanUpFunction()]);
+  }
+
+  app.quit();
+}
+
+ipcMain.on('user-quit', async () => {
+  await quitApp();
+});
diff --git a/src/main/realtime.ts b/src/apps/main/realtime.ts
similarity index 100%
rename from src/main/realtime.ts
rename to src/apps/main/realtime.ts
diff --git a/src/main/remote-sync/RemoteSyncManager.test.ts b/src/apps/main/remote-sync/RemoteSyncManager.test.ts
similarity index 97%
rename from src/main/remote-sync/RemoteSyncManager.test.ts
rename to src/apps/main/remote-sync/RemoteSyncManager.test.ts
index e6ac83436..6cce45eed 100644
--- a/src/main/remote-sync/RemoteSyncManager.test.ts
+++ b/src/apps/main/remote-sync/RemoteSyncManager.test.ts
@@ -6,13 +6,14 @@ jest.mock('@sentry/electron/main', () => ({
 jest.mock('electron');
 jest.mock('electron-store');
 jest.mock('axios');
-import { DatabaseCollectionAdapter } from 'main/database/adapters/base';
-import { DriveFile } from 'main/database/entities/DriveFile';
-import { DriveFolder } from 'main/database/entities/DriveFolder';
+
 import { RemoteSyncManager } from './RemoteSyncManager';
 import { RemoteSyncedFile, RemoteSyncedFolder } from './helpers';
 import * as uuid from 'uuid';
 import axios from 'axios';
+import { DatabaseCollectionAdapter } from '../database/adapters/base';
+import { DriveFile } from '../database/entities/DriveFile';
+import { DriveFolder } from '../database/entities/DriveFolder';
 
 const mockedAxios = axios as jest.Mocked<typeof axios>;
 
diff --git a/src/main/remote-sync/RemoteSyncManager.ts b/src/apps/main/remote-sync/RemoteSyncManager.ts
similarity index 93%
rename from src/main/remote-sync/RemoteSyncManager.ts
rename to src/apps/main/remote-sync/RemoteSyncManager.ts
index a6c67f7e1..db87a1487 100644
--- a/src/main/remote-sync/RemoteSyncManager.ts
+++ b/src/apps/main/remote-sync/RemoteSyncManager.ts
@@ -68,7 +68,7 @@ export class RemoteSyncManager {
    * Throws an error if there's a sync in progress for this class instance
    */
   async startRemoteSync() {
-    const start = Date.now();
+    // const start = Date.now();
     Logger.info('Starting remote to local sync');
 
     const testPassed = this.smokeTest();
@@ -102,26 +102,27 @@ export class RemoteSyncManager {
       this.changeStatus('SYNC_FAILED');
       reportError(error as Error);
     } finally {
-      const totalDuration = Date.now() - start;
+      // const totalDuration = Date.now() - start;
 
-      Logger.info('-----------------');
-      Logger.info('REMOTE SYNC STATS\n');
+      // Logger.info('-----------------');
+      // Logger.info('REMOTE SYNC STATS\n');
       Logger.info('Total synced files: ', this.totalFilesSynced);
-
-      Logger.info(
-        `Files sync speed: ${
-          this.totalFilesSynced / (totalDuration / 1000)
-        } files/second`
-      );
-
       Logger.info('Total synced folders: ', this.totalFoldersSynced);
-      Logger.info(
-        `Folders sync speed: ${
-          this.totalFoldersSynced / (totalDuration / 1000)
-        } folders/second`
-      );
-      Logger.info(`Total remote to local sync time: ${totalDuration}ms`);
-      Logger.info('-----------------');
+
+      // Logger.info(
+      //   `Files sync speed: ${
+      //     this.totalFilesSynced / (totalDuration / 1000)
+      //   } files/second`
+      // );
+
+      // Logger.info('Total synced folders: ', this.totalFoldersSynced);
+      // Logger.info(
+      //   `Folders sync speed: ${
+      //     this.totalFoldersSynced / (totalDuration / 1000)
+      //   } folders/second`
+      // );
+      // Logger.info(`Total remote to local sync time: ${totalDuration}ms`);
+      // Logger.info('-----------------');
     }
   }
 
@@ -387,9 +388,9 @@ export class RemoteSyncManager {
         ? updatedAtCheckpoint.toISOString()
         : undefined,
     };
-    Logger.info(
-      `Requesting folders with params ${JSON.stringify(params, null, 2)}`
-    );
+    // Logger.info(
+    //   `Requesting folders with params ${JSON.stringify(params, null, 2)}`
+    // );
     const response = await this.config.httpClient.get(
       `${process.env.NEW_DRIVE_URL}/drive/folders`,
       {
@@ -465,12 +466,19 @@ export class RemoteSyncManager {
     };
   };
   private async createOrUpdateSyncedFileEntry(remoteFile: RemoteSyncedFile) {
+    if (!remoteFile.folderId) {
+      return;
+    }
     await this.db.files.create(remoteFile);
   }
 
   private async createOrUpdateSyncedFolderEntry(
     remoteFolder: RemoteSyncedFolder
   ) {
+    if (!remoteFolder.id) {
+      return;
+    }
+
     await this.db.folders.create({
       ...remoteFolder,
       parentId: remoteFolder.parentId ?? undefined,
diff --git a/src/main/remote-sync/handlers.ts b/src/apps/main/remote-sync/handlers.ts
similarity index 84%
rename from src/main/remote-sync/handlers.ts
rename to src/apps/main/remote-sync/handlers.ts
index acd23168f..2426f0bc3 100644
--- a/src/main/remote-sync/handlers.ts
+++ b/src/apps/main/remote-sync/handlers.ts
@@ -9,6 +9,7 @@ import { ipcMain } from 'electron';
 import { reportError } from '../bug-report/service';
 import { sleep } from '../util';
 import { broadcastToWindows } from '../windows';
+import { updateSyncEngine } from '../background-processes/sync-engine';
 
 let initialSyncReady = false;
 const driveFilesCollection = new DriveFilesCollection();
@@ -27,7 +28,7 @@ const remoteSyncManager = new RemoteSyncManager(
   }
 );
 
-ipcMain.handle('GET_UPDATED_REMOTE_ITEMS', async () => {
+export async function getUpdatedRemoteItems() {
   try {
     const [allDriveFiles, allDriveFolders] = await Promise.all([
       driveFilesCollection.getAll(),
@@ -50,10 +51,18 @@ ipcMain.handle('GET_UPDATED_REMOTE_ITEMS', async () => {
     });
     throw error;
   }
+}
+
+ipcMain.handle('GET_UPDATED_REMOTE_ITEMS', async () => {
+  Logger.debug('[MAIN] Getting updated remote items');
+  return getUpdatedRemoteItems();
 });
 
+export function startRemoteSync(): Promise<void> {
+  return remoteSyncManager.startRemoteSync();
+}
 ipcMain.handle('START_REMOTE_SYNC', async () => {
-  await remoteSyncManager.startRemoteSync();
+  await startRemoteSync();
 });
 
 remoteSyncManager.onStatusChange((newStatus) => {
@@ -72,13 +81,16 @@ eventBus.on('RECEIVED_REMOTE_CHANGES', async () => {
   // Wait before checking for updates, could be possible
   // that we received the notification, but if we check
   // for new data we don't receive it
-  await sleep(500);
+  await sleep(2_000);
+
   await remoteSyncManager.startRemoteSync();
+  updateSyncEngine();
 });
-eventBus.on('USER_LOGGED_IN', () => {
+
+eventBus.on('USER_LOGGED_IN', async () => {
   Logger.info('Received user logged in event');
 
-  remoteSyncManager.startRemoteSync().catch((error) => {
+  await remoteSyncManager.startRemoteSync().catch((error) => {
     Logger.error('Error starting remote sync manager', error);
     reportError(error);
   });
diff --git a/src/main/remote-sync/helpers.ts b/src/apps/main/remote-sync/helpers.ts
similarity index 100%
rename from src/main/remote-sync/helpers.ts
rename to src/apps/main/remote-sync/helpers.ts
diff --git a/src/main/thumbnails/application/create-and-upload-thumbnail.ts b/src/apps/main/thumbnails/application/create-and-upload-thumbnail.ts
similarity index 100%
rename from src/main/thumbnails/application/create-and-upload-thumbnail.ts
rename to src/apps/main/thumbnails/application/create-and-upload-thumbnail.ts
diff --git a/src/apps/main/thumbnails/application/extract-pdf-page.ts b/src/apps/main/thumbnails/application/extract-pdf-page.ts
new file mode 100644
index 000000000..5028ba683
--- /dev/null
+++ b/src/apps/main/thumbnails/application/extract-pdf-page.ts
@@ -0,0 +1,13 @@
+import { Readable } from 'stream';
+
+export async function extractFirstPageAsReadablePNG(
+  pdfPath: string
+): Promise<Readable> {
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const gm = require('gm').subClass({ imageMagick: true });
+
+  return gm(pdfPath + '[0]')
+    .density(300, 300)
+    .quality(100)
+    .stream('png');
+}
diff --git a/src/main/thumbnails/application/obtain-image-to-thumbnail-it.ts b/src/apps/main/thumbnails/application/obtain-image-to-thumbnail-it.ts
similarity index 100%
rename from src/main/thumbnails/application/obtain-image-to-thumbnail-it.ts
rename to src/apps/main/thumbnails/application/obtain-image-to-thumbnail-it.ts
diff --git a/src/apps/main/thumbnails/application/resize-image.ts b/src/apps/main/thumbnails/application/resize-image.ts
new file mode 100644
index 000000000..100e5d96a
--- /dev/null
+++ b/src/apps/main/thumbnails/application/resize-image.ts
@@ -0,0 +1,17 @@
+import gm from 'gm';
+import { Readable } from 'stream';
+import { ThumbnailProperties } from '../domain/ThumbnailProperties';
+
+export async function reziseImage(file: Readable): Promise<Buffer> {
+  return new Promise((resolve, reject) => {
+    gm(file)
+      .resize(ThumbnailProperties.dimensions, ThumbnailProperties.dimensions)
+      .toBuffer(
+        ThumbnailProperties.type,
+        (err: Error | null, buffer: Buffer) => {
+          if (err) reject(err);
+          resolve(buffer);
+        }
+      );
+  });
+}
diff --git a/src/main/thumbnails/domain/ThumbnableExtension.ts b/src/apps/main/thumbnails/domain/ThumbnableExtension.ts
similarity index 100%
rename from src/main/thumbnails/domain/ThumbnableExtension.ts
rename to src/apps/main/thumbnails/domain/ThumbnableExtension.ts
diff --git a/src/main/thumbnails/domain/ThumbnailProperties.ts b/src/apps/main/thumbnails/domain/ThumbnailProperties.ts
similarity index 100%
rename from src/main/thumbnails/domain/ThumbnailProperties.ts
rename to src/apps/main/thumbnails/domain/ThumbnailProperties.ts
diff --git a/src/main/thumbnails/domain/ThumbnailUploader.ts b/src/apps/main/thumbnails/domain/ThumbnailUploader.ts
similarity index 100%
rename from src/main/thumbnails/domain/ThumbnailUploader.ts
rename to src/apps/main/thumbnails/domain/ThumbnailUploader.ts
diff --git a/src/main/thumbnails/handlers/index.ts b/src/apps/main/thumbnails/handlers/index.ts
similarity index 100%
rename from src/main/thumbnails/handlers/index.ts
rename to src/apps/main/thumbnails/handlers/index.ts
diff --git a/src/main/thumbnails/handlers/remote-file-pull-completed.ts b/src/apps/main/thumbnails/handlers/remote-file-pull-completed.ts
similarity index 100%
rename from src/main/thumbnails/handlers/remote-file-pull-completed.ts
rename to src/apps/main/thumbnails/handlers/remote-file-pull-completed.ts
diff --git a/src/main/thumbnails/infrastructure/EnvironmentAndStorageThumbnailUploader.ts b/src/apps/main/thumbnails/infrastructure/EnvironmentAndStorageThumbnailUploader.ts
similarity index 100%
rename from src/main/thumbnails/infrastructure/EnvironmentAndStorageThumbnailUploader.ts
rename to src/apps/main/thumbnails/infrastructure/EnvironmentAndStorageThumbnailUploader.ts
diff --git a/src/main/thumbnails/infrastructure/ThumbnailUploaderFactory.ts b/src/apps/main/thumbnails/infrastructure/ThumbnailUploaderFactory.ts
similarity index 100%
rename from src/main/thumbnails/infrastructure/ThumbnailUploaderFactory.ts
rename to src/apps/main/thumbnails/infrastructure/ThumbnailUploaderFactory.ts
diff --git a/src/main/token-scheduler/TokenScheduler.ts b/src/apps/main/token-scheduler/TokenScheduler.ts
similarity index 100%
rename from src/main/token-scheduler/TokenScheduler.ts
rename to src/apps/main/token-scheduler/TokenScheduler.ts
diff --git a/src/main/token-scheduler/token-scheduler.test.ts b/src/apps/main/token-scheduler/token-scheduler.test.ts
similarity index 100%
rename from src/main/token-scheduler/token-scheduler.test.ts
rename to src/apps/main/token-scheduler/token-scheduler.test.ts
diff --git a/src/main/tray/handlers.ts b/src/apps/main/tray/handlers.ts
similarity index 78%
rename from src/main/tray/handlers.ts
rename to src/apps/main/tray/handlers.ts
index 60f1a7808..40ee32769 100644
--- a/src/main/tray/handlers.ts
+++ b/src/apps/main/tray/handlers.ts
@@ -6,7 +6,7 @@ ipcMainDrive.on('FOLDER_CREATING', () => {
 });
 
 ipcMainDrive.on('FOLDER_CREATED', () => {
-  setTrayStatus('STANDBY');
+  setTrayStatus('IDLE');
 });
 
 ipcMainDrive.on('FOLDER_RENAMING', () => {
@@ -14,26 +14,30 @@ ipcMainDrive.on('FOLDER_RENAMING', () => {
 });
 
 ipcMainDrive.on('FOLDER_RENAMED', () => {
-  setTrayStatus('STANDBY');
+  setTrayStatus('IDLE');
 });
 
 ipcMainDrive.on('FILE_DELETING', () => {
   setTrayStatus('SYNCING');
 });
 ipcMainDrive.on('FILE_DELETED', () => {
-  setTrayStatus('STANDBY');
+  setTrayStatus('IDLE');
 });
 
 ipcMainDrive.on('FILE_DOWNLOADING', () => {
   setTrayStatus('SYNCING');
 });
 
+ipcMainDrive.on('FILE_DOWNLOADED', () => {
+  setTrayStatus('IDLE');
+});
+
 ipcMainDrive.on('FILE_MOVED', () => {
-  setTrayStatus('STANDBY');
+  setTrayStatus('IDLE');
 });
 
 ipcMainDrive.on('FILE_OVERWRITED', () => {
-  setTrayStatus('STANDBY');
+  setTrayStatus('IDLE');
 });
 
 ipcMainDrive.on('FILE_RENAMING', () => {
@@ -41,11 +45,11 @@ ipcMainDrive.on('FILE_RENAMING', () => {
 });
 
 ipcMainDrive.on('FILE_RENAMED', () => {
-  setTrayStatus('LOADING');
+  setTrayStatus('IDLE');
 });
 
 ipcMainDrive.on('FILE_CLONNED', () => {
-  setTrayStatus('STANDBY');
+  setTrayStatus('IDLE');
 });
 
 ipcMainDrive.on('FILE_UPLOADING', () => {
@@ -53,7 +57,7 @@ ipcMainDrive.on('FILE_UPLOADING', () => {
 });
 
 ipcMainDrive.on('FILE_UPLOADED', () => {
-  setTrayStatus('STANDBY');
+  setTrayStatus('IDLE');
 });
 
 ipcMainDrive.on('FILE_UPLOAD_ERROR', () => {
@@ -68,6 +72,6 @@ ipcMainDrive.on('FILE_RENAME_ERROR', () => {
   setTrayStatus('ALERT');
 });
 
-ipcMainDrive.on('FILE_DELETE_ERROR', () => {
+ipcMainDrive.on('FILE_DELETION_ERROR', () => {
   setTrayStatus('ALERT');
 });
diff --git a/src/main/tray/tray.ts b/src/apps/main/tray/tray.ts
similarity index 81%
rename from src/main/tray/tray.ts
rename to src/apps/main/tray/tray.ts
index 5be2087b1..7104e5298 100644
--- a/src/main/tray/tray.ts
+++ b/src/apps/main/tray/tray.ts
@@ -1,18 +1,17 @@
 import { app, Menu, nativeImage, Tray } from 'electron';
-import Logger from 'electron-log';
 import path from 'path';
-import PackageJson from '../../../package.json';
+import PackageJson from '../../../../package.json';
 import eventBus from '../event-bus';
 import {
-  getWidget,
+  getOrCreateWidged,
   setBoundsOfWidgetByPath,
   toggleWidgetVisibility,
 } from '../windows/widget';
 import { getIsLoggedIn } from '../auth/handlers';
 import { getAuthWindow } from '../windows/auth';
-import { unmountDrive } from '../../workers/webdav/VirtualDrive';
+import { quitApp } from '../quit';
 
-type TrayMenuState = 'STANDBY' | 'SYNCING' | 'ALERT' | 'LOADING';
+type TrayMenuState = 'IDLE' | 'SYNCING' | 'ALERT' | 'LOADING';
 
 export class TrayMenu {
   private tray: Tray;
@@ -23,7 +22,7 @@ export class TrayMenu {
 
   constructor(
     private readonly iconsPath: string,
-    private readonly onClick: () => void,
+    private readonly onClick: () => Promise<void>,
     private readonly onQuit: () => void
   ) {
     const trayIcon = this.getIconPath('LOADING');
@@ -34,8 +33,8 @@ export class TrayMenu {
 
     this.tray.setIgnoreDoubleClickEvents(true);
 
-    this.tray.on('click', () => {
-      this.onClick();
+    this.tray.on('click', async () => {
+      await this.onClick();
       this.tray.setContextMenu(null);
     });
     if (process.platform !== 'linux') {
@@ -94,7 +93,7 @@ export class TrayMenu {
   setTooltip(state: TrayMenuState) {
     const messages: Record<TrayMenuState, string> = {
       SYNCING: 'Sync in process',
-      STANDBY: `Internxt Drive ${PackageJson.version}`,
+      IDLE: `Internxt Drive ${PackageJson.version}`,
       ALERT: 'There are some issues with your sync',
       LOADING: 'Loading Internxt Drive...',
     };
@@ -120,17 +119,18 @@ export const setTrayStatus = (status: TrayMenuState) => {
 export function setupTrayIcon() {
   const RESOURCES_PATH = app.isPackaged
     ? path.join(process.resourcesPath, 'assets')
-    : path.join(__dirname, '../../../assets');
+    : path.join(__dirname, '../../../../assets');
 
   const iconsPath = path.join(RESOURCES_PATH, 'tray');
 
-  function onTrayClick() {
+  async function onTrayClick() {
     const isLoggedIn = getIsLoggedIn();
     if (!isLoggedIn) {
       getAuthWindow()?.show();
+      return;
     }
 
-    const widgetWindow = getWidget();
+    const widgetWindow = await getOrCreateWidged();
     if (tray && widgetWindow) {
       setBoundsOfWidgetByPath(widgetWindow, tray);
     }
@@ -141,18 +141,10 @@ export function setupTrayIcon() {
   }
 
   async function onQuitClick() {
-    try {
-      await unmountDrive();
-    } catch (onTrayQuitClickError) {
-      Logger.error({ onTrayQuitClickError });
-    }
-    app.quit();
+    quitApp();
   }
 
   tray = new TrayMenu(iconsPath, onTrayClick, onQuitClick);
 }
 
 eventBus.on('APP_IS_READY', setupTrayIcon);
-app.on('will-quit', () => {
-  getTray()?.destroy();
-});
diff --git a/src/main/types.ts b/src/apps/main/types.ts
similarity index 100%
rename from src/main/types.ts
rename to src/apps/main/types.ts
diff --git a/src/main/usage/Usage.ts b/src/apps/main/usage/Usage.ts
similarity index 100%
rename from src/main/usage/Usage.ts
rename to src/apps/main/usage/Usage.ts
diff --git a/src/main/usage/handlers.ts b/src/apps/main/usage/handlers.ts
similarity index 100%
rename from src/main/usage/handlers.ts
rename to src/apps/main/usage/handlers.ts
diff --git a/src/main/usage/service.ts b/src/apps/main/usage/service.ts
similarity index 100%
rename from src/main/usage/service.ts
rename to src/apps/main/usage/service.ts
diff --git a/src/main/usage/serviceBuilder.ts b/src/apps/main/usage/serviceBuilder.ts
similarity index 100%
rename from src/main/usage/serviceBuilder.ts
rename to src/apps/main/usage/serviceBuilder.ts
diff --git a/src/main/util.ts b/src/apps/main/util.ts
similarity index 100%
rename from src/main/util.ts
rename to src/apps/main/util.ts
diff --git a/src/apps/main/virutal-root-folder/handlers.ts b/src/apps/main/virutal-root-folder/handlers.ts
new file mode 100644
index 000000000..e5fecef05
--- /dev/null
+++ b/src/apps/main/virutal-root-folder/handlers.ts
@@ -0,0 +1,15 @@
+import { ipcMain } from 'electron';
+
+import {
+  chooseSyncRootWithDialog,
+  getRootVirtualDrive,
+  openVirtualDriveRootFolder,
+} from './service';
+
+ipcMain.handle('get-virtual-drive-root', getRootVirtualDrive);
+
+ipcMain.handle('choose-sync-root-with-dialog', chooseSyncRootWithDialog);
+
+ipcMain.handle('open-virtual-drive-folder', openVirtualDriveRootFolder);
+
+ipcMain.handle('retry-virtual-drive-mount', () => chooseSyncRootWithDialog);
diff --git a/src/main/sync-root-folder/service.ts b/src/apps/main/virutal-root-folder/service.ts
similarity index 73%
rename from src/main/sync-root-folder/service.ts
rename to src/apps/main/virutal-root-folder/service.ts
index 469b07e76..f76540e12 100644
--- a/src/main/sync-root-folder/service.ts
+++ b/src/apps/main/virutal-root-folder/service.ts
@@ -1,13 +1,15 @@
-import { app, dialog } from 'electron';
+import { app, dialog, shell } from 'electron';
 import fs from 'fs/promises';
 import path from 'path';
 
 import configStore from '../config';
 import eventBus from '../event-bus';
 
-const ROOT_FOLDER_NAME = 'Internxt';
+const ROOT_FOLDER_NAME = 'InternxtDrive';
 const HOME_FOLDER_PATH = app.getPath('home');
 
+const VIRTUAL_DRIVE_FOLDER = path.join(HOME_FOLDER_PATH, ROOT_FOLDER_NAME);
+
 async function existsFolder(pathname: string): Promise<boolean> {
   try {
     await fs.access(pathname);
@@ -32,11 +34,18 @@ function setSyncRoot(pathname: string): void {
   configStore.set('lastSavedListing', '');
 }
 
-export function getSyncRoot(): string {
+export function getRootVirtualDrive(): string {
+  const current = configStore.get('syncRoot');
+  if (current !== VIRTUAL_DRIVE_FOLDER) {
+    setupRootFolder();
+  }
+
   return configStore.get('syncRoot');
 }
 
 export async function setupRootFolder(n = 0): Promise<void> {
+  setSyncRoot(VIRTUAL_DRIVE_FOLDER);
+  return;
   const folderName = ROOT_FOLDER_NAME;
 
   const rootFolderName = folderName + (n ? ` (${n})` : '');
@@ -67,3 +76,11 @@ export async function chooseSyncRootWithDialog(): Promise<string | null> {
 
   return null;
 }
+
+export async function openVirtualDriveRootFolder() {
+  const syncFolderPath = getRootVirtualDrive();
+
+  const errorMessage = await shell.openPath(syncFolderPath);
+
+  if (errorMessage) throw new Error(errorMessage);
+}
diff --git a/src/main/windows/auth.ts b/src/apps/main/windows/auth.ts
similarity index 97%
rename from src/main/windows/auth.ts
rename to src/apps/main/windows/auth.ts
index 629b4ae87..1b485baec 100644
--- a/src/main/windows/auth.ts
+++ b/src/apps/main/windows/auth.ts
@@ -1,6 +1,5 @@
 import { BrowserWindow } from 'electron';
 
-import eventBus from '../event-bus';
 import { preloadPath, resolveHtmlPath } from '../util';
 import { setUpCommonWindowHandlers } from '.';
 import { getIsLoggedIn } from '../auth/handlers';
diff --git a/src/main/windows/feedback.ts b/src/apps/main/windows/feedback.ts
similarity index 100%
rename from src/main/windows/feedback.ts
rename to src/apps/main/windows/feedback.ts
diff --git a/src/main/windows/index.ts b/src/apps/main/windows/index.ts
similarity index 87%
rename from src/main/windows/index.ts
rename to src/apps/main/windows/index.ts
index 2b24dbbac..b15a099bd 100644
--- a/src/main/windows/index.ts
+++ b/src/apps/main/windows/index.ts
@@ -1,4 +1,4 @@
-import { BrowserWindow, shell } from 'electron';
+import { BrowserWindow } from 'electron';
 
 import eventBus from '../event-bus';
 import { getOnboardingWindow } from './onboarding';
@@ -7,6 +7,7 @@ import { getProcessIssuesWindow } from './process-issues';
 import { getSettingsWindow } from './settings';
 import { getFeedbackWindow } from './feedback';
 import { getWidget } from './widget';
+import { openVirtualDriveRootFolder } from '../virutal-root-folder/service';
 
 function closeAuxWindows() {
   getProcessIssuesWindow()?.close();
@@ -33,11 +34,6 @@ export function broadcastToWindows(eventName: string, data: any) {
 
 export function setUpCommonWindowHandlers(window: BrowserWindow) {
   // Open urls in the user's browser
-  window.webContents.on('new-window', (event, url) => {
-    event.preventDefault();
-    shell.openExternal(url);
-  });
-
   window.webContents.on('ipc-message', (_, channel) => {
     if (channel === 'user-closed-window') {
       window?.close();
@@ -47,7 +43,7 @@ export function setUpCommonWindowHandlers(window: BrowserWindow) {
     }
     if (channel === 'user-finished-onboarding') {
       window?.close();
-      getWidget()?.show();
+      openVirtualDriveRootFolder();
     }
 
     if (channel === 'user-finished-migration') {
diff --git a/src/main/windows/migration.ts b/src/apps/main/windows/migration.ts
similarity index 100%
rename from src/main/windows/migration.ts
rename to src/apps/main/windows/migration.ts
diff --git a/src/main/windows/onboarding.ts b/src/apps/main/windows/onboarding.ts
similarity index 100%
rename from src/main/windows/onboarding.ts
rename to src/apps/main/windows/onboarding.ts
diff --git a/src/main/windows/process-issues.ts b/src/apps/main/windows/process-issues.ts
similarity index 100%
rename from src/main/windows/process-issues.ts
rename to src/apps/main/windows/process-issues.ts
diff --git a/src/main/windows/settings.ts b/src/apps/main/windows/settings.ts
similarity index 100%
rename from src/main/windows/settings.ts
rename to src/apps/main/windows/settings.ts
diff --git a/src/main/windows/widget.ts b/src/apps/main/windows/widget.ts
similarity index 80%
rename from src/main/windows/widget.ts
rename to src/apps/main/windows/widget.ts
index 79fde8b71..37bf966f0 100644
--- a/src/main/windows/widget.ts
+++ b/src/apps/main/windows/widget.ts
@@ -1,4 +1,4 @@
-import { BrowserWindow, screen } from 'electron';
+import { BrowserWindow, ipcMain, screen } from 'electron';
 
 import eventBus from '../event-bus';
 import { TrayMenu } from '../tray/tray';
@@ -12,6 +12,19 @@ const widgetConfig: { width: number; height: number; placeUnderTray: boolean } =
 let widget: BrowserWindow | null = null;
 export const getWidget = () => (widget?.isDestroyed() ? null : widget);
 
+ipcMain.on('FILE_DOWNLOADING', (_, payload) => {
+  const { processInfo } = payload;
+  if (!processInfo.progress) {
+    const widget = getWidget();
+    if (widget && !widget.isVisible()) {
+      //  Windows 11 is not focusing the app on .show(), so it is not moving the app to top.
+      widget.setAlwaysOnTop(true);
+      widget.show();
+      widget.setAlwaysOnTop(false);
+    }
+  }
+});
+
 export const createWidget = async () => {
   widget = new BrowserWindow({
     width: widgetConfig.width,
@@ -56,6 +69,14 @@ export const createWidget = async () => {
   eventBus.emit('WIDGET_IS_READY');
 };
 
+export async function getOrCreateWidged(): Promise<BrowserWindow | null> {
+  if (widget) return widget;
+
+  await createWidget();
+
+  return getWidget();
+}
+
 export function toggleWidgetVisibility() {
   const widget = getWidget();
   if (!widget) {
diff --git a/src/renderer/App.css b/src/apps/renderer/App.css
similarity index 100%
rename from src/renderer/App.css
rename to src/apps/renderer/App.css
diff --git a/src/renderer/App.tsx b/src/apps/renderer/App.tsx
similarity index 100%
rename from src/renderer/App.tsx
rename to src/apps/renderer/App.tsx
diff --git a/src/renderer/actions/shared-actions.ts b/src/apps/renderer/actions/shared-actions.ts
similarity index 100%
rename from src/renderer/actions/shared-actions.ts
rename to src/apps/renderer/actions/shared-actions.ts
diff --git a/src/renderer/actions/sync-error-actions.ts b/src/apps/renderer/actions/sync-error-actions.ts
similarity index 100%
rename from src/renderer/actions/sync-error-actions.ts
rename to src/apps/renderer/actions/sync-error-actions.ts
diff --git a/src/apps/renderer/actions/types.ts b/src/apps/renderer/actions/types.ts
new file mode 100644
index 000000000..3bb177c6e
--- /dev/null
+++ b/src/apps/renderer/actions/types.ts
@@ -0,0 +1,8 @@
+import { ProcessFatalErrorName } from '../../shared/types';
+
+export interface Action {
+  name: string;
+  func: (() => void) | ((error: undefined) => Promise<void>);
+}
+
+export type FatalErrorActionMap = Record<ProcessFatalErrorName, Action>;
diff --git a/src/renderer/assets/error.svg b/src/apps/renderer/assets/error.svg
similarity index 100%
rename from src/renderer/assets/error.svg
rename to src/apps/renderer/assets/error.svg
diff --git a/src/renderer/assets/file.svg b/src/apps/renderer/assets/file.svg
similarity index 100%
rename from src/renderer/assets/file.svg
rename to src/apps/renderer/assets/file.svg
diff --git a/src/renderer/assets/folder.svg b/src/apps/renderer/assets/folder.svg
similarity index 100%
rename from src/renderer/assets/folder.svg
rename to src/apps/renderer/assets/folder.svg
diff --git a/src/renderer/assets/fonts/InstrumentSans/InstrumentSans-Bold.woff2 b/src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-Bold.woff2
similarity index 100%
rename from src/renderer/assets/fonts/InstrumentSans/InstrumentSans-Bold.woff2
rename to src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-Bold.woff2
diff --git a/src/renderer/assets/fonts/InstrumentSans/InstrumentSans-Medium.woff2 b/src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-Medium.woff2
similarity index 100%
rename from src/renderer/assets/fonts/InstrumentSans/InstrumentSans-Medium.woff2
rename to src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-Medium.woff2
diff --git a/src/renderer/assets/fonts/InstrumentSans/InstrumentSans-Regular.woff2 b/src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-Regular.woff2
similarity index 100%
rename from src/renderer/assets/fonts/InstrumentSans/InstrumentSans-Regular.woff2
rename to src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-Regular.woff2
diff --git a/src/renderer/assets/fonts/InstrumentSans/InstrumentSans-SemiBold.woff2 b/src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-SemiBold.woff2
similarity index 100%
rename from src/renderer/assets/fonts/InstrumentSans/InstrumentSans-SemiBold.woff2
rename to src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans-SemiBold.woff2
diff --git a/src/renderer/assets/fonts/InstrumentSans/InstrumentSans[wdth,wght].woff2 b/src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans[wdth,wght].woff2
similarity index 100%
rename from src/renderer/assets/fonts/InstrumentSans/InstrumentSans[wdth,wght].woff2
rename to src/apps/renderer/assets/fonts/InstrumentSans/InstrumentSans[wdth,wght].woff2
diff --git a/src/renderer/assets/fonts/InstrumentSans/OFL.txt b/src/apps/renderer/assets/fonts/InstrumentSans/OFL.txt
similarity index 100%
rename from src/renderer/assets/fonts/InstrumentSans/OFL.txt
rename to src/apps/renderer/assets/fonts/InstrumentSans/OFL.txt
diff --git a/src/renderer/assets/fonts/InstrumentSans/font.css b/src/apps/renderer/assets/fonts/InstrumentSans/font.css
similarity index 100%
rename from src/renderer/assets/fonts/InstrumentSans/font.css
rename to src/apps/renderer/assets/fonts/InstrumentSans/font.css
diff --git a/src/renderer/assets/icons/audio.svg b/src/apps/renderer/assets/icons/audio.svg
similarity index 100%
rename from src/renderer/assets/icons/audio.svg
rename to src/apps/renderer/assets/icons/audio.svg
diff --git a/src/renderer/assets/icons/code.svg b/src/apps/renderer/assets/icons/code.svg
similarity index 100%
rename from src/renderer/assets/icons/code.svg
rename to src/apps/renderer/assets/icons/code.svg
diff --git a/src/renderer/assets/icons/csv.svg b/src/apps/renderer/assets/icons/csv.svg
similarity index 100%
rename from src/renderer/assets/icons/csv.svg
rename to src/apps/renderer/assets/icons/csv.svg
diff --git a/src/renderer/assets/icons/default.svg b/src/apps/renderer/assets/icons/default.svg
similarity index 100%
rename from src/renderer/assets/icons/default.svg
rename to src/apps/renderer/assets/icons/default.svg
diff --git a/src/renderer/assets/icons/excel.svg b/src/apps/renderer/assets/icons/excel.svg
similarity index 100%
rename from src/renderer/assets/icons/excel.svg
rename to src/apps/renderer/assets/icons/excel.svg
diff --git a/src/renderer/assets/icons/figma.svg b/src/apps/renderer/assets/icons/figma.svg
similarity index 100%
rename from src/renderer/assets/icons/figma.svg
rename to src/apps/renderer/assets/icons/figma.svg
diff --git a/src/renderer/assets/icons/folder.svg b/src/apps/renderer/assets/icons/folder.svg
similarity index 100%
rename from src/renderer/assets/icons/folder.svg
rename to src/apps/renderer/assets/icons/folder.svg
diff --git a/src/renderer/assets/icons/getIcon.tsx b/src/apps/renderer/assets/icons/getIcon.tsx
similarity index 100%
rename from src/renderer/assets/icons/getIcon.tsx
rename to src/apps/renderer/assets/icons/getIcon.tsx
diff --git a/src/renderer/assets/icons/illustrator.svg b/src/apps/renderer/assets/icons/illustrator.svg
similarity index 100%
rename from src/renderer/assets/icons/illustrator.svg
rename to src/apps/renderer/assets/icons/illustrator.svg
diff --git a/src/renderer/assets/icons/image.svg b/src/apps/renderer/assets/icons/image.svg
similarity index 100%
rename from src/renderer/assets/icons/image.svg
rename to src/apps/renderer/assets/icons/image.svg
diff --git a/src/renderer/assets/icons/indesign.svg b/src/apps/renderer/assets/icons/indesign.svg
similarity index 100%
rename from src/renderer/assets/icons/indesign.svg
rename to src/apps/renderer/assets/icons/indesign.svg
diff --git a/src/renderer/assets/icons/pdf.svg b/src/apps/renderer/assets/icons/pdf.svg
similarity index 100%
rename from src/renderer/assets/icons/pdf.svg
rename to src/apps/renderer/assets/icons/pdf.svg
diff --git a/src/renderer/assets/icons/photoshop.svg b/src/apps/renderer/assets/icons/photoshop.svg
similarity index 100%
rename from src/renderer/assets/icons/photoshop.svg
rename to src/apps/renderer/assets/icons/photoshop.svg
diff --git a/src/renderer/assets/icons/powerpoint.svg b/src/apps/renderer/assets/icons/powerpoint.svg
similarity index 100%
rename from src/renderer/assets/icons/powerpoint.svg
rename to src/apps/renderer/assets/icons/powerpoint.svg
diff --git a/src/renderer/assets/icons/ppt.svg b/src/apps/renderer/assets/icons/ppt.svg
similarity index 100%
rename from src/renderer/assets/icons/ppt.svg
rename to src/apps/renderer/assets/icons/ppt.svg
diff --git a/src/renderer/assets/icons/sketch.svg b/src/apps/renderer/assets/icons/sketch.svg
similarity index 100%
rename from src/renderer/assets/icons/sketch.svg
rename to src/apps/renderer/assets/icons/sketch.svg
diff --git a/src/renderer/assets/icons/txt.svg b/src/apps/renderer/assets/icons/txt.svg
similarity index 100%
rename from src/renderer/assets/icons/txt.svg
rename to src/apps/renderer/assets/icons/txt.svg
diff --git a/src/renderer/assets/icons/video.svg b/src/apps/renderer/assets/icons/video.svg
similarity index 100%
rename from src/renderer/assets/icons/video.svg
rename to src/apps/renderer/assets/icons/video.svg
diff --git a/src/renderer/assets/icons/word.svg b/src/apps/renderer/assets/icons/word.svg
similarity index 100%
rename from src/renderer/assets/icons/word.svg
rename to src/apps/renderer/assets/icons/word.svg
diff --git a/src/renderer/assets/icons/zip.svg b/src/apps/renderer/assets/icons/zip.svg
similarity index 100%
rename from src/renderer/assets/icons/zip.svg
rename to src/apps/renderer/assets/icons/zip.svg
diff --git a/src/renderer/assets/illustrations/syncedStack-dark.png b/src/apps/renderer/assets/illustrations/syncedStack-dark.png
similarity index 100%
rename from src/renderer/assets/illustrations/syncedStack-dark.png
rename to src/apps/renderer/assets/illustrations/syncedStack-dark.png
diff --git a/src/renderer/assets/illustrations/syncedStack-light.png b/src/apps/renderer/assets/illustrations/syncedStack-light.png
similarity index 100%
rename from src/renderer/assets/illustrations/syncedStack-light.png
rename to src/apps/renderer/assets/illustrations/syncedStack-light.png
diff --git a/src/renderer/assets/index.d.ts b/src/apps/renderer/assets/index.d.ts
similarity index 100%
rename from src/renderer/assets/index.d.ts
rename to src/apps/renderer/assets/index.d.ts
diff --git a/src/renderer/assets/migration/upload-error.svg b/src/apps/renderer/assets/migration/upload-error.svg
similarity index 100%
rename from src/renderer/assets/migration/upload-error.svg
rename to src/apps/renderer/assets/migration/upload-error.svg
diff --git a/src/renderer/assets/migration/widget.svg b/src/apps/renderer/assets/migration/widget.svg
similarity index 100%
rename from src/renderer/assets/migration/widget.svg
rename to src/apps/renderer/assets/migration/widget.svg
diff --git a/src/renderer/assets/onboarding/context-menu.svg b/src/apps/renderer/assets/onboarding/context-menu.svg
similarity index 100%
rename from src/renderer/assets/onboarding/context-menu.svg
rename to src/apps/renderer/assets/onboarding/context-menu.svg
diff --git a/src/renderer/assets/onboarding/finder/linux.svg b/src/apps/renderer/assets/onboarding/finder/linux.svg
similarity index 100%
rename from src/renderer/assets/onboarding/finder/linux.svg
rename to src/apps/renderer/assets/onboarding/finder/linux.svg
diff --git a/src/renderer/assets/onboarding/finder/macos.svg b/src/apps/renderer/assets/onboarding/finder/macos.svg
similarity index 100%
rename from src/renderer/assets/onboarding/finder/macos.svg
rename to src/apps/renderer/assets/onboarding/finder/macos.svg
diff --git a/src/renderer/assets/onboarding/finder/windows.svg b/src/apps/renderer/assets/onboarding/finder/windows.svg
similarity index 100%
rename from src/renderer/assets/onboarding/finder/windows.svg
rename to src/apps/renderer/assets/onboarding/finder/windows.svg
diff --git a/src/renderer/assets/onboarding/folder-with-overlay-icons/offline/en.svg b/src/apps/renderer/assets/onboarding/folder-with-overlay-icons/offline/en.svg
similarity index 100%
rename from src/renderer/assets/onboarding/folder-with-overlay-icons/offline/en.svg
rename to src/apps/renderer/assets/onboarding/folder-with-overlay-icons/offline/en.svg
diff --git a/src/renderer/assets/onboarding/folder-with-overlay-icons/offline/es.svg b/src/apps/renderer/assets/onboarding/folder-with-overlay-icons/offline/es.svg
similarity index 100%
rename from src/renderer/assets/onboarding/folder-with-overlay-icons/offline/es.svg
rename to src/apps/renderer/assets/onboarding/folder-with-overlay-icons/offline/es.svg
diff --git a/src/renderer/assets/onboarding/folder-with-overlay-icons/offline/fr.svg b/src/apps/renderer/assets/onboarding/folder-with-overlay-icons/offline/fr.svg
similarity index 100%
rename from src/renderer/assets/onboarding/folder-with-overlay-icons/offline/fr.svg
rename to src/apps/renderer/assets/onboarding/folder-with-overlay-icons/offline/fr.svg
diff --git a/src/renderer/assets/onboarding/folder-with-overlay-icons/online/en.svg b/src/apps/renderer/assets/onboarding/folder-with-overlay-icons/online/en.svg
similarity index 100%
rename from src/renderer/assets/onboarding/folder-with-overlay-icons/online/en.svg
rename to src/apps/renderer/assets/onboarding/folder-with-overlay-icons/online/en.svg
diff --git a/src/renderer/assets/onboarding/folder-with-overlay-icons/online/es.svg b/src/apps/renderer/assets/onboarding/folder-with-overlay-icons/online/es.svg
similarity index 100%
rename from src/renderer/assets/onboarding/folder-with-overlay-icons/online/es.svg
rename to src/apps/renderer/assets/onboarding/folder-with-overlay-icons/online/es.svg
diff --git a/src/renderer/assets/onboarding/folder-with-overlay-icons/online/fr.svg b/src/apps/renderer/assets/onboarding/folder-with-overlay-icons/online/fr.svg
similarity index 100%
rename from src/renderer/assets/onboarding/folder-with-overlay-icons/online/fr.svg
rename to src/apps/renderer/assets/onboarding/folder-with-overlay-icons/online/fr.svg
diff --git a/src/renderer/assets/onboarding/logo.svg b/src/apps/renderer/assets/onboarding/logo.svg
similarity index 100%
rename from src/renderer/assets/onboarding/logo.svg
rename to src/apps/renderer/assets/onboarding/logo.svg
diff --git a/src/renderer/assets/onboarding/mac-finder-widget.png b/src/apps/renderer/assets/onboarding/mac-finder-widget.png
similarity index 100%
rename from src/renderer/assets/onboarding/mac-finder-widget.png
rename to src/apps/renderer/assets/onboarding/mac-finder-widget.png
diff --git a/src/renderer/assets/onboarding/widget.png b/src/apps/renderer/assets/onboarding/widget.png
similarity index 100%
rename from src/renderer/assets/onboarding/widget.png
rename to src/apps/renderer/assets/onboarding/widget.png
diff --git a/src/renderer/assets/play.svg b/src/apps/renderer/assets/play.svg
similarity index 100%
rename from src/renderer/assets/play.svg
rename to src/apps/renderer/assets/play.svg
diff --git a/src/renderer/assets/spinner.svg b/src/apps/renderer/assets/spinner.svg
similarity index 100%
rename from src/renderer/assets/spinner.svg
rename to src/apps/renderer/assets/spinner.svg
diff --git a/src/renderer/assets/stop.svg b/src/apps/renderer/assets/stop.svg
similarity index 100%
rename from src/renderer/assets/stop.svg
rename to src/apps/renderer/assets/stop.svg
diff --git a/src/renderer/assets/success.svg b/src/apps/renderer/assets/success.svg
similarity index 100%
rename from src/renderer/assets/success.svg
rename to src/apps/renderer/assets/success.svg
diff --git a/src/renderer/assets/warn.svg b/src/apps/renderer/assets/warn.svg
similarity index 100%
rename from src/renderer/assets/warn.svg
rename to src/apps/renderer/assets/warn.svg
diff --git a/src/renderer/components/Backups/BackupsFoldersSelector.tsx b/src/apps/renderer/components/Backups/BackupsFoldersSelector.tsx
similarity index 97%
rename from src/renderer/components/Backups/BackupsFoldersSelector.tsx
rename to src/apps/renderer/components/Backups/BackupsFoldersSelector.tsx
index 7ab385e8b..07d2e3838 100644
--- a/src/renderer/components/Backups/BackupsFoldersSelector.tsx
+++ b/src/apps/renderer/components/Backups/BackupsFoldersSelector.tsx
@@ -1,10 +1,8 @@
 import React, { useState } from 'react';
 import FolderIcon from '../../assets/folder.svg';
-
 import Button from '../Button';
 import { UilMinus, UilPlus } from '@iconscout/react-unicons';
-import { useTranslationContext } from 'renderer/context/LocalContext';
-import { reportError } from 'renderer/utils/errors';
+import { useTranslationContext } from '../../context/LocalContext';
 
 export type BackupFolder = {
   path: string;
diff --git a/src/renderer/components/Backups/FatalError.tsx b/src/apps/renderer/components/Backups/FatalError.tsx
similarity index 85%
rename from src/renderer/components/Backups/FatalError.tsx
rename to src/apps/renderer/components/Backups/FatalError.tsx
index ace51606f..887ca9084 100644
--- a/src/renderer/components/Backups/FatalError.tsx
+++ b/src/apps/renderer/components/Backups/FatalError.tsx
@@ -1,9 +1,8 @@
-import { useTranslationContext } from 'renderer/context/LocalContext';
-
-import { ProcessFatalErrorName } from '../../../workers/types';
+import { ProcessFatalErrorName } from '../../../shared/types';
 import ErrorIcon from '../../assets/error.svg';
+import { useTranslationContext } from '../../context/LocalContext';
 import messages from '../../messages/process-fatal-error';
-import Button from 'renderer/components/Button';
+import Button from '../Button';
 
 export function FatalError({
   errorName,
diff --git a/src/renderer/components/Button.tsx b/src/apps/renderer/components/Button.tsx
similarity index 100%
rename from src/renderer/components/Button.tsx
rename to src/apps/renderer/components/Button.tsx
diff --git a/src/renderer/components/Checkbox.tsx b/src/apps/renderer/components/Checkbox.tsx
similarity index 100%
rename from src/renderer/components/Checkbox.tsx
rename to src/apps/renderer/components/Checkbox.tsx
diff --git a/src/renderer/components/FileWithOperation.tsx b/src/apps/renderer/components/FileWithOperation.tsx
similarity index 100%
rename from src/renderer/components/FileWithOperation.tsx
rename to src/apps/renderer/components/FileWithOperation.tsx
diff --git a/src/renderer/components/PasswordInput.tsx b/src/apps/renderer/components/PasswordInput.tsx
similarity index 100%
rename from src/renderer/components/PasswordInput.tsx
rename to src/apps/renderer/components/PasswordInput.tsx
diff --git a/src/renderer/components/Select.tsx b/src/apps/renderer/components/Select.tsx
similarity index 100%
rename from src/renderer/components/Select.tsx
rename to src/apps/renderer/components/Select.tsx
diff --git a/src/renderer/components/TextArea.tsx b/src/apps/renderer/components/TextArea.tsx
similarity index 100%
rename from src/renderer/components/TextArea.tsx
rename to src/apps/renderer/components/TextArea.tsx
diff --git a/src/renderer/components/TextInput.tsx b/src/apps/renderer/components/TextInput.tsx
similarity index 100%
rename from src/renderer/components/TextInput.tsx
rename to src/apps/renderer/components/TextInput.tsx
diff --git a/src/renderer/components/WindowTopBar.tsx b/src/apps/renderer/components/WindowTopBar.tsx
similarity index 100%
rename from src/renderer/components/WindowTopBar.tsx
rename to src/apps/renderer/components/WindowTopBar.tsx
diff --git a/src/renderer/context/DeviceContext.tsx b/src/apps/renderer/context/DeviceContext.tsx
similarity index 100%
rename from src/renderer/context/DeviceContext.tsx
rename to src/apps/renderer/context/DeviceContext.tsx
diff --git a/src/renderer/context/LocalContext.tsx b/src/apps/renderer/context/LocalContext.tsx
similarity index 100%
rename from src/renderer/context/LocalContext.tsx
rename to src/apps/renderer/context/LocalContext.tsx
diff --git a/src/apps/renderer/hooks/BackupFatalErrors.tsx b/src/apps/renderer/hooks/BackupFatalErrors.tsx
new file mode 100644
index 000000000..cc49fe75f
--- /dev/null
+++ b/src/apps/renderer/hooks/BackupFatalErrors.tsx
@@ -0,0 +1,13 @@
+export default function useBackupFatalErrors() {
+  // const [errors, setErrors] = useState<BackupFatalError[]>([]);
+
+  function thereAreErrors() {
+    return [].length > 0;
+  }
+
+  function deleteError(_folderId: number) {
+    // no-op
+  }
+
+  return { backupFatalErrors: [], thereAreErrors, deleteError };
+}
diff --git a/src/renderer/hooks/ClientPlatform.tsx b/src/apps/renderer/hooks/ClientPlatform.tsx
similarity index 100%
rename from src/renderer/hooks/ClientPlatform.tsx
rename to src/apps/renderer/hooks/ClientPlatform.tsx
diff --git a/src/renderer/hooks/FatalErrorActions.ts b/src/apps/renderer/hooks/FatalErrorActions.ts
similarity index 84%
rename from src/renderer/hooks/FatalErrorActions.ts
rename to src/apps/renderer/hooks/FatalErrorActions.ts
index 58bfdacf5..405c61472 100644
--- a/src/renderer/hooks/FatalErrorActions.ts
+++ b/src/apps/renderer/hooks/FatalErrorActions.ts
@@ -1,13 +1,11 @@
 import { useEffect, useState } from 'react';
 
 import { Process } from '../../shared/types/Process';
-import { backupsErrorActions } from '../actions/backsups-error-actions';
 import { syncErrorActions } from '../actions/sync-error-actions';
 import { FatalErrorActionMap } from '../actions/types';
 
 const actionsMap: Record<Process, FatalErrorActionMap> = {
   SYNC: syncErrorActions,
-  BACKUPS: backupsErrorActions,
 };
 
 export default function useFatalErrorActions(
diff --git a/src/renderer/hooks/GeneralIssues.tsx b/src/apps/renderer/hooks/GeneralIssues.tsx
similarity index 88%
rename from src/renderer/hooks/GeneralIssues.tsx
rename to src/apps/renderer/hooks/GeneralIssues.tsx
index 84b1e1cff..986445c6b 100644
--- a/src/renderer/hooks/GeneralIssues.tsx
+++ b/src/apps/renderer/hooks/GeneralIssues.tsx
@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react';
-
-import { GeneralIssue } from '../../workers/types';
+import { GeneralIssue } from '../../shared/types';
 
 export default function useGeneralIssues() {
   const [generalIssues, setGeneralIssues] = useState<GeneralIssue[]>([]);
diff --git a/src/renderer/hooks/ProcessIssues.tsx b/src/apps/renderer/hooks/ProcessIssues.tsx
similarity index 88%
rename from src/renderer/hooks/ProcessIssues.tsx
rename to src/apps/renderer/hooks/ProcessIssues.tsx
index 70e4f03c4..581fcacb5 100644
--- a/src/renderer/hooks/ProcessIssues.tsx
+++ b/src/apps/renderer/hooks/ProcessIssues.tsx
@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react';
-
-import { ProcessIssue } from '../../workers/types';
+import { ProcessIssue } from '../../shared/types';
 
 export default function useProcessIssues() {
   const [processIssues, setProcessIssues] = useState<ProcessIssue[]>([]);
diff --git a/src/apps/renderer/hooks/VirtualDriveStatus.tsx b/src/apps/renderer/hooks/VirtualDriveStatus.tsx
new file mode 100644
index 000000000..6acd47a5d
--- /dev/null
+++ b/src/apps/renderer/hooks/VirtualDriveStatus.tsx
@@ -0,0 +1,23 @@
+import { useEffect, useState } from 'react';
+import { reportError } from '../utils/errors';
+import { VirtualDriveStatus } from '../../shared/types/VirtualDriveStatus';
+
+export default function useVirtualDriveStatus() {
+  const [virtualDriveStatus, setVirtualDriveStatus] =
+    useState<VirtualDriveStatus>();
+
+  useEffect(() => {
+    window.electron
+      .getVirtualDriveRoot()
+      .then(() => setVirtualDriveStatus(VirtualDriveStatus.READY))
+      .catch((err) => {
+        reportError(err);
+      });
+  }, []);
+
+  function virtualDriveCanBeOpened() {
+    return virtualDriveStatus !== VirtualDriveStatus.NOT_FOUND;
+  }
+
+  return { virtualDriveStatus, virtualDriveCanBeOpened };
+}
diff --git a/src/renderer/hooks/useBackups.tsx b/src/apps/renderer/hooks/useBackups.tsx
similarity index 100%
rename from src/renderer/hooks/useBackups.tsx
rename to src/apps/renderer/hooks/useBackups.tsx
diff --git a/src/renderer/hooks/useConfig.tsx b/src/apps/renderer/hooks/useConfig.tsx
similarity index 100%
rename from src/renderer/hooks/useConfig.tsx
rename to src/apps/renderer/hooks/useConfig.tsx
diff --git a/src/renderer/hooks/useLanguage.tsx b/src/apps/renderer/hooks/useLanguage.tsx
similarity index 100%
rename from src/renderer/hooks/useLanguage.tsx
rename to src/apps/renderer/hooks/useLanguage.tsx
diff --git a/src/apps/renderer/hooks/useOnSyncRunning.tsx b/src/apps/renderer/hooks/useOnSyncRunning.tsx
new file mode 100644
index 000000000..288d1743b
--- /dev/null
+++ b/src/apps/renderer/hooks/useOnSyncRunning.tsx
@@ -0,0 +1,14 @@
+import { SyncStatus } from '../../../context/desktop/sync/domain/SyncStatus';
+import useSyncStatus from './useSyncStatus';
+
+export function useOnSyncRunning(fn: () => void) {
+  function isRunning(status: SyncStatus) {
+    return status === 'RUNNING';
+  }
+
+  useSyncStatus((status) => {
+    if (!isRunning(status)) return;
+
+    fn();
+  });
+}
diff --git a/src/apps/renderer/hooks/useOnSyncStopped.tsx b/src/apps/renderer/hooks/useOnSyncStopped.tsx
new file mode 100644
index 000000000..78da543c8
--- /dev/null
+++ b/src/apps/renderer/hooks/useOnSyncStopped.tsx
@@ -0,0 +1,12 @@
+import { useEffect } from 'react';
+import useSyncStopped from './useSyncStopped';
+
+export function useOnSyncStopped(onStop: () => void) {
+  const [syncStopped] = useSyncStopped();
+
+  useEffect(() => {
+    if (syncStopped) {
+      onStop();
+    }
+  }, [syncStopped]);
+}
diff --git a/src/apps/renderer/hooks/useSyncInfoSubscriber.tsx b/src/apps/renderer/hooks/useSyncInfoSubscriber.tsx
new file mode 100644
index 000000000..d8b2049ee
--- /dev/null
+++ b/src/apps/renderer/hooks/useSyncInfoSubscriber.tsx
@@ -0,0 +1,66 @@
+import { useEffect, useState } from 'react';
+import { ProcessInfoUpdatePayload } from '../../shared/types';
+
+export function useSyncInfoSubscriber() {
+  const [processInfoUpdatedPayload, setProcessInfoUpdatedPayload] = useState<
+    ProcessInfoUpdatePayload[]
+  >([]);
+
+  function onSyncItem(item: ProcessInfoUpdatePayload) {
+    const MAX_ITEMS = 50;
+
+    setProcessInfoUpdatedPayload((currentItems) => {
+      const itemsWithoutGivenItem = currentItems.filter(
+        (i) => i.name !== item.name
+      );
+
+      const itemIsAnError = [
+        'UPLOAD_ERROR',
+        'DOWNLOAD_ERROR',
+        'RENAME_ERROR',
+        'DELETE_ERROR',
+        'METADATA_READ_ERROR',
+      ].includes(item.action);
+
+      const newItems = itemIsAnError
+        ? itemsWithoutGivenItem
+        : [item, ...itemsWithoutGivenItem].slice(0, MAX_ITEMS);
+
+      return newItems;
+    });
+  }
+
+  function clearItems() {
+    setProcessInfoUpdatedPayload((current) =>
+      current.filter((item) =>
+        ['UPLOADING', 'DOWNLOADING', 'RENAMING', 'DELETING'].includes(
+          item.action
+        )
+      )
+    );
+  }
+
+  function removeOnProgressItems() {
+    setProcessInfoUpdatedPayload((currentItems) => {
+      return currentItems.filter(
+        (item) =>
+          item.action !== 'UPLOADING' &&
+          item.action !== 'DOWNLOADING' &&
+          item.action !== 'RENAMING' &&
+          item.action !== 'DELETING'
+      );
+    });
+  }
+
+  useEffect(() => {
+    const removeListener = window.electron.onSyncInfoUpdate(onSyncItem);
+
+    return removeListener;
+  }, []);
+
+  return {
+    processInfoUpdatedPayload,
+    clearItems,
+    removeOnProgressItems,
+  };
+}
diff --git a/src/renderer/hooks/SyncStatus.tsx b/src/apps/renderer/hooks/useSyncStatus.tsx
similarity index 52%
rename from src/renderer/hooks/SyncStatus.tsx
rename to src/apps/renderer/hooks/useSyncStatus.tsx
index aeb13bf9f..1775900ee 100644
--- a/src/renderer/hooks/SyncStatus.tsx
+++ b/src/apps/renderer/hooks/useSyncStatus.tsx
@@ -1,41 +1,48 @@
-import { useEffect } from 'react';
-
-import { SyncStatus } from '../../main/background-processes/sync';
+import { useEffect, useState } from 'react';
+import { SyncStatus } from '../../../context/desktop/sync/domain/SyncStatus';
 
 export default function useSyncStatus(
-  onSyncStatusChanged: (value: SyncStatus) => void
+  onChange?: (curentState: SyncStatus) => void
 ) {
+  const [syncStatus, setSyncStatus] = useState<SyncStatus>('RUNNING');
+
   useEffect(() => {
     window.electron.getRemoteSyncStatus().then((status) => {
       if (status === 'SYNCING') {
-        onSyncStatusChanged('RUNNING');
+        setSyncStatus('RUNNING');
       }
 
       if (status === 'IDLE' || status === 'SYNCED') {
-        onSyncStatusChanged('STANDBY');
+        setSyncStatus('STANDBY');
       }
 
       if (status === 'SYNC_FAILED') {
-        onSyncStatusChanged('FAILED');
+        setSyncStatus('FAILED');
       }
     });
 
     const removeListener = window.electron.onRemoteSyncStatusChange(
       (newStatus) => {
         if (newStatus === 'SYNCING') {
-          onSyncStatusChanged('RUNNING');
+          setSyncStatus('RUNNING');
         }
 
         if (newStatus === 'IDLE' || newStatus === 'SYNCED') {
-          onSyncStatusChanged('STANDBY');
+          setSyncStatus('STANDBY');
         }
 
         if (newStatus === 'SYNC_FAILED') {
-          onSyncStatusChanged('FAILED');
+          setSyncStatus('FAILED');
         }
       }
     );
 
     return removeListener;
   }, []);
+
+  useEffect(() => {
+    if (onChange) onChange(syncStatus);
+  }, [syncStatus]);
+
+  return { syncStatus };
 }
diff --git a/src/renderer/hooks/SyncStopped.tsx b/src/apps/renderer/hooks/useSyncStopped.tsx
similarity index 82%
rename from src/renderer/hooks/SyncStopped.tsx
rename to src/apps/renderer/hooks/useSyncStopped.tsx
index 98ad00c58..09acb92f4 100644
--- a/src/renderer/hooks/SyncStopped.tsx
+++ b/src/apps/renderer/hooks/useSyncStopped.tsx
@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react';
-
-import { SyncStoppedPayload } from '../../main/background-processes/sync';
+import { SyncStoppedPayload } from '../../../context/desktop/sync/domain/SyncStoppedPayload';
 
 export default function useSyncStopped(): [
   SyncStoppedPayload | null,
diff --git a/src/renderer/hooks/useUsage.tsx b/src/apps/renderer/hooks/useUsage.tsx
similarity index 94%
rename from src/renderer/hooks/useUsage.tsx
rename to src/apps/renderer/hooks/useUsage.tsx
index 233c0a6bb..2ab83a2d8 100644
--- a/src/renderer/hooks/useUsage.tsx
+++ b/src/apps/renderer/hooks/useUsage.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Usage } from '../../main/usage/usage';
+import { Usage } from '../../main/usage/Usage';
 
 export default function useUsage() {
   const [usage, setUsage] = useState<Usage>();
diff --git a/src/renderer/index.ejs b/src/apps/renderer/index.ejs
similarity index 100%
rename from src/renderer/index.ejs
rename to src/apps/renderer/index.ejs
diff --git a/src/renderer/index.tsx b/src/apps/renderer/index.tsx
similarity index 100%
rename from src/renderer/index.tsx
rename to src/apps/renderer/index.tsx
diff --git a/src/renderer/localize/i18n.service.ts b/src/apps/renderer/localize/i18n.service.ts
similarity index 73%
rename from src/renderer/localize/i18n.service.ts
rename to src/apps/renderer/localize/i18n.service.ts
index 34edc95ee..549c1c98a 100644
--- a/src/renderer/localize/i18n.service.ts
+++ b/src/apps/renderer/localize/i18n.service.ts
@@ -1,14 +1,13 @@
 import dayjs from 'dayjs';
 import i18next from 'i18next';
 import { initReactI18next } from 'react-i18next';
-import { getConfigKey, queryApp } from 'renderer/utils/query';
-
 import DayJsLocales from '../../shared/Locale/DayJsLocales';
 import {
   DEFAULT_LANGUAGE,
-  isLanguage,
   Language,
+  isLanguage,
 } from '../../shared/Locale/Language';
+import { getConfigKey } from '../utils/query';
 
 const languageDetection = (callback: (lang: Language | undefined) => void) => {
   const run = async () => {
@@ -20,13 +19,18 @@ const languageDetection = (callback: (lang: Language | undefined) => void) => {
       return;
     }
 
-    const systemLangs = await queryApp('getPreferredSystemLanguages');
-    const parsed = systemLangs.map((l) => l.split('-')[0]);
+    const systemLangs = await window.electron.getPreferredAppLanguage();
+    const parsed = systemLangs.map((l: string) => l.split('-')[0]);
+
+    const preferedLanguageAvailable =
+      (parsed.find(isLanguage) as Language) || undefined;
+
+    const language = preferedLanguageAvailable || DEFAULT_LANGUAGE;
 
-    const preferedLanguageAvailable = parsed.find(isLanguage);
+    window.electron.setConfigKey('preferedLanguage', language);
 
-    dayjs.locale(DayJsLocales[preferedLanguageAvailable || DEFAULT_LANGUAGE]);
-    callback(preferedLanguageAvailable || DEFAULT_LANGUAGE);
+    dayjs.locale(DayJsLocales[language]);
+    callback(language);
   };
 
   run();
diff --git a/src/renderer/localize/locales/en.json b/src/apps/renderer/localize/locales/en.json
similarity index 99%
rename from src/renderer/localize/locales/en.json
rename to src/apps/renderer/localize/locales/en.json
index 6cb6c9570..e53efcfd8 100644
--- a/src/renderer/localize/locales/en.json
+++ b/src/apps/renderer/localize/locales/en.json
@@ -324,7 +324,7 @@
       "no-internet-connection": "No internet connection",
       "no-permission": "Insufficient permissions",
       "file-does-not-exist": "File doesn't exist",
-      "file-too-big": "Max upload size is 10GB. Please try smaller files."
+      "file-too-big": "Max upload size is 20GB. Please try smaller files."
     },
     "error-messages": {
       "no-internet": "Looks like you are not connected to the internet, we'll try again later",
@@ -338,7 +338,7 @@
       "empty-file": "We don't support files with a size of 0 bytes because of our processes of sharding and encryption",
       "bad-response": "We got a bad response from our servers while processing this file. Please, try starting the sync process again.",
       "file-does-not-exist": "This file was present when we compared your local folder with your Internxt drive but dissapeared when we tried to access it. If you deleted this file, don't worry, this error should dissapear the next time the sync process starts.",
-      "file-too-big": "Max upload size is 10GB. Please try smaller files."
+      "file-too-big": "Max upload size is 20GB. Please try smaller files."
     },
     "report-modal": {
       "actions": {
diff --git a/src/renderer/localize/locales/es.json b/src/apps/renderer/localize/locales/es.json
similarity index 99%
rename from src/renderer/localize/locales/es.json
rename to src/apps/renderer/localize/locales/es.json
index d0bc0943c..9ef912f4d 100644
--- a/src/renderer/localize/locales/es.json
+++ b/src/apps/renderer/localize/locales/es.json
@@ -323,7 +323,7 @@
       "no-internet-connection": "No hay conexión a Internet",
       "no-permission": "Permisos insuficientes",
       "file-does-not-exist": "El archivo no existe",
-      "file-too-big": "El tamaño máximo de carga es de 10GB. Por favor, intenta con archivos más pequeños."
+      "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños."
     },
     "error-messages": {
       "no-internet": "No estás conectado a Internet, lo intentaremos más tarde",
@@ -337,7 +337,7 @@
       "empty-file": "No admitimos archivos con un tamaño de 0 bytes debido a nuestros procesos de cifrado",
       "bad-response": "Error de servidor al procesar este archivo. Por favor, intente iniciar de nuevo el proceso de sincronización",
       "file-does-not-exist": "Este archivo estaba presente cuando comparamos su carpeta local con su unidad Internxt, pero desapareció cuando intentamos acceder a él. Si has eliminado este archivo, no te preocupes, este error debería desaparecer la próxima vez que se inicie el proceso de sincronización",
-      "file-too-big": "El tamaño máximo de carga es de 10GB. Por favor, intenta con archivos más pequeños."
+      "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños."
     },
     "report-modal": {
       "actions": {
diff --git a/src/renderer/localize/locales/fr.json b/src/apps/renderer/localize/locales/fr.json
similarity index 99%
rename from src/renderer/localize/locales/fr.json
rename to src/apps/renderer/localize/locales/fr.json
index c795642aa..e0ec54e62 100644
--- a/src/renderer/localize/locales/fr.json
+++ b/src/apps/renderer/localize/locales/fr.json
@@ -318,7 +318,7 @@
       "no-internet-connection": "Pas de connexion internet",
       "no-permission": "Permissions insuffisantes",
       "file-does-not-exist": "Le fichier n'existe pas",
-      "file-too-big": "La taille maximale de téléchargement est de 10 GB. Veuillez essayer des fichiers plus petits."
+      "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits."
     },
     "error-messages": {
       "no-internet": "Il semble que vous ne soyez pas connecté à l'internet, nous réessayerons plus tard",
@@ -332,7 +332,7 @@
       "empty-file": "Nous ne prenons pas en charge les fichiers d'une taille de 0 octet en raison de nos processus de  chiffrement",
       "bad-response": "Nous avons reçu une mauvaise réponse de nos serveurs lors du traitement de ce fichier. Veuillez essayer de relancer le processus de synchronisation.",
       "file-does-not-exist": "Ce fichier était présent lorsque nous avons comparé votre dossier local avec votre disque interne, mais il a disparu lorsque nous avons essayé d'y accéder. Si vous avez supprimé ce fichier, ne vous inquiétez pas, cette erreur devrait disparaître au prochain démarrage du processus de synchronisation.",
-      "file-too-big": "La taille maximale de téléchargement est de 10 GB. Veuillez essayer des fichiers plus petits."
+      "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits."
     },
     "report-modal": {
       "actions": {
diff --git a/src/renderer/messages/backups/backups-actions-map.ts b/src/apps/renderer/messages/backups/backups-actions-map.ts
similarity index 86%
rename from src/renderer/messages/backups/backups-actions-map.ts
rename to src/apps/renderer/messages/backups/backups-actions-map.ts
index f0841532d..54c98dd93 100644
--- a/src/renderer/messages/backups/backups-actions-map.ts
+++ b/src/apps/renderer/messages/backups/backups-actions-map.ts
@@ -1,4 +1,4 @@
-import { ProcessFatalErrorName } from '../../../workers/types';
+import { ProcessFatalErrorName } from '../../../shared/types';
 
 export type FaltalErrorAction = { name: string; fn: () => void };
 
diff --git a/src/renderer/messages/backups/backups-fatal-errors.ts b/src/apps/renderer/messages/backups/backups-fatal-errors.ts
similarity index 88%
rename from src/renderer/messages/backups/backups-fatal-errors.ts
rename to src/apps/renderer/messages/backups/backups-fatal-errors.ts
index 74789118e..ba0a0e946 100644
--- a/src/renderer/messages/backups/backups-fatal-errors.ts
+++ b/src/apps/renderer/messages/backups/backups-fatal-errors.ts
@@ -1,4 +1,4 @@
-import { ProcessFatalErrorName } from '../../../workers/types';
+import { ProcessFatalErrorName } from '../../../shared/types';
 import processFatalErrors from '../process-fatal-error';
 
 const messages: Partial<Record<ProcessFatalErrorName, string>> = {
diff --git a/src/renderer/messages/general-error.ts b/src/apps/renderer/messages/general-error.ts
similarity index 88%
rename from src/renderer/messages/general-error.ts
rename to src/apps/renderer/messages/general-error.ts
index 946cba500..d0e98fec8 100644
--- a/src/renderer/messages/general-error.ts
+++ b/src/apps/renderer/messages/general-error.ts
@@ -1,4 +1,4 @@
-import { GeneralErrorName } from '../../workers/types';
+import { GeneralErrorName } from '../../shared/types';
 
 type GeneralErrorMessages = Record<GeneralErrorName, string>;
 
diff --git a/src/renderer/messages/process-error.ts b/src/apps/renderer/messages/process-error.ts
similarity index 95%
rename from src/renderer/messages/process-error.ts
rename to src/apps/renderer/messages/process-error.ts
index d3c0b267e..90b76900b 100644
--- a/src/renderer/messages/process-error.ts
+++ b/src/apps/renderer/messages/process-error.ts
@@ -1,4 +1,4 @@
-import { ProcessErrorName } from '../../workers/types';
+import { ProcessErrorName } from '../../shared/types';
 
 type ProcessErrorMessages = Record<ProcessErrorName, string>;
 
diff --git a/src/renderer/messages/process-fatal-error.ts b/src/apps/renderer/messages/process-fatal-error.ts
similarity index 92%
rename from src/renderer/messages/process-fatal-error.ts
rename to src/apps/renderer/messages/process-fatal-error.ts
index fe23c3349..06b493ec8 100644
--- a/src/renderer/messages/process-fatal-error.ts
+++ b/src/apps/renderer/messages/process-fatal-error.ts
@@ -1,4 +1,4 @@
-import { ProcessFatalErrorName } from '../../workers/types';
+import { ProcessFatalErrorName } from '../../shared/types';
 
 const messages: Record<ProcessFatalErrorName, string> = {
   NO_INTERNET: 'issues.error-messages.no-internet',
diff --git a/src/renderer/pages/Feedback/index.tsx b/src/apps/renderer/pages/Feedback/index.tsx
similarity index 95%
rename from src/renderer/pages/Feedback/index.tsx
rename to src/apps/renderer/pages/Feedback/index.tsx
index 0e918cf8d..45070821f 100644
--- a/src/renderer/pages/Feedback/index.tsx
+++ b/src/apps/renderer/pages/Feedback/index.tsx
@@ -1,10 +1,10 @@
 import { useState } from 'react';
 import Button from '../../components/Button';
 import { useTranslationContext } from '../../context/LocalContext';
-import { reportError } from 'renderer/utils/errors';
 import { ChatsCircle } from 'phosphor-react';
-import WindowTopBar from 'renderer/components/WindowTopBar';
-import TextArea from 'renderer/components/TextArea';
+import WindowTopBar from '../../components/WindowTopBar';
+import TextArea from '../../components/TextArea';
+import { reportError } from '../../utils/errors';
 
 const CHARACTERS_LIMIT = 1000;
 export default function Feedback() {
diff --git a/src/renderer/pages/Login/ErrorBanner.tsx b/src/apps/renderer/pages/Login/ErrorBanner.tsx
similarity index 100%
rename from src/renderer/pages/Login/ErrorBanner.tsx
rename to src/apps/renderer/pages/Login/ErrorBanner.tsx
diff --git a/src/renderer/pages/Login/TwoFA.tsx b/src/apps/renderer/pages/Login/TwoFA.tsx
similarity index 100%
rename from src/renderer/pages/Login/TwoFA.tsx
rename to src/apps/renderer/pages/Login/TwoFA.tsx
diff --git a/src/renderer/pages/Login/WarningBanner.tsx b/src/apps/renderer/pages/Login/WarningBanner.tsx
similarity index 93%
rename from src/renderer/pages/Login/WarningBanner.tsx
rename to src/apps/renderer/pages/Login/WarningBanner.tsx
index c6115319f..234d04b97 100644
--- a/src/renderer/pages/Login/WarningBanner.tsx
+++ b/src/apps/renderer/pages/Login/WarningBanner.tsx
@@ -1,10 +1,8 @@
 export default function WarningBanner({
   children,
-  icon,
   className,
 }: {
   children: string;
-  icon: string;
   className: string;
 }) {
   return (
diff --git a/src/renderer/pages/Login/index.tsx b/src/apps/renderer/pages/Login/index.tsx
similarity index 95%
rename from src/renderer/pages/Login/index.tsx
rename to src/apps/renderer/pages/Login/index.tsx
index 32b901094..f2eef050e 100644
--- a/src/renderer/pages/Login/index.tsx
+++ b/src/apps/renderer/pages/Login/index.tsx
@@ -1,15 +1,15 @@
 import { useEffect, useRef, useState } from 'react';
-import packageJson from '../../../../package.json';
+import packageJson from '../../../../../package.json';
 import { useTranslationContext } from '../../context/LocalContext';
 import ErrorBanner from './ErrorBanner';
 import { accessRequest, hashPassword, loginRequest } from './service';
 import TwoFA from './TwoFA';
 import { LoginState } from './types';
 import WarningBanner from './WarningBanner';
-import TextInput from 'renderer/components/TextInput';
-import PasswordInput from 'renderer/components/PasswordInput';
-import WindowTopBar from 'renderer/components/WindowTopBar';
-import Button from 'renderer/components/Button';
+import Button from '../../components/Button';
+import PasswordInput from '../../components/PasswordInput';
+import TextInput from '../../components/TextInput';
+import WindowTopBar from '../../components/WindowTopBar';
 
 const TOWFA_ERROR_MESSAGE = 'Wrong 2-factor auth code';
 
@@ -241,7 +241,6 @@ export default function Login() {
       <div className="flex flex-1 flex-col space-y-2 p-6 pt-0">
         {warning && state === 'warning' && (
           <WarningBanner
-            icon=""
             className={`${state === 'warning' ? 'opacity-100' : 'opacity-0'}`}
           >
             {warning}
diff --git a/src/renderer/pages/Login/service.ts b/src/apps/renderer/pages/Login/service.ts
similarity index 97%
rename from src/renderer/pages/Login/service.ts
rename to src/apps/renderer/pages/Login/service.ts
index 4be5d9774..7ea74ab21 100644
--- a/src/renderer/pages/Login/service.ts
+++ b/src/apps/renderer/pages/Login/service.ts
@@ -1,6 +1,6 @@
 import CryptoJS from 'crypto-js';
 
-import packageConfig from '../../../../package.json';
+import packageConfig from '../../../../../package.json';
 import { User } from '../../../main/types';
 
 export function hashPassword(password: string, sKey: string): string {
diff --git a/src/renderer/pages/Login/types.ts b/src/apps/renderer/pages/Login/types.ts
similarity index 100%
rename from src/renderer/pages/Login/types.ts
rename to src/apps/renderer/pages/Login/types.ts
diff --git a/src/renderer/pages/Migration/config.tsx b/src/apps/renderer/pages/Migration/config.tsx
similarity index 99%
rename from src/renderer/pages/Migration/config.tsx
rename to src/apps/renderer/pages/Migration/config.tsx
index 85b346856..f31a68a33 100644
--- a/src/renderer/pages/Migration/config.tsx
+++ b/src/apps/renderer/pages/Migration/config.tsx
@@ -1,6 +1,4 @@
-import { useTranslationContext } from 'renderer/context/LocalContext';
 import { MigrationSlide, UploadSuccessAnimation } from './helpers';
-import Button from 'renderer/components/Button';
 import {
   SideImageAnimation,
   SideTextAnimation,
@@ -18,6 +16,8 @@ import { DeleteOldDriveFolderSlide } from './slides/DeleteOldDriveFolderSlide';
 import { AvailableOnlineSlide } from '../Onboarding/slides/AvailableOnlineSlide';
 import { ContextMenuSlide } from '../Onboarding/slides/ContextMenuSlide';
 import { AvailableOfflineSlide } from '../Onboarding/slides/AvailableOfflineSlide';
+import { useTranslationContext } from '../../context/LocalContext';
+import Button from '../../components/Button';
 
 export const SLIDES: MigrationSlide[] = [
   {
diff --git a/src/renderer/pages/Migration/helpers.tsx b/src/apps/renderer/pages/Migration/helpers.tsx
similarity index 99%
rename from src/renderer/pages/Migration/helpers.tsx
rename to src/apps/renderer/pages/Migration/helpers.tsx
index 4cb8c2663..d4b73270f 100644
--- a/src/renderer/pages/Migration/helpers.tsx
+++ b/src/apps/renderer/pages/Migration/helpers.tsx
@@ -1,4 +1,4 @@
-import { LocalContextProps } from 'renderer/context/LocalContext';
+import { LocalContextProps } from '../../context/LocalContext';
 
 export type MigrationSlideProps = {
   onGoNextSlide: () => void;
diff --git a/src/renderer/pages/Migration/index.tsx b/src/apps/renderer/pages/Migration/index.tsx
similarity index 96%
rename from src/renderer/pages/Migration/index.tsx
rename to src/apps/renderer/pages/Migration/index.tsx
index 2a49a0a41..5afb9e4e7 100644
--- a/src/renderer/pages/Migration/index.tsx
+++ b/src/apps/renderer/pages/Migration/index.tsx
@@ -1,10 +1,9 @@
 import { useMemo, useState } from 'react';
 import { SLIDES } from './config';
-
-import { useTranslationContext } from 'renderer/context/LocalContext';
 import { MigrationSlideProps } from './helpers';
-import { reportError } from 'renderer/utils/errors';
-import useClientPlatform from 'renderer/hooks/ClientPlatform';
+import { useTranslationContext } from '../../context/LocalContext';
+import useClientPlatform from '../../hooks/ClientPlatform';
+import { reportError } from '../../utils/errors';
 
 const totalSlides = SLIDES.length - 3;
 
diff --git a/src/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx b/src/apps/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx
similarity index 96%
rename from src/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx
rename to src/apps/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx
index 088420c0c..06ec32d82 100644
--- a/src/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx
+++ b/src/apps/renderer/pages/Migration/slides/DeleteOldDriveFolderSlide.tsx
@@ -3,7 +3,7 @@ import { MigrationSlideProps } from '../helpers';
 import {
   SideTextAnimation,
   getPlatformPhraseTranslationKey,
-} from 'renderer/pages/Onboarding/helpers';
+} from '../../Onboarding/helpers';
 
 export type DeleteOldDriveFolderSlideProps = MigrationSlideProps;
 
diff --git a/src/renderer/pages/Migration/slides/MigrationFailedSlide.tsx b/src/apps/renderer/pages/Migration/slides/MigrationFailedSlide.tsx
similarity index 92%
rename from src/renderer/pages/Migration/slides/MigrationFailedSlide.tsx
rename to src/apps/renderer/pages/Migration/slides/MigrationFailedSlide.tsx
index 61776a681..993a6b606 100644
--- a/src/renderer/pages/Migration/slides/MigrationFailedSlide.tsx
+++ b/src/apps/renderer/pages/Migration/slides/MigrationFailedSlide.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { MigrationSlideProps } from '../helpers';
-import { SideTextAnimation } from 'renderer/pages/Onboarding/helpers';
 import { XCircle } from 'phosphor-react';
-import Button from 'renderer/components/Button';
+import { SideTextAnimation } from '../../Onboarding/helpers';
+import Button from '../../../components/Button';
 
 export type MigrationFailedSlideProps = MigrationSlideProps;
 
diff --git a/src/renderer/pages/Onboarding/config.tsx b/src/apps/renderer/pages/Onboarding/config.tsx
similarity index 97%
rename from src/renderer/pages/Onboarding/config.tsx
rename to src/apps/renderer/pages/Onboarding/config.tsx
index 747451d85..b5e46a356 100644
--- a/src/renderer/pages/Onboarding/config.tsx
+++ b/src/apps/renderer/pages/Onboarding/config.tsx
@@ -2,13 +2,12 @@
 import { AvailableOnlineSlide } from './slides/AvailableOnlineSlide';
 import { AvailableOfflineSlide } from './slides/AvailableOfflineSlide';
 import { ContextMenuSlide } from './slides/ContextMenuSlide';
-import { BackupsSlide } from './slides/BackupsSlide';
+// import { BackupsSlide } from './slides/BackupsSlide';
 import { WelcomeSlide } from './slides/WelcomeSlide';
 import { FilesOrganizationSlide } from './slides/FilesOrganizationSlide';
 
-import { useTranslationContext } from 'renderer/context/LocalContext';
 import {
-  BackupsSVG,
+  // BackupsSVG,
   OnboardingSlide,
   SideImageAnimation,
   SideTextAnimation,
@@ -16,10 +15,11 @@ import {
   getOfflineImageSvg,
   getOnlineImageSvg,
 } from './helpers';
-import Button from 'renderer/components/Button';
 
 import ContextMenuSvg from '../../assets/onboarding/context-menu.svg';
 import { OnboardingCompletedSlide } from './slides/OnboardingCompletedSlide';
+import Button from '../../components/Button';
+import { useTranslationContext } from '../../context/LocalContext';
 export const SLIDES: OnboardingSlide[] = [
   {
     name: 'Welcome Slide',
diff --git a/src/renderer/pages/Onboarding/helpers.tsx b/src/apps/renderer/pages/Onboarding/helpers.tsx
similarity index 99%
rename from src/renderer/pages/Onboarding/helpers.tsx
rename to src/apps/renderer/pages/Onboarding/helpers.tsx
index 3c0c95623..f5860eb98 100644
--- a/src/renderer/pages/Onboarding/helpers.tsx
+++ b/src/apps/renderer/pages/Onboarding/helpers.tsx
@@ -13,7 +13,7 @@ import AvailableOfflineImageFrench from '../../assets/onboarding/folder-with-ove
 import MacOSFinderImage from '../../assets/onboarding/finder/macos.svg';
 import LinuxFinderImage from '../../assets/onboarding/finder/linux.svg';
 import WindowsFinderImage from '../../assets/onboarding/finder/windows.svg';
-import { BackupFolder } from 'renderer/components/Backups/BackupsFoldersSelector';
+import { BackupFolder } from '../../components/Backups/BackupsFoldersSelector';
 
 export type OnboardingSlideProps = {
   onGoNextSlide: () => void;
diff --git a/src/renderer/pages/Onboarding/index.tsx b/src/apps/renderer/pages/Onboarding/index.tsx
similarity index 95%
rename from src/renderer/pages/Onboarding/index.tsx
rename to src/apps/renderer/pages/Onboarding/index.tsx
index 4f77355a4..6b2d50918 100644
--- a/src/renderer/pages/Onboarding/index.tsx
+++ b/src/apps/renderer/pages/Onboarding/index.tsx
@@ -3,9 +3,8 @@ import { SLIDES } from './config';
 import {
   BackupFolder,
   BackupsFoldersSelector,
-} from 'renderer/components/Backups/BackupsFoldersSelector';
-import { reportError } from 'renderer/utils/errors';
-import useClientPlatform from 'renderer/hooks/ClientPlatform';
+} from '../../components/Backups/BackupsFoldersSelector';
+import useClientPlatform from '../../hooks/ClientPlatform';
 
 // Slide 1 is welcome slide, last slide is summary, doesn't count
 const totalSlides = SLIDES.length - 2;
diff --git a/src/renderer/pages/Onboarding/slides/AvailableOfflineSlide.tsx b/src/apps/renderer/pages/Onboarding/slides/AvailableOfflineSlide.tsx
similarity index 91%
rename from src/renderer/pages/Onboarding/slides/AvailableOfflineSlide.tsx
rename to src/apps/renderer/pages/Onboarding/slides/AvailableOfflineSlide.tsx
index 10c189e80..edab94808 100644
--- a/src/renderer/pages/Onboarding/slides/AvailableOfflineSlide.tsx
+++ b/src/apps/renderer/pages/Onboarding/slides/AvailableOfflineSlide.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { useTranslationContext } from 'renderer/context/LocalContext';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export const AvailableOfflineSlide: React.FC = () => {
   const { translate } = useTranslationContext();
diff --git a/src/renderer/pages/Onboarding/slides/AvailableOnlineSlide.tsx b/src/apps/renderer/pages/Onboarding/slides/AvailableOnlineSlide.tsx
similarity index 91%
rename from src/renderer/pages/Onboarding/slides/AvailableOnlineSlide.tsx
rename to src/apps/renderer/pages/Onboarding/slides/AvailableOnlineSlide.tsx
index aa1eee8d7..7d884fc16 100644
--- a/src/renderer/pages/Onboarding/slides/AvailableOnlineSlide.tsx
+++ b/src/apps/renderer/pages/Onboarding/slides/AvailableOnlineSlide.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-
-import { useTranslationContext } from 'renderer/context/LocalContext';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export const AvailableOnlineSlide: React.FC = () => {
   const { translate } = useTranslationContext();
diff --git a/src/renderer/pages/Onboarding/slides/BackupsSlide.tsx b/src/apps/renderer/pages/Onboarding/slides/BackupsSlide.tsx
similarity index 92%
rename from src/renderer/pages/Onboarding/slides/BackupsSlide.tsx
rename to src/apps/renderer/pages/Onboarding/slides/BackupsSlide.tsx
index 6e0b4fc1e..c3e90ceba 100644
--- a/src/renderer/pages/Onboarding/slides/BackupsSlide.tsx
+++ b/src/apps/renderer/pages/Onboarding/slides/BackupsSlide.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { OnboardingSlideProps } from '../helpers';
-import { useTranslationContext } from 'renderer/context/LocalContext';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export type BackupsSlideProps = OnboardingSlideProps;
 
diff --git a/src/renderer/pages/Onboarding/slides/ContextMenuSlide.tsx b/src/apps/renderer/pages/Onboarding/slides/ContextMenuSlide.tsx
similarity index 93%
rename from src/renderer/pages/Onboarding/slides/ContextMenuSlide.tsx
rename to src/apps/renderer/pages/Onboarding/slides/ContextMenuSlide.tsx
index 82e3651d1..e5ca770e0 100644
--- a/src/renderer/pages/Onboarding/slides/ContextMenuSlide.tsx
+++ b/src/apps/renderer/pages/Onboarding/slides/ContextMenuSlide.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
-
-import { useTranslationContext } from 'renderer/context/LocalContext';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export const ContextMenuSlide: React.FC = () => {
   const { translate } = useTranslationContext();
diff --git a/src/renderer/pages/Onboarding/slides/FilesOrganizationSlide.tsx b/src/apps/renderer/pages/Onboarding/slides/FilesOrganizationSlide.tsx
similarity index 92%
rename from src/renderer/pages/Onboarding/slides/FilesOrganizationSlide.tsx
rename to src/apps/renderer/pages/Onboarding/slides/FilesOrganizationSlide.tsx
index 27ae0547a..5b957d94d 100644
--- a/src/renderer/pages/Onboarding/slides/FilesOrganizationSlide.tsx
+++ b/src/apps/renderer/pages/Onboarding/slides/FilesOrganizationSlide.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { useTranslationContext } from 'renderer/context/LocalContext';
 import { OnboardingSlideProps, getPlatformName } from '../helpers';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export type FilesOrganizationSlideProps = OnboardingSlideProps;
 
diff --git a/src/renderer/pages/Onboarding/slides/OnboardingCompletedSlide.tsx b/src/apps/renderer/pages/Onboarding/slides/OnboardingCompletedSlide.tsx
similarity index 97%
rename from src/renderer/pages/Onboarding/slides/OnboardingCompletedSlide.tsx
rename to src/apps/renderer/pages/Onboarding/slides/OnboardingCompletedSlide.tsx
index 6a990c3d1..c4cf2e0fb 100644
--- a/src/renderer/pages/Onboarding/slides/OnboardingCompletedSlide.tsx
+++ b/src/apps/renderer/pages/Onboarding/slides/OnboardingCompletedSlide.tsx
@@ -1,10 +1,10 @@
 import { CheckCircle } from 'phosphor-react';
 import React from 'react';
-import { useTranslationContext } from 'renderer/context/LocalContext';
 import {
   OnboardingSlideProps,
   getPlatformPhraseTranslationKey,
 } from '../helpers';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export type OnboardingCompletedSlideProps = OnboardingSlideProps;
 
diff --git a/src/renderer/pages/Onboarding/slides/WelcomeSlide.tsx b/src/apps/renderer/pages/Onboarding/slides/WelcomeSlide.tsx
similarity index 91%
rename from src/renderer/pages/Onboarding/slides/WelcomeSlide.tsx
rename to src/apps/renderer/pages/Onboarding/slides/WelcomeSlide.tsx
index 949c9818e..25bfbacc9 100644
--- a/src/renderer/pages/Onboarding/slides/WelcomeSlide.tsx
+++ b/src/apps/renderer/pages/Onboarding/slides/WelcomeSlide.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
-import { useTranslationContext } from 'renderer/context/LocalContext';
 import { OnboardingSlideProps } from '../helpers';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export type WelcomeSlideProps = OnboardingSlideProps;
 
diff --git a/src/renderer/pages/ProcessIssues/List.tsx b/src/apps/renderer/pages/ProcessIssues/List.tsx
similarity index 79%
rename from src/renderer/pages/ProcessIssues/List.tsx
rename to src/apps/renderer/pages/ProcessIssues/List.tsx
index 93e42a7be..a6887aade 100644
--- a/src/renderer/pages/ProcessIssues/List.tsx
+++ b/src/apps/renderer/pages/ProcessIssues/List.tsx
@@ -1,49 +1,31 @@
 import { CaretDown } from '@phosphor-icons/react';
 import { AnimatePresence, motion } from 'framer-motion';
 import { useState } from 'react';
-import { useTranslationContext } from 'renderer/context/LocalContext';
-
-import { BackupFatalError } from '../../../main/background-processes/types/BackupFatalError';
-import {
-  GeneralErrorName,
-  GeneralIssue,
-  ProcessErrorName,
-  ProcessIssue,
-} from '../../../workers/types';
-import { Action } from '../../actions/types';
 import FileIcon from '../../assets/file.svg';
 import Spinner from '../../assets/spinner.svg';
 import WarnIcon from '../../assets/warn.svg';
-import useFatalErrorActions from '../../hooks/FatalErrorActions';
 import { generalErrors } from '../../messages/general-error';
 import { shortMessages } from '../../messages/process-error';
 import { getBaseName } from '../../utils/path';
-import Button from 'renderer/components/Button';
-import { FatalError } from '../../components/Backups/FatalError';
+import {
+  GeneralIssue,
+  ProcessIssue,
+  ProcessErrorName,
+  GeneralErrorName,
+} from '../../../shared/types';
+import { useTranslationContext } from '../../context/LocalContext';
 
 export default function ProcessIssuesList({
   selectedTab,
   processIssues,
-  backupFatalErrors,
-  showBackupFatalErrors,
   onClickOnErrorInfo,
   generalIssues,
 }: {
   generalIssues: GeneralIssue[];
   processIssues: ProcessIssue[];
-  backupFatalErrors: BackupFatalError[];
-  showBackupFatalErrors: boolean;
   selectedTab: 'SYNC' | 'BACKUPS' | 'GENERAL';
-  onClickOnErrorInfo: (
-    errorClicked: Pick<ProcessIssue, 'errorName' | 'errorDetails'>
-  ) => void;
+  onClickOnErrorInfo: (errorClicked: Pick<ProcessIssue, 'errorName'>) => void;
 }) {
-  const { translate } = useTranslationContext();
-  const [isLoading, setIsLoading] = useState(false);
-  const fatalErrorActionMap = useFatalErrorActions(
-    showBackupFatalErrors ? 'BACKUPS' : 'SYNC'
-  );
-
   const [selectedErrorName, setSelectedErrorName] = useState<
     ProcessErrorName | GeneralErrorName | null
   >(null);
@@ -53,8 +35,6 @@ export default function ProcessIssuesList({
   function onInfoClick(errorName: ProcessErrorName) {
     onClickOnErrorInfo({
       errorName,
-      errorDetails: processIssues.find((i) => i.errorName === errorName)!
-        .errorDetails,
     });
   }
 
@@ -95,21 +75,12 @@ export default function ProcessIssuesList({
     ));
   };
 
-  const actionWrapper =
-    (action: Action) => async (error: BackupFatalError | undefined) => {
-      setIsLoading(true);
-      await action.func(error);
-      setIsLoading(false);
-    };
-
   const issuesIsEmpty = () => {
     switch (selectedTab) {
       case 'GENERAL':
         return generalIssues.length === 0;
       case 'SYNC':
         return processIssues.length === 0;
-      case 'BACKUPS':
-        return backupFatalErrors.length === 0;
       default:
         return true;
     }
@@ -117,23 +88,10 @@ export default function ProcessIssuesList({
 
   return (
     <ul className="relative m-5 mt-2 flex flex-1 flex-col divide-y divide-gray-5 overflow-y-auto rounded-lg border border-gray-20 bg-surface shadow-sm">
-      {showBackupFatalErrors &&
-        backupFatalErrors.map((error) => (
-          <FatalError
-            key={error.folderId}
-            errorName={error.errorName}
-            path={error.path}
-            showIcon={true}
-            actionName={translate(fatalErrorActionMap[error.errorName].name)}
-            onActionClick={() =>
-              actionWrapper(fatalErrorActionMap[error.errorName])(error)
-            }
-          />
-        ))}
       {renderItems()}
 
       {issuesIsEmpty() ? <Empty /> : null}
-      {isLoading && (
+      {false && (
         <div className="absolute flex h-full w-full items-center justify-center bg-surface/75">
           <Spinner className="h-5 w-5 animate-spin text-gray-100" />
         </div>
@@ -225,7 +183,6 @@ function Item({
   issues,
   isSelected,
   onClick,
-  onInfoClick,
 }: {
   errorName: ProcessErrorName;
   issues: ProcessIssue[];
@@ -257,9 +214,9 @@ function Item({
         </div>
 
         <div className="flex items-center space-x-2">
-          <Button variant="secondary" size="sm" onClick={onInfoClick}>
+          {/* <Button variant="secondary" size="sm" onClick={onInfoClick}>
             Report
-          </Button>
+          </Button> */}
 
           <CaretDown
             className={`transform transition-all duration-200 ${
diff --git a/src/renderer/pages/ProcessIssues/ReportModal.tsx b/src/apps/renderer/pages/ProcessIssues/ReportModal.tsx
similarity index 89%
rename from src/renderer/pages/ProcessIssues/ReportModal.tsx
rename to src/apps/renderer/pages/ProcessIssues/ReportModal.tsx
index e4829c459..ab421c785 100644
--- a/src/renderer/pages/ProcessIssues/ReportModal.tsx
+++ b/src/apps/renderer/pages/ProcessIssues/ReportModal.tsx
@@ -1,12 +1,11 @@
 import { Dialog, Transition } from '@headlessui/react';
 import { Fragment, useState } from 'react';
-import { useTranslationContext } from 'renderer/context/LocalContext';
-
-import { ProcessIssue } from '../../../workers/types';
-import { longMessages, shortMessages } from '../../messages/process-error';
-import Button from 'renderer/components/Button';
-import TextArea from 'renderer/components/TextArea';
-import Checkbox from 'renderer/components/Checkbox';
+import { ProcessIssue, ErrorDetails } from '../../../shared/types';
+import Button from '../../components/Button';
+import Checkbox from '../../components/Checkbox';
+import TextArea from '../../components/TextArea';
+import { useTranslationContext } from '../../context/LocalContext';
+import { shortMessages, longMessages } from '../../messages/general-error';
 
 const posibleErrorStates = ['ERROR', 'TOO_MANY_REPORTS'] as const;
 type ErrorReportRequestState = (typeof posibleErrorStates)[number];
@@ -26,7 +25,7 @@ export function ReportModal({
   data,
   onClose,
 }: {
-  data: Pick<ProcessIssue, 'errorName' | 'errorDetails'> | null;
+  data: Pick<ProcessIssue, 'errorName'> | null;
   onClose: () => void;
 }) {
   const { translate } = useTranslationContext();
@@ -38,12 +37,12 @@ export function ReportModal({
   const [includeLogs, setIncludeLogs] = useState(true);
   const [userComment, setUserComment] = useState('');
 
-  const dialogTitle = data
-    ? translate(shortMessages[data.errorName])
-    : undefined;
-  const errorDescription = data
-    ? translate(longMessages[data.errorName])
-    : undefined;
+
+  //@ts-ignore
+  const dialogTitle = data ? translate(shortMessages[data.errorName]) : undefined;
+
+  //@ts-ignore
+  const errorDescription = data ? translate(longMessages[data.errorName]) : undefined;
 
   const handleOpenURL = async (URL: string) => {
     try {
@@ -68,8 +67,9 @@ export function ReportModal({
 
   async function handleSubmit() {
     setRequestState('SENDING');
+    // Send reports throw the issues windows was disabled
     const result = await window.electron.sendReport({
-      errorDetails: data!.errorDetails,
+      errorDetails: {} as ErrorDetails,
       userComment,
       includeLogs,
     });
diff --git a/src/renderer/pages/ProcessIssues/index.tsx b/src/apps/renderer/pages/ProcessIssues/index.tsx
similarity index 80%
rename from src/renderer/pages/ProcessIssues/index.tsx
rename to src/apps/renderer/pages/ProcessIssues/index.tsx
index e6ed95f90..c145787ad 100644
--- a/src/renderer/pages/ProcessIssues/index.tsx
+++ b/src/apps/renderer/pages/ProcessIssues/index.tsx
@@ -1,7 +1,5 @@
 import { motion } from 'framer-motion';
 import { useEffect, useState } from 'react';
-
-import { ProcessIssue } from '../../../workers/types';
 import WindowTopBar from '../../components/WindowTopBar';
 import { useTranslationContext } from '../../context/LocalContext';
 import useBackupFatalErrors from '../../hooks/BackupFatalErrors';
@@ -9,8 +7,9 @@ import useGeneralIssues from '../../hooks/GeneralIssues';
 import useProcessIssues from '../../hooks/ProcessIssues';
 import ProcessIssuesList from './List';
 import { ReportModal } from './ReportModal';
+import { ProcessIssue } from '../../../shared/types';
 
-type Section = 'SYNC' | 'BACKUPS' | 'GENERAL';
+type Section = 'SYNC' | 'GENERAL';
 
 export default function ProcessIssues() {
   const { translate } = useTranslationContext();
@@ -19,7 +18,7 @@ export default function ProcessIssues() {
   const { backupFatalErrors } = useBackupFatalErrors();
   const [reportData, setReportData] = useState<Pick<
     ProcessIssue,
-    'errorName' | 'errorDetails'
+    'errorName'
   > | null>(null);
 
   const [activeSection, setActiveSection] = useState<Section>('SYNC');
@@ -36,13 +35,6 @@ export default function ProcessIssues() {
     ) {
       setActiveSection('GENERAL');
     } else if (
-      activeSection === 'SYNC' &&
-      processIssuesFilteredByActiveSection.length === 0 &&
-      (backupFatalErrors.length || processIssues.length)
-    ) {
-      setActiveSection('BACKUPS');
-    } else if (
-      activeSection === 'BACKUPS' &&
       processIssuesFilteredByActiveSection.length === 0 &&
       backupFatalErrors.length === 0 &&
       processIssues.length
@@ -61,8 +53,6 @@ export default function ProcessIssues() {
 
       <ProcessIssuesList
         selectedTab={activeSection}
-        showBackupFatalErrors={activeSection === 'BACKUPS'}
-        backupFatalErrors={backupFatalErrors}
         generalIssues={generalIssues}
         processIssues={processIssuesFilteredByActiveSection}
         onClickOnErrorInfo={setReportData}
@@ -85,14 +75,11 @@ function Tabs({
   onChangeTab: (section: Section) => void;
 }) {
   const { translate, language } = useTranslationContext();
-  const [tabsWidth, setTabsWidth] = useState<[number, number, number]>([
-    0, 0, 0,
-  ]);
+  const [tabsWidth, setTabsWidth] = useState<[number, number]>([0, 0]);
 
   useEffect(() => {
     setTabsWidth([
       (document.querySelector('#tab-SYNC') as HTMLElement).offsetWidth,
-      (document.querySelector('#tab-BACKUPS') as HTMLElement).offsetWidth,
       (document.querySelector('#tab-GENERAL') as HTMLElement).offsetWidth,
     ]);
   }, [language, active]);
@@ -102,10 +89,6 @@ function Tabs({
       value: 'SYNC',
       name: translate('issues.tabs.sync'),
     },
-    {
-      value: 'BACKUPS',
-      name: translate('issues.tabs.backups'),
-    },
     {
       value: 'GENERAL',
       name: translate('issues.tabs.general'),
@@ -130,16 +113,11 @@ function Tabs({
         <motion.div
           variants={{
             SYNC: { left: 0, right: 'unset', width: tabsWidth[0] },
-            BACKUPS: {
+            GENERAL: {
               left: tabsWidth[0],
               right: 'unset',
               width: tabsWidth[1],
             },
-            GENERAL: {
-              left: tabsWidth[0] + tabsWidth[1],
-              right: 'unset',
-              width: tabsWidth[2],
-            },
           }}
           animate={active}
           transition={{ ease: 'easeOut', duration: 0.2 }}
diff --git a/src/renderer/pages/Settings/Account/Usage.tsx b/src/apps/renderer/pages/Settings/Account/Usage.tsx
similarity index 100%
rename from src/renderer/pages/Settings/Account/Usage.tsx
rename to src/apps/renderer/pages/Settings/Account/Usage.tsx
diff --git a/src/renderer/pages/Settings/Account/UserInfo.tsx b/src/apps/renderer/pages/Settings/Account/UserInfo.tsx
similarity index 96%
rename from src/renderer/pages/Settings/Account/UserInfo.tsx
rename to src/apps/renderer/pages/Settings/Account/UserInfo.tsx
index 38cb9b122..c2d33e64c 100644
--- a/src/renderer/pages/Settings/Account/UserInfo.tsx
+++ b/src/apps/renderer/pages/Settings/Account/UserInfo.tsx
@@ -1,4 +1,4 @@
-import { User } from 'main/types';
+import { User } from '../../../../main/types';
 import Button from '../../../components/Button';
 import { useTranslationContext } from '../../../context/LocalContext';
 
diff --git a/src/renderer/pages/Settings/Account/index.tsx b/src/apps/renderer/pages/Settings/Account/index.tsx
similarity index 93%
rename from src/renderer/pages/Settings/Account/index.tsx
rename to src/apps/renderer/pages/Settings/Account/index.tsx
index 30251b055..efeff87ee 100644
--- a/src/renderer/pages/Settings/Account/index.tsx
+++ b/src/apps/renderer/pages/Settings/Account/index.tsx
@@ -1,11 +1,11 @@
 import { useEffect, useState } from 'react';
-import Button from 'renderer/components/Button';
 import { User } from '../../../../main/types';
 import Spinner from '../../../assets/spinner.svg';
 import useUsage from '../../../hooks/useUsage';
 import Usage from './Usage';
 import UserInfo from './UserInfo';
-import { useTranslationContext } from 'renderer/context/LocalContext';
+import Button from '../../../components/Button';
+import { useTranslationContext } from '../../../context/LocalContext';
 
 export default function AccountSection({ active }: { active: boolean }) {
   const { translate } = useTranslationContext();
diff --git a/src/renderer/pages/Settings/General/AppInfo.tsx b/src/apps/renderer/pages/Settings/General/AppInfo.tsx
similarity index 96%
rename from src/renderer/pages/Settings/General/AppInfo.tsx
rename to src/apps/renderer/pages/Settings/General/AppInfo.tsx
index 64793ef6a..8e9295a16 100644
--- a/src/renderer/pages/Settings/General/AppInfo.tsx
+++ b/src/apps/renderer/pages/Settings/General/AppInfo.tsx
@@ -1,4 +1,4 @@
-import packageJson from '../../../../../package.json';
+import packageJson from '../../../../../../package.json';
 import { useTranslationContext } from '../../../context/LocalContext';
 
 export default function AppInfo() {
diff --git a/src/renderer/pages/Settings/General/DeviceName.tsx b/src/apps/renderer/pages/Settings/General/DeviceName.tsx
similarity index 97%
rename from src/renderer/pages/Settings/General/DeviceName.tsx
rename to src/apps/renderer/pages/Settings/General/DeviceName.tsx
index b64db7951..9744b604d 100644
--- a/src/renderer/pages/Settings/General/DeviceName.tsx
+++ b/src/apps/renderer/pages/Settings/General/DeviceName.tsx
@@ -1,9 +1,9 @@
 import { useContext, useEffect, useState } from 'react';
-import Button from 'renderer/components/Button';
-import TextInput from 'renderer/components/TextInput';
 import Spinner from '../../../assets/spinner.svg';
 import { DeviceContext } from '../../../context/DeviceContext';
 import { useTranslationContext } from '../../../context/LocalContext';
+import Button from '../../../components/Button';
+import TextInput from '../../../components/TextInput';
 
 export default function DeviceName({
   onChangeView,
diff --git a/src/renderer/pages/Settings/General/LanguagePicker.tsx b/src/apps/renderer/pages/Settings/General/LanguagePicker.tsx
similarity index 96%
rename from src/renderer/pages/Settings/General/LanguagePicker.tsx
rename to src/apps/renderer/pages/Settings/General/LanguagePicker.tsx
index 1ba8eaf8e..31ddb2b97 100644
--- a/src/renderer/pages/Settings/General/LanguagePicker.tsx
+++ b/src/apps/renderer/pages/Settings/General/LanguagePicker.tsx
@@ -3,7 +3,7 @@ import i18next from 'i18next';
 import { useEffect, useState } from 'react';
 import DayJsLocales from '../../../../shared/Locale/DayJsLocales';
 import { DEFAULT_LANGUAGE, Language } from '../../../../shared/Locale/Language';
-import Select, { SelectOptionsType } from 'renderer/components/Select';
+import Select, { SelectOptionsType } from '../../../components/Select';
 import { useTranslationContext } from '../../../context/LocalContext';
 import useConfig from '../../../hooks/useConfig';
 
diff --git a/src/renderer/pages/Settings/General/StartAutomatically.tsx b/src/apps/renderer/pages/Settings/General/StartAutomatically.tsx
similarity index 100%
rename from src/renderer/pages/Settings/General/StartAutomatically.tsx
rename to src/apps/renderer/pages/Settings/General/StartAutomatically.tsx
diff --git a/src/renderer/pages/Settings/General/ThemePicker.tsx b/src/apps/renderer/pages/Settings/General/ThemePicker.tsx
similarity index 96%
rename from src/renderer/pages/Settings/General/ThemePicker.tsx
rename to src/apps/renderer/pages/Settings/General/ThemePicker.tsx
index eaece24fd..e0f10a4d1 100644
--- a/src/renderer/pages/Settings/General/ThemePicker.tsx
+++ b/src/apps/renderer/pages/Settings/General/ThemePicker.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { DEFAULT_THEME, Theme } from '../../../../shared/types/Theme';
-import Select, { SelectOptionsType } from 'renderer/components/Select';
+import Select, { SelectOptionsType } from '../../../components/Select';
 import { useTranslationContext } from '../../../context/LocalContext';
 import useConfig from '../../../hooks/useConfig';
 
diff --git a/src/renderer/pages/Settings/General/index.tsx b/src/apps/renderer/pages/Settings/General/index.tsx
similarity index 100%
rename from src/renderer/pages/Settings/General/index.tsx
rename to src/apps/renderer/pages/Settings/General/index.tsx
diff --git a/src/renderer/pages/Settings/Header.tsx b/src/apps/renderer/pages/Settings/Header.tsx
similarity index 91%
rename from src/renderer/pages/Settings/Header.tsx
rename to src/apps/renderer/pages/Settings/Header.tsx
index 4e780f309..72cd7cdce 100644
--- a/src/renderer/pages/Settings/Header.tsx
+++ b/src/apps/renderer/pages/Settings/Header.tsx
@@ -1,11 +1,38 @@
-import { At, ClockCounterClockwise, Gear, Icon } from '@phosphor-icons/react';
+import { At, Gear, Icon } from '@phosphor-icons/react';
 import { motion } from 'framer-motion';
 
 import { useTranslationContext } from '../../context/LocalContext';
 
-const sectionValues = ['GENERAL', 'ACCOUNT', 'BACKUPS'] as const;
+const sectionValues = ['GENERAL', 'ACCOUNT'] as const;
 export type Section = (typeof sectionValues)[number];
 
+function Item({
+  Icon,
+  title,
+  onClick,
+  isActive,
+}: {
+  Icon: Icon;
+  title: string;
+  onClick: () => void;
+  isActive: boolean;
+}) {
+  return (
+    <button
+      onClick={onClick}
+      type="button"
+      className={`relative flex w-20 cursor-pointer flex-col items-center rounded-lg px-4 py-1.5 outline-none transition-colors duration-100 ease-in-out ${
+        isActive
+          ? 'text-gray-100'
+          : 'text-gray-50 hover:text-gray-60 active:text-gray-80'
+      }`}
+    >
+      <Icon size={28} />
+      <p className="text-xs font-medium capitalize">{title.toLowerCase()}</p>
+    </button>
+  );
+}
+
 export default function Header({
   onClick,
   active,
@@ -20,7 +47,6 @@ export default function Header({
   }[] = [
     { label: 'GENERAL', icon: Gear },
     { label: 'ACCOUNT', icon: At },
-    { label: 'BACKUPS', icon: ClockCounterClockwise },
   ];
 
   const animationVariants: Record<Section, { left: string }> =
@@ -56,30 +82,3 @@ export default function Header({
     </div>
   );
 }
-
-function Item({
-  Icon,
-  title,
-  onClick,
-  isActive,
-}: {
-  Icon: Icon;
-  title: string;
-  onClick: () => void;
-  isActive: boolean;
-}) {
-  return (
-    <button
-      onClick={onClick}
-      type="button"
-      className={`relative flex w-20 cursor-pointer flex-col items-center rounded-lg px-4 py-1.5 outline-none transition-colors duration-100 ease-in-out ${
-        isActive
-          ? 'text-gray-100'
-          : 'text-gray-50 hover:text-gray-60 active:text-gray-80'
-      }`}
-    >
-      <Icon size={28} />
-      <p className="text-xs font-medium capitalize">{title.toLowerCase()}</p>
-    </button>
-  );
-}
diff --git a/src/renderer/pages/Settings/index.tsx b/src/apps/renderer/pages/Settings/index.tsx
similarity index 92%
rename from src/renderer/pages/Settings/index.tsx
rename to src/apps/renderer/pages/Settings/index.tsx
index e715f4540..43312c02e 100644
--- a/src/renderer/pages/Settings/index.tsx
+++ b/src/apps/renderer/pages/Settings/index.tsx
@@ -2,7 +2,6 @@ import { useEffect, useRef, useState } from 'react';
 
 import WindowTopBar from '../../components/WindowTopBar';
 import AccountSection from './Account';
-import BackupsSection from './Backups';
 import GeneralSection from './General';
 import Header, { Section } from './Header';
 
@@ -40,7 +39,6 @@ export default function Settings() {
       <div className="bg-gray-1 p-5">
         <GeneralSection active={activeSection === 'GENERAL'} />
         <AccountSection active={activeSection === 'ACCOUNT'} />
-        <BackupsSection active={activeSection === 'BACKUPS'} />
       </div>
     </div>
   );
diff --git a/src/apps/renderer/pages/Widget/AnimationWrapper.tsx b/src/apps/renderer/pages/Widget/AnimationWrapper.tsx
new file mode 100644
index 000000000..08a79bc3b
--- /dev/null
+++ b/src/apps/renderer/pages/Widget/AnimationWrapper.tsx
@@ -0,0 +1,21 @@
+import { motion } from 'framer-motion';
+import { ReactNode } from 'react';
+
+export function AnimationWrapper({
+  children,
+  i,
+}: {
+  children: ReactNode;
+  i: number;
+}) {
+  return (
+    <motion.div
+      initial={{ opacity: 0 }}
+      animate={{ opacity: 1 }}
+      exit={{ opacity: 0, transition: { delay: i * 0.03 } }}
+      transition={{ duration: 0.25, ease: 'easeInOut' }}
+    >
+      {children}
+    </motion.div>
+  );
+}
diff --git a/src/renderer/pages/Widget/Header.tsx b/src/apps/renderer/pages/Widget/Header.tsx
similarity index 97%
rename from src/renderer/pages/Widget/Header.tsx
rename to src/apps/renderer/pages/Widget/Header.tsx
index 2e4d4f62c..33dca6632 100644
--- a/src/renderer/pages/Widget/Header.tsx
+++ b/src/apps/renderer/pages/Widget/Header.tsx
@@ -14,7 +14,7 @@ import { reportError } from '../../utils/errors';
 
 export default function Header() {
   const { translate } = useTranslationContext();
-  const { status: virtualDriveStatus } = useVirtualDriveStatus();
+  const { virtualDriveCanBeOpened } = useVirtualDriveStatus();
   const processIssues = useProcessIssues();
   const generalIssues = useGeneralIssues();
   const { backupFatalErrors } = useBackupFatalErrors();
@@ -42,7 +42,7 @@ export default function Header() {
   }, []);
 
   function onQuitClick() {
-    window.electron.unmountVirtualDriveAndQuit();
+    window.electron.quit();
   }
 
   const handleOpenURL = async (URL: string) => {
@@ -156,8 +156,8 @@ export default function Header() {
       </HeaderItemWrapper>
 
       <HeaderItemWrapper
-        disabled={virtualDriveStatus !== 'MOUNTED'}
-        onClick={window.electron.openSyncFolder}
+        disabled={!virtualDriveCanBeOpened()}
+        onClick={window.electron.openVirtualDriveFolder}
       >
         <FolderSimple size={22} />
       </HeaderItemWrapper>
diff --git a/src/apps/renderer/pages/Widget/Item.tsx b/src/apps/renderer/pages/Widget/Item.tsx
new file mode 100644
index 000000000..5bd6f9ab8
--- /dev/null
+++ b/src/apps/renderer/pages/Widget/Item.tsx
@@ -0,0 +1,133 @@
+import { Check, WarningCircle } from '@phosphor-icons/react';
+import { CircularProgressbar, buildStyles } from 'react-circular-progressbar';
+import { useTranslationContext } from '../../context/LocalContext';
+import { shortMessages } from '../../messages/process-error';
+import { getBaseName, getExtension } from '../../utils/path';
+import {
+  ProcessInfoUpdatePayload,
+  ProcessErrorName,
+} from '../../../shared/types';
+import { fileIcon } from '../../assets/icons/getIcon';
+
+export function Item({
+  name,
+  action,
+  progress,
+  errorName,
+}: ProcessInfoUpdatePayload & {
+  progress?: number;
+  errorName?: ProcessErrorName;
+}) {
+  const { translate } = useTranslationContext();
+  const progressDisplay = progress ? `${Math.ceil(progress * 100)}%` : '';
+
+  let description = '';
+
+  if (action === 'DOWNLOADING') {
+    description = progress
+      ? translate('widget.body.activity.operation.downloading')
+      : translate('widget.body.activity.operation.decrypting');
+  } else if (action === 'UPLOADING') {
+    description = progress
+      ? translate('widget.body.activity.operation.uploading')
+      : translate('widget.body.activity.operation.encrypting');
+  } else if (action === 'DOWNLOADED') {
+    description = translate('widget.body.activity.operation.downloaded');
+  } else if (action === 'UPLOADED') {
+    description = translate('widget.body.activity.operation.uploaded');
+  } else if (action === 'DELETING') {
+    description = translate('widget.body.activity.operation.deleting');
+  } else if (action === 'DELETED') {
+    description = translate('widget.body.activity.operation.deleted');
+  } else if (action === 'RENAMING') {
+    description = translate('widget.body.activity.operation.renaming');
+  } else if (action === 'RENAMED') {
+    description = translate('widget.body.activity.operation.renamed');
+  } else if (errorName) {
+    description = shortMessages[errorName];
+  }
+
+  return (
+    <div className="flex h-14 w-full px-3">
+      <div className="flex h-full flex-1 items-center space-x-3 truncate border-b border-gray-5">
+        <div className="flex h-8 w-8 items-center justify-center drop-shadow-sm">
+          {fileIcon(getExtension(name))}
+        </div>
+
+        <div className="flex flex-1 flex-col justify-center space-y-px truncate pr-[14px]">
+          <p
+            className="truncate text-sm text-gray-100"
+            title={getBaseName(name)}
+          >
+            {getBaseName(name)}
+          </p>
+          <p
+            className={`truncate text-xs text-gray-50 ${
+              action &&
+              (action === 'DELETE_ERROR' ||
+                action === 'DOWNLOAD_ERROR' ||
+                action === 'UPLOAD_ERROR' ||
+                action === 'RENAME_ERROR' ||
+                action === 'METADATA_READ_ERROR')
+                ? 'text-red'
+                : undefined
+            }`}
+            title={
+              action &&
+              (action === 'DELETE_ERROR' ||
+                action === 'DOWNLOAD_ERROR' ||
+                action === 'UPLOAD_ERROR' ||
+                action === 'RENAME_ERROR' ||
+                action === 'METADATA_READ_ERROR')
+                ? description
+                : undefined
+            }
+          >
+            {`${description} ${progressDisplay}`}
+          </p>
+        </div>
+
+        <div className="flex w-7 items-center justify-center">
+          {/* PROGRESS */}
+          {action &&
+            (action === 'UPLOADING' ||
+              action === 'DOWNLOADING' ||
+              action === 'RENAMING' ||
+              action === 'DELETING') && (
+              <CircularProgressbar
+                value={progress ?? 0}
+                minValue={0}
+                maxValue={1}
+                strokeWidth={16}
+                styles={buildStyles({
+                  pathTransitionDuration: 0.25,
+                  pathColor: 'rgb(var(--color-primary) / 1)',
+                  strokeLinecap: 'round',
+                })}
+                className="aspect-square w-6 rounded-full ring-4 ring-inset ring-primary/15 dark:ring-gray-10"
+              />
+            )}
+
+          {/* DONE */}
+          {action &&
+            (action === 'DELETED' ||
+              action === 'DOWNLOADED' ||
+              action === 'UPLOADED' ||
+              action === 'RENAMED') && (
+              <Check size={24} className="text-green" weight="bold" />
+            )}
+
+          {/* ERROR */}
+          {action &&
+            (action === 'DELETE_ERROR' ||
+              action === 'DOWNLOAD_ERROR' ||
+              action === 'UPLOAD_ERROR' ||
+              action === 'RENAME_ERROR' ||
+              action === 'METADATA_READ_ERROR') && (
+              <WarningCircle size={24} className="text-red" weight="regular" />
+            )}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/apps/renderer/pages/Widget/NoInfoToShow.tsx b/src/apps/renderer/pages/Widget/NoInfoToShow.tsx
new file mode 100644
index 000000000..be91cbbe6
--- /dev/null
+++ b/src/apps/renderer/pages/Widget/NoInfoToShow.tsx
@@ -0,0 +1,46 @@
+import { AnimatePresence, motion } from 'framer-motion';
+
+import syncedStackLight from '../../assets/illustrations/syncedStack-light.png';
+import syncedStackDark from '../../assets/illustrations/syncedStack-dark.png';
+import { useTranslationContext } from '../../context/LocalContext';
+
+export function NoInfoToShow() {
+  const { translate } = useTranslationContext();
+
+  return (
+    <AnimatePresence>
+      <motion.div
+        initial={{ opacity: 0 }}
+        animate={{ opacity: 1, transition: { delay: 0.4 } }}
+        exit={{ opacity: 0 }}
+        transition={{ duration: 0.5, ease: 'easeInOut' }}
+      >
+        <div className="trasform absolute left-1/2 top-1/2 flex w-full -translate-x-1/2 -translate-y-1/2 flex-col items-center space-y-6 text-center">
+          <div>
+            <img
+              src={syncedStackLight}
+              className="dark:hidden"
+              width={128}
+              draggable={false}
+            />
+            <img
+              src={syncedStackDark}
+              className="hidden dark:flex"
+              width={128}
+              draggable={false}
+            />
+          </div>
+
+          <div className="flex flex-col">
+            <p className="text-base font-medium text-gray-100">
+              {translate('widget.body.upToDate.title')}
+            </p>
+            <p className="text-sm text-gray-60">
+              {translate('widget.body.upToDate.subtitle')}
+            </p>
+          </div>
+        </div>
+      </motion.div>
+    </AnimatePresence>
+  );
+}
diff --git a/src/renderer/pages/Widget/SyncAction.tsx b/src/apps/renderer/pages/Widget/SyncAction.tsx
similarity index 83%
rename from src/renderer/pages/Widget/SyncAction.tsx
rename to src/apps/renderer/pages/Widget/SyncAction.tsx
index 0b48edad0..0baf69085 100644
--- a/src/renderer/pages/Widget/SyncAction.tsx
+++ b/src/apps/renderer/pages/Widget/SyncAction.tsx
@@ -1,28 +1,23 @@
-import { useEffect, useState } from 'react';
-
-import { useTranslationContext } from '../../context/LocalContext';
 import { CheckCircle, XCircle } from '@phosphor-icons/react';
+import { useEffect, useState } from 'react';
+import { SyncStatus } from '../../../../context/desktop/sync/domain/SyncStatus';
 import Spinner from '../../assets/spinner.svg';
-import { SyncStatus } from '../../../main/background-processes/sync';
-import useUsage from 'renderer/hooks/useUsage';
-import Button from 'renderer/components/Button';
-import useVirtualDriveStatus from 'renderer/hooks/VirtualDriveStatus';
-import useSyncStatus from 'renderer/hooks/SyncStatus';
+import Button from '../../components/Button';
+import { useTranslationContext } from '../../context/LocalContext';
+import useVirtualDriveStatus from '../../hooks/VirtualDriveStatus';
+import useSyncStatus from '../../hooks/useSyncStatus';
+import useUsage from '../../hooks/useUsage';
 
 export default function SyncAction(props: { syncStatus: SyncStatus }) {
   const { translate } = useTranslationContext();
 
   const [isOnLine, setIsOnLine] = useState(true);
   const { usage, status } = useUsage();
-  const { status: virtualDriveStatus } = useVirtualDriveStatus();
-  const [syncStatus, setSyncStatus] = useState<SyncStatus | null>(null);
-  useSyncStatus(setSyncStatus);
+  const { virtualDriveStatus } = useVirtualDriveStatus();
+  const { syncStatus } = useSyncStatus();
 
   const isSyncStopped =
-    (virtualDriveStatus &&
-      (virtualDriveStatus === 'FAILED_TO_MOUNT' ||
-        virtualDriveStatus === 'MOUNTING')) ||
-    (syncStatus && syncStatus === 'FAILED');
+    virtualDriveStatus && syncStatus && syncStatus === 'FAILED';
 
   const handleOpenUpgrade = async () => {
     try {
diff --git a/src/renderer/pages/Widget/SyncErrorBanner.tsx b/src/apps/renderer/pages/Widget/SyncErrorBanner.tsx
similarity index 86%
rename from src/renderer/pages/Widget/SyncErrorBanner.tsx
rename to src/apps/renderer/pages/Widget/SyncErrorBanner.tsx
index a84b81511..2e668580c 100644
--- a/src/renderer/pages/Widget/SyncErrorBanner.tsx
+++ b/src/apps/renderer/pages/Widget/SyncErrorBanner.tsx
@@ -1,10 +1,10 @@
-import { SyncStatus } from '../../../main/background-processes/sync';
-import { ProcessFatalErrorName } from '../../../workers/types';
+import { SyncStatus } from '../../../../context/desktop/sync/domain/SyncStatus';
+import { ProcessFatalErrorName } from '../../../shared/types';
 import Error from '../../assets/error.svg';
 import Warn from '../../assets/warn.svg';
 import { useTranslationContext } from '../../context/LocalContext';
-import useSyncStatus from '../../hooks/SyncStatus';
-import useSyncStopped from '../../hooks/SyncStopped';
+import useSyncStatus from '../../hooks/useSyncStatus';
+import useSyncStopped from '../../hooks/useSyncStopped';
 import SyncFatalErrorMessages from '../../messages/process-fatal-error';
 
 const fatalErrorActionMap: Record<
@@ -50,10 +50,7 @@ export default function SyncErrorBanner() {
   useSyncStatus(onSyncStatusChanged);
 
   const severity: 'FATAL' | 'WARN' = 'FATAL' as 'FATAL' | 'WARN';
-  const show =
-    stopReason !== null &&
-    stopReason?.reason !== 'EXIT' &&
-    stopReason?.reason !== 'STOPPED_BY_USER';
+  const show = stopReason !== null && stopReason?.reason !== 'STOPPED_BY_USER';
 
   const Icon = severity === 'FATAL' ? Error : Warn;
 
diff --git a/src/renderer/pages/Widget/SyncFailed.tsx b/src/apps/renderer/pages/Widget/SyncFailed.tsx
similarity index 100%
rename from src/renderer/pages/Widget/SyncFailed.tsx
rename to src/apps/renderer/pages/Widget/SyncFailed.tsx
diff --git a/src/apps/renderer/pages/Widget/SyncInfo.tsx b/src/apps/renderer/pages/Widget/SyncInfo.tsx
new file mode 100644
index 000000000..15216c1c5
--- /dev/null
+++ b/src/apps/renderer/pages/Widget/SyncInfo.tsx
@@ -0,0 +1,30 @@
+import { AnimatePresence } from 'framer-motion';
+import { useOnSyncRunning } from '../../hooks/useOnSyncRunning';
+import { useOnSyncStopped } from '../../hooks/useOnSyncStopped';
+import { useSyncInfoSubscriber } from '../../hooks/useSyncInfoSubscriber';
+import { AnimationWrapper } from './AnimationWrapper';
+import { Item } from './Item';
+import { NoInfoToShow } from './NoInfoToShow';
+
+export default function SyncInfo() {
+  const { processInfoUpdatedPayload, clearItems, removeOnProgressItems } =
+    useSyncInfoSubscriber();
+
+  useOnSyncStopped(removeOnProgressItems);
+  useOnSyncRunning(clearItems);
+
+  return (
+    <div className="no-scrollbar relative flex flex-1 flex-col overflow-y-auto">
+      {processInfoUpdatedPayload.length === 0 && <NoInfoToShow />}
+      <div className="flex-1">
+        <AnimatePresence>
+          {processInfoUpdatedPayload.map((item, i) => (
+            <AnimationWrapper key={item.name} i={i}>
+              <Item {...item} />
+            </AnimationWrapper>
+          ))}
+        </AnimatePresence>
+      </div>
+    </div>
+  );
+}
diff --git a/src/renderer/pages/Widget/VirtualDriveError.tsx b/src/apps/renderer/pages/Widget/VirtualDriveError.tsx
similarity index 100%
rename from src/renderer/pages/Widget/VirtualDriveError.tsx
rename to src/apps/renderer/pages/Widget/VirtualDriveError.tsx
diff --git a/src/apps/renderer/pages/Widget/index.tsx b/src/apps/renderer/pages/Widget/index.tsx
new file mode 100644
index 000000000..edc2d44bd
--- /dev/null
+++ b/src/apps/renderer/pages/Widget/index.tsx
@@ -0,0 +1,34 @@
+import Header from './Header';
+import SyncAction from './SyncAction';
+import SyncErrorBanner from './SyncErrorBanner';
+import SyncInfo from './SyncInfo';
+import useSyncStatus from '../../hooks/useSyncStatus';
+import { SyncFailed } from './SyncFailed';
+
+export default function Widget() {
+  const { syncStatus } = useSyncStatus();
+
+  const handleRetrySync = () => {
+    window.electron.startRemoteSync().catch((err) => {
+      reportError(err);
+    });
+  };
+
+  const displayErrorInWidget = syncStatus && syncStatus === 'FAILED';
+
+  const renderWidgetError = () => {
+    if (syncStatus === 'FAILED') {
+      return <SyncFailed onRetrySync={handleRetrySync} />;
+    }
+    return <></>;
+  };
+
+  return (
+    <div className="flex h-screen flex-col overflow-hidden">
+      <Header />
+      <SyncErrorBanner />
+      {displayErrorInWidget ? renderWidgetError() : <SyncInfo />}
+      <SyncAction syncStatus={syncStatus} />
+    </div>
+  );
+}
diff --git a/src/renderer/utils/errors.ts b/src/apps/renderer/utils/errors.ts
similarity index 100%
rename from src/renderer/utils/errors.ts
rename to src/apps/renderer/utils/errors.ts
diff --git a/src/renderer/utils/http-request.ts b/src/apps/renderer/utils/http-request.ts
similarity index 100%
rename from src/renderer/utils/http-request.ts
rename to src/apps/renderer/utils/http-request.ts
diff --git a/src/renderer/utils/path.ts b/src/apps/renderer/utils/path.ts
similarity index 100%
rename from src/renderer/utils/path.ts
rename to src/apps/renderer/utils/path.ts
diff --git a/src/apps/renderer/utils/query.ts b/src/apps/renderer/utils/query.ts
new file mode 100644
index 000000000..042305758
--- /dev/null
+++ b/src/apps/renderer/utils/query.ts
@@ -0,0 +1,5 @@
+import { StoredValues } from '../../main/config/service';
+
+export async function getConfigKey(key: StoredValues) {
+  return window.electron.getConfigKey(key);
+}
diff --git a/src/renderer/utils/usage.ts b/src/apps/renderer/utils/usage.ts
similarity index 100%
rename from src/renderer/utils/usage.ts
rename to src/apps/renderer/utils/usage.ts
diff --git a/src/shared/FileTypes/FileTypes.ts b/src/apps/shared/FileTypes/FileTypes.ts
similarity index 100%
rename from src/shared/FileTypes/FileTypes.ts
rename to src/apps/shared/FileTypes/FileTypes.ts
diff --git a/src/shared/HttpClient/Clients.ts b/src/apps/shared/HttpClient/Clients.ts
similarity index 100%
rename from src/shared/HttpClient/Clients.ts
rename to src/apps/shared/HttpClient/Clients.ts
diff --git a/src/shared/HttpClient/HttpClient.ts b/src/apps/shared/HttpClient/HttpClient.ts
similarity index 100%
rename from src/shared/HttpClient/HttpClient.ts
rename to src/apps/shared/HttpClient/HttpClient.ts
diff --git a/src/shared/HttpClient/backgroud-process-clients.ts b/src/apps/shared/HttpClient/background-process-clients.ts
similarity index 88%
rename from src/shared/HttpClient/backgroud-process-clients.ts
rename to src/apps/shared/HttpClient/background-process-clients.ts
index 6631c78b2..29d893bb8 100644
--- a/src/shared/HttpClient/backgroud-process-clients.ts
+++ b/src/apps/shared/HttpClient/background-process-clients.ts
@@ -3,7 +3,8 @@ import { ipcRenderer } from 'electron';
 import { AuthorizedClients } from './Clients';
 import { AuthorizedHttpClient } from './HttpClient';
 
-const onUserUnauthorized = () => ipcRenderer.emit('user-is-unauthorized');
+export const onUserUnauthorized = () =>
+  ipcRenderer.emit('user-is-unauthorized');
 
 const driveHeadersProvider = () => ipcRenderer.invoke('get-headers');
 const newDriveHeadersProvider = () =>
diff --git a/src/shared/HttpClient/http-client.test.skip.ts b/src/apps/shared/HttpClient/http-client.test.skip.ts
similarity index 100%
rename from src/shared/HttpClient/http-client.test.skip.ts
rename to src/apps/shared/HttpClient/http-client.test.skip.ts
diff --git a/src/shared/HttpClient/main-process-client.ts b/src/apps/shared/HttpClient/main-process-client.ts
similarity index 82%
rename from src/shared/HttpClient/main-process-client.ts
rename to src/apps/shared/HttpClient/main-process-client.ts
index 02473f88f..cc07d288d 100644
--- a/src/shared/HttpClient/main-process-client.ts
+++ b/src/apps/shared/HttpClient/main-process-client.ts
@@ -2,6 +2,7 @@ import { Axios } from 'axios';
 
 import { onUserUnauthorized } from '../../main/auth/handlers';
 import { getHeaders, getNewApiHeaders } from '../../main/auth/service';
+import { AuthorizedClients } from './Clients';
 import { AuthorizedHttpClient } from './HttpClient';
 
 const headersProvider = () => Promise.resolve(getHeaders(false));
@@ -28,3 +29,10 @@ export function getNewTokenClient(): Axios {
 
   return newClient.client;
 }
+
+export function getClients(): AuthorizedClients {
+  return {
+    drive: getClient(),
+    newDrive: getNewTokenClient(),
+  };
+}
diff --git a/src/shared/HttpClient/responses/file-created.ts b/src/apps/shared/HttpClient/responses/file-created.ts
similarity index 100%
rename from src/shared/HttpClient/responses/file-created.ts
rename to src/apps/shared/HttpClient/responses/file-created.ts
diff --git a/src/shared/IPC/IPCs.ts b/src/apps/shared/IPC/IPCs.ts
similarity index 78%
rename from src/shared/IPC/IPCs.ts
rename to src/apps/shared/IPC/IPCs.ts
index b8e3b5ed8..1940719c1 100644
--- a/src/shared/IPC/IPCs.ts
+++ b/src/apps/shared/IPC/IPCs.ts
@@ -23,20 +23,20 @@ type VoidParamsHandler<T extends CustomIPCEvents> = {
 };
 
 export interface CustomIpc<
-  EmitedEvents extends CustomIPCEvents,
+  EmittedEvents extends CustomIPCEvents,
   ListenedEvents extends CustomIPCEvents
 > {
-  emit(event: keyof VoidParamsHandler<EmitedEvents>): void;
+  emit(event: keyof VoidParamsHandler<EmittedEvents>): void;
 
-  send<Event extends keyof VoidReturnHandler<EmitedEvents>>(
+  send<Event extends keyof VoidReturnHandler<EmittedEvents>>(
     event: Event,
-    ...args: Parameters<VoidReturnHandler<EmitedEvents>[Event]>
+    ...args: Parameters<VoidReturnHandler<EmittedEvents>[Event]>
   ): void;
 
-  invoke<Event extends keyof NonVoidReturnHandler<EmitedEvents>>(
+  invoke<Event extends keyof NonVoidReturnHandler<EmittedEvents>>(
     event: Event,
-    ...args: Parameters<NonVoidReturnHandler<EmitedEvents>[Event]>
-  ): Promise<ReturnType<EmitedEvents[Event]>>;
+    ...args: Parameters<NonVoidReturnHandler<EmittedEvents>[Event]>
+  ): Promise<ReturnType<EmittedEvents[Event]>>;
 
   on<Event extends keyof VoidReturnHandler<ListenedEvents>>(
     event: Event,
diff --git a/src/shared/IPC/events/drive.ts b/src/apps/shared/IPC/events/drive.ts
similarity index 93%
rename from src/shared/IPC/events/drive.ts
rename to src/apps/shared/IPC/events/drive.ts
index eaa0c0d8c..2475f1008 100644
--- a/src/shared/IPC/events/drive.ts
+++ b/src/apps/shared/IPC/events/drive.ts
@@ -29,6 +29,7 @@ export type FileErrorInfo = {
 type UploadEvents = {
   FILE_UPLOADING: (payload: FileProgressInfo) => void;
   FILE_UPLOADED: (payload: FileProgressInfo) => void;
+  FILE_CREATED: (payload: { nameWithExtension: string }) => void;
   FILE_UPLOAD_ERROR: (payload: FileErrorInfo) => void;
 };
 
@@ -41,7 +42,7 @@ type DownloadEvents = {
 type TrashEvents = {
   FILE_DELETED: (payload: FileInfo) => void;
   FILE_DELETING: (payload: FileInfo) => void;
-  FILE_DELETE_ERROR: (payload: FileErrorInfo) => void;
+  FILE_DELETION_ERROR: (payload: FileErrorInfo) => void;
 };
 
 type RenameEvents = {
diff --git a/src/apps/shared/IPC/events/sync-engine.ts b/src/apps/shared/IPC/events/sync-engine.ts
new file mode 100644
index 000000000..bf09401ed
--- /dev/null
+++ b/src/apps/shared/IPC/events/sync-engine.ts
@@ -0,0 +1,140 @@
+import { DriveFile } from '../../../main/database/entities/DriveFile';
+import { DriveFolder } from '../../../main/database/entities/DriveFolder';
+import { ProcessInfoUpdatePayload } from '../../types';
+
+const trackedEvents = [
+  'delete',
+  'upload',
+  'download',
+  'preview',
+  'move',
+  'rename',
+] as const;
+export type TrackedEvents = Capitalize<(typeof trackedEvents)[number]>;
+
+const trackedEventsActions = [
+  'started',
+  'completed',
+  'aborted',
+  'error',
+] as const;
+type TrackedProviderActions = Capitalize<(typeof trackedEventsActions)[number]>;
+
+export type TrackedActions = `${TrackedEvents} ${TrackedProviderActions}`;
+
+export type ErrorContext = {
+  action: TrackedEvents;
+  itemType: 'File' | 'Folder';
+  from: string;
+  root: string;
+};
+
+type ProcessInfo = {
+  elapsedTime: number;
+  progress?: number;
+};
+
+type FileUpdatePayload = {
+  name: string;
+  extension: string;
+  nameWithExtension: string;
+  size: number;
+  processInfo: ProcessInfo;
+};
+
+export type FolderEvents = {
+  FOLDER_CREATING: (payload: { name: string }) => void;
+  FOLDER_CREATED: (payload: { name: string }) => void;
+
+  FOLDER_RENAMING: (payload: { oldName: string; newName: string }) => void;
+  FOLDER_RENAMED: (payload: { oldName: string; newName: string }) => void;
+};
+
+export type FilesEvents = {
+  FILE_UPLOADING: (payload: FileUpdatePayload) => void;
+  FILE_UPLOADED: (payload: FileUpdatePayload) => void;
+  FILE_CREATED: (payload: {
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+  }) => void;
+  FILE_DOWNLOAD_ERROR: (payload: {
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    error: string;
+  }) => void;
+
+  FILE_DOWNLOADING: (payload: FileUpdatePayload) => void;
+  FILE_DOWNLOADED: (payload: FileUpdatePayload) => void;
+  FILE_UPLOAD_ERROR: (payload: {
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    error: string;
+  }) => void;
+
+  FILE_DELETING: (payload: {
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    size: number;
+  }) => void;
+  FILE_DELETED: (payload: {
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    size: number;
+  }) => void;
+  FILE_DELETION_ERROR: (payload: {
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    error: string;
+  }) => void;
+
+  FILE_RENAMING: (payload: {
+    nameWithExtension: string;
+    oldName: string;
+  }) => void;
+  FILE_RENAMED: (payload: {
+    nameWithExtension: string;
+    oldName: string;
+  }) => void;
+  FILE_MOVED: (payload: {
+    nameWithExtension: string;
+    folderName: string;
+  }) => void;
+  FILE_RENAME_ERROR: (payload: {
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    error: string;
+  }) => void;
+
+  FILE_OVERWRITTEN: (payload: { nameWithExtension: string }) => void;
+
+  FILE_CLONED: (payload: FileUpdatePayload) => void;
+};
+
+export type SyncEngineInvocableFunctions = {
+  GET_UPDATED_REMOTE_ITEMS: () => Promise<{
+    files: DriveFile[];
+    folders: DriveFolder[];
+  }>;
+  START_REMOTE_SYNC: () => Promise<void>;
+};
+
+// TODO: change how errors are reported to the ui
+export type ProcessInfoUpdate = {
+  SYNC_INFO_UPDATE: (payload: ProcessInfoUpdatePayload) => void;
+};
+
+export type FromProcess = FilesEvents &
+  FolderEvents &
+  SyncEngineInvocableFunctions &
+  ProcessInfoUpdate;
+
+export type FromMain = {
+  [key: string]: (...args: Array<any>) => any;
+};
diff --git a/src/shared/IPC/events/virtual-drive.ts b/src/apps/shared/IPC/events/virtual-drive.ts
similarity index 100%
rename from src/shared/IPC/events/virtual-drive.ts
rename to src/apps/shared/IPC/events/virtual-drive.ts
diff --git a/src/shared/ItemKind.ts b/src/apps/shared/ItemKind.ts
similarity index 100%
rename from src/shared/ItemKind.ts
rename to src/apps/shared/ItemKind.ts
diff --git a/src/shared/Locale/DayJsLocales.ts b/src/apps/shared/Locale/DayJsLocales.ts
similarity index 100%
rename from src/shared/Locale/DayJsLocales.ts
rename to src/apps/shared/Locale/DayJsLocales.ts
diff --git a/src/shared/Locale/Language.ts b/src/apps/shared/Locale/Language.ts
similarity index 100%
rename from src/shared/Locale/Language.ts
rename to src/apps/shared/Locale/Language.ts
diff --git a/src/apps/shared/fs/PathTypeChecker .ts b/src/apps/shared/fs/PathTypeChecker .ts
new file mode 100644
index 000000000..ed44e3475
--- /dev/null
+++ b/src/apps/shared/fs/PathTypeChecker .ts	
@@ -0,0 +1,21 @@
+import fs from 'fs/promises';
+
+export class PathTypeChecker {
+  static async isFolder(path: string): Promise<boolean> {
+    try {
+      const stats = await fs.stat(path);
+      return stats.isDirectory();
+    } catch (error) {
+      return false;
+    }
+  }
+
+  static async isFile(path: string): Promise<boolean> {
+    try {
+      const stats = await fs.stat(path);
+      return stats.isFile();
+    } catch (error) {
+      return false;
+    }
+  }
+}
diff --git a/src/apps/shared/fs/ReadStreamToBuffer.ts b/src/apps/shared/fs/ReadStreamToBuffer.ts
new file mode 100644
index 000000000..a8155923f
--- /dev/null
+++ b/src/apps/shared/fs/ReadStreamToBuffer.ts
@@ -0,0 +1,20 @@
+import { Readable, Writable, pipeline } from 'stream';
+import { promisify } from 'util';
+const promisifiedPipeline = promisify(pipeline);
+
+export class ReadStreamToBuffer {
+  static async read(stream: Readable): Promise<Buffer> {
+    const bufferArray: any[] = [];
+
+    const bufferWriter = new Writable({
+      write: (chunk, _, callback) => {
+        bufferArray.push(chunk);
+        callback();
+      },
+    });
+
+    await promisifiedPipeline(stream, bufferWriter);
+
+    return Buffer.concat(bufferArray);
+  }
+}
diff --git a/src/apps/shared/fs/ensure-folder-exists.ts b/src/apps/shared/fs/ensure-folder-exists.ts
new file mode 100644
index 000000000..ef941bdee
--- /dev/null
+++ b/src/apps/shared/fs/ensure-folder-exists.ts
@@ -0,0 +1,5 @@
+import { PathLike, mkdirSync } from 'fs';
+
+export function ensureFolderExists(folder: PathLike) {
+  mkdirSync(folder, { recursive: true });
+}
diff --git a/src/apps/shared/fs/write-readable-to-file.ts b/src/apps/shared/fs/write-readable-to-file.ts
new file mode 100644
index 000000000..857cc509f
--- /dev/null
+++ b/src/apps/shared/fs/write-readable-to-file.ts
@@ -0,0 +1,15 @@
+import fs, { PathLike } from 'fs';
+import { Readable } from 'stream';
+
+export class WriteReadableToFile {
+  static write(readable: Readable, path: PathLike): Promise<void> {
+    const writableStream = fs.createWriteStream(path);
+
+    readable.pipe(writableStream);
+
+    return new Promise<void>((resolve, reject) => {
+      writableStream.on('finish', resolve);
+      writableStream.on('error', reject);
+    });
+  }
+}
diff --git a/src/workers/types.ts b/src/apps/shared/types.ts
similarity index 99%
rename from src/workers/types.ts
rename to src/apps/shared/types.ts
index 4cdc3084d..0b6409d00 100644
--- a/src/workers/types.ts
+++ b/src/apps/shared/types.ts
@@ -213,7 +213,6 @@ export type ProcessIssue = ProcessInfoBase & {
     | 'METADATA_READ_ERROR';
 
   errorName: ProcessErrorName;
-  errorDetails: ErrorDetails;
   process: 'SYNC' | 'BACKUPS';
 };
 
diff --git a/src/shared/types/Nullable.ts b/src/apps/shared/types/Nullable.ts
similarity index 100%
rename from src/shared/types/Nullable.ts
rename to src/apps/shared/types/Nullable.ts
diff --git a/src/apps/shared/types/Primitives.ts b/src/apps/shared/types/Primitives.ts
new file mode 100644
index 000000000..97ee65190
--- /dev/null
+++ b/src/apps/shared/types/Primitives.ts
@@ -0,0 +1 @@
+export type Primitives = string | number | boolean | null | undefined;
diff --git a/src/apps/shared/types/Process.ts b/src/apps/shared/types/Process.ts
new file mode 100644
index 000000000..b20b29b3f
--- /dev/null
+++ b/src/apps/shared/types/Process.ts
@@ -0,0 +1 @@
+export type Process = 'SYNC';
diff --git a/src/shared/types/Stopwatch.ts b/src/apps/shared/types/Stopwatch.ts
similarity index 100%
rename from src/shared/types/Stopwatch.ts
rename to src/apps/shared/types/Stopwatch.ts
diff --git a/src/shared/types/Theme.ts b/src/apps/shared/types/Theme.ts
similarity index 100%
rename from src/shared/types/Theme.ts
rename to src/apps/shared/types/Theme.ts
diff --git a/src/apps/shared/types/VirtualDriveStatus.ts b/src/apps/shared/types/VirtualDriveStatus.ts
new file mode 100644
index 000000000..aca700603
--- /dev/null
+++ b/src/apps/shared/types/VirtualDriveStatus.ts
@@ -0,0 +1,4 @@
+export enum VirtualDriveStatus {
+  READY = 'READY',
+  NOT_FOUND = 'NOT_FOUND',
+}
diff --git a/src/apps/sync-engine/BindingManager.ts b/src/apps/sync-engine/BindingManager.ts
new file mode 100644
index 000000000..5a33533d1
--- /dev/null
+++ b/src/apps/sync-engine/BindingManager.ts
@@ -0,0 +1,286 @@
+import Logger from 'electron-log';
+import * as fs from 'fs';
+import { VirtualDrive } from 'virtual-drive/dist';
+import { FilePlaceholderId } from '../../context/virtual-drive/files/domain/PlaceholderId';
+import { ItemsSearcher } from '../../context/virtual-drive/items/application/ItemsSearcher';
+import { PlatformPathConverter } from '../../context/virtual-drive/shared/application/PlatformPathConverter';
+import { buildControllers } from './callbacks-controllers/buildControllers';
+import { executeControllerWithFallback } from './callbacks-controllers/middlewares/executeControllerWithFallback';
+import { DependencyContainer } from './dependency-injection/DependencyContainer';
+import { ipcRendererSyncEngine } from './ipcRendererSyncEngine';
+import { ProcessIssue } from '../shared/types';
+
+export type CallbackDownload = (
+  success: boolean,
+  filePath: string
+) => Promise<{ finished: boolean; progress: number }>;
+export class BindingsManager {
+  private static readonly PROVIDER_NAME = 'Internxt';
+  private progressBuffer = 0;
+  constructor(
+    private readonly container: DependencyContainer,
+    private readonly paths: {
+      root: string;
+      icon: string;
+    }
+  ) {}
+
+  async load(): Promise<void> {
+    const tree = await this.container.existingItemsTreeBuilder.run();
+
+    await this.container.repositoryPopulator.run(tree.files);
+    await this.container.filesPlaceholderCreator.run(tree.files);
+
+    await this.container.folderRepositoryInitiator.run(tree.folders);
+    await this.container.foldersPlaceholderCreator.run(tree.folders);
+  }
+
+  async start(version: string, providerId: string) {
+    await this.stop();
+
+    const controllers = buildControllers(this.container);
+
+    const callbacks = {
+      notifyDeleteCallback: (
+        contentsId: string,
+        callback: (response: boolean) => void
+      ) => {
+        controllers.delete
+          .execute(contentsId)
+          .then(() => {
+            callback(true);
+          })
+          .catch((error: Error) => {
+            Logger.error(error);
+            callback(false);
+          });
+      },
+      notifyDeleteCompletionCallback: () => {
+        Logger.info('Deletion completed');
+      },
+      notifyRenameCallback: (
+        absolutePath: string,
+        contentsId: string,
+        callback: (response: boolean) => void
+      ) => {
+        const fn = executeControllerWithFallback({
+          handler: controllers.renameOrMove.execute.bind(
+            controllers.renameOrMove
+          ),
+          fallback: controllers.offline.renameOrMove.execute.bind(
+            controllers.offline.renameOrMove
+          ),
+        });
+        fn(absolutePath, contentsId, callback);
+      },
+      notifyFileAddedCallback: (
+        absolutePath: string,
+        callback: (acknowledge: boolean, id: string) => boolean
+      ) => {
+        controllers.addFile.execute(absolutePath, callback);
+      },
+      fetchDataCallback: async (
+        contentsId: FilePlaceholderId,
+        callback: CallbackDownload
+      ) => {
+        try {
+          const path = await controllers.downloadFile.execute(
+            contentsId,
+            callback
+          );
+          Logger.debug('Execute Fetch Data Callback, sending path:', path);
+          const file = controllers.downloadFile.fileFinderByContentsId(
+            contentsId
+              .replace(
+                // eslint-disable-next-line no-control-regex
+                /[\x00-\x1F\x7F-\x9F]/g,
+                ''
+              )
+              .split(':')[1]
+          );
+          let finished = false;
+          while (!finished) {
+            const result = await callback(true, path);
+            finished = result.finished;
+            if (this.progressBuffer == result.progress) {
+              break;
+            } else {
+              this.progressBuffer = result.progress;
+            }
+            Logger.debug('condition', finished);
+            ipcRendererSyncEngine.send('FILE_DOWNLOADING', {
+              name: file.name,
+              extension: file.type,
+              nameWithExtension: file.nameWithExtension,
+              size: file.size,
+              processInfo: {
+                elapsedTime: 0,
+                progress: result.progress,
+              },
+            });
+          }
+
+          this.progressBuffer = 0;
+          try {
+            await controllers.notifyPlaceholderHydrationFinished.execute(
+              contentsId
+            );
+          } catch (error) {
+            Logger.error('notify: ', error);
+          }
+
+          // Esperar hasta que la ejecución de fetchDataCallback esté completa antes de continuar
+          await new Promise((resolve) => {
+            setTimeout(() => {
+              Logger.debug('timeout');
+              resolve(true);
+            }, 500);
+          });
+
+          fs.unlinkSync(path);
+        } catch (error) {
+          Logger.error(error);
+          callback(false, '');
+        }
+      },
+      notifyMessageCallback: (
+        message: string,
+        action: ProcessIssue['action'],
+        errorName: ProcessIssue['errorName'],
+        callback: (response: boolean) => void
+      ) => {
+        try {
+          callback(true);
+          ipcRendererSyncEngine.send('SYNC_INFO_UPDATE', {
+            name: message,
+            action: action,
+            errorName,
+            process: 'SYNC',
+            kind: 'LOCAL',
+          });
+        } catch (error) {
+          Logger.error(error);
+          callback(false);
+        }
+      },
+      validateDataCallback: () => {
+        Logger.debug('validateDataCallback');
+      },
+      cancelFetchDataCallback: () => {
+        Logger.debug('cancelFetchDataCallback');
+      },
+      fetchPlaceholdersCallback: () => {
+        Logger.debug('fetchPlaceholdersCallback');
+      },
+      cancelFetchPlaceholdersCallback: () => {
+        Logger.debug('cancelFetchPlaceholdersCallback');
+      },
+      notifyFileOpenCompletionCallback: () => {
+        Logger.debug('notifyFileOpenCompletionCallback');
+      },
+      notifyFileCloseCompletionCallback: () => {
+        Logger.debug('notifyFileCloseCompletionCallback');
+      },
+      notifyDehydrateCallback: () => {
+        Logger.debug('notifyDehydrateCallback');
+      },
+      notifyDehydrateCompletionCallback: () => {
+        Logger.debug('notifyDehydrateCompletionCallback');
+      },
+      notifyRenameCompletionCallback: () => {
+        Logger.debug('notifyRenameCompletionCallback');
+      },
+      noneCallback: () => {
+        Logger.debug('noneCallback');
+      },
+    };
+
+    await this.container.virtualDrive.registerSyncRoot(
+      BindingsManager.PROVIDER_NAME,
+      version,
+      providerId,
+      callbacks,
+      this.paths.icon
+    );
+
+    await this.container.virtualDrive.connectSyncRoot();
+
+    await this.load();
+  }
+
+  watch() {
+    this.container.virtualDrive.watchAndWait(this.paths.root);
+  }
+
+  async stop() {
+    await this.container.virtualDrive.disconnectSyncRoot();
+  }
+
+  async cleanUp() {
+    await VirtualDrive.unregisterSyncRoot(this.paths.root);
+
+    const itemsSearcher = new ItemsSearcher();
+    const remainingItems = itemsSearcher.listFilesAndFolders(this.paths.root);
+
+    const files = await this.container.retrieveAllFiles.run();
+    const folders = await this.container.retrieveAllFolders.run();
+
+    const items = [...files, ...folders];
+
+    const win32AbsolutePaths = items.map((item) => {
+      const posixRelativePath = item.path;
+      // este path es relativo al root y en formato posix
+
+      const win32RelativePaths =
+        PlatformPathConverter.posixToWin(posixRelativePath);
+
+      return this.container.relativePathToAbsoluteConverter.run(
+        win32RelativePaths
+      );
+    });
+
+    Logger.debug('remainingItems', remainingItems);
+    Logger.debug('win32AbsolutePaths', win32AbsolutePaths);
+    // find all common string in remainingItems and win32AbsolutePaths
+    // and delete them
+    const commonItems = remainingItems.filter((item) =>
+      win32AbsolutePaths.includes(item)
+    );
+
+    const toDeleteFolder: string[] = [];
+
+    commonItems.forEach((item) => {
+      try {
+        const stat = fs.statSync(item);
+        if (stat.isDirectory()) {
+          toDeleteFolder.push(item);
+        } else if (stat.isFile()) {
+          fs.unlinkSync(item);
+        }
+      } catch (error) {
+        Logger.error(error);
+      }
+    });
+
+    toDeleteFolder.forEach((item) => {
+      try {
+        fs.rmdirSync(item, { recursive: true });
+      } catch (error) {
+        Logger.error(error);
+      }
+    });
+  }
+
+  async update() {
+    Logger.info('[SYNC ENGINE]: Updating placeholders');
+
+    try {
+      const tree = await this.container.existingItemsTreeBuilder.run();
+
+      await this.container.filesPlaceholderUpdater.run(tree.files);
+      await this.container.folderPlaceholderUpdater.run(tree.folders);
+    } catch (error) {
+      Logger.error('[SYNC ENGINE] ', error);
+    }
+  }
+}
diff --git a/src/apps/sync-engine/callbacks-controllers/buildControllers.ts b/src/apps/sync-engine/callbacks-controllers/buildControllers.ts
new file mode 100644
index 000000000..1f749a02d
--- /dev/null
+++ b/src/apps/sync-engine/callbacks-controllers/buildControllers.ts
@@ -0,0 +1,54 @@
+import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { AddController } from './controllers/AddController';
+import { DeleteController } from './controllers/DeleteController';
+import { DownloadFileController } from './controllers/DownloadFileController';
+import { NotifyPlaceholderHydrationFinished } from './controllers/NotifyPlaceholderHydrationFinished';
+import { RenameOrMoveController } from './controllers/RenameOrMoveController';
+import { OfflineRenameOrMoveController } from './controllers/offline/OfflineRenameOrMoveController';
+
+export function buildControllers(container: DependencyContainer) {
+  const addFileController = new AddController(
+    container.absolutePathToRelativeConverter,
+    container.fileCreationOrchestrator,
+    container.folderCreator,
+    container.offline.folderCreator
+  );
+
+  const deleteController = new DeleteController(
+    container.fileDeleter,
+    container.folderDeleter
+  );
+
+  const renameOrMoveController = new RenameOrMoveController(
+    container.absolutePathToRelativeConverter,
+    container.filePathUpdater,
+    container.folderPathUpdater,
+    deleteController
+  );
+
+  const downloadFileController = new DownloadFileController(
+    container.fileFinderByContentsId,
+    container.contentsDownloader
+  );
+
+  const offlineRenameOrMoveController = new OfflineRenameOrMoveController(
+    container.absolutePathToRelativeConverter,
+    container.offline.folderPathUpdater
+  );
+
+  const notifyPlaceholderHydrationFinished =
+    new NotifyPlaceholderHydrationFinished(
+      container.notifyMainProcessHydrationFinished
+    );
+
+  return {
+    addFile: addFileController,
+    renameOrMove: renameOrMoveController,
+    delete: deleteController,
+    downloadFile: downloadFileController,
+    offline: {
+      renameOrMove: offlineRenameOrMoveController,
+    },
+    notifyPlaceholderHydrationFinished,
+  } as const;
+}
diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
new file mode 100644
index 000000000..6530dbbeb
--- /dev/null
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
@@ -0,0 +1,142 @@
+import Logger from 'electron-log';
+import { FileCreationOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
+import { createFilePlaceholderId } from '../../../../context/virtual-drive/files/domain/PlaceholderId';
+import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
+import { OfflineFolderCreator } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
+import { createFolderPlaceholderId } from '../../../../context/virtual-drive/folders/domain/FolderPlaceholderId';
+import { OfflineFolder } from '../../../../context/virtual-drive/folders/domain/OfflineFolder';
+import { AbsolutePathToRelativeConverter } from '../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
+import { PlatformPathConverter } from '../../../../context/virtual-drive/shared/application/PlatformPathConverter';
+import { MapObserver } from '../../../../context/virtual-drive/shared/domain/MapObserver';
+import { PathTypeChecker } from '../../../shared/fs/PathTypeChecker ';
+import { CallbackController } from './CallbackController';
+
+type FileCreationQueue = Map<
+  string,
+  (acknowledge: boolean, id: string) => void
+>;
+type FolderCreationQueue = Map<
+  OfflineFolder,
+  (acknowledge: boolean, id: string) => void
+>;
+type CreationCallback = (acknowledge: boolean, id: string) => void;
+
+export class AddController extends CallbackController {
+  // Gets called when:
+  //  - a file has been added
+  //  -a file has been saved
+  //  - after a file has been moved to a folder
+
+  private readonly filesQueue: FileCreationQueue;
+  private readonly foldersQueue: FolderCreationQueue;
+
+  private readonly observer: MapObserver;
+
+  constructor(
+    private readonly absolutePathToRelativeConverter: AbsolutePathToRelativeConverter,
+    private readonly fileCreationOrchestrator: FileCreationOrchestrator,
+    private readonly folderCreator: FolderCreator,
+    private readonly offlineFolderCreator: OfflineFolderCreator
+  ) {
+    super();
+
+    this.filesQueue = new Map();
+    this.foldersQueue = new Map();
+
+    this.observer = new MapObserver(this.foldersQueue, this.createFiles);
+    this.observer.startObserving();
+  }
+
+  private createFile = async (
+    posixRelativePath: string,
+    callback: (acknowledge: boolean, id: string) => void
+  ) => {
+    try {
+      const contentsId = await this.fileCreationOrchestrator.run(
+        posixRelativePath
+      );
+      return callback(true, createFilePlaceholderId(contentsId));
+    } catch (error: unknown) {
+      Logger.error('Error when adding a file: ', error);
+      callback(false, '');
+    } finally {
+      this.filesQueue.delete(posixRelativePath);
+    }
+  };
+
+  private createFiles = async () => {
+    for (const [posixRelativePath, callback] of this.filesQueue) {
+      await this.createFile(posixRelativePath, callback);
+    }
+  };
+
+  private createFolders = async () => {
+    Logger.debug('FOLDERS TO CREATE', this.foldersQueue.size);
+    for (const [offlineFolder, callback] of this.foldersQueue) {
+      await this.createFolder(offlineFolder, callback);
+    }
+  };
+
+  private createFolder = async (
+    offlineFolder: OfflineFolder,
+    callback: (acknowledge: boolean, id: string) => void
+  ) => {
+    Logger.info('Creating folder', offlineFolder);
+    try {
+      await this.folderCreator.run(offlineFolder);
+    } catch (error: unknown) {
+      Logger.error('Error creating a folder: ', error);
+      callback(false, '');
+    } finally {
+      this.foldersQueue.delete(offlineFolder);
+    }
+  };
+
+  private enqueueFolder = (
+    posixRelativePath: string,
+    callback: CreationCallback
+  ) => {
+    try {
+      const offlineFolder = this.offlineFolderCreator.run(posixRelativePath);
+      callback(true, createFolderPlaceholderId(offlineFolder.uuid));
+      this.foldersQueue.set(offlineFolder, () => {
+        //no-op
+      });
+    } catch (error: unknown) {
+      Logger.error('Error on folder creation: ', error);
+      callback(false, '');
+    }
+  };
+
+  async execute(
+    absolutePath: string,
+    callback: CreationCallback
+  ): Promise<void> {
+    const win32RelativePath =
+      this.absolutePathToRelativeConverter.run(absolutePath);
+
+    const posixRelativePath =
+      PlatformPathConverter.winToPosix(win32RelativePath);
+
+    const isFolder = await PathTypeChecker.isFolder(absolutePath);
+
+    if (isFolder) {
+      this.enqueueFolder(posixRelativePath, callback);
+      await this.createFolders();
+      await this.createFiles();
+      return;
+    }
+
+    this.filesQueue.set(posixRelativePath, callback);
+
+    if (this.foldersQueue.size === 0) {
+      Logger.debug(
+        'File is not going to be queued. Creating...',
+        posixRelativePath
+      );
+      await this.createFiles();
+    } else {
+      Logger.debug('File has been queued: ', posixRelativePath);
+    }
+  }
+}
diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/CallbackController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/CallbackController.ts
new file mode 100644
index 000000000..ce680154b
--- /dev/null
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/CallbackController.ts
@@ -0,0 +1,36 @@
+import {
+  FilePlaceholderId,
+  isFilePlaceholderId,
+} from '../../../../context/virtual-drive/files/domain/PlaceholderId';
+import {
+  FolderPlaceholderId,
+  isFolderPlaceholderId,
+} from '../../../../context/virtual-drive/folders/domain/FolderPlaceholderId';
+
+export abstract class CallbackController {
+  protected trim(id: string): string {
+    return id
+      .replace(
+        // eslint-disable-next-line no-control-regex
+        /[\x00-\x1F\x7F-\x9F]/g,
+        ''
+      )
+      .normalize();
+  }
+
+  protected isFilePlaceholder(id: string): id is FilePlaceholderId {
+    // make sure the id is trimmed before comparing
+    // if it was already trimmed should not change its length
+    const trimmed = this.trim(id);
+
+    return isFilePlaceholderId(trimmed);
+  }
+
+  protected isFolderPlaceholder(id: string): id is FolderPlaceholderId {
+    // make sure the id is trimmed before comparing
+    // if it was already trimmed should not change its length
+    const trimmed = this.trim(id);
+
+    return isFolderPlaceholderId(trimmed);
+  }
+}
diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/DeleteController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/DeleteController.ts
new file mode 100644
index 000000000..65ee7fa18
--- /dev/null
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/DeleteController.ts
@@ -0,0 +1,63 @@
+import { FileDeleter } from '../../../../context/virtual-drive/files/application/FileDeleter';
+import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
+import { DelayQueue } from '../../../../context/virtual-drive/shared/domain/DelayQueue';
+import { CallbackController } from './CallbackController';
+import Logger from 'electron-log';
+
+export class DeleteController extends CallbackController {
+  private readonly filesQueue: DelayQueue;
+  private readonly foldersQueue: DelayQueue;
+
+  constructor(
+    private readonly fileDeleter: FileDeleter,
+    private readonly folderDeleter: FolderDeleter
+  ) {
+    super();
+
+    const deleteFile = async (file: string) => {
+      await this.fileDeleter.run(file);
+    };
+
+    const deleteFolder = async (folder: string) => {
+      await this.folderDeleter.run(folder);
+    };
+
+    const canDeleteFolders = () => {
+      // Folders can always be deleted
+      return true;
+    };
+
+    this.foldersQueue = new DelayQueue(
+      'folders',
+      deleteFolder,
+      canDeleteFolders
+    );
+
+    const canDeleteFiles = () => {
+      // Files cannot be deleted if there are folders on the queue
+      return this.foldersQueue.size === 0;
+    };
+
+    this.filesQueue = new DelayQueue('files', deleteFile, canDeleteFiles);
+  }
+
+  async execute(contentsId: string) {
+    const trimmedId = this.trim(contentsId);
+
+    if (this.isFilePlaceholder(trimmedId)) {
+      const [_, contentsId] = trimmedId.split(':');
+      Logger.debug(`Adding file: ${contentsId} to the trash queue`);
+      this.filesQueue.push(contentsId);
+      return;
+    }
+
+    if (this.isFolderPlaceholder(trimmedId)) {
+      const [_, folderUuid] = trimmedId.split(':');
+      Logger.debug(`Adding folder: ${folderUuid} to the trash queue`);
+      this.foldersQueue.push(folderUuid);
+      return;
+    }
+
+    throw new Error(`Placeholder Id not identified:  ${trimmedId}`);
+  }
+}
diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts
new file mode 100644
index 000000000..6e5b8bfbc
--- /dev/null
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts
@@ -0,0 +1,55 @@
+import Logger from 'electron-log';
+import { ContentsDownloader } from '../../../../context/virtual-drive/contents/application/ContentsDownloader';
+import { FileFinderByContentsId } from '../../../../context/virtual-drive/files/application/FileFinderByContentsId';
+import { FilePlaceholderId } from '../../../../context/virtual-drive/files/domain/PlaceholderId';
+import { CallbackDownload } from '../../BindingManager';
+import { CallbackController } from './CallbackController';
+
+export class DownloadFileController extends CallbackController {
+  constructor(
+    private readonly fileFinder: FileFinderByContentsId,
+    private readonly downloader: ContentsDownloader
+  ) {
+    super();
+  }
+
+  private async action(id: string, cb: CallbackDownload): Promise<string> {
+    const file = this.fileFinder.run(id);
+
+    return await this.downloader.run(file, cb);
+  }
+
+  fileFinderByContentsId(contentsId: string) {
+    return this.fileFinder.run(contentsId);
+  }
+
+  async execute(
+    filePlaceholderId: FilePlaceholderId,
+    cb: CallbackDownload
+  ): Promise<string> {
+    const trimmedId = this.trim(filePlaceholderId);
+
+    try {
+      const [_, contentsId] = trimmedId.split(':');
+      return await this.action(contentsId, cb);
+    } catch (error: unknown) {
+      Logger.error(
+        'Error downloading a file, going to refresh and retry: ',
+        error
+      );
+
+      return await new Promise((resolve, reject) => {
+        setTimeout(async () => {
+          try {
+            const [_, contentsId] = trimmedId.split(':');
+            Logger.debug('cb: ', cb);
+            const result = await this.action(contentsId, cb);
+            resolve(result);
+          } catch (error) {
+            reject(error);
+          }
+        }, 100);
+      });
+    }
+  }
+}
diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/NotifyPlaceholderHydrationFinished.ts b/src/apps/sync-engine/callbacks-controllers/controllers/NotifyPlaceholderHydrationFinished.ts
new file mode 100644
index 000000000..50afcc7e6
--- /dev/null
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/NotifyPlaceholderHydrationFinished.ts
@@ -0,0 +1,18 @@
+import { NotifyMainProcessHydrationFinished } from '../../../../context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished';
+import { FilePlaceholderId } from '../../../../context/virtual-drive/files/domain/PlaceholderId';
+import { CallbackController } from './CallbackController';
+
+export class NotifyPlaceholderHydrationFinished extends CallbackController {
+  constructor(private readonly notifier: NotifyMainProcessHydrationFinished) {
+    super();
+  }
+
+  async execute(filePlaceholderId: FilePlaceholderId) {
+    const trimmedId = this.trim(filePlaceholderId);
+    const [_, contentsId] = trimmedId.split(':');
+
+    if (!contentsId) return;
+
+    await this.notifier.run(contentsId);
+  }
+}
diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/RenameOrMoveController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/RenameOrMoveController.ts
new file mode 100644
index 000000000..082e50146
--- /dev/null
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/RenameOrMoveController.ts
@@ -0,0 +1,57 @@
+import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
+import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
+import { AbsolutePathToRelativeConverter } from '../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
+import { PlatformPathConverter } from '../../../../context/virtual-drive/shared/application/PlatformPathConverter';
+import { CallbackController } from './CallbackController';
+import { DeleteController } from './DeleteController';
+import Logger from 'electron-log';
+
+export class RenameOrMoveController extends CallbackController {
+  constructor(
+    private readonly absolutePathToRelativeConverter: AbsolutePathToRelativeConverter,
+    private readonly filePathUpdater: FilePathUpdater,
+    private readonly folderPathUpdater: FolderPathUpdater,
+    private readonly deleteController: DeleteController
+  ) {
+    super();
+  }
+
+  async execute(
+    absolutePath: string,
+    contentsId: string,
+    callback: (response: boolean) => void
+  ) {
+    const trimmedId = this.trim(contentsId);
+
+    try {
+      if (absolutePath.startsWith('\\$Recycle.Bin')) {
+        await this.deleteController.execute(trimmedId);
+        return callback(true);
+      }
+
+      const win32RelativePath =
+        this.absolutePathToRelativeConverter.run(absolutePath);
+
+      const posixRelativePath =
+        PlatformPathConverter.winToPosix(win32RelativePath);
+
+      if (this.isFilePlaceholder(trimmedId)) {
+        const [_, contentsId] = trimmedId.split(':');
+        await this.filePathUpdater.run(contentsId, posixRelativePath);
+        return callback(true);
+      }
+
+      if (this.isFolderPlaceholder(trimmedId)) {
+        const [_, folderUuid] = trimmedId.split(':');
+        await this.folderPathUpdater.run(folderUuid, posixRelativePath);
+        return callback(true);
+      }
+
+      Logger.error('Unidentified placeholder id: ', trimmedId);
+      callback(false);
+    } catch (error: unknown) {
+      Logger.error(error);
+      callback(false);
+    }
+  }
+}
diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/offline/OfflineRenameOrMoveController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/offline/OfflineRenameOrMoveController.ts
new file mode 100644
index 000000000..6d758c5fd
--- /dev/null
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/offline/OfflineRenameOrMoveController.ts
@@ -0,0 +1,53 @@
+import Logger from 'electron-log';
+import { OfflineFolderPathUpdater } from '../../../../../context/virtual-drive/folders/application/Offline/OfflineFolderPathUpdater';
+import { AbsolutePathToRelativeConverter } from '../../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
+import { PlatformPathConverter } from '../../../../../context/virtual-drive/shared/application/PlatformPathConverter';
+import { CallbackController } from '../CallbackController';
+
+export class OfflineRenameOrMoveController extends CallbackController {
+  constructor(
+    private readonly absolutePathToRelativeConverter: AbsolutePathToRelativeConverter,
+    private readonly folderPathUpdater: OfflineFolderPathUpdater
+  ) {
+    super();
+  }
+
+  async execute(
+    absolutePath: string,
+    placeholderId: string,
+    callback: (response: boolean) => void
+  ) {
+    Logger.warn('Inside the fallback');
+    const trimmedId = this.trim(placeholderId);
+
+    try {
+      if (absolutePath.startsWith('\\$Recycle.Bin')) {
+        return callback(false);
+      }
+
+      const win32RelativePath =
+        this.absolutePathToRelativeConverter.run(absolutePath);
+
+      const posixRelativePath =
+        PlatformPathConverter.winToPosix(win32RelativePath);
+
+      if (this.isFilePlaceholder(trimmedId)) {
+        Logger.error('Tried to rename or move an offline file');
+        return callback(false);
+      }
+
+      if (this.isFolderPlaceholder(trimmedId)) {
+        const [_, folderUuid] = trimmedId.split(':');
+        await this.folderPathUpdater.run(folderUuid, posixRelativePath);
+        Logger.debug('OFFLINE FOLDER PATH UPDATED: ', folderUuid);
+        return callback(true);
+      }
+
+      Logger.error('Placeholder id not identified: ', trimmedId);
+      callback(false);
+    } catch (error: unknown) {
+      Logger.error(error);
+      callback(false);
+    }
+  }
+}
diff --git a/src/apps/sync-engine/callbacks-controllers/helpers/rawPathIsFolder.ts b/src/apps/sync-engine/callbacks-controllers/helpers/rawPathIsFolder.ts
new file mode 100644
index 000000000..be91952c9
--- /dev/null
+++ b/src/apps/sync-engine/callbacks-controllers/helpers/rawPathIsFolder.ts
@@ -0,0 +1,3 @@
+export function rawPathIsFolder(raw: string) {
+  return raw.endsWith('\\') || raw.endsWith('/');
+}
diff --git a/src/apps/sync-engine/callbacks-controllers/middlewares/executeControllerWithFallback.ts b/src/apps/sync-engine/callbacks-controllers/middlewares/executeControllerWithFallback.ts
new file mode 100644
index 000000000..869ff7382
--- /dev/null
+++ b/src/apps/sync-engine/callbacks-controllers/middlewares/executeControllerWithFallback.ts
@@ -0,0 +1,32 @@
+import Logger from 'electron-log';
+
+export const executeControllerWithFallback =
+  <Action extends (...args: any[]) => void>({
+    handler,
+    fallback,
+  }: {
+    handler: Action;
+    fallback: Action;
+  }) =>
+  (
+    absolutePath: string,
+    placeholderId: string,
+    callback: (response: boolean) => void
+  ) => {
+    Logger.warn('Executing');
+    try {
+      handler(absolutePath, placeholderId, (response: boolean) => {
+        if (!response) {
+          Logger.warn('Default handler failed, running fallback');
+          fallback(absolutePath, placeholderId, callback.bind(fallback));
+          return;
+        }
+
+        Logger.warn('Default handler success');
+        callback(true);
+      });
+    } catch (error: unknown) {
+      Logger.error(error);
+      callback(false);
+    }
+  };
diff --git a/src/apps/sync-engine/dependency-injection/DependencyContainer.ts b/src/apps/sync-engine/dependency-injection/DependencyContainer.ts
new file mode 100644
index 000000000..ebd6870b5
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/DependencyContainer.ts
@@ -0,0 +1,18 @@
+/* eslint-disable max-len */
+import { VirtualDrive } from 'virtual-drive/dist';
+import { ContentsContainer } from './contents/ContentsContainer';
+import { FilesContainer } from './files/FilesContainer';
+import { FoldersContainer } from './folders/FoldersContainer';
+import { ItemsContainer } from './items/ItemsContainer';
+import { BoundaryBridgeContainer } from './boundaryBridge/BoundaryBridgeContainer';
+import { SharedContainer } from './shared/SharedContainer';
+
+export interface DependencyContainer
+  extends ItemsContainer,
+    ContentsContainer,
+    FilesContainer,
+    FoldersContainer,
+    SharedContainer,
+    BoundaryBridgeContainer {
+  virtualDrive: VirtualDrive;
+}
diff --git a/src/apps/sync-engine/dependency-injection/DependencyContainerFactory.ts b/src/apps/sync-engine/dependency-injection/DependencyContainerFactory.ts
new file mode 100644
index 000000000..657e3e1c2
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/DependencyContainerFactory.ts
@@ -0,0 +1,71 @@
+import { DomainEventSubscribers } from '../../../context/virtual-drive/shared/infrastructure/DomainEventSubscribers';
+import { getUser } from '../../main/auth/service';
+import { DependencyContainer } from './DependencyContainer';
+import { buildBoundaryBridgeContainer } from './boundaryBridge/build';
+import { DependencyInjectionEventBus } from './common/eventBus';
+import { DependencyInjectionVirtualDrive } from './common/virtualDrive';
+import { buildContentsContainer } from './contents/builder';
+import { buildFilesContainer } from './files/builder';
+import { buildFoldersContainer } from './folders/builder';
+import { buildItemsContainer } from './items/builder';
+import { buildSharedContainer } from './shared/builder';
+
+export class DependencyContainerFactory {
+  private static _container: DependencyContainer | undefined;
+
+  static readonly subscribers: Array<keyof DependencyContainer> = [
+    'createFilePlaceholderOnDeletionFailed',
+    'synchronizeOfflineModificationsOnFolderCreated',
+  ];
+
+  eventSubscribers(
+    key: keyof DependencyContainer
+  ): DependencyContainer[keyof DependencyContainer] | undefined {
+    if (!DependencyContainerFactory._container) return undefined;
+
+    return DependencyContainerFactory._container[key];
+  }
+
+  async build(): Promise<DependencyContainer> {
+    if (DependencyContainerFactory._container !== undefined) {
+      return DependencyContainerFactory._container;
+    }
+    const user = getUser();
+
+    if (!user) {
+      throw new Error('');
+    }
+
+    const { bus } = DependencyInjectionEventBus;
+    const { virtualDrive } = DependencyInjectionVirtualDrive;
+
+    const sharedContainer = buildSharedContainer();
+    const itemsContainer = buildItemsContainer();
+    const contentsContainer = await buildContentsContainer(sharedContainer);
+    const foldersContainer = await buildFoldersContainer(sharedContainer);
+    const { container: filesContainer } = await buildFilesContainer(
+      foldersContainer,
+      sharedContainer
+    );
+    const boundaryBridgeContainer = buildBoundaryBridgeContainer(
+      contentsContainer,
+      filesContainer
+    );
+
+    const container = {
+      ...itemsContainer,
+      ...contentsContainer,
+      ...filesContainer,
+      ...foldersContainer,
+      ...sharedContainer,
+      ...boundaryBridgeContainer,
+
+      virtualDrive,
+    };
+
+    bus.addSubscribers(DomainEventSubscribers.from(container));
+    DependencyContainerFactory._container = container;
+
+    return container;
+  }
+}
diff --git a/src/apps/sync-engine/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts b/src/apps/sync-engine/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts
new file mode 100644
index 000000000..a885d570f
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts
@@ -0,0 +1,5 @@
+import { FileCreationOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
+
+export interface BoundaryBridgeContainer {
+  fileCreationOrchestrator: FileCreationOrchestrator;
+}
diff --git a/src/apps/sync-engine/dependency-injection/boundaryBridge/build.ts b/src/apps/sync-engine/dependency-injection/boundaryBridge/build.ts
new file mode 100644
index 000000000..bb065d7e1
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/boundaryBridge/build.ts
@@ -0,0 +1,19 @@
+import { BoundaryBridgeContainer } from './BoundaryBridgeContainer';
+import { ContentsContainer } from '../contents/ContentsContainer';
+import { FilesContainer } from '../files/FilesContainer';
+import { FileCreationOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
+
+export function buildBoundaryBridgeContainer(
+  contentsContainer: ContentsContainer,
+  filesContainer: FilesContainer
+): BoundaryBridgeContainer {
+  const fileCreationOrchestrator = new FileCreationOrchestrator(
+    contentsContainer.contentsUploader,
+    filesContainer.fileCreator,
+    filesContainer.sameFileWasMoved
+  );
+
+  return {
+    fileCreationOrchestrator,
+  };
+}
diff --git a/src/apps/sync-engine/dependency-injection/common/clients.ts b/src/apps/sync-engine/dependency-injection/common/clients.ts
new file mode 100644
index 000000000..61d2b7f88
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/common/clients.ts
@@ -0,0 +1,18 @@
+import { AuthorizedClients } from '../../../shared/HttpClient/Clients';
+import { getClients } from '../../../shared/HttpClient/background-process-clients';
+
+export class DependencyInjectionHttpClientsProvider {
+  private static clients: AuthorizedClients;
+
+  static get(): AuthorizedClients {
+    if (DependencyInjectionHttpClientsProvider.clients) {
+      return DependencyInjectionHttpClientsProvider.clients;
+    }
+
+    const clients = getClients();
+
+    DependencyInjectionHttpClientsProvider.clients = clients;
+
+    return clients;
+  }
+}
diff --git a/src/apps/sync-engine/dependency-injection/common/crypt.ts b/src/apps/sync-engine/dependency-injection/common/crypt.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/apps/sync-engine/dependency-injection/common/eventBus.ts b/src/apps/sync-engine/dependency-injection/common/eventBus.ts
new file mode 100644
index 000000000..4958886ca
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/common/eventBus.ts
@@ -0,0 +1,24 @@
+import { EventBus } from '../../../../context/virtual-drive/shared/domain/EventBus';
+import { EventRecorder } from '../../../../context/virtual-drive/shared/infrastructure/EventRecorder';
+import { NodeJsEventBus } from '../../../../context/virtual-drive/shared/infrastructure/NodeJsEventBus';
+import { DependencyInjectionEventRepository } from './eventRepository';
+
+export class DependencyInjectionEventBus {
+  private static _bus: EventBus;
+
+  static get bus(): EventBus {
+    if (DependencyInjectionEventBus._bus) {
+      return DependencyInjectionEventBus._bus;
+    }
+
+    const eventBus = new NodeJsEventBus();
+
+    const eventHistory = DependencyInjectionEventRepository.get();
+
+    const bus = new EventRecorder(eventHistory, eventBus);
+
+    DependencyInjectionEventBus._bus = bus;
+
+    return DependencyInjectionEventBus._bus;
+  }
+}
diff --git a/src/apps/sync-engine/dependency-injection/common/eventRepository.ts b/src/apps/sync-engine/dependency-injection/common/eventRepository.ts
new file mode 100644
index 000000000..485237051
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/common/eventRepository.ts
@@ -0,0 +1,16 @@
+import { EventRepository } from '../../../../context/virtual-drive/shared/domain/EventRepository';
+import { InMemoryEventRepository } from '../../../../context/virtual-drive/shared/infrastructure/InMemoryEventHistory';
+
+export class DependencyInjectionEventRepository {
+  private static history: EventRepository;
+
+  static get(): EventRepository {
+    if (DependencyInjectionEventRepository.history) {
+      return DependencyInjectionEventRepository.history;
+    }
+
+    DependencyInjectionEventRepository.history = new InMemoryEventRepository();
+
+    return DependencyInjectionEventRepository.history;
+  }
+}
diff --git a/src/apps/sync-engine/dependency-injection/common/localRootFolderPath.ts b/src/apps/sync-engine/dependency-injection/common/localRootFolderPath.ts
new file mode 100644
index 000000000..c8f34a324
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/common/localRootFolderPath.ts
@@ -0,0 +1,15 @@
+import configStore from '../../../main/config';
+
+export class DependencyInjectionLocalRootFolderPath {
+  private static path: string;
+
+  static get(): string {
+    if (DependencyInjectionLocalRootFolderPath.path) {
+      return DependencyInjectionLocalRootFolderPath.path;
+    }
+
+    DependencyInjectionLocalRootFolderPath.path = configStore.get('syncRoot');
+
+    return DependencyInjectionLocalRootFolderPath.path;
+  }
+}
diff --git a/src/apps/sync-engine/dependency-injection/common/mnemonic.ts b/src/apps/sync-engine/dependency-injection/common/mnemonic.ts
new file mode 100644
index 000000000..24100430b
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/common/mnemonic.ts
@@ -0,0 +1,20 @@
+import configStore from '../../../main/config';
+
+export class DependencyInjectionMnemonicProvider {
+  private static _: string;
+
+  static get() {
+    if (DependencyInjectionMnemonicProvider._) {
+      return DependencyInjectionMnemonicProvider._;
+    }
+
+    const mnemonic = configStore.get('mnemonic');
+
+    if (mnemonic) {
+      DependencyInjectionMnemonicProvider._ = mnemonic;
+      return mnemonic;
+    }
+
+    throw new Error('Could not get mnemonic in dependency injection');
+  }
+}
diff --git a/src/apps/sync-engine/dependency-injection/common/sdk.ts b/src/apps/sync-engine/dependency-injection/common/sdk.ts
new file mode 100644
index 000000000..84437b858
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/common/sdk.ts
@@ -0,0 +1,35 @@
+import { Storage } from '@internxt/sdk/dist/drive/storage';
+import { ipcRenderer } from 'electron';
+import { onUserUnauthorized } from '../../../shared/HttpClient/background-process-clients';
+import packageJson from '../../../../../package.json';
+
+export class DependencyInjectionStorageSdk {
+  private static sdk: Storage;
+
+  static async get(): Promise<any> {
+    if (DependencyInjectionStorageSdk.sdk) {
+      return DependencyInjectionStorageSdk.sdk;
+    }
+
+    const url = `${process.env.API_URL}/api`;
+    const { name: clientName, version: clientVersion } = packageJson;
+
+    const token = await ipcRenderer.invoke('get-token');
+
+    const sdk = Storage.client(
+      url,
+      {
+        clientName,
+        clientVersion,
+      },
+      {
+        token,
+        unauthorizedCallback: onUserUnauthorized,
+      }
+    );
+
+    DependencyInjectionStorageSdk.sdk = sdk;
+
+    return DependencyInjectionStorageSdk.sdk;
+  }
+}
diff --git a/src/apps/sync-engine/dependency-injection/common/traverser.ts b/src/apps/sync-engine/dependency-injection/common/traverser.ts
new file mode 100644
index 000000000..b25de6491
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/common/traverser.ts
@@ -0,0 +1,21 @@
+import crypt from '../../../../context/shared/infrastructure/crypt';
+import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
+import { DependencyInjectionUserProvider } from './user';
+
+export class DependencyInjectionTraverserProvider {
+  private static traverser: Traverser;
+
+  static get(): Traverser {
+    if (DependencyInjectionTraverserProvider.traverser) {
+      return DependencyInjectionTraverserProvider.traverser;
+    }
+
+    const user = DependencyInjectionUserProvider.get();
+
+    const traverser = Traverser.existingItems(crypt, user.root_folder_id);
+
+    DependencyInjectionTraverserProvider.traverser = traverser;
+
+    return traverser;
+  }
+}
diff --git a/src/apps/sync-engine/dependency-injection/common/user.ts b/src/apps/sync-engine/dependency-injection/common/user.ts
new file mode 100644
index 000000000..fddca6487
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/common/user.ts
@@ -0,0 +1,20 @@
+import { getUser } from '../../../main/auth/service';
+import { User } from '../../../main/types';
+
+export class DependencyInjectionUserProvider {
+  private static _user: User;
+
+  static get() {
+    if (DependencyInjectionUserProvider._user)
+      return DependencyInjectionUserProvider._user;
+
+    const user = getUser();
+
+    if (user) {
+      DependencyInjectionUserProvider._user = user;
+      return user;
+    }
+
+    throw new Error('Could not get user in dependency injection');
+  }
+}
diff --git a/src/apps/sync-engine/dependency-injection/common/virtualDrive.ts b/src/apps/sync-engine/dependency-injection/common/virtualDrive.ts
new file mode 100644
index 000000000..e74b97645
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/common/virtualDrive.ts
@@ -0,0 +1,20 @@
+import { VirtualDrive } from 'virtual-drive/dist';
+import { DependencyInjectionLocalRootFolderPath } from './localRootFolderPath';
+
+export class DependencyInjectionVirtualDrive {
+  private static _vd: VirtualDrive;
+
+  static get virtualDrive(): VirtualDrive {
+    if (DependencyInjectionVirtualDrive._vd) {
+      return DependencyInjectionVirtualDrive._vd;
+    }
+
+    const root = DependencyInjectionLocalRootFolderPath.get();
+
+    const vd = new VirtualDrive(root);
+
+    DependencyInjectionVirtualDrive._vd = vd;
+
+    return DependencyInjectionVirtualDrive._vd;
+  }
+}
diff --git a/src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts b/src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts
new file mode 100644
index 000000000..047842c5d
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/contents/ContentsContainer.ts
@@ -0,0 +1,11 @@
+import { ContentsDownloader } from '../../../../context/virtual-drive/contents/application/ContentsDownloader';
+import { NotifyMainProcessHydrationFinished } from '../../../../context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished';
+import { RetryContentsUploader } from '../../../../context/virtual-drive/contents/application/RetryContentsUploader';
+import { TemporalFolderProvider } from '../../../../context/virtual-drive/contents/application/temporalFolderProvider';
+
+export interface ContentsContainer {
+  contentsUploader: RetryContentsUploader;
+  contentsDownloader: ContentsDownloader;
+  temporalFolderProvider: TemporalFolderProvider;
+  notifyMainProcessHydrationFinished: NotifyMainProcessHydrationFinished;
+}
diff --git a/src/apps/sync-engine/dependency-injection/contents/builder.ts b/src/apps/sync-engine/dependency-injection/contents/builder.ts
new file mode 100644
index 000000000..e001458a3
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/contents/builder.ts
@@ -0,0 +1,68 @@
+import { Environment } from '@internxt/inxt-js';
+import { DependencyInjectionMnemonicProvider } from '../common/mnemonic';
+import { DependencyInjectionUserProvider } from '../common/user';
+import { SharedContainer } from '../shared/SharedContainer';
+import { ContentsContainer } from './ContentsContainer';
+import { DependencyInjectionEventBus } from '../common/eventBus';
+import { DependencyInjectionEventRepository } from '../common/eventRepository';
+import { ContentsDownloader } from '../../../../context/virtual-drive/contents/application/ContentsDownloader';
+import { ContentsUploader } from '../../../../context/virtual-drive/contents/application/ContentsUploader';
+import { NotifyMainProcessHydrationFinished } from '../../../../context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished';
+import { RetryContentsUploader } from '../../../../context/virtual-drive/contents/application/RetryContentsUploader';
+import { temporalFolderProvider } from '../../../../context/virtual-drive/contents/application/temporalFolderProvider';
+import { EnvironmentRemoteFileContentsManagersFactory } from '../../../../context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
+import { FSLocalFileProvider } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileProvider';
+import { FSLocalFileWriter } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileWriter';
+import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
+
+export async function buildContentsContainer(
+  sharedContainer: SharedContainer
+): Promise<ContentsContainer> {
+  const user = DependencyInjectionUserProvider.get();
+  const mnemonic = DependencyInjectionMnemonicProvider.get();
+  const { bus: eventBus } = DependencyInjectionEventBus;
+  const eventRepository = DependencyInjectionEventRepository.get();
+
+  const environment = new Environment({
+    bridgeUrl: process.env.BRIDGE_URL,
+    bridgeUser: user.bridgeUser,
+    bridgePass: user.userId,
+    encryptionKey: mnemonic,
+  });
+
+  const contentsManagerFactory =
+    new EnvironmentRemoteFileContentsManagersFactory(environment, user.bucket);
+
+  const contentsProvider = new FSLocalFileProvider();
+  const contentsUploader = new ContentsUploader(
+    contentsManagerFactory,
+    contentsProvider,
+    ipcRendererSyncEngine,
+    sharedContainer.relativePathToAbsoluteConverter
+  );
+
+  const retryContentsUploader = new RetryContentsUploader(contentsUploader);
+
+  const localWriter = new FSLocalFileWriter(temporalFolderProvider);
+
+  const contentsDownloader = new ContentsDownloader(
+    contentsManagerFactory,
+    localWriter,
+    ipcRendererSyncEngine,
+    temporalFolderProvider,
+    eventBus
+  );
+
+  const notifyMainProcessHydrationFinished =
+    new NotifyMainProcessHydrationFinished(
+      eventRepository,
+      ipcRendererSyncEngine
+    );
+
+  return {
+    contentsUploader: retryContentsUploader,
+    contentsDownloader,
+    temporalFolderProvider,
+    notifyMainProcessHydrationFinished,
+  };
+}
diff --git a/src/apps/sync-engine/dependency-injection/files/FilesContainer.ts b/src/apps/sync-engine/dependency-injection/files/FilesContainer.ts
new file mode 100644
index 000000000..5ba634247
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/files/FilesContainer.ts
@@ -0,0 +1,25 @@
+import { CreateFilePlaceholderOnDeletionFailed } from '../../../../context/virtual-drive/files/application/CreateFilePlaceholderOnDeletionFailed';
+import { FileCreator } from '../../../../context/virtual-drive/files/application/FileCreator';
+import { FileDeleter } from '../../../../context/virtual-drive/files/application/FileDeleter';
+import { FileFinderByContentsId } from '../../../../context/virtual-drive/files/application/FileFinderByContentsId';
+import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
+import { FilePlaceholderCreatorFromContentsId } from '../../../../context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId';
+import { FilesPlaceholderUpdater } from '../../../../context/virtual-drive/files/application/FilesPlaceholderUpdater';
+import { FilesPlaceholderCreator } from '../../../../context/virtual-drive/files/application/FilesPlaceholdersCreator';
+import { RepositoryPopulator } from '../../../../context/virtual-drive/files/application/RepositoryPopulator';
+import { RetrieveAllFiles } from '../../../../context/virtual-drive/files/application/RetrieveAllFiles';
+import { SameFileWasMoved } from '../../../../context/virtual-drive/files/application/SameFileWasMoved';
+
+export interface FilesContainer {
+  fileFinderByContentsId: FileFinderByContentsId;
+  fileDeleter: FileDeleter;
+  filePathUpdater: FilePathUpdater;
+  fileCreator: FileCreator;
+  filePlaceholderCreatorFromContentsId: FilePlaceholderCreatorFromContentsId;
+  createFilePlaceholderOnDeletionFailed: CreateFilePlaceholderOnDeletionFailed;
+  sameFileWasMoved: SameFileWasMoved;
+  retrieveAllFiles: RetrieveAllFiles;
+  repositoryPopulator: RepositoryPopulator;
+  filesPlaceholderCreator: FilesPlaceholderCreator;
+  filesPlaceholderUpdater: FilesPlaceholderUpdater;
+}
diff --git a/src/apps/sync-engine/dependency-injection/files/builder.ts b/src/apps/sync-engine/dependency-injection/files/builder.ts
new file mode 100644
index 000000000..94969cb85
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/files/builder.ts
@@ -0,0 +1,126 @@
+import crypt from '../../../../context/shared/infrastructure/crypt';
+import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
+import { DependencyInjectionEventBus } from '../common/eventBus';
+import { DependencyInjectionEventRepository } from '../common/eventRepository';
+import { DependencyInjectionUserProvider } from '../common/user';
+import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
+import { FoldersContainer } from '../folders/FoldersContainer';
+import { SharedContainer } from '../shared/SharedContainer';
+import { FilesContainer } from './FilesContainer';
+import { DependencyInjectionStorageSdk } from '../common/sdk';
+import { CreateFilePlaceholderOnDeletionFailed } from '../../../../context/virtual-drive/files/application/CreateFilePlaceholderOnDeletionFailed';
+import { FileCreator } from '../../../../context/virtual-drive/files/application/FileCreator';
+import { FileDeleter } from '../../../../context/virtual-drive/files/application/FileDeleter';
+import { FileFinderByContentsId } from '../../../../context/virtual-drive/files/application/FileFinderByContentsId';
+import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
+import { FilePlaceholderCreatorFromContentsId } from '../../../../context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId';
+import { FilesPlaceholderUpdater } from '../../../../context/virtual-drive/files/application/FilesPlaceholderUpdater';
+import { FilesPlaceholderCreator } from '../../../../context/virtual-drive/files/application/FilesPlaceholdersCreator';
+import { RepositoryPopulator } from '../../../../context/virtual-drive/files/application/RepositoryPopulator';
+import { RetrieveAllFiles } from '../../../../context/virtual-drive/files/application/RetrieveAllFiles';
+import { SameFileWasMoved } from '../../../../context/virtual-drive/files/application/SameFileWasMoved';
+import { InMemoryFileRepository } from '../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
+import { SDKRemoteFileSystem } from '../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
+import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem';
+import { LocalFileIdProvider } from '../../../../context/virtual-drive/shared/application/LocalFileIdProvider';
+
+export async function buildFilesContainer(
+  folderContainer: FoldersContainer,
+  sharedContainer: SharedContainer
+): Promise<{
+  container: FilesContainer;
+  subscribers: any;
+}> {
+  const user = DependencyInjectionUserProvider.get();
+  const { bus: eventBus } = DependencyInjectionEventBus;
+  const eventHistory = DependencyInjectionEventRepository.get();
+  const { virtualDrive } = DependencyInjectionVirtualDrive;
+  const sdk = await DependencyInjectionStorageSdk.get();
+
+  const remoteFileSystem = new SDKRemoteFileSystem(sdk, crypt, user.bucket);
+  const localFileSystem = new NodeWinLocalFileSystem(
+    virtualDrive,
+    sharedContainer.relativePathToAbsoluteConverter
+  );
+
+  const repository = new InMemoryFileRepository();
+
+  const fileFinderByContentsId = new FileFinderByContentsId(repository);
+
+  const fileDeleter = new FileDeleter(
+    remoteFileSystem,
+    localFileSystem,
+    repository,
+    folderContainer.allParentFoldersStatusIsExists,
+    ipcRendererSyncEngine
+  );
+
+  const sameFileWasMoved = new SameFileWasMoved(
+    repository,
+    localFileSystem,
+    eventHistory
+  );
+
+  const filePathUpdater = new FilePathUpdater(
+    remoteFileSystem,
+    localFileSystem,
+    repository,
+    fileFinderByContentsId,
+    folderContainer.folderFinder,
+    ipcRendererSyncEngine,
+    eventBus
+  );
+
+  const fileCreator = new FileCreator(
+    remoteFileSystem,
+    repository,
+    folderContainer.folderFinder,
+    fileDeleter,
+    eventBus,
+    ipcRendererSyncEngine
+  );
+
+  const filePlaceholderCreatorFromContentsId =
+    new FilePlaceholderCreatorFromContentsId(
+      fileFinderByContentsId,
+      localFileSystem
+    );
+
+  const createFilePlaceholderOnDeletionFailed =
+    new CreateFilePlaceholderOnDeletionFailed(
+      filePlaceholderCreatorFromContentsId
+    );
+
+  const repositoryPopulator = new RepositoryPopulator(repository);
+
+  const filesPlaceholderCreator = new FilesPlaceholderCreator(localFileSystem);
+
+  const localFileIdProvider = new LocalFileIdProvider(
+    sharedContainer.relativePathToAbsoluteConverter
+  );
+
+  const filesPlaceholderUpdater = new FilesPlaceholderUpdater(
+    repository,
+    localFileSystem,
+    sharedContainer.relativePathToAbsoluteConverter,
+    localFileIdProvider,
+    eventHistory
+  );
+
+  const container: FilesContainer = {
+    fileFinderByContentsId,
+    fileDeleter,
+    filePathUpdater,
+    fileCreator,
+    filePlaceholderCreatorFromContentsId: filePlaceholderCreatorFromContentsId,
+    createFilePlaceholderOnDeletionFailed:
+      createFilePlaceholderOnDeletionFailed,
+    sameFileWasMoved,
+    retrieveAllFiles: new RetrieveAllFiles(repository),
+    repositoryPopulator: repositoryPopulator,
+    filesPlaceholderCreator,
+    filesPlaceholderUpdater,
+  };
+
+  return { container, subscribers: [] };
+}
diff --git a/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts b/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
new file mode 100644
index 000000000..bcb774e3d
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
@@ -0,0 +1,33 @@
+import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
+import { FolderByPartialSearcher } from '../../../../context/virtual-drive/folders/application/FolderByPartialSearcher';
+import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
+import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
+import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
+import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
+import { FolderRepositoryInitiator } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
+import { FoldersPlaceholderCreator } from '../../../../context/virtual-drive/folders/application/FoldersPlaceholderCreator';
+import { OfflineFolderCreator } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
+import { OfflineFolderPathUpdater } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderPathUpdater';
+import { RetrieveAllFolders } from '../../../../context/virtual-drive/folders/application/RetrieveAllFolders';
+import { SynchronizeOfflineModifications } from '../../../../context/virtual-drive/folders/application/SynchronizeOfflineModifications';
+import { SynchronizeOfflineModificationsOnFolderCreated } from '../../../../context/virtual-drive/folders/application/SynchronizeOfflineModificationsOnFolderCreated';
+import { FolderPlaceholderUpdater } from '../../../../context/virtual-drive/folders/application/UpdatePlaceholderFolder';
+
+export interface FoldersContainer {
+  folderCreator: FolderCreator;
+  folderFinder: FolderFinder;
+  folderDeleter: FolderDeleter;
+  allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
+  folderPathUpdater: FolderPathUpdater;
+  folderByPartialSearcher: FolderByPartialSearcher;
+  synchronizeOfflineModificationsOnFolderCreated: SynchronizeOfflineModificationsOnFolderCreated;
+  offline: {
+    folderCreator: OfflineFolderCreator;
+    folderPathUpdater: OfflineFolderPathUpdater;
+    synchronizeOfflineModifications: SynchronizeOfflineModifications;
+  };
+  retrieveAllFolders: RetrieveAllFolders;
+  folderRepositoryInitiator: FolderRepositoryInitiator;
+  folderPlaceholderUpdater: FolderPlaceholderUpdater;
+  foldersPlaceholderCreator: FoldersPlaceholderCreator;
+}
diff --git a/src/apps/sync-engine/dependency-injection/folders/builder.ts b/src/apps/sync-engine/dependency-injection/folders/builder.ts
new file mode 100644
index 000000000..b40d16044
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/folders/builder.ts
@@ -0,0 +1,145 @@
+import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem';
+import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
+import { FolderByPartialSearcher } from '../../../../context/virtual-drive/folders/application/FolderByPartialSearcher';
+import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
+import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
+import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
+import { FolderMover } from '../../../../context/virtual-drive/folders/application/FolderMover';
+import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
+import { FolderRenamer } from '../../../../context/virtual-drive/folders/application/FolderRenamer';
+import { FolderRepositoryInitiator } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
+import { FoldersPlaceholderCreator } from '../../../../context/virtual-drive/folders/application/FoldersPlaceholderCreator';
+import { OfflineFolderCreator } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
+import { OfflineFolderMover } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderMover';
+import { OfflineFolderPathUpdater } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderPathUpdater';
+import { OfflineFolderRenamer } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderRenamer';
+import { RetrieveAllFolders } from '../../../../context/virtual-drive/folders/application/RetrieveAllFolders';
+import { SynchronizeOfflineModifications } from '../../../../context/virtual-drive/folders/application/SynchronizeOfflineModifications';
+import { SynchronizeOfflineModificationsOnFolderCreated } from '../../../../context/virtual-drive/folders/application/SynchronizeOfflineModificationsOnFolderCreated';
+import { FolderPlaceholderUpdater } from '../../../../context/virtual-drive/folders/application/UpdatePlaceholderFolder';
+import { HttpRemoteFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
+import { InMemoryFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
+import { InMemoryOfflineFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository';
+import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
+import { DependencyInjectionHttpClientsProvider } from '../common/clients';
+import { DependencyInjectionEventBus } from '../common/eventBus';
+import { DependencyInjectionEventRepository } from '../common/eventRepository';
+import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
+import { SharedContainer } from '../shared/SharedContainer';
+import { FoldersContainer } from './FoldersContainer';
+
+export async function buildFoldersContainer(
+  shredContainer: SharedContainer
+): Promise<FoldersContainer> {
+  const clients = DependencyInjectionHttpClientsProvider.get();
+  const eventBus = DependencyInjectionEventBus.bus;
+  const { virtualDrive } = DependencyInjectionVirtualDrive;
+  const eventRepository = DependencyInjectionEventRepository.get();
+
+  const repository = new InMemoryFolderRepository();
+
+  const localFileSystem = new NodeWinLocalFileSystem(virtualDrive);
+  const remoteFileSystem = new HttpRemoteFileSystem(
+    clients.drive,
+    clients.newDrive
+  );
+
+  const folderFinder = new FolderFinder(repository);
+
+  const allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
+    repository
+  );
+
+  const folderDeleter = new FolderDeleter(
+    repository,
+    remoteFileSystem,
+    localFileSystem,
+    allParentFoldersStatusIsExists
+  );
+
+  const folderCreator = new FolderCreator(
+    repository,
+    remoteFileSystem,
+    ipcRendererSyncEngine,
+    eventBus
+  );
+
+  const folderMover = new FolderMover(
+    repository,
+    remoteFileSystem,
+    folderFinder
+  );
+  const folderRenamer = new FolderRenamer(
+    repository,
+    remoteFileSystem,
+    ipcRendererSyncEngine
+  );
+
+  const folderByPartialSearcher = new FolderByPartialSearcher(repository);
+
+  const folderPathUpdater = new FolderPathUpdater(
+    repository,
+    folderMover,
+    folderRenamer
+  );
+
+  const offlineRepository = new InMemoryOfflineFolderRepository();
+  const offlineFolderCreator = new OfflineFolderCreator(
+    folderFinder,
+    offlineRepository,
+    repository
+  );
+
+  const offlineFolderMover = new OfflineFolderMover(
+    offlineRepository,
+    folderFinder
+  );
+  const offlineFolderRenamer = new OfflineFolderRenamer(offlineRepository);
+  const offlineFolderPathUpdater = new OfflineFolderPathUpdater(
+    offlineRepository,
+    offlineFolderMover,
+    offlineFolderRenamer
+  );
+  const synchronizeOfflineModifications = new SynchronizeOfflineModifications(
+    offlineRepository,
+    repository,
+    folderRenamer,
+    eventRepository
+  );
+
+  const synchronizeOfflineModificationsOnFolderCreated =
+    new SynchronizeOfflineModificationsOnFolderCreated(
+      synchronizeOfflineModifications
+    );
+
+  const folderRepositoryInitiator = new FolderRepositoryInitiator(repository);
+
+  const foldersPlaceholderCreator = new FoldersPlaceholderCreator(
+    localFileSystem
+  );
+
+  const folderPlaceholderUpdater = new FolderPlaceholderUpdater(
+    repository,
+    localFileSystem,
+    shredContainer.relativePathToAbsoluteConverter
+  );
+
+  return {
+    folderCreator,
+    folderFinder,
+    folderDeleter,
+    allParentFoldersStatusIsExists: allParentFoldersStatusIsExists,
+    folderPathUpdater,
+    folderByPartialSearcher,
+    synchronizeOfflineModificationsOnFolderCreated,
+    offline: {
+      folderCreator: offlineFolderCreator,
+      folderPathUpdater: offlineFolderPathUpdater,
+      synchronizeOfflineModifications,
+    },
+    retrieveAllFolders: new RetrieveAllFolders(repository),
+    folderRepositoryInitiator,
+    foldersPlaceholderCreator,
+    folderPlaceholderUpdater,
+  };
+}
diff --git a/src/apps/sync-engine/dependency-injection/items/ItemsContainer.ts b/src/apps/sync-engine/dependency-injection/items/ItemsContainer.ts
new file mode 100644
index 000000000..973ce57ca
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/items/ItemsContainer.ts
@@ -0,0 +1,6 @@
+import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
+
+export interface ItemsContainer {
+  existingItemsTreeBuilder: TreeBuilder;
+  allStatusesTreeBuilder: TreeBuilder;
+}
diff --git a/src/apps/sync-engine/dependency-injection/items/builder.ts b/src/apps/sync-engine/dependency-injection/items/builder.ts
new file mode 100644
index 000000000..c6f66a759
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/items/builder.ts
@@ -0,0 +1,42 @@
+import { RemoteItemsGenerator } from '../../../../context/virtual-drive/items/application/RemoteItemsGenerator';
+import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
+import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
+import { CryptoJsNameDecrypt } from '../../../../context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt';
+import { getUser } from '../../../main/auth/service';
+import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
+import { ItemsContainer } from './ItemsContainer';
+
+export function buildItemsContainer(): ItemsContainer {
+  const user = getUser();
+
+  if (!user) {
+    throw new Error('Could not get user when building Items dependencies');
+  }
+
+  const remoteItemsGenerator = new RemoteItemsGenerator(ipcRendererSyncEngine);
+
+  const nameDecryptor = new CryptoJsNameDecrypt();
+
+  const existingItemsTraverser = Traverser.existingItems(
+    nameDecryptor,
+    user.root_folder_id
+  );
+  const allStatusesTraverser = Traverser.allItems(
+    nameDecryptor,
+    user.root_folder_id
+  );
+  const treeBuilder = new TreeBuilder(
+    remoteItemsGenerator,
+    existingItemsTraverser
+  );
+
+  const allStatusesTreeBuilder = new TreeBuilder(
+    remoteItemsGenerator,
+    allStatusesTraverser
+  );
+
+  return {
+    existingItemsTreeBuilder: treeBuilder,
+    allStatusesTreeBuilder,
+  };
+}
diff --git a/src/apps/sync-engine/dependency-injection/shared/SharedContainer.ts b/src/apps/sync-engine/dependency-injection/shared/SharedContainer.ts
new file mode 100644
index 000000000..1649eceac
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/shared/SharedContainer.ts
@@ -0,0 +1,7 @@
+import { AbsolutePathToRelativeConverter } from '../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
+import { RelativePathToAbsoluteConverter } from '../../../../context/virtual-drive/shared/application/RelativePathToAbsoluteConverter';
+
+export interface SharedContainer {
+  absolutePathToRelativeConverter: AbsolutePathToRelativeConverter;
+  relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter;
+}
diff --git a/src/apps/sync-engine/dependency-injection/shared/builder.ts b/src/apps/sync-engine/dependency-injection/shared/builder.ts
new file mode 100644
index 000000000..b7b086734
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/shared/builder.ts
@@ -0,0 +1,20 @@
+import { AbsolutePathToRelativeConverter } from '../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
+import { RelativePathToAbsoluteConverter } from '../../../../context/virtual-drive/shared/application/RelativePathToAbsoluteConverter';
+import { DependencyInjectionLocalRootFolderPath } from '../common/localRootFolderPath';
+import { SharedContainer } from './SharedContainer';
+
+export function buildSharedContainer(): SharedContainer {
+  const localRootFolderPath = DependencyInjectionLocalRootFolderPath.get();
+  const absolutePathToRelativeConverter = new AbsolutePathToRelativeConverter(
+    localRootFolderPath
+  );
+
+  const relativePathToAbsoluteConverter = new RelativePathToAbsoluteConverter(
+    localRootFolderPath
+  );
+
+  return {
+    absolutePathToRelativeConverter,
+    relativePathToAbsoluteConverter,
+  };
+}
diff --git a/src/apps/sync-engine/index.ts b/src/apps/sync-engine/index.ts
new file mode 100644
index 000000000..c5ea70358
--- /dev/null
+++ b/src/apps/sync-engine/index.ts
@@ -0,0 +1,85 @@
+import Logger from 'electron-log';
+import { ipcRenderer } from 'electron';
+import { DependencyContainerFactory } from './dependency-injection/DependencyContainerFactory';
+import packageJson from '../../../package.json';
+import { BindingsManager } from './BindingManager';
+import fs from 'fs/promises';
+import { iconPath } from '../utils/icon';
+
+async function ensureTheFolderExist(path: string) {
+  try {
+    await fs.access(path);
+  } catch {
+    Logger.info(`Folder <${path}> does not exists, going to  create it`);
+    await fs.mkdir(path);
+  }
+}
+
+async function setUp() {
+  Logger.info('[SYNC ENGINE] Starting sync engine process');
+
+  const virtualDrivePath = await ipcRenderer.invoke('get-virtual-drive-root');
+
+  Logger.info('[SYNC ENGINE] Going to use root folder: ', virtualDrivePath);
+
+  await ensureTheFolderExist(virtualDrivePath);
+
+  const factory = new DependencyContainerFactory();
+  const container = await factory.build();
+
+  const bindings = new BindingsManager(container, {
+    root: virtualDrivePath,
+    icon: iconPath,
+  });
+
+  ipcRenderer.on('STOP_SYNC_ENGINE_PROCESS', async (event) => {
+    Logger.info('[SYNC ENGINE] Stopping sync engine');
+
+    await bindings.stop();
+
+    Logger.info('[SYNC ENGINE] sync engine stopped successfully');
+
+    event.sender.send('SYNC_ENGINE_STOP_SUCCESS');
+  });
+
+  ipcRenderer.on('UPDATE_SYNC_ENGINE_PROCESS', async () => {
+    Logger.info('[SYNC ENGINE] Updating sync engine');
+
+    await bindings.update();
+
+    Logger.info('[SYNC ENGINE] sync engine updated successfully');
+  });
+
+  ipcRenderer.on('STOP_AND_CLEAR_SYNC_ENGINE_PROCESS', async (event) => {
+    Logger.info('[SYNC ENGINE] Stopping and clearing sync engine');
+
+    try {
+      await bindings.stop();
+      await bindings.cleanUp();
+
+      Logger.info('[SYNC ENGINE] sync engine stopped and cleared successfully');
+
+      event.sender.send('SYNC_ENGINE_STOP_AND_CLEAR_SUCCESS');
+    } catch (error: unknown) {
+      Logger.error('[SYNC ENGINE] Error stopping and cleaning: ', error);
+      event.sender.send('ERROR_ON_STOP_AND_CLEAR_SYNC_ENGINE_PROCESS');
+    }
+  });
+
+  await bindings.start(
+    packageJson.version,
+    '{E9D7EB38-B229-5DC5-9396-017C449D59CD}'
+  );
+
+  bindings.watch();
+}
+
+setUp()
+  .then(() => {
+    Logger.info('[SYNC ENGINE] Sync engine has successfully started');
+    ipcRenderer.send('SYNC_ENGINE_PROCESS_SETUP_SUCCESSFUL');
+  })
+  .catch((error) => {
+    Logger.error('[SYNC ENGINE] Error setting up', error);
+    ipcRenderer.send('SYNC_ENGINE_PROCESS_SETUP_FAILED');
+  });
diff --git a/src/apps/sync-engine/ipcRendererSyncEngine.ts b/src/apps/sync-engine/ipcRendererSyncEngine.ts
new file mode 100644
index 000000000..4aca87223
--- /dev/null
+++ b/src/apps/sync-engine/ipcRendererSyncEngine.ts
@@ -0,0 +1,7 @@
+import { CustomIpc } from '../shared/IPC/IPCs';
+import { FromProcess, FromMain } from '../shared/IPC/events/sync-engine';
+import { ipcRenderer } from 'electron';
+
+export type SyncEngineIpc = CustomIpc<FromProcess, FromMain>;
+
+export const ipcRendererSyncEngine = ipcRenderer as unknown as SyncEngineIpc;
diff --git a/src/workers/utils/date.ts b/src/apps/utils/date.ts
similarity index 100%
rename from src/workers/utils/date.ts
rename to src/apps/utils/date.ts
diff --git a/src/workers/utils/file-is-on-folder.ts b/src/apps/utils/file-is-on-folder.ts
similarity index 100%
rename from src/workers/utils/file-is-on-folder.ts
rename to src/apps/utils/file-is-on-folder.ts
diff --git a/src/workers/utils/http-request.ts b/src/apps/utils/http-request.ts
similarity index 91%
rename from src/workers/utils/http-request.ts
rename to src/apps/utils/http-request.ts
index 4184d0ad8..63ca52239 100644
--- a/src/workers/utils/http-request.ts
+++ b/src/apps/utils/http-request.ts
@@ -1,7 +1,7 @@
 import { ipcRenderer } from 'electron';
 import Logger from 'electron-log';
 
-import configStore from '../../main/config';
+import configStore from '../../apps/main/config';
 
 const userIsUnauthorized = () => {
   Logger.warn('[AUTH] Request unauthorized');
diff --git a/src/apps/utils/icon.ts b/src/apps/utils/icon.ts
new file mode 100644
index 000000000..c98b9cf47
--- /dev/null
+++ b/src/apps/utils/icon.ts
@@ -0,0 +1,6 @@
+import path from 'path';
+
+export const iconPath =
+  process.env.NODE_ENV === 'development'
+    ? path.join(__dirname, '../../../../assets', 'icon.ico')
+    : path.join(process.resourcesPath, 'assets', 'icon.ico');
diff --git a/src/workers/utils/is-online.ts b/src/apps/utils/is-online.ts
similarity index 100%
rename from src/workers/utils/is-online.ts
rename to src/apps/utils/is-online.ts
diff --git a/src/workers/utils/name-verification.ts b/src/apps/utils/name-verification.ts
similarity index 76%
rename from src/workers/utils/name-verification.ts
rename to src/apps/utils/name-verification.ts
index c2fcf6f32..8444ee497 100644
--- a/src/workers/utils/name-verification.ts
+++ b/src/apps/utils/name-verification.ts
@@ -12,11 +12,11 @@ const validations = [
   (name: string) => containsNullCharacter.test(name),
 ];
 
-const sanitazeRelativePath = (relativePath: string) =>
+const sanitizeRelativePath = (relativePath: string) =>
   relativePath.replaceAll(path.sep, '/');
 
 export const fileNameIsValid = (fileName: string): boolean => {
-  const sanitazedPath = sanitazeRelativePath(fileName);
+  const sanitatedPath = sanitizeRelativePath(fileName);
 
-  return validations.every((validation) => !validation(sanitazedPath));
+  return validations.every((validation) => !validation(sanitatedPath));
 };
diff --git a/src/workers/utils/reporting.ts b/src/apps/utils/reporting.ts
similarity index 91%
rename from src/workers/utils/reporting.ts
rename to src/apps/utils/reporting.ts
index 25bbbe4eb..b0ae28f83 100644
--- a/src/workers/utils/reporting.ts
+++ b/src/apps/utils/reporting.ts
@@ -1,4 +1,4 @@
-import { ErrorDetails } from '../types';
+import { ErrorDetails } from '../shared/types';
 
 export function createErrorDetails(
   originalError: any,
diff --git a/src/workers/utils/test/file-is-on-folder.test.ts b/src/apps/utils/test/file-is-on-folder.test.ts
similarity index 100%
rename from src/workers/utils/test/file-is-on-folder.test.ts
rename to src/apps/utils/test/file-is-on-folder.test.ts
diff --git a/src/workers/utils/test/name-verification.test.ts b/src/apps/utils/test/name-verification.test.ts
similarity index 100%
rename from src/workers/utils/test/name-verification.test.ts
rename to src/apps/utils/test/name-verification.test.ts
diff --git a/src/workers/utils/test/sensible-files.json b/src/apps/utils/test/sensible-files.json
similarity index 100%
rename from src/workers/utils/test/sensible-files.json
rename to src/apps/utils/test/sensible-files.json
diff --git a/src/workers/utils/types/Tuple.ts b/src/apps/utils/types/Tuple.ts
similarity index 100%
rename from src/workers/utils/types/Tuple.ts
rename to src/apps/utils/types/Tuple.ts
diff --git a/src/context/desktop/app/domain/AppIssue.ts b/src/context/desktop/app/domain/AppIssue.ts
new file mode 100644
index 000000000..4b6407508
--- /dev/null
+++ b/src/context/desktop/app/domain/AppIssue.ts
@@ -0,0 +1,10 @@
+export type AppIssue = {
+  action: 'GET_DEVICE_NAME_ERROR';
+  errorName: 'UNKNOWN_DEVICE_NAME';
+  process: 'GENERAL';
+  errorDetails: {
+    name: string;
+    messages: string;
+    stack: string;
+  };
+};
diff --git a/src/context/desktop/sync/domain/SyncStatus.ts b/src/context/desktop/sync/domain/SyncStatus.ts
new file mode 100644
index 000000000..b76562463
--- /dev/null
+++ b/src/context/desktop/sync/domain/SyncStatus.ts
@@ -0,0 +1 @@
+export type SyncStatus = 'STANDBY' | 'RUNNING' | 'FAILED';
diff --git a/src/context/desktop/sync/domain/SyncStoppedPayload.ts b/src/context/desktop/sync/domain/SyncStoppedPayload.ts
new file mode 100644
index 000000000..6e4155556
--- /dev/null
+++ b/src/context/desktop/sync/domain/SyncStoppedPayload.ts
@@ -0,0 +1,8 @@
+import { ProcessFatalErrorName } from '../../../../apps/shared/types';
+
+export type SyncStoppedPayload =
+  | { reason: 'STOPPED_BY_USER' }
+  | {
+      reason: 'FATAL_ERROR';
+      errorName: ProcessFatalErrorName;
+    };
diff --git a/src/workers/webdav/modules/shared/domain/AggregateRoot.ts b/src/context/shared/domain/AggregateRoot.ts
similarity index 76%
rename from src/workers/webdav/modules/shared/domain/AggregateRoot.ts
rename to src/context/shared/domain/AggregateRoot.ts
index 08bf11309..5293e60bf 100644
--- a/src/workers/webdav/modules/shared/domain/AggregateRoot.ts
+++ b/src/context/shared/domain/AggregateRoot.ts
@@ -1,4 +1,4 @@
-import { Primitives } from '../../../../../shared/types/Primitives';
+import { Primitives } from './ValueObject';
 import { DomainEvent } from './DomainEvent';
 
 export abstract class AggregateRoot {
@@ -19,5 +19,5 @@ export abstract class AggregateRoot {
     this.domainEvents.push(event);
   }
 
-  abstract toPrimitives(): Record<string, Primitives>;
+  abstract attributes(): Record<string, Primitives>;
 }
diff --git a/src/workers/webdav/modules/shared/domain/DomainEvent.ts b/src/context/shared/domain/DomainEvent.ts
similarity index 82%
rename from src/workers/webdav/modules/shared/domain/DomainEvent.ts
rename to src/context/shared/domain/DomainEvent.ts
index 95ca90cb3..d23a98ba1 100644
--- a/src/workers/webdav/modules/shared/domain/DomainEvent.ts
+++ b/src/context/shared/domain/DomainEvent.ts
@@ -15,6 +15,7 @@ export abstract class DomainEvent {
   readonly aggregateId: string;
   readonly eventId: string;
   readonly eventName: string;
+  readonly occurredOn?: Date;
 
   constructor(params: {
     eventName: string;
@@ -22,10 +23,11 @@ export abstract class DomainEvent {
     eventId?: string;
     occurredOn?: Date;
   }) {
-    const { aggregateId, eventName, eventId } = params;
+    const { aggregateId, eventName, eventId, occurredOn } = params;
     this.aggregateId = aggregateId;
     this.eventId = eventId || uuid.v4();
-    this.eventName = `webdav.${eventName}`;
+    this.eventName = `${eventName}`;
+    this.occurredOn = occurredOn || new Date();
   }
 
   abstract toPrimitives(): DomainEventAttributes;
diff --git a/src/workers/webdav/modules/shared/domain/WebdavDomainEventSubscriber.ts b/src/context/shared/domain/DomainEventSubscriber.ts
similarity index 67%
rename from src/workers/webdav/modules/shared/domain/WebdavDomainEventSubscriber.ts
rename to src/context/shared/domain/DomainEventSubscriber.ts
index 406b52cfb..37d2a878c 100644
--- a/src/workers/webdav/modules/shared/domain/WebdavDomainEventSubscriber.ts
+++ b/src/context/shared/domain/DomainEventSubscriber.ts
@@ -1,6 +1,6 @@
 import { DomainEventClass, DomainEvent } from './DomainEvent';
 
-export interface WebdavDomainEventSubscriber<T extends DomainEvent> {
+export interface DomainEventSubscriber<T extends DomainEvent> {
   subscribedTo(): Array<DomainEventClass>;
   on(domainEvent: T): Promise<void>;
 }
diff --git a/src/context/shared/domain/Either.ts b/src/context/shared/domain/Either.ts
new file mode 100644
index 000000000..216f37a30
--- /dev/null
+++ b/src/context/shared/domain/Either.ts
@@ -0,0 +1,47 @@
+class Right<L, R> {
+  constructor(_: L, private _value: R) {}
+
+  getRight = (): R => this._value;
+
+  getLeft = (): L => null as unknown as L;
+
+  isRight(): boolean {
+    return true;
+  }
+
+  isLeft = (): boolean => {
+    return false;
+  };
+
+  fold<T>(_: (_: L) => T | void | void, rightFn: (_: R) => T): T | void {
+    return rightFn(this._value);
+  }
+}
+
+class Left<L, R> {
+  constructor(private _value: L, _: R) {}
+
+  getLeft = (): L => this._value;
+
+  getRight = (): R => null as unknown as R;
+
+  isRight = (): boolean => {
+    return false;
+  };
+
+  isLeft = (): boolean => {
+    return true;
+  };
+
+  fold<T>(leftFn: (_: L) => T | void, _: (_: R) => T): T | void {
+    return leftFn(this._value);
+  }
+}
+
+export type Either<L, R> = Left<L, R> | Right<L, R>;
+
+export const right = <L, R>(value: R) =>
+  new Right<L, R>(null as unknown as L, value);
+
+export const left = <L, R>(value: L) =>
+  new Left<L, R>(value, null as unknown as R);
diff --git a/src/workers/shared/domain/EnumValueObject.ts b/src/context/shared/domain/EnumValueObject.ts
similarity index 100%
rename from src/workers/shared/domain/EnumValueObject.ts
rename to src/context/shared/domain/EnumValueObject.ts
diff --git a/src/workers/shared/domain/InvalidArgumentError.ts b/src/context/shared/domain/InvalidArgumentError.ts
similarity index 100%
rename from src/workers/shared/domain/InvalidArgumentError.ts
rename to src/context/shared/domain/InvalidArgumentError.ts
diff --git a/src/workers/filesystems/domain/ServerFile.ts b/src/context/shared/domain/ServerFile.ts
similarity index 94%
rename from src/workers/filesystems/domain/ServerFile.ts
rename to src/context/shared/domain/ServerFile.ts
index 0008f5b36..12e5e3a3e 100644
--- a/src/workers/filesystems/domain/ServerFile.ts
+++ b/src/context/shared/domain/ServerFile.ts
@@ -18,4 +18,5 @@ export type ServerFile = {
   updatedAt: string;
   userId: number;
   status: ServerFileStatus;
+  plainName?: string;
 };
diff --git a/src/workers/filesystems/domain/ServerFolder.ts b/src/context/shared/domain/ServerFolder.ts
similarity index 95%
rename from src/workers/filesystems/domain/ServerFolder.ts
rename to src/context/shared/domain/ServerFolder.ts
index 60d24af5e..e2336689c 100644
--- a/src/workers/filesystems/domain/ServerFolder.ts
+++ b/src/context/shared/domain/ServerFolder.ts
@@ -13,4 +13,5 @@ export type ServerFolder = {
   updatedAt: string;
   plain_name: string | null;
   status: ServerFolderStatus;
+  uuid: string;
 };
diff --git a/src/workers/shared/domain/ValueObject.ts b/src/context/shared/domain/ValueObject.ts
similarity index 82%
rename from src/workers/shared/domain/ValueObject.ts
rename to src/context/shared/domain/ValueObject.ts
index 154b5051e..d1908baba 100644
--- a/src/workers/shared/domain/ValueObject.ts
+++ b/src/context/shared/domain/ValueObject.ts
@@ -1,6 +1,6 @@
 import { InvalidArgumentError } from './InvalidArgumentError';
 
-export type Primitives = string | number | boolean | Date;
+export type Primitives = string | number | boolean | Date | undefined;
 
 export abstract class ValueObject<T extends Primitives> {
   readonly value: T;
@@ -22,8 +22,4 @@ export abstract class ValueObject<T extends Primitives> {
       other.value === this.value
     );
   }
-
-  toString(): string {
-    return this.value.toString();
-  }
 }
diff --git a/src/workers/utils/crypt.ts b/src/context/shared/infrastructure/crypt.ts
similarity index 100%
rename from src/workers/utils/crypt.ts
rename to src/context/shared/infrastructure/crypt.ts
diff --git a/src/context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator.ts b/src/context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator.ts
new file mode 100644
index 000000000..8e3f8eb9e
--- /dev/null
+++ b/src/context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator.ts
@@ -0,0 +1,31 @@
+import { RetryContentsUploader } from '../../contents/application/RetryContentsUploader';
+import { FileCreator } from '../../files/application/FileCreator';
+import { SameFileWasMoved } from '../../files/application/SameFileWasMoved';
+import { File } from '../../files/domain/File';
+import { FilePath } from '../../files/domain/FilePath';
+
+export class FileCreationOrchestrator {
+  constructor(
+    private readonly contentsUploader: RetryContentsUploader,
+    private readonly fileCreator: FileCreator,
+    private readonly sameFileWasMoved: SameFileWasMoved
+  ) {}
+
+  async run(posixRelativePath: string): Promise<File['contentsId']> {
+    const path = new FilePath(posixRelativePath);
+
+    const wasMoved = await this.sameFileWasMoved.run(path);
+
+    if (wasMoved.result) {
+      // When a file gets moved, a file creation get triggered.
+      // if we find out that its the same file return the contents Id of that file
+      throw new Error('File was moved here');
+    }
+
+    const fileContents = await this.contentsUploader.run(posixRelativePath);
+
+    const createdFile = await this.fileCreator.run(path, fileContents);
+
+    return createdFile.contentsId;
+  }
+}
diff --git a/src/context/virtual-drive/contents/application/ContentsDownloader.ts b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
new file mode 100644
index 000000000..833886af7
--- /dev/null
+++ b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
@@ -0,0 +1,112 @@
+import Logger from 'electron-log';
+import path from 'path';
+import { Readable } from 'stream';
+import { ensureFolderExists } from '../../../../apps/shared/fs/ensure-folder-exists';
+import { CallbackDownload } from '../../../../apps/sync-engine/BindingManager';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
+import { File } from '../../files/domain/File';
+import { EventBus } from '../../shared/domain/EventBus';
+import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
+import { LocalFileContents } from '../domain/LocalFileContents';
+import { LocalFileWriter } from '../domain/LocalFileWriter';
+import { ContentFileDownloader } from '../domain/contentHandlers/ContentFileDownloader';
+import { TemporalFolderProvider } from './temporalFolderProvider';
+
+export class ContentsDownloader {
+  private readableDownloader: Readable | null;
+  constructor(
+    private readonly managerFactory: ContentsManagersFactory,
+    private readonly localWriter: LocalFileWriter,
+    private readonly ipc: SyncEngineIpc,
+    private readonly temporalFolderProvider: TemporalFolderProvider,
+    private readonly eventBus: EventBus
+  ) {
+    this.readableDownloader = null;
+  }
+
+  private async registerEvents(
+    downloader: ContentFileDownloader,
+    file: File,
+    cb: CallbackDownload
+  ) {
+    const location = await this.temporalFolderProvider();
+    const folderPath = path.join(location, 'internxt');
+    ensureFolderExists(folderPath);
+    const filePath = path.join(folderPath, file.nameWithExtension);
+
+    downloader.on('start', () => {
+      this.ipc.send('FILE_DOWNLOADING', {
+        name: file.name,
+        extension: file.type,
+        nameWithExtension: file.nameWithExtension,
+        size: file.size,
+        processInfo: { elapsedTime: downloader.elapsedTime() },
+      });
+    });
+
+    downloader.on('progress', async () => {
+      const result = await cb(true, filePath);
+      const hydrationProgress = result.progress;
+
+      if (result.finished) {
+        downloader.forceStop();
+        Logger.debug('Downloader force stop', this.readableDownloader);
+        this.readableDownloader?.destroy();
+        this.readableDownloader?.emit('close');
+        this.ipc.send('FILE_DOWNLOADED', {
+          name: file.name,
+          extension: file.type,
+          nameWithExtension: file.nameWithExtension,
+          size: file.size,
+          processInfo: { elapsedTime: downloader.elapsedTime() },
+        });
+      } else {
+        this.ipc.send('FILE_DOWNLOADING', {
+          name: file.name,
+          extension: file.type,
+          nameWithExtension: file.nameWithExtension,
+          size: file.size,
+          processInfo: {
+            elapsedTime: downloader.elapsedTime(),
+            progress: hydrationProgress,
+          },
+        });
+      }
+    });
+
+    downloader.on('error', (error: Error) => {
+      this.ipc.send('FILE_DOWNLOAD_ERROR', {
+        name: file.name,
+        extension: file.type,
+        nameWithExtension: file.nameWithExtension,
+        error: error.message,
+      });
+    });
+
+    downloader.on('finish', () => {
+      // The file download being finished does not mean it has been hidratated
+      // TODO: We might want to track this time instead of the whole completion time
+    });
+  }
+
+  async run(file: File, cb: CallbackDownload): Promise<string> {
+    const downloader = this.managerFactory.downloader();
+
+    this.registerEvents(downloader, file, cb);
+
+    const readable = await downloader.download(file);
+    this.readableDownloader = readable;
+    const localContents = LocalFileContents.downloadedFrom(
+      file,
+      readable,
+      downloader.elapsedTime()
+    );
+
+    const write = await this.localWriter.write(localContents);
+
+    const events = localContents.pullDomainEvents();
+    await this.eventBus.publish(events);
+
+    return write;
+  }
+}
diff --git a/src/context/virtual-drive/contents/application/ContentsUploader.ts b/src/context/virtual-drive/contents/application/ContentsUploader.ts
new file mode 100644
index 000000000..3bd65c842
--- /dev/null
+++ b/src/context/virtual-drive/contents/application/ContentsUploader.ts
@@ -0,0 +1,86 @@
+import { ContentFileUploader } from '../domain/contentHandlers/ContentFileUploader';
+import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
+import { LocalContentsProvider } from '../domain/LocalFileProvider';
+import { RemoteFileContents } from '../domain/RemoteFileContents';
+import { LocalFileContents } from '../domain/LocalFileContents';
+import { PlatformPathConverter } from '../../shared/application/PlatformPathConverter';
+import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
+
+export class ContentsUploader {
+  constructor(
+    private readonly remoteContentsManagersFactory: ContentsManagersFactory,
+    private readonly contentProvider: LocalContentsProvider,
+    private readonly ipc: SyncEngineIpc,
+    private readonly relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter
+  ) {}
+
+  private registerEvents(
+    uploader: ContentFileUploader,
+    localFileContents: LocalFileContents
+  ) {
+    uploader.on('start', () => {
+      this.ipc.send('FILE_UPLOADING', {
+        name: localFileContents.name,
+        extension: localFileContents.extension,
+        nameWithExtension: localFileContents.nameWithExtension,
+        size: localFileContents.size,
+        processInfo: { elapsedTime: uploader.elapsedTime() },
+      });
+    });
+
+    uploader.on('progress', (progress: number) => {
+      this.ipc.send('FILE_UPLOADING', {
+        name: localFileContents.name,
+        extension: localFileContents.extension,
+        nameWithExtension: localFileContents.nameWithExtension,
+        size: localFileContents.size,
+        processInfo: { elapsedTime: uploader.elapsedTime(), progress },
+      });
+    });
+
+    uploader.on('error', (error: Error) => {
+      this.ipc.send('FILE_UPLOAD_ERROR', {
+        name: localFileContents.name,
+        extension: localFileContents.extension,
+        nameWithExtension: localFileContents.nameWithExtension,
+        error: error.message,
+      });
+    });
+
+    uploader.on('finish', () => {
+      this.ipc.send('FILE_UPLOADED', {
+        name: localFileContents.name,
+        extension: localFileContents.extension,
+        nameWithExtension: localFileContents.nameWithExtension,
+        size: localFileContents.size,
+        processInfo: { elapsedTime: uploader.elapsedTime() },
+      });
+    });
+  }
+
+  async run(posixRelativePath: string): Promise<RemoteFileContents> {
+    const win32RelativePath =
+      PlatformPathConverter.posixToWin(posixRelativePath);
+
+    const absolutePath =
+      this.relativePathToAbsoluteConverter.run(win32RelativePath);
+
+    const { contents, abortSignal } = await this.contentProvider.provide(
+      absolutePath
+    );
+
+    const uploader = this.remoteContentsManagersFactory.uploader(
+      contents,
+      abortSignal
+    );
+
+    this.registerEvents(uploader, contents);
+
+    const contentsId = await uploader.upload(contents.stream, contents.size);
+
+    const fileContents = RemoteFileContents.create(contentsId, contents.size);
+
+    return fileContents;
+  }
+}
diff --git a/src/context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished.ts b/src/context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished.ts
new file mode 100644
index 000000000..faff126b9
--- /dev/null
+++ b/src/context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished.ts
@@ -0,0 +1,34 @@
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
+import { EventRepository } from '../../shared/domain/EventRepository';
+import { ContentsDownloadedDomainEvent } from '../domain/events/ContentsDownloadedDomainEvent';
+import Logger from 'electron-log';
+
+export class NotifyMainProcessHydrationFinished {
+  constructor(
+    private readonly eventRepository: EventRepository,
+    private readonly ipc: SyncEngineIpc
+  ) {}
+
+  async run(contentsId: string) {
+    const events = await this.eventRepository.search(contentsId);
+
+    const downloadCompletionEvent = events.find(
+      (event) => event.eventName === 'contents.downloaded'
+    );
+
+    if (!downloadCompletionEvent) {
+      Logger.debug('Download completion event not found');
+      return;
+    }
+
+    const event = downloadCompletionEvent as ContentsDownloadedDomainEvent;
+
+    this.ipc.send('FILE_DOWNLOADED', {
+      name: event.name,
+      extension: event.extension,
+      nameWithExtension: event.nameWithExtension,
+      size: event.size,
+      processInfo: { elapsedTime: event.elapsedTime },
+    });
+  }
+}
diff --git a/src/context/virtual-drive/contents/application/ReadLocalFileContentsToBuffer.ts b/src/context/virtual-drive/contents/application/ReadLocalFileContentsToBuffer.ts
new file mode 100644
index 000000000..938db9329
--- /dev/null
+++ b/src/context/virtual-drive/contents/application/ReadLocalFileContentsToBuffer.ts
@@ -0,0 +1,23 @@
+import { Writable, pipeline } from 'stream';
+import { LocalFileContents } from '../domain/LocalFileContents';
+import { promisify } from 'util';
+const promisifiedPipeline = promisify(pipeline);
+
+export class ReadLocalFileContentsToBuffer {
+  static async run(contents: LocalFileContents): Promise<Buffer> {
+    const bufferArray: any[] = [];
+
+    const bufferWritter = new Writable({
+      write: (chunk, _, callback) => {
+        bufferArray.push(chunk);
+        callback();
+      },
+    });
+
+    await promisifiedPipeline(contents.stream, bufferWritter);
+
+    const buffer = Buffer.concat(bufferArray);
+
+    return buffer;
+  }
+}
diff --git a/src/context/virtual-drive/contents/application/RetryContentsUploader.ts b/src/context/virtual-drive/contents/application/RetryContentsUploader.ts
new file mode 100644
index 000000000..697b2afc6
--- /dev/null
+++ b/src/context/virtual-drive/contents/application/RetryContentsUploader.ts
@@ -0,0 +1,53 @@
+import { RemoteFileContents } from '../domain/RemoteFileContents';
+import { ContentsUploader } from './ContentsUploader';
+import Logger from 'electron-log';
+
+// TODO: the retry logic should be on the infrastructure layer
+// change the uploader factory method to revive a function that returns the needed data
+export class RetryContentsUploader {
+  private static NUMBER_OF_RETRIES = 2;
+  private static MILLISECOND_BETWEEN_TRIES = 1_000;
+  private static INITIAL_DELAY = 100;
+
+  constructor(private readonly uploader: ContentsUploader) {}
+
+  async retryUpload(asyncFunction: () => Promise<RemoteFileContents>) {
+    let retryCount = 0;
+
+    while (retryCount <= RetryContentsUploader.NUMBER_OF_RETRIES) {
+      try {
+        const result = await asyncFunction();
+        return result;
+      } catch (error: unknown) {
+        if (error instanceof Error) {
+          Logger.warn(
+            `Upload attempt ${retryCount + 1} failed: ${error.message}`
+          );
+        } else {
+          Logger.warn(
+            `Upload attempt ${retryCount + 1} failed with an unknown error.`
+          );
+        }
+
+        await new Promise((resolve) => {
+          setTimeout(resolve, RetryContentsUploader.MILLISECOND_BETWEEN_TRIES);
+        });
+
+        retryCount++;
+      }
+    }
+    throw new Error(
+      `Max retries (${RetryContentsUploader.NUMBER_OF_RETRIES}) reached. Upload still failed.`
+    );
+  }
+
+  async run(posixRelativePath: string): Promise<RemoteFileContents> {
+    await new Promise((resolve) => {
+      setTimeout(resolve, RetryContentsUploader.INITIAL_DELAY);
+    });
+
+    const upload = () => this.uploader.run(posixRelativePath);
+
+    return this.retryUpload(upload);
+  }
+}
diff --git a/src/context/virtual-drive/contents/application/temporalFolderProvider.ts b/src/context/virtual-drive/contents/application/temporalFolderProvider.ts
new file mode 100644
index 000000000..f59cd3ccb
--- /dev/null
+++ b/src/context/virtual-drive/contents/application/temporalFolderProvider.ts
@@ -0,0 +1,15 @@
+import { ipcRenderer } from 'electron';
+
+export const temporalFolderProvider = async (): Promise<string> => {
+  const temporalFilesFolder = await ipcRenderer.invoke(
+    'APP:TEMPORAL_FILES_FOLDER'
+  );
+
+  if (typeof temporalFilesFolder !== 'string') {
+    throw new Error('Temporal folder path is not a string ');
+  }
+
+  return temporalFilesFolder;
+};
+
+export type TemporalFolderProvider = typeof temporalFolderProvider;
diff --git a/src/workers/webdav/modules/contents/domain/ContentsId.ts b/src/context/virtual-drive/contents/domain/ContentsId.ts
similarity index 68%
rename from src/workers/webdav/modules/contents/domain/ContentsId.ts
rename to src/context/virtual-drive/contents/domain/ContentsId.ts
index 9a7904471..607a9b52b 100644
--- a/src/workers/webdav/modules/contents/domain/ContentsId.ts
+++ b/src/context/virtual-drive/contents/domain/ContentsId.ts
@@ -1,5 +1,5 @@
-import { ValueObject } from '../../../../shared/domain/ValueObject';
-import { InvalidArgumentError } from '../../../../shared/domain/InvalidArgumentError';
+import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { ValueObject } from '../../../shared/domain/ValueObject';
 
 export class ContentsId extends ValueObject<string> {
   static readonly VALID_LENGTH = 24;
diff --git a/src/context/virtual-drive/contents/domain/ContentsManagersFactory.ts b/src/context/virtual-drive/contents/domain/ContentsManagersFactory.ts
new file mode 100644
index 000000000..093d3784c
--- /dev/null
+++ b/src/context/virtual-drive/contents/domain/ContentsManagersFactory.ts
@@ -0,0 +1,12 @@
+import { ContentFileDownloader } from './contentHandlers/ContentFileDownloader';
+import { ContentFileUploader } from './contentHandlers/ContentFileUploader';
+import { LocalFileContents } from './LocalFileContents';
+
+export interface ContentsManagersFactory {
+  downloader(): ContentFileDownloader;
+
+  uploader(
+    contents: LocalFileContents,
+    abortSignal?: AbortSignal
+  ): ContentFileUploader;
+}
diff --git a/src/context/virtual-drive/contents/domain/ContentsSize.ts b/src/context/virtual-drive/contents/domain/ContentsSize.ts
new file mode 100644
index 000000000..a1f263f13
--- /dev/null
+++ b/src/context/virtual-drive/contents/domain/ContentsSize.ts
@@ -0,0 +1,3 @@
+import { BucketEntry } from '../../shared/domain/BucketEntry';
+
+export class ContentsSize extends BucketEntry {}
diff --git a/src/context/virtual-drive/contents/domain/LocalFileContents.ts b/src/context/virtual-drive/contents/domain/LocalFileContents.ts
new file mode 100644
index 000000000..95a5c24ea
--- /dev/null
+++ b/src/context/virtual-drive/contents/domain/LocalFileContents.ts
@@ -0,0 +1,97 @@
+import { Readable } from 'stream';
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
+import { ContentsSize } from './ContentsSize';
+import { ContentsDownloadedDomainEvent } from './events/ContentsDownloadedDomainEvent';
+import { File } from '../../files/domain/File';
+
+export type LocalFileContentsAttributes = {
+  name: string;
+  extension: string;
+  size: number;
+  birthTime: number;
+  modifiedTime: number;
+  contents: Readable;
+};
+
+export class LocalFileContents extends AggregateRoot {
+  private constructor(
+    private readonly _name: string,
+    private readonly _extension: string,
+    private readonly _size: ContentsSize,
+    private readonly _birthTime: number,
+    private readonly _modifiedTime: number,
+    public readonly stream: Readable
+  ) {
+    super();
+  }
+
+  public get name(): string {
+    return this._name;
+  }
+  public get extension(): string {
+    return this._extension;
+  }
+
+  public get nameWithExtension(): string {
+    return this.name + (this.extension.length >= 0 ? '.' + this.extension : '');
+  }
+
+  public get size(): number {
+    return this._size.value;
+  }
+
+  public get birthTime(): number {
+    return this._birthTime;
+  }
+
+  public get modifiedTime(): number {
+    return this._modifiedTime;
+  }
+
+  static from(attributes: LocalFileContentsAttributes): LocalFileContents {
+    const remoteContents = new LocalFileContents(
+      attributes.name,
+      attributes.extension,
+      new ContentsSize(attributes.size),
+      attributes.birthTime,
+      attributes.modifiedTime,
+      attributes.contents
+    );
+
+    return remoteContents;
+  }
+
+  static downloadedFrom(file: File, contents: Readable, elapsedTime: number) {
+    const remoteContents = new LocalFileContents(
+      file.name,
+      file.type,
+      new ContentsSize(file.size),
+      file.createdAt.getUTCMilliseconds(),
+      file.updatedAt.getUTCMilliseconds(),
+      contents
+    );
+
+    const contentsDownloadedEvent = new ContentsDownloadedDomainEvent({
+      aggregateId: file.contentsId,
+      name: file.name,
+      extension: file.type,
+      nameWithExtension: file.nameWithExtension,
+      size: file.size,
+      elapsedTime: elapsedTime,
+    });
+
+    remoteContents.record(contentsDownloadedEvent);
+
+    return remoteContents;
+  }
+
+  attributes(): Omit<LocalFileContentsAttributes, 'contents'> {
+    return {
+      name: this.name,
+      extension: this.extension,
+      size: this.size,
+      birthTime: this.birthTime,
+      modifiedTime: this.modifiedTime,
+    };
+  }
+}
diff --git a/src/context/virtual-drive/contents/domain/LocalFileProvider.ts b/src/context/virtual-drive/contents/domain/LocalFileProvider.ts
new file mode 100644
index 000000000..8a4c818fa
--- /dev/null
+++ b/src/context/virtual-drive/contents/domain/LocalFileProvider.ts
@@ -0,0 +1,8 @@
+import { LocalFileContents } from './LocalFileContents';
+
+export interface LocalContentsProvider {
+  provide: (path: string) => Promise<{
+    contents: LocalFileContents;
+    abortSignal: AbortSignal;
+  }>;
+}
diff --git a/src/context/virtual-drive/contents/domain/LocalFileWriter.ts b/src/context/virtual-drive/contents/domain/LocalFileWriter.ts
new file mode 100644
index 000000000..8ba39b899
--- /dev/null
+++ b/src/context/virtual-drive/contents/domain/LocalFileWriter.ts
@@ -0,0 +1,7 @@
+import { LocalFileContents } from './LocalFileContents';
+
+type ResultFilePath = string;
+
+export interface LocalFileWriter {
+  write(contents: LocalFileContents): Promise<ResultFilePath>;
+}
diff --git a/src/context/virtual-drive/contents/domain/RemoteFileContents.ts b/src/context/virtual-drive/contents/domain/RemoteFileContents.ts
new file mode 100644
index 000000000..e48baa6a8
--- /dev/null
+++ b/src/context/virtual-drive/contents/domain/RemoteFileContents.ts
@@ -0,0 +1,43 @@
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
+import { ContentsId } from './ContentsId';
+import { ContentsSize } from './ContentsSize';
+
+export type RemoteFileContentsAttributes = {
+  id: string;
+  size: number;
+};
+
+export class RemoteFileContents extends AggregateRoot {
+  private constructor(
+    private readonly _id: ContentsId,
+    private readonly _size: ContentsSize
+  ) {
+    super();
+  }
+
+  public get id(): string {
+    return this._id.value;
+  }
+
+  public get size(): number {
+    return this._size.value;
+  }
+
+  static create(id: ContentsId, size: number): RemoteFileContents {
+    return new RemoteFileContents(id, new ContentsSize(size));
+  }
+
+  static from(attributes: RemoteFileContentsAttributes): RemoteFileContents {
+    return new RemoteFileContents(
+      new ContentsId(attributes.id),
+      new ContentsSize(attributes.size)
+    );
+  }
+
+  attributes() {
+    return {
+      contentsId: this.id,
+      size: this.size,
+    };
+  }
+}
diff --git a/src/workers/webdav/modules/contents/domain/ContentFileDownloader.ts b/src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader.ts
similarity index 72%
rename from src/workers/webdav/modules/contents/domain/ContentFileDownloader.ts
rename to src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader.ts
index 77847f2f8..586057f85 100644
--- a/src/workers/webdav/modules/contents/domain/ContentFileDownloader.ts
+++ b/src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader.ts
@@ -1,16 +1,18 @@
 import { Readable } from 'stream';
-import { File, FileAtributes } from '../../files/domain/File';
+import { File, FileAttributes } from '../../../files/domain/File';
 
 export type FileDownloadEvents = {
   start: () => void;
   progress: (progress: number) => void;
-  finish: (fileId: FileAtributes['contentsId']) => void;
+  finish: (fileId: FileAttributes['contentsId']) => void;
   error: (error: Error) => void;
 };
 
 export interface ContentFileDownloader {
   download(file: File): Promise<Readable>;
 
+  forceStop(): void;
+
   on(
     event: keyof FileDownloadEvents,
     handler: FileDownloadEvents[keyof FileDownloadEvents]
diff --git a/src/workers/webdav/modules/contents/domain/ContentFileUploader.ts b/src/context/virtual-drive/contents/domain/contentHandlers/ContentFileUploader.ts
similarity index 65%
rename from src/workers/webdav/modules/contents/domain/ContentFileUploader.ts
rename to src/context/virtual-drive/contents/domain/contentHandlers/ContentFileUploader.ts
index 0a198c1dc..419ce6fd1 100644
--- a/src/workers/webdav/modules/contents/domain/ContentFileUploader.ts
+++ b/src/context/virtual-drive/contents/domain/contentHandlers/ContentFileUploader.ts
@@ -1,16 +1,17 @@
 import { Readable } from 'stream';
+import { ContentsId } from '../ContentsId';
 
-type FileId = string;
+type ConenentsId = string;
 
 export type FileUploadEvents = {
   start: () => void;
   progress: (progress: number) => void;
-  finish: (fileId: FileId) => void;
+  finish: (fileId: ConenentsId) => void;
   error: (error: Error) => void;
 };
 
 export interface ContentFileUploader {
-  upload(contents: Readable, size: number): Promise<FileId>;
+  upload(contents: Readable, size: number): Promise<ContentsId>;
 
   on(
     event: keyof FileUploadEvents,
diff --git a/src/context/virtual-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts b/src/context/virtual-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts
new file mode 100644
index 000000000..7b15bfba5
--- /dev/null
+++ b/src/context/virtual-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts
@@ -0,0 +1,53 @@
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
+
+export class ContentsDownloadedDomainEvent extends DomainEvent {
+  static readonly EVENT_NAME: 'contents.downloaded';
+
+  readonly name: string;
+  readonly extension: string;
+  readonly nameWithExtension: string;
+  readonly size: number;
+  readonly elapsedTime: number;
+
+  constructor({
+    aggregateId,
+    eventId,
+    name,
+    extension,
+    nameWithExtension,
+    size,
+    elapsedTime,
+  }: {
+    aggregateId: string;
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    size: number;
+    elapsedTime: number;
+    eventId?: string;
+  }) {
+    super({
+      eventName: 'contents.downloaded',
+      aggregateId,
+      eventId,
+    });
+
+    this.name = name;
+    this.extension = extension;
+    this.nameWithExtension = nameWithExtension;
+    this.size = size;
+    this.elapsedTime = elapsedTime;
+  }
+
+  toPrimitives() {
+    return {
+      aggregateId: this.aggregateId,
+      eventId: this.eventId,
+      name: this.name,
+      extension: this.extension,
+      nameWithExtension: this.nameWithExtension,
+      size: this.size,
+      elapsedTime: this.elapsedTime,
+    };
+  }
+}
diff --git a/src/context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts b/src/context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
new file mode 100644
index 000000000..0bca52526
--- /dev/null
+++ b/src/context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
@@ -0,0 +1,39 @@
+import { Environment } from '@internxt/inxt-js';
+import { ContentFileDownloader } from '../domain/contentHandlers/ContentFileDownloader';
+import { ContentFileUploader } from '../domain/contentHandlers/ContentFileUploader';
+import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
+import { EnvironmentContentFileDownloader } from './download/EnvironmentContentFileDownloader';
+import { EnvironmentContentFileUploader } from './upload/EnvironmentContentFileUploader';
+import { LocalFileContents } from '../domain/LocalFileContents';
+
+export class EnvironmentRemoteFileContentsManagersFactory
+  implements ContentsManagersFactory
+{
+  private static MULTIPART_UPLOAD_SIZE_THRESHOLD = 5 * 1024 * 1024 * 1024;
+
+  constructor(
+    private readonly environment: Environment,
+    private readonly bucket: string
+  ) {}
+
+  downloader(): ContentFileDownloader {
+    return new EnvironmentContentFileDownloader(
+      this.environment.download,
+      this.bucket
+    );
+  }
+
+  uploader(
+    contents: LocalFileContents,
+    abortSignal?: AbortSignal
+  ): ContentFileUploader {
+    contents.size;
+    const fn =
+      contents.size >
+      EnvironmentRemoteFileContentsManagersFactory.MULTIPART_UPLOAD_SIZE_THRESHOLD
+        ? this.environment.uploadMultipartFile
+        : this.environment.upload;
+
+    return new EnvironmentContentFileUploader(fn, this.bucket, abortSignal);
+  }
+}
diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileProvider.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileProvider.ts
new file mode 100644
index 000000000..d9be2ff50
--- /dev/null
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileProvider.ts
@@ -0,0 +1,86 @@
+import Logger from 'electron-log';
+import { createReadStream, promises as fs, watch } from 'fs';
+import path from 'path';
+import { Readable } from 'stream';
+import { LocalFileContents } from '../domain/LocalFileContents';
+import { LocalContentsProvider } from '../domain/LocalFileProvider';
+
+function extractNameAndExtension(nameWithExtension: string): [string, string] {
+  if (nameWithExtension.startsWith('.')) {
+    return [nameWithExtension, ''];
+  }
+
+  const [name, extension] = nameWithExtension.split('.');
+
+  return [name, extension];
+}
+
+export class FSLocalFileProvider implements LocalContentsProvider {
+  private reading = new Map<string, AbortController>();
+
+  private createAbortableStream(filePath: string): {
+    readable: Readable;
+    controller: AbortController;
+  } {
+    const isBeingRead = this.reading.get(filePath);
+
+    if (isBeingRead) {
+      isBeingRead.abort();
+    }
+
+    const readStream = createReadStream(filePath);
+
+    const controller = new AbortController();
+
+    this.reading.set(filePath, controller);
+
+    return { readable: readStream, controller };
+  }
+
+  async provide(absoluteFilePath: string) {
+    const { readable, controller } =
+      this.createAbortableStream(absoluteFilePath);
+
+    const { size, mtimeMs, birthtimeMs } = await fs.stat(absoluteFilePath);
+
+    const absoluteFolderPath = path.dirname(absoluteFilePath);
+    const nameWithExtension = path.basename(absoluteFilePath);
+
+    const watcher = watch(absoluteFolderPath, (_, filename) => {
+      if (filename !== nameWithExtension) {
+        return;
+      }
+      Logger.warn(
+        filename,
+        ' has been changed during read, it will be aborted'
+      );
+
+      controller.abort();
+    });
+
+    readable.on('end', () => {
+      watcher.close();
+      this.reading.delete(absoluteFilePath);
+    });
+
+    readable.on('close', () => {
+      this.reading.delete(absoluteFilePath);
+    });
+
+    const [name, extension] = extractNameAndExtension(nameWithExtension);
+
+    const contents = LocalFileContents.from({
+      name,
+      extension,
+      size,
+      modifiedTime: mtimeMs,
+      birthTime: birthtimeMs,
+      contents: readable,
+    });
+
+    return {
+      contents,
+      abortSignal: controller.signal,
+    };
+  }
+}
diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
new file mode 100644
index 000000000..812f1d4b1
--- /dev/null
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
@@ -0,0 +1,24 @@
+import { ensureFolderExists } from '../../../../apps/shared/fs/ensure-folder-exists';
+import { WriteReadableToFile } from '../../../../apps/shared/fs/write-readable-to-file';
+import { LocalFileContents } from '../domain/LocalFileContents';
+import { LocalFileWriter } from '../domain/LocalFileWriter';
+import path from 'path';
+
+export type LocationProvider = () => Promise<string>;
+
+export class FSLocalFileWriter implements LocalFileWriter {
+  constructor(private readonly getLocation: LocationProvider) {}
+
+  async write(contents: LocalFileContents): Promise<string> {
+    const location = await this.getLocation();
+
+    const folderPath = path.join(location, 'internxt');
+    ensureFolderExists(folderPath);
+
+    const filePath = path.join(folderPath, contents.nameWithExtension);
+
+    await WriteReadableToFile.write(contents.stream, filePath);
+
+    return filePath;
+  }
+}
diff --git a/src/workers/webdav/modules/contents/infrastructure/download/EnvironmentContnetFileDownloader.ts b/src/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
similarity index 66%
rename from src/workers/webdav/modules/contents/infrastructure/download/EnvironmentContnetFileDownloader.ts
rename to src/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
index 3b9c9b254..5744672bd 100644
--- a/src/workers/webdav/modules/contents/infrastructure/download/EnvironmentContnetFileDownloader.ts
+++ b/src/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
@@ -1,24 +1,36 @@
 import { DownloadStrategyFunction } from '@internxt/inxt-js/build/lib/core/download/strategy';
-import { Stopwatch } from '../../../../../../shared/types/Stopwatch';
 import { EventEmitter, Readable } from 'stream';
 import {
   ContentFileDownloader,
   FileDownloadEvents,
-} from '../../domain/ContentFileDownloader';
-import { Contents } from '../../domain/Contents';
+} from '../../domain/contentHandlers/ContentFileDownloader';
 import { File } from '../../../files/domain/File';
-import { ContentsId } from '../../domain/ContentsId';
+import { DownloadOneShardStrategy } from '@internxt/inxt-js/build/lib/core';
+import { ActionState } from '@internxt/inxt-js/build/api';
+import { Stopwatch } from '../../../../../apps/shared/types/Stopwatch';
 
 export class EnvironmentContentFileDownloader implements ContentFileDownloader {
   private eventEmitter: EventEmitter;
   private stopwatch: Stopwatch;
 
+  private state: ActionState | null;
+
   constructor(
-    private readonly fn: DownloadStrategyFunction<unknown>,
+    private readonly fn: DownloadStrategyFunction<DownloadOneShardStrategy>,
     private readonly bucket: string
   ) {
     this.eventEmitter = new EventEmitter();
     this.stopwatch = new Stopwatch();
+    this.state = null;
+  }
+
+  forceStop(): void {
+    //@ts-ignore
+    // Logger.debug('Finish emitter type', this.state?.type);
+    // Logger.debug('Finish emitter stop method', this.state?.stop);
+    this.state?.stop();
+    // this.eventEmitter.emit('error');
+    // this.eventEmitter.emit('finish');
   }
 
   download(file: File): Promise<Readable> {
@@ -27,7 +39,7 @@ export class EnvironmentContentFileDownloader implements ContentFileDownloader {
     this.eventEmitter.emit('start');
 
     return new Promise((resolve, reject) => {
-      this.fn(
+      this.state = this.fn(
         this.bucket,
         file.contentsId,
         {
@@ -42,16 +54,15 @@ export class EnvironmentContentFileDownloader implements ContentFileDownloader {
               return reject(err);
             }
             this.eventEmitter.emit('finish');
-            const id = new ContentsId(file.contentsId);
-            const remoteContents = Contents.from(id, stream);
-            resolve(remoteContents.stream);
+
+            resolve(stream);
           },
         },
         {
           label: 'Dynamic',
           params: {
             useProxy: false,
-            concurrency: 10,
+            chunkSize: 4096 * 1024,
           },
         }
       );
diff --git a/src/workers/webdav/modules/contents/infrastructure/upload/EnvironmentContentFileUpoader.ts b/src/context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader.ts
similarity index 56%
rename from src/workers/webdav/modules/contents/infrastructure/upload/EnvironmentContentFileUpoader.ts
rename to src/context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader.ts
index 6a0943339..36b6dd933 100644
--- a/src/workers/webdav/modules/contents/infrastructure/upload/EnvironmentContentFileUpoader.ts
+++ b/src/context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader.ts
@@ -3,43 +3,52 @@ import { EventEmitter, Readable } from 'stream';
 import {
   ContentFileUploader,
   FileUploadEvents,
-} from '../../domain/ContentFileUploader';
-import { Stopwatch } from '../../../../../../shared/types/Stopwatch';
+} from '../../domain/contentHandlers/ContentFileUploader';
+import { ContentsId } from '../../domain/ContentsId';
+import { Stopwatch } from '../../../../../apps/shared/types/Stopwatch';
 
-export class EnvironmentContentFileUpoader implements ContentFileUploader {
+export class EnvironmentContentFileUploader implements ContentFileUploader {
   private eventEmitter: EventEmitter;
   private stopwatch: Stopwatch;
 
   constructor(
     private readonly fn: UploadStrategyFunction,
-    private readonly bucket: string
+    private readonly bucket: string,
+    private readonly abortSignal?: AbortSignal
   ) {
     this.eventEmitter = new EventEmitter();
     this.stopwatch = new Stopwatch();
   }
 
-  async upload(contents: Readable, size: number): Promise<string> {
+  async upload(contents: Readable, size: number): Promise<ContentsId> {
     this.eventEmitter.emit('start');
     this.stopwatch.start();
 
     return new Promise((resolve, reject) => {
-      this.fn(this.bucket, {
-        contents,
+      const state = this.fn(this.bucket, {
+        source: contents,
         fileSize: size,
-        finishedCallback: (err: Error | null, fileId: string) => {
+        finishedCallback: (err: Error | null, contentsId: string) => {
           this.stopwatch.finish();
 
           if (err) {
             this.eventEmitter.emit('error', err);
             return reject(err);
           }
-          this.eventEmitter.emit('finish', fileId);
-          resolve(fileId);
+          this.eventEmitter.emit('finish', contentsId);
+          resolve(new ContentsId(contentsId));
         },
         progressCallback: (progress: number) => {
           this.eventEmitter.emit('progress', progress);
         },
       });
+
+      if (this.abortSignal) {
+        this.abortSignal.addEventListener('abort', () => {
+          state.stop();
+          contents.destroy();
+        });
+      }
     });
   }
 
diff --git a/src/context/virtual-drive/files/application/CreateFilePlaceholderOnDeletionFailed.ts b/src/context/virtual-drive/files/application/CreateFilePlaceholderOnDeletionFailed.ts
new file mode 100644
index 000000000..02f123d5b
--- /dev/null
+++ b/src/context/virtual-drive/files/application/CreateFilePlaceholderOnDeletionFailed.ts
@@ -0,0 +1,18 @@
+import { DomainEventClass } from '../../../shared/domain/DomainEvent';
+import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
+import { OptimisticFileDeletionFailed } from '../domain/events/OptimisticFileDeletionFailed';
+import { FilePlaceholderCreatorFromContentsId } from './FilePlaceholderCreatorFromContentsId';
+
+export class CreateFilePlaceholderOnDeletionFailed
+  implements DomainEventSubscriber<OptimisticFileDeletionFailed>
+{
+  constructor(private readonly creator: FilePlaceholderCreatorFromContentsId) {}
+
+  subscribedTo(): DomainEventClass[] {
+    return [OptimisticFileDeletionFailed];
+  }
+
+  async on(domainEvent: OptimisticFileDeletionFailed): Promise<void> {
+    this.creator.run(domainEvent.toPrimitives().contentsId);
+  }
+}
diff --git a/src/context/virtual-drive/files/application/FileCreator.ts b/src/context/virtual-drive/files/application/FileCreator.ts
new file mode 100644
index 000000000..9515a6fbd
--- /dev/null
+++ b/src/context/virtual-drive/files/application/FileCreator.ts
@@ -0,0 +1,65 @@
+import { FolderFinder } from '../../folders/application/FolderFinder';
+import { FilePath } from '../domain/FilePath';
+import { File } from '../domain/File';
+import { FileSize } from '../domain/FileSize';
+import { EventBus } from '../../shared/domain/EventBus';
+import { RemoteFileContents } from '../../contents/domain/RemoteFileContents';
+import { FileDeleter } from './FileDeleter';
+import { PlatformPathConverter } from '../../shared/application/PlatformPathConverter';
+import { FileRepository } from '../domain/FileRepository';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { OfflineFile } from '../domain/OfflineFile';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
+
+export class FileCreator {
+  constructor(
+    private readonly remote: RemoteFileSystem,
+    private readonly repository: FileRepository,
+    private readonly folderFinder: FolderFinder,
+    private readonly fileDeleter: FileDeleter,
+    private readonly eventBus: EventBus,
+    private readonly ipc: SyncEngineIpc
+  ) {}
+
+  async run(filePath: FilePath, contents: RemoteFileContents): Promise<File> {
+    try {
+      const existingFile = this.repository.searchByPartial({
+        path: PlatformPathConverter.winToPosix(filePath.value),
+      });
+
+      if (existingFile) {
+        await this.fileDeleter.run(existingFile.contentsId);
+      }
+
+      const size = new FileSize(contents.size);
+
+      const folder = this.folderFinder.findFromFilePath(filePath);
+
+      const offline = OfflineFile.create(contents.id, folder, size, filePath);
+
+      const persistedAttributes = await this.remote.persist(offline);
+      const file = File.from(persistedAttributes);
+
+      await this.repository.add(file);
+
+      await this.eventBus.publish(offline.pullDomainEvents());
+      this.ipc.send('FILE_CREATED', {
+        name: file.name,
+        extension: file.type,
+        nameWithExtension: file.nameWithExtension,
+      });
+
+      return file;
+    } catch (error: unknown) {
+      const message = error instanceof Error ? error.message : 'unknown error';
+
+      this.ipc.send('FILE_UPLOAD_ERROR', {
+        name: filePath.name(),
+        extension: filePath.extension(),
+        nameWithExtension: filePath.nameWithExtension(),
+        error: message,
+      });
+      throw error;
+    }
+  }
+}
diff --git a/src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts b/src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts
new file mode 100644
index 000000000..454a71441
--- /dev/null
+++ b/src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts
@@ -0,0 +1,18 @@
+import { ServerFile } from '../../../shared/domain/ServerFile';
+import { File } from '../domain/File';
+
+export function createFileFromServerFile(
+  server: ServerFile,
+  relativePath: string
+): File {
+  return File.from({
+    folderId: server.folderId,
+    contentsId: server.fileId,
+    modificationTime: server.modificationTime,
+    size: server.size,
+    createdAt: server.createdAt,
+    updatedAt: server.updatedAt,
+    path: relativePath,
+    status: server.status,
+  });
+}
diff --git a/src/context/virtual-drive/files/application/FileDeleter.ts b/src/context/virtual-drive/files/application/FileDeleter.ts
new file mode 100644
index 000000000..59a32e25b
--- /dev/null
+++ b/src/context/virtual-drive/files/application/FileDeleter.ts
@@ -0,0 +1,87 @@
+import Logger from 'electron-log';
+import { AllParentFoldersStatusIsExists } from '../../folders/application/AllParentFoldersStatusIsExists';
+import { FileStatuses } from '../domain/FileStatus';
+import { File } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
+
+export class FileDeleter {
+  constructor(
+    private readonly remote: RemoteFileSystem,
+    private readonly local: LocalFileSystem,
+    private readonly repository: FileRepository,
+    private readonly allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists,
+    private readonly ipc: SyncEngineIpc
+  ) {}
+
+  async run(contentsId: File['contentsId']): Promise<void> {
+    const file = this.repository.searchByPartial({ contentsId });
+
+    if (!file) {
+      return;
+    }
+
+    if (file.status.is(FileStatuses.TRASHED)) {
+      Logger.warn(`File ${file.path} is already trashed. Will ignore...`);
+      return;
+    }
+
+    const allParentsExists = this.allParentFoldersStatusIsExists.run(
+      file.folderId
+    );
+
+    if (!allParentsExists) {
+      Logger.warn(
+        `Skipped file deletion for ${file.path}. A folder in a higher level is already marked as trashed`
+      );
+      return;
+    }
+
+    this.ipc.send('FILE_DELETING', {
+      name: file.name,
+      extension: file.type,
+      nameWithExtension: file.nameWithExtension,
+      size: file.size,
+    });
+
+    try {
+      file.trash();
+
+      await this.remote.trash(file.contentsId);
+      await this.repository.delete(file.contentsId);
+
+      this.ipc.send('FILE_DELETED', {
+        name: file.name,
+        extension: file.type,
+        nameWithExtension: file.nameWithExtension,
+        size: file.size,
+      });
+    } catch (error: unknown) {
+      Logger.error(
+        `Error deleting the file ${file.nameWithExtension}: `,
+        error
+      );
+
+      const message = error instanceof Error ? error.message : 'Unknown error';
+
+      this.ipc.send('FILE_DELETION_ERROR', {
+        name: file.name,
+        extension: file.type,
+        nameWithExtension: file.nameWithExtension,
+        error: message,
+      });
+
+      this.ipc.send('SYNC_INFO_UPDATE', {
+        kind: 'REMOTE',
+        name: file.nameWithExtension,
+        action: 'DELETE_ERROR',
+        errorName: 'BAD_RESPONSE',
+        process: 'SYNC',
+      });
+
+      this.local.createPlaceHolder(file);
+    }
+  }
+}
diff --git a/src/context/virtual-drive/files/application/FileFinderByContentsId.ts b/src/context/virtual-drive/files/application/FileFinderByContentsId.ts
new file mode 100644
index 000000000..e4eb8271d
--- /dev/null
+++ b/src/context/virtual-drive/files/application/FileFinderByContentsId.ts
@@ -0,0 +1,17 @@
+import { FileNotFoundError } from '../domain/errors/FileNotFoundError';
+import { File } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+
+export class FileFinderByContentsId {
+  constructor(private readonly repository: FileRepository) {}
+
+  run(contentsId: string): File {
+    const file = this.repository.searchByPartial({ contentsId });
+
+    if (!file) {
+      throw new FileNotFoundError(contentsId);
+    }
+
+    return file;
+  }
+}
diff --git a/src/context/virtual-drive/files/application/FilePathUpdater.ts b/src/context/virtual-drive/files/application/FilePathUpdater.ts
new file mode 100644
index 000000000..06896bed7
--- /dev/null
+++ b/src/context/virtual-drive/files/application/FilePathUpdater.ts
@@ -0,0 +1,89 @@
+import { ActionNotPermittedError } from '../domain/errors/ActionNotPermittedError';
+import { FileAlreadyExistsError } from '../domain/errors/FileAlreadyExistsError';
+import { FilePath } from '../domain/FilePath';
+import { File } from '../domain/File';
+import { FolderFinder } from '../../folders/application/FolderFinder';
+import { FileFinderByContentsId } from './FileFinderByContentsId';
+import { EventBus } from '../../shared/domain/EventBus';
+import { FileRepository } from '../domain/FileRepository';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
+
+export class FilePathUpdater {
+  constructor(
+    private readonly remote: RemoteFileSystem,
+    private readonly local: LocalFileSystem,
+    private readonly repository: FileRepository,
+    private readonly fileFinderByContentsId: FileFinderByContentsId,
+    private readonly folderFinder: FolderFinder,
+    private readonly ipc: SyncEngineIpc,
+    private readonly eventBus: EventBus
+  ) {}
+
+  private async rename(file: File, path: FilePath) {
+    file.rename(path);
+
+    await this.remote.rename(file);
+    await this.repository.update(file);
+
+    const events = file.pullDomainEvents();
+    this.eventBus.publish(events);
+  }
+
+  private async move(file: File, destination: FilePath) {
+    const trackerId = await this.local.getLocalFileId(file);
+
+    const destinationFolder = this.folderFinder.run(destination.dirname());
+
+    file.moveTo(destinationFolder, trackerId);
+
+    await this.remote.move(file);
+    await this.repository.update(file);
+
+    const events = file.pullDomainEvents();
+    this.eventBus.publish(events);
+  }
+
+  async run(contentsId: string, posixRelativePath: string) {
+    const destination = new FilePath(posixRelativePath);
+    const file = this.fileFinderByContentsId.run(contentsId);
+
+    if (file.dirname !== destination.dirname()) {
+      if (file.nameWithExtension !== destination.nameWithExtension()) {
+        throw new ActionNotPermittedError('rename and change folder');
+      }
+      await this.move(file, destination);
+      return;
+    }
+
+    const destinationFile = this.repository.searchByPartial({
+      path: destination.value,
+    });
+
+    if (destinationFile) {
+      this.ipc.send('FILE_RENAME_ERROR', {
+        name: file.name,
+        extension: file.type,
+        nameWithExtension: file.nameWithExtension,
+        error: 'Renaming error: file already exists',
+      });
+      throw new FileAlreadyExistsError(destination.name());
+    }
+
+    if (destination.extensionMatch(file.type)) {
+      this.ipc.send('FILE_RENAMING', {
+        oldName: file.name,
+        nameWithExtension: destination.nameWithExtension(),
+      });
+      await this.rename(file, destination);
+      this.ipc.send('FILE_RENAMED', {
+        oldName: file.name,
+        nameWithExtension: destination.nameWithExtension(),
+      });
+      return;
+    }
+
+    throw new Error('Cannot reupload files atm');
+  }
+}
diff --git a/src/context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId.ts b/src/context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId.ts
new file mode 100644
index 000000000..691aa35d0
--- /dev/null
+++ b/src/context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId.ts
@@ -0,0 +1,16 @@
+import { File } from '../domain/File';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+import { FileFinderByContentsId } from './FileFinderByContentsId';
+
+export class FilePlaceholderCreatorFromContentsId {
+  constructor(
+    private readonly finder: FileFinderByContentsId,
+    private readonly local: LocalFileSystem
+  ) {}
+
+  run(contentsId: File['contentsId']) {
+    const file = this.finder.run(contentsId);
+
+    this.local.createPlaceHolder(file);
+  }
+}
diff --git a/src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts b/src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts
new file mode 100644
index 000000000..7e0623758
--- /dev/null
+++ b/src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts
@@ -0,0 +1,89 @@
+import Logger from 'electron-log';
+import fs from 'fs/promises';
+import { LocalFileIdProvider } from '../../shared/application/LocalFileIdProvider';
+import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
+import { EventRepository } from '../../shared/domain/EventRepository';
+import { File } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+import { FileStatuses } from '../domain/FileStatus';
+import { FileMovedDomainEvent } from '../domain/events/FileMovedDomainEvent';
+import { FileRenamedDomainEvent } from '../domain/events/FileRenamedDomainEvent';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+
+export class FilesPlaceholderUpdater {
+  constructor(
+    private readonly repository: FileRepository,
+    private readonly localFileSystem: LocalFileSystem,
+    private readonly relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter,
+    private readonly localFileIdProvider: LocalFileIdProvider,
+    private readonly eventHistory: EventRepository
+  ) {}
+
+  private hasToBeDeleted(local: File, remote: File): boolean {
+    const localExists = local.status.is(FileStatuses.EXISTS);
+    const remoteIsTrashed = remote.status.is(FileStatuses.TRASHED);
+    const remoteIsDeleted = remote.status.is(FileStatuses.DELETED);
+    return localExists && (remoteIsTrashed || remoteIsDeleted);
+  }
+
+  private async update(remote: File): Promise<void> {
+    const local = this.repository.searchByPartial({
+      contentsId: remote.contentsId,
+    });
+
+    if (!local) {
+      if (remote.status.is(FileStatuses.EXISTS)) {
+        Logger.debug('Creating file placeholder: ', remote.path);
+        await this.repository.add(remote);
+        await this.localFileSystem.createPlaceHolder(remote);
+      }
+      return;
+    }
+
+    if (local.path !== remote.path) {
+      Logger.debug('Updating file placeholder: ', remote.path);
+      const trackerId = await this.localFileIdProvider.run(local.path);
+      if (remote.name !== local.name) {
+        const event = new FileRenamedDomainEvent({
+          aggregateId: remote.contentsId,
+        });
+        this.eventHistory.store(event);
+      }
+      if (remote.folderId !== local.folderId) {
+        const event = new FileMovedDomainEvent({
+          aggregateId: remote.contentsId,
+          trackerId,
+        });
+        this.eventHistory.store(event);
+      }
+
+      await this.repository.update(remote);
+
+      try {
+        await fs.stat(remote.path);
+        // Do nothing
+      } catch {
+        const win32AbsolutePath = this.relativePathToAbsoluteConverter.run(
+          local.path
+        );
+        const newWin32AbsolutePath = this.relativePathToAbsoluteConverter.run(
+          remote.path
+        );
+        await fs.rename(win32AbsolutePath, newWin32AbsolutePath);
+      }
+    }
+
+    if (this.hasToBeDeleted(local, remote)) {
+      const win32AbsolutePath = this.relativePathToAbsoluteConverter.run(
+        local.path
+      );
+      await fs.unlink(win32AbsolutePath);
+    }
+  }
+
+  async run(remotes: Array<File>): Promise<void> {
+    const updatePromises = remotes.map((remote) => this.update(remote));
+
+    await Promise.all(updatePromises);
+  }
+}
diff --git a/src/context/virtual-drive/files/application/FilesPlaceholdersCreator.ts b/src/context/virtual-drive/files/application/FilesPlaceholdersCreator.ts
new file mode 100644
index 000000000..79d5a6210
--- /dev/null
+++ b/src/context/virtual-drive/files/application/FilesPlaceholdersCreator.ts
@@ -0,0 +1,14 @@
+import { File } from '../domain/File';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+
+export class FilesPlaceholderCreator {
+  constructor(private readonly local: LocalFileSystem) {}
+
+  async run(files: Array<File>): Promise<void> {
+    const creationPromises = files.map((file) =>
+      this.local.createPlaceHolder(file)
+    );
+
+    await Promise.all(creationPromises);
+  }
+}
diff --git a/src/context/virtual-drive/files/application/RepositoryPopulator.ts b/src/context/virtual-drive/files/application/RepositoryPopulator.ts
new file mode 100644
index 000000000..711666c74
--- /dev/null
+++ b/src/context/virtual-drive/files/application/RepositoryPopulator.ts
@@ -0,0 +1,12 @@
+import { File } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+
+export class RepositoryPopulator {
+  constructor(private readonly repository: FileRepository) {}
+
+  async run(files: Array<File>): Promise<void> {
+    const addPromises = files.map((file: File) => this.repository.add(file));
+
+    await Promise.all(addPromises);
+  }
+}
diff --git a/src/context/virtual-drive/files/application/RetrieveAllFiles.ts b/src/context/virtual-drive/files/application/RetrieveAllFiles.ts
new file mode 100644
index 000000000..64c19c306
--- /dev/null
+++ b/src/context/virtual-drive/files/application/RetrieveAllFiles.ts
@@ -0,0 +1,10 @@
+import { File } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+
+export class RetrieveAllFiles {
+  constructor(private readonly repository: FileRepository) {}
+
+  run(): Promise<Array<File>> {
+    return this.repository.all();
+  }
+}
diff --git a/src/context/virtual-drive/files/application/SameFileWasMoved.ts b/src/context/virtual-drive/files/application/SameFileWasMoved.ts
new file mode 100644
index 000000000..334e8d6e4
--- /dev/null
+++ b/src/context/virtual-drive/files/application/SameFileWasMoved.ts
@@ -0,0 +1,58 @@
+import { EventRepository } from '../../shared/domain/EventRepository';
+import { FilePath } from '../domain/FilePath';
+import { FileRepository } from '../domain/FileRepository';
+import { FileMovedDomainEvent } from '../domain/events/FileMovedDomainEvent';
+import Logger from 'electron-log';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+
+// TODO: find a better name
+type WasMovedResult = { result: false } | { result: true; contentsId: string };
+
+export class SameFileWasMoved {
+  constructor(
+    private readonly repository: FileRepository,
+    private readonly localFileSystem: LocalFileSystem,
+    private readonly eventHistory: EventRepository
+  ) {}
+
+  async run(path: FilePath): Promise<WasMovedResult> {
+    const fileInDestination = this.repository.searchByPartial({
+      path: path.value,
+    });
+
+    if (!fileInDestination) {
+      return { result: false };
+    }
+
+    const events = await this.eventHistory.search(fileInDestination.contentsId);
+
+    if (events.length === 0) {
+      return { result: false };
+    }
+
+    const movedEvent = events.find(
+      (event) => event instanceof FileMovedDomainEvent
+    );
+
+    if (!movedEvent) {
+      return { result: false };
+    }
+
+    const file = this.repository.searchByPartial({
+      contentsId: movedEvent.aggregateId,
+    });
+
+    if (!file) {
+      return { result: false };
+    }
+
+    const trackerId = await this.localFileSystem.getLocalFileId(file);
+
+    if (trackerId !== movedEvent.toPrimitives().trackerId) {
+      return { result: false };
+    }
+
+    Logger.warn('The file has been moved here');
+    return { result: true, contentsId: fileInDestination.contentsId };
+  }
+}
diff --git a/src/workers/webdav/modules/files/application/WebdavFileMimeTypeResolver.ts b/src/context/virtual-drive/files/application/WebdavFileMimeTypeResolver.ts
similarity index 100%
rename from src/workers/webdav/modules/files/application/WebdavFileMimeTypeResolver.ts
rename to src/context/virtual-drive/files/application/WebdavFileMimeTypeResolver.ts
diff --git a/src/workers/webdav/modules/files/domain/File.ts b/src/context/virtual-drive/files/domain/File.ts
similarity index 58%
rename from src/workers/webdav/modules/files/domain/File.ts
rename to src/context/virtual-drive/files/domain/File.ts
index 5a58f9bab..e8f831024 100644
--- a/src/workers/webdav/modules/files/domain/File.ts
+++ b/src/context/virtual-drive/files/domain/File.ts
@@ -1,17 +1,20 @@
-import { AggregateRoot } from '../../shared/domain/AggregateRoot';
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
 import { Folder } from '../../folders/domain/Folder';
 import { FilePath } from './FilePath';
 import { FileSize } from './FileSize';
-import { FileCreatedDomainEvent } from './FileCreatedDomainEvent';
+import { FileCreatedDomainEvent } from './events/FileCreatedDomainEvent';
 import { FileCannotBeMovedToTheOriginalFolderError } from './errors/FileCannotBeMovedToTheOriginalFolderError';
 import { FileActionOnlyCanAffectOneLevelError } from './errors/FileActionOnlyCanAffectOneLevelError';
 import { FileNameShouldDifferFromOriginalError } from './errors/FileNameShouldDifferFromOriginalError';
 import { FileActionCannotModifyExtension } from './errors/FileActionCannotModifyExtension';
-import { FileDeletedDomainEvent } from './FileDeletedDomainEvent';
+import { FileDeletedDomainEvent } from './events/FileDeletedDomainEvent';
 import { FileStatus, FileStatuses } from './FileStatus';
 import { ContentsId } from '../../contents/domain/ContentsId';
+import { FileMovedDomainEvent } from './events/FileMovedDomainEvent';
+import { FileRenamedDomainEvent } from './events/FileRenamedDomainEvent';
+import { FilePlaceholderId, createFilePlaceholderId } from './PlaceholderId';
 
-export type FileAtributes = {
+export type FileAttributes = {
   contentsId: string;
   folderId: number;
   createdAt: string;
@@ -43,8 +46,8 @@ export class File extends AggregateRoot {
     return this._folderId;
   }
 
-  public get path() {
-    return this._path;
+  public get path(): string {
+    return this._path.value;
   }
 
   public get type() {
@@ -71,7 +74,11 @@ export class File extends AggregateRoot {
     return this._status;
   }
 
-  static from(attributes: FileAtributes): File {
+  public get placeholderId(): FilePlaceholderId {
+    return createFilePlaceholderId(this.contentsId);
+  }
+
+  static from(attributes: FileAttributes): File {
     return new File(
       new ContentsId(attributes.contentsId),
       attributes.folderId,
@@ -86,14 +93,14 @@ export class File extends AggregateRoot {
   static create(
     contentsId: string,
     folder: Folder,
-    size: number,
+    size: FileSize,
     path: FilePath
   ): File {
     const file = new File(
       new ContentsId(contentsId),
       folder.id,
       path,
-      new FileSize(size),
+      size,
       new Date(),
       new Date(),
       FileStatus.Exists
@@ -102,7 +109,7 @@ export class File extends AggregateRoot {
     file.record(
       new FileCreatedDomainEvent({
         aggregateId: contentsId,
-        size,
+        size: file.size,
         type: path.extension(),
       })
     );
@@ -112,6 +119,7 @@ export class File extends AggregateRoot {
 
   trash() {
     this._status = this._status.changeTo(FileStatuses.TRASHED);
+    this.updatedAt = new Date();
 
     this.record(
       new FileDeletedDomainEvent({
@@ -121,59 +129,20 @@ export class File extends AggregateRoot {
     );
   }
 
-  moveTo(folder: Folder): void {
+  moveTo(folder: Folder, trackerId: string): void {
     if (this.folderId === folder.id) {
-      throw new FileCannotBeMovedToTheOriginalFolderError(this.path.value);
+      throw new FileCannotBeMovedToTheOriginalFolderError(this.path);
     }
 
     this._folderId = folder.id;
-    this._path = this._path.changeFolder(folder.path.value);
-
-    //TODO: record file moved event
-  }
-
-  clone(contentsId: string, folderId: number, newPath: FilePath) {
-    const file = new File(
-      new ContentsId(contentsId),
-      folderId,
-      newPath,
-      this._size,
-      this.createdAt,
-      new Date(),
-      FileStatus.Exists
-    );
+    this._path = this._path.changeFolder(folder.path);
 
-    file.record(
-      new FileCreatedDomainEvent({
-        aggregateId: contentsId,
-        size: this._size.value,
-        type: this._path.extension(),
+    this.record(
+      new FileMovedDomainEvent({
+        aggregateId: this._contentsId.value,
+        trackerId,
       })
     );
-
-    return file;
-  }
-
-  overwrite(contentsId: string, folderId: number, newPath: FilePath) {
-    const file = new File(
-      new ContentsId(contentsId),
-      folderId,
-      newPath,
-      this._size,
-      this.createdAt,
-      new Date(),
-      FileStatus.Exists
-    );
-
-    file.record(
-      new FileCreatedDomainEvent({
-        aggregateId: contentsId,
-        size: this._size.value,
-        type: this._path.extension(),
-      })
-    );
-
-    return file;
   }
 
   rename(newPath: FilePath) {
@@ -191,7 +160,11 @@ export class File extends AggregateRoot {
 
     this._path = this._path.updateName(newPath.nameWithExtension());
 
-    // TODO: record rename event
+    this.record(
+      new FileRenamedDomainEvent({
+        aggregateId: this.contentsId,
+      })
+    );
   }
 
   hasParent(id: number): boolean {
@@ -210,65 +183,13 @@ export class File extends AggregateRoot {
     return this._status.is(status);
   }
 
-  update(
-    attributes: Partial<
-      Pick<
-        FileAtributes,
-        | 'path'
-        | 'createdAt'
-        | 'updatedAt'
-        | 'contentsId'
-        | 'folderId'
-        | 'status'
-      >
-    >
-  ) {
-    if (attributes.path) {
-      this._path = new FilePath(attributes.path);
-    }
-
-    if (attributes.createdAt) {
-      this.createdAt = new Date(attributes.createdAt);
-    }
-
-    if (attributes.updatedAt) {
-      this.updatedAt = new Date(attributes.updatedAt);
-    }
-
-    if (attributes.contentsId) {
-      this._contentsId = new ContentsId(attributes.contentsId);
-    }
-
-    if (attributes.folderId) {
-      this._folderId = attributes.folderId;
-    }
-
-    if (attributes.status) {
-      this._status = FileStatus.fromValue(attributes.status);
-    }
-
-    return this;
-  }
-
-  toPrimitives(): Omit<FileAtributes, 'modificationTime'> {
-    return {
-      contentsId: this.contentsId,
-      folderId: this.folderId,
-      path: this._path.value,
-      size: this._size.value,
-      createdAt: this.createdAt.toISOString(),
-      updatedAt: this.updatedAt.toISOString(),
-      status: this.status.value,
-    };
-  }
-
-  attributes(): FileAtributes {
+  attributes(): FileAttributes {
     return {
       contentsId: this.contentsId,
       folderId: this.folderId,
       createdAt: this.createdAt.toISOString(),
-      path: this._path.value,
-      size: this._size.value,
+      path: this.path,
+      size: this.size,
       updatedAt: this.updatedAt.toISOString(),
       status: this.status.value,
       modificationTime: this.updatedAt.toISOString(),
diff --git a/src/context/virtual-drive/files/domain/FilePath.ts b/src/context/virtual-drive/files/domain/FilePath.ts
new file mode 100644
index 000000000..82a36b423
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/FilePath.ts
@@ -0,0 +1,58 @@
+import path from 'path';
+import { Path } from '../../shared/domain/Path';
+
+export class FilePath extends Path {
+  constructor(value: string) {
+    super(value);
+  }
+
+  static fromParts(parts: Array<string>) {
+    const full = path.posix.join(...parts);
+
+    return new FilePath(full);
+  }
+
+  extension(): string {
+    const base = path.posix.basename(this.value);
+    const { ext } = path.posix.parse(base);
+    return ext.slice(1);
+  }
+
+  hasExtension(): boolean {
+    const extension = this.extension();
+
+    return extension !== '';
+  }
+
+  name(): string {
+    const base = path.posix.basename(this.value);
+    const { name } = path.posix.parse(base);
+    return name;
+  }
+
+  nameWithExtension(): string {
+    const basename = path.posix.basename(this.value);
+    const { base } = path.posix.parse(basename);
+    return base;
+  }
+
+  hasSameDirname(other: FilePath): boolean {
+    return this.dirname() === other.dirname();
+  }
+
+  extensionMatch(extension: string): boolean {
+    return this.extension() === extension;
+  }
+
+  hasSameExtension(other: FilePath): boolean {
+    return this.extension() === other.extension();
+  }
+
+  changeFolder(folder: string): FilePath {
+    return FilePath.fromParts([folder, this.nameWithExtension()]);
+  }
+
+  updateName(name: string): FilePath {
+    return FilePath.fromParts([this.dirname(), name]);
+  }
+}
diff --git a/src/context/virtual-drive/files/domain/FileRepository.ts b/src/context/virtual-drive/files/domain/FileRepository.ts
new file mode 100644
index 000000000..db12ab343
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/FileRepository.ts
@@ -0,0 +1,13 @@
+import { File, FileAttributes } from './File';
+
+export interface FileRepository {
+  all(): Promise<Array<File>>;
+
+  searchByPartial(partial: Partial<FileAttributes>): File | undefined;
+
+  delete(id: File['contentsId']): Promise<void>;
+
+  add(file: File): Promise<void>;
+
+  update(file: File): Promise<void>;
+}
diff --git a/src/context/virtual-drive/files/domain/FileSize.ts b/src/context/virtual-drive/files/domain/FileSize.ts
new file mode 100644
index 000000000..411a4809f
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/FileSize.ts
@@ -0,0 +1,3 @@
+import { BucketEntry } from '../../shared/domain/BucketEntry';
+
+export class FileSize extends BucketEntry {}
diff --git a/src/workers/webdav/modules/files/domain/FileStatus.ts b/src/context/virtual-drive/files/domain/FileStatus.ts
similarity index 72%
rename from src/workers/webdav/modules/files/domain/FileStatus.ts
rename to src/context/virtual-drive/files/domain/FileStatus.ts
index 5bdc79e25..66070c4a1 100644
--- a/src/workers/webdav/modules/files/domain/FileStatus.ts
+++ b/src/context/virtual-drive/files/domain/FileStatus.ts
@@ -1,6 +1,6 @@
-import { InvalidArgumentError } from '../../../../shared/domain/InvalidArgumentError';
-import { EnumValueObject } from '../../../../shared/domain/EnumValueObject';
-import { ActionNotPermitedError } from './errors/ActionNotPermitedError';
+import { EnumValueObject } from '../../../shared/domain/EnumValueObject';
+import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { ActionNotPermittedError } from './errors/ActionNotPermittedError';
 
 export enum FileStatuses {
   EXISTS = 'EXISTS',
@@ -25,14 +25,15 @@ export class FileStatus extends EnumValueObject<FileStatuses> {
 
   static Exists = new FileStatus(FileStatuses.EXISTS);
   static Trashed = new FileStatus(FileStatuses.TRASHED);
+  static Deleted = new FileStatus(FileStatuses.DELETED);
 
   changeTo(status: FileStatuses): FileStatus {
     if (this.value === 'TRASHED') {
-      throw new ActionNotPermitedError('restore from trash');
+      throw new ActionNotPermittedError('restore from trash');
     }
 
     if (this.value === 'DELETED') {
-      throw new ActionNotPermitedError('restore, file is deleted');
+      throw new ActionNotPermittedError('restore, file is deleted');
     }
 
     return new FileStatus(FileStatuses[status]);
diff --git a/src/workers/webdav/modules/files/domain/MimeTypesMap.ts b/src/context/virtual-drive/files/domain/MimeTypesMap.ts
similarity index 100%
rename from src/workers/webdav/modules/files/domain/MimeTypesMap.ts
rename to src/context/virtual-drive/files/domain/MimeTypesMap.ts
diff --git a/src/context/virtual-drive/files/domain/OfflineFile.ts b/src/context/virtual-drive/files/domain/OfflineFile.ts
new file mode 100644
index 000000000..4aeeaca82
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/OfflineFile.ts
@@ -0,0 +1,110 @@
+import { ContentsId } from '../../contents/domain/ContentsId';
+import { Folder } from '../../folders/domain/Folder';
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
+import { FilePath } from './FilePath';
+import { FileSize } from './FileSize';
+import { FileCreatedDomainEvent } from './events/FileCreatedDomainEvent';
+
+export type OfflineFileAttributes = {
+  contentsId: string;
+  folderId: number;
+  path: string;
+  size: number;
+};
+
+export class OfflineFile extends AggregateRoot {
+  private constructor(
+    private _contentsId: ContentsId,
+    private _folderId: number,
+    private _path: FilePath,
+    private readonly _size: FileSize
+  ) {
+    super();
+  }
+
+  public get contentsId() {
+    return this._contentsId.value;
+  }
+
+  public get folderId() {
+    return this._folderId;
+  }
+
+  public get path(): string {
+    return this._path.value;
+  }
+
+  public get type() {
+    return this._path.extension();
+  }
+
+  public get name() {
+    return this._path.name();
+  }
+
+  public get nameWithExtension() {
+    return this._path.nameWithExtension();
+  }
+
+  public get dirname() {
+    return this._path.dirname();
+  }
+
+  public get size(): number {
+    return this._size.value;
+  }
+
+  static from(attributes: OfflineFileAttributes): OfflineFile {
+    return new OfflineFile(
+      new ContentsId(attributes.contentsId),
+      attributes.folderId,
+      new FilePath(attributes.path),
+      new FileSize(attributes.size)
+    );
+  }
+
+  static create(
+    contentsId: string,
+    folder: Folder,
+    size: FileSize,
+    path: FilePath
+  ): OfflineFile {
+    const file = new OfflineFile(
+      new ContentsId(contentsId),
+      folder.id,
+      path,
+      size
+    );
+
+    file.record(
+      new FileCreatedDomainEvent({
+        aggregateId: contentsId,
+        size: file.size,
+        type: path.extension(),
+      })
+    );
+
+    return file;
+  }
+
+  hasParent(id: number): boolean {
+    return this.folderId === id;
+  }
+
+  isFolder(): this is Folder {
+    return false;
+  }
+
+  isFile(): this is File {
+    return true;
+  }
+
+  attributes(): OfflineFileAttributes {
+    return {
+      contentsId: this.contentsId,
+      folderId: this.folderId,
+      path: this._path.value,
+      size: this._size.value,
+    };
+  }
+}
diff --git a/src/context/virtual-drive/files/domain/OldFileRepository.ts b/src/context/virtual-drive/files/domain/OldFileRepository.ts
new file mode 100644
index 000000000..ed8c81f2f
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/OldFileRepository.ts
@@ -0,0 +1,24 @@
+import { File, FileAttributes } from './File';
+import { FolderAttributes } from '../../folders/domain/Folder';
+import { FilePath } from './FilePath';
+
+export interface OldFileRepository {
+  search(pathLike: FilePath): File | undefined;
+
+  searchByPartial(partial: Partial<FileAttributes>): File | undefined;
+
+  delete(file: File): Promise<void>;
+
+  add(file: File): Promise<void>;
+
+  updateName(item: File): Promise<void>;
+
+  updateParentDir(item: File): Promise<void>;
+
+  searchOnFolder(folderId: FolderAttributes['id']): Promise<Array<File>>;
+
+  all(): Promise<Array<File>>;
+
+  /** @deprecated */
+  clear(): void;
+}
diff --git a/src/context/virtual-drive/files/domain/PlaceholderId.ts b/src/context/virtual-drive/files/domain/PlaceholderId.ts
new file mode 100644
index 000000000..d67b5b95c
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/PlaceholderId.ts
@@ -0,0 +1,25 @@
+export type FilePlaceholderIdPrefixType = 'FILE:';
+export const FilePlaceholderIdPrefix = 'FILE:';
+
+export type FilePlaceholderId = `${FilePlaceholderIdPrefixType}${string}`;
+
+function typedCheck(
+  input: string,
+  prefix: FilePlaceholderIdPrefixType = 'FILE:'
+): input is FilePlaceholderId {
+  return input.startsWith(prefix);
+}
+export function isFilePlaceholderId(input: string): input is FilePlaceholderId {
+  return typedCheck(input);
+}
+
+function typedCreate(
+  id: string,
+  prefix: FilePlaceholderIdPrefixType = 'FILE:'
+): FilePlaceholderId {
+  return (prefix + id) as FilePlaceholderId;
+}
+
+export function createFilePlaceholderId(id: string): FilePlaceholderId {
+  return typedCreate(id);
+}
diff --git a/src/context/virtual-drive/files/domain/errors/ActionNotPermittedError.ts b/src/context/virtual-drive/files/domain/errors/ActionNotPermittedError.ts
new file mode 100644
index 000000000..3fc77c9d3
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/errors/ActionNotPermittedError.ts
@@ -0,0 +1,5 @@
+export class ActionNotPermittedError extends Error {
+  constructor(action: string) {
+    super(`${action} is not permitted on files`);
+  }
+}
diff --git a/src/workers/webdav/modules/files/domain/errors/FileActionCannotModifyExtension.ts b/src/context/virtual-drive/files/domain/errors/FileActionCannotModifyExtension.ts
similarity index 100%
rename from src/workers/webdav/modules/files/domain/errors/FileActionCannotModifyExtension.ts
rename to src/context/virtual-drive/files/domain/errors/FileActionCannotModifyExtension.ts
diff --git a/src/workers/webdav/modules/files/domain/errors/FileActionOnlyCanAffectOneLevelError.ts b/src/context/virtual-drive/files/domain/errors/FileActionOnlyCanAffectOneLevelError.ts
similarity index 100%
rename from src/workers/webdav/modules/files/domain/errors/FileActionOnlyCanAffectOneLevelError.ts
rename to src/context/virtual-drive/files/domain/errors/FileActionOnlyCanAffectOneLevelError.ts
diff --git a/src/workers/webdav/modules/files/domain/errors/FileAlreadyExistsError.ts b/src/context/virtual-drive/files/domain/errors/FileAlreadyExistsError.ts
similarity index 100%
rename from src/workers/webdav/modules/files/domain/errors/FileAlreadyExistsError.ts
rename to src/context/virtual-drive/files/domain/errors/FileAlreadyExistsError.ts
diff --git a/src/workers/webdav/modules/files/domain/errors/FileCannotBeMovedToTheOriginalFolderError.ts b/src/context/virtual-drive/files/domain/errors/FileCannotBeMovedToTheOriginalFolderError.ts
similarity index 100%
rename from src/workers/webdav/modules/files/domain/errors/FileCannotBeMovedToTheOriginalFolderError.ts
rename to src/context/virtual-drive/files/domain/errors/FileCannotBeMovedToTheOriginalFolderError.ts
diff --git a/src/workers/webdav/modules/files/domain/errors/FileNameShouldBeEqualToOriginalError.ts b/src/context/virtual-drive/files/domain/errors/FileNameShouldBeEqualToOriginalError.ts
similarity index 100%
rename from src/workers/webdav/modules/files/domain/errors/FileNameShouldBeEqualToOriginalError.ts
rename to src/context/virtual-drive/files/domain/errors/FileNameShouldBeEqualToOriginalError.ts
diff --git a/src/workers/webdav/modules/files/domain/errors/FileNameShouldDifferFromOriginalError.ts b/src/context/virtual-drive/files/domain/errors/FileNameShouldDifferFromOriginalError.ts
similarity index 100%
rename from src/workers/webdav/modules/files/domain/errors/FileNameShouldDifferFromOriginalError.ts
rename to src/context/virtual-drive/files/domain/errors/FileNameShouldDifferFromOriginalError.ts
diff --git a/src/context/virtual-drive/files/domain/errors/FileNotFoundError.ts b/src/context/virtual-drive/files/domain/errors/FileNotFoundError.ts
new file mode 100644
index 000000000..2eb92dd83
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/errors/FileNotFoundError.ts
@@ -0,0 +1,5 @@
+export class FileNotFoundError extends Error {
+  constructor(id: string) {
+    super(`File ${id} not found`);
+  }
+}
diff --git a/src/workers/webdav/modules/files/domain/errors/UnknownFileActionError.ts b/src/context/virtual-drive/files/domain/errors/UnknownFileActionError.ts
similarity index 100%
rename from src/workers/webdav/modules/files/domain/errors/UnknownFileActionError.ts
rename to src/context/virtual-drive/files/domain/errors/UnknownFileActionError.ts
diff --git a/src/workers/webdav/modules/files/domain/FileCreatedDomainEvent.ts b/src/context/virtual-drive/files/domain/events/FileCreatedDomainEvent.ts
similarity index 91%
rename from src/workers/webdav/modules/files/domain/FileCreatedDomainEvent.ts
rename to src/context/virtual-drive/files/domain/events/FileCreatedDomainEvent.ts
index 7cf934afa..c52845306 100644
--- a/src/workers/webdav/modules/files/domain/FileCreatedDomainEvent.ts
+++ b/src/context/virtual-drive/files/domain/events/FileCreatedDomainEvent.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from '../../shared/domain/DomainEvent';
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
 
 export type CreatedWebdavFileDomainEventAttributes = {
   readonly size: number;
diff --git a/src/workers/webdav/modules/files/domain/FileDeletedDomainEvent.ts b/src/context/virtual-drive/files/domain/events/FileDeletedDomainEvent.ts
similarity index 89%
rename from src/workers/webdav/modules/files/domain/FileDeletedDomainEvent.ts
rename to src/context/virtual-drive/files/domain/events/FileDeletedDomainEvent.ts
index 9219fe5b4..1530b04b1 100644
--- a/src/workers/webdav/modules/files/domain/FileDeletedDomainEvent.ts
+++ b/src/context/virtual-drive/files/domain/events/FileDeletedDomainEvent.ts
@@ -1,4 +1,4 @@
-import { DomainEvent } from '../../shared/domain/DomainEvent';
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
 
 type DeleteWebdavFileDomainEventAttributes = {
   readonly size: number;
diff --git a/src/context/virtual-drive/files/domain/events/FileMovedDomainEvent.ts b/src/context/virtual-drive/files/domain/events/FileMovedDomainEvent.ts
new file mode 100644
index 000000000..5a4c76afe
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/events/FileMovedDomainEvent.ts
@@ -0,0 +1,29 @@
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
+
+export class FileMovedDomainEvent extends DomainEvent {
+  static readonly EVENT_NAME = 'file.moved';
+
+  readonly trackerId: string;
+
+  constructor({
+    aggregateId,
+    trackerId,
+  }: {
+    aggregateId: string;
+    trackerId: string;
+  }) {
+    super({
+      eventName: FileMovedDomainEvent.EVENT_NAME,
+      aggregateId,
+    });
+
+    this.trackerId = trackerId;
+  }
+
+  toPrimitives() {
+    return {
+      contentsId: this.aggregateId,
+      trackerId: this.trackerId,
+    };
+  }
+}
diff --git a/src/context/virtual-drive/files/domain/events/FileRenamedDomainEvent.ts b/src/context/virtual-drive/files/domain/events/FileRenamedDomainEvent.ts
new file mode 100644
index 000000000..7e77db845
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/events/FileRenamedDomainEvent.ts
@@ -0,0 +1,18 @@
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
+
+export class FileRenamedDomainEvent extends DomainEvent {
+  static readonly EVENT_NAME = 'file.renamed';
+
+  constructor({ aggregateId }: { aggregateId: string }) {
+    super({
+      eventName: FileRenamedDomainEvent.EVENT_NAME,
+      aggregateId,
+    });
+  }
+
+  toPrimitives() {
+    return {
+      contentsId: this.aggregateId,
+    };
+  }
+}
diff --git a/src/context/virtual-drive/files/domain/events/OptimisticFileDeletionFailed.ts b/src/context/virtual-drive/files/domain/events/OptimisticFileDeletionFailed.ts
new file mode 100644
index 000000000..da9259ddc
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/events/OptimisticFileDeletionFailed.ts
@@ -0,0 +1,18 @@
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
+
+export class OptimisticFileDeletionFailed extends DomainEvent {
+  static readonly EVENT_NAME = 'file.deletion.failed';
+
+  constructor({ aggregateId }: { aggregateId: string }) {
+    super({
+      eventName: OptimisticFileDeletionFailed.EVENT_NAME,
+      aggregateId,
+    });
+  }
+
+  toPrimitives() {
+    return {
+      contentsId: this.aggregateId,
+    };
+  }
+}
diff --git a/src/context/virtual-drive/files/domain/file-systems/LocalFileSystem.ts b/src/context/virtual-drive/files/domain/file-systems/LocalFileSystem.ts
new file mode 100644
index 000000000..acdddbb1d
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/file-systems/LocalFileSystem.ts
@@ -0,0 +1,7 @@
+import { File } from '../File';
+
+export interface LocalFileSystem {
+  createPlaceHolder(file: File): Promise<void>;
+
+  getLocalFileId(file: File): Promise<`${string}-${string}`>;
+}
diff --git a/src/context/virtual-drive/files/domain/file-systems/RemoteFileSystem.ts b/src/context/virtual-drive/files/domain/file-systems/RemoteFileSystem.ts
new file mode 100644
index 000000000..9573f252c
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/file-systems/RemoteFileSystem.ts
@@ -0,0 +1,12 @@
+import { File, FileAttributes } from '../File';
+import { OfflineFile } from '../OfflineFile';
+
+export interface RemoteFileSystem {
+  persist(offline: OfflineFile): Promise<FileAttributes>;
+
+  trash(contentsId: File['contentsId']): Promise<void>;
+
+  move(file: File): Promise<void>;
+
+  rename(file: File): Promise<void>;
+}
diff --git a/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts b/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
new file mode 100644
index 000000000..cc7623820
--- /dev/null
+++ b/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
@@ -0,0 +1,63 @@
+import { File, FileAttributes } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+
+export class InMemoryFileRepository implements FileRepository {
+  private files: Map<string, FileAttributes>;
+
+  private get values(): Array<FileAttributes> {
+    return Array.from(this.files.values());
+  }
+
+  constructor() {
+    this.files = new Map();
+  }
+
+  public all(): Promise<Array<File>> {
+    const files = [...this.files.values()].map((attributes) =>
+      File.from(attributes)
+    );
+    return Promise.resolve(files);
+  }
+
+  searchByPartial(partial: Partial<FileAttributes>): File | undefined {
+    const keys = Object.keys(partial) as Array<keyof Partial<FileAttributes>>;
+
+    const file = this.values.find((attributes) => {
+      return keys.every((key: keyof FileAttributes) => {
+        if (key === 'contentsId') {
+          return (
+            attributes[key].normalize() == (partial[key] as string).normalize()
+          );
+        }
+
+        return attributes[key] == partial[key];
+      });
+    });
+
+    if (file) {
+      return File.from(file);
+    }
+
+    return undefined;
+  }
+
+  async delete(id: File['contentsId']): Promise<void> {
+    const deleted = this.files.delete(id);
+
+    if (!deleted) {
+      throw new Error('File not found');
+    }
+  }
+
+  async add(file: File): Promise<void> {
+    this.files.set(file.contentsId, file.attributes());
+  }
+
+  async update(file: File): Promise<void> {
+    if (!this.files.has(file.contentsId)) {
+      throw new Error('File not found');
+    }
+
+    return this.add(file);
+  }
+}
diff --git a/src/context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem.ts b/src/context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem.ts
new file mode 100644
index 000000000..49e7e5cf1
--- /dev/null
+++ b/src/context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem.ts
@@ -0,0 +1,37 @@
+import { VirtualDrive } from 'virtual-drive/dist';
+import { FileStatuses } from '../../files/domain/FileStatus';
+import { File } from '../domain/File';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
+import fs from 'fs/promises';
+
+export class NodeWinLocalFileSystem implements LocalFileSystem {
+  constructor(
+    private readonly virtualDrive: VirtualDrive,
+    private readonly relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter
+  ) {}
+
+  async getLocalFileId(file: File): Promise<`${string}-${string}`> {
+    const win32AbsolutePath = this.relativePathToAbsoluteConverter.run(
+      file.path
+    );
+
+    const { ino, dev } = await fs.stat(win32AbsolutePath);
+
+    return `${dev}-${ino}`;
+  }
+
+  async createPlaceHolder(file: File): Promise<void> {
+    if (!file.hasStatus(FileStatuses.EXISTS)) {
+      return;
+    }
+
+    this.virtualDrive.createFileByPath(
+      file.path,
+      file.placeholderId,
+      file.size,
+      file.createdAt.getTime(),
+      file.updatedAt.getTime()
+    );
+  }
+}
diff --git a/src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts b/src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts
new file mode 100644
index 000000000..d0b85607a
--- /dev/null
+++ b/src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts
@@ -0,0 +1,77 @@
+import { Storage } from '@internxt/sdk/dist/drive/storage';
+import { EncryptionVersion } from '@internxt/sdk/dist/drive/storage/types';
+import { Crypt } from '../../shared/domain/Crypt';
+import { File, FileAttributes } from '../domain/File';
+import { FileStatuses } from '../domain/FileStatus';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { OfflineFile } from '../domain/OfflineFile';
+import * as uuid from 'uuid';
+
+export class SDKRemoteFileSystem implements RemoteFileSystem {
+  constructor(
+    private readonly sdk: Storage,
+    private readonly crypt: Crypt,
+    private readonly bucket: string
+  ) {}
+
+  async persist(offline: OfflineFile): Promise<FileAttributes> {
+    const encryptedName = this.crypt.encryptName(
+      offline.name,
+      offline.folderId.toString()
+    );
+
+    if (!encryptedName) {
+      throw new Error('Failed to encrypt name');
+    }
+
+    const data = await this.sdk.createFileEntry({
+      id: offline.contentsId,
+      type: offline.type,
+      size: offline.size,
+      name: encryptedName,
+      plain_name: offline.name,
+      bucket: this.bucket,
+      folder_id: offline.folderId,
+      encrypt_version: EncryptionVersion.Aes03,
+    });
+
+    return {
+      ...data,
+      contentsId: data.fileId,
+      modificationTime: data.updatedAt,
+      path: offline.path,
+      status: FileStatuses.EXISTS,
+    };
+  }
+
+  async trash(contentsId: string): Promise<void> {
+    await this.sdk.addItemsToTrash({
+      items: [
+        {
+          type: 'file',
+          id: contentsId,
+        },
+      ],
+    });
+  }
+
+  async rename(file: File): Promise<void> {
+    await this.sdk.updateFile({
+      fileId: file.contentsId,
+      bucketId: this.bucket,
+      destinationPath: uuid.v4(),
+      metadata: {
+        itemName: file.name,
+      },
+    });
+  }
+
+  async move(file: File): Promise<void> {
+    await this.sdk.moveFile({
+      fileId: file.contentsId,
+      destination: file.folderId,
+      destinationPath: uuid.v4(),
+      bucketId: this.bucket,
+    });
+  }
+}
diff --git a/src/workers/webdav/modules/files/infrastructure/persistance/dtos/AddFileDTO.ts b/src/context/virtual-drive/files/infrastructure/dtos/AddFileDTO.ts
similarity index 100%
rename from src/workers/webdav/modules/files/infrastructure/persistance/dtos/AddFileDTO.ts
rename to src/context/virtual-drive/files/infrastructure/dtos/AddFileDTO.ts
diff --git a/src/workers/webdav/modules/files/infrastructure/persistance/dtos/UpdateFileNameDTO.ts b/src/context/virtual-drive/files/infrastructure/dtos/UpdateFileNameDTO.ts
similarity index 100%
rename from src/workers/webdav/modules/files/infrastructure/persistance/dtos/UpdateFileNameDTO.ts
rename to src/context/virtual-drive/files/infrastructure/dtos/UpdateFileNameDTO.ts
diff --git a/src/workers/webdav/modules/files/infrastructure/persistance/dtos/UpdateFileParentDirDTO.ts b/src/context/virtual-drive/files/infrastructure/dtos/UpdateFileParentDirDTO.ts
similarity index 100%
rename from src/workers/webdav/modules/files/infrastructure/persistance/dtos/UpdateFileParentDirDTO.ts
rename to src/context/virtual-drive/files/infrastructure/dtos/UpdateFileParentDirDTO.ts
diff --git a/src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists.ts b/src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists.ts
new file mode 100644
index 000000000..fe5e1229c
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists.ts
@@ -0,0 +1,26 @@
+import { Folder } from '../domain/Folder';
+import { FolderRepository } from '../domain/FolderRepository';
+import { FolderStatuses } from '../domain/FolderStatus';
+
+export class AllParentFoldersStatusIsExists {
+  constructor(private readonly repository: FolderRepository) {}
+
+  run(id: Folder['id']): boolean {
+    const folder = this.repository.searchByPartial({ id });
+
+    if (!folder) {
+      // TODO: investigate why when uploading a file in a path than previously existed returns undefined
+      return true;
+    }
+
+    if (!folder.hasStatus(FolderStatuses.EXISTS)) {
+      return false;
+    }
+
+    if (!folder.parentId) {
+      return true;
+    }
+
+    return this.run(folder.parentId);
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/FolderByPartialSearcher.ts b/src/context/virtual-drive/folders/application/FolderByPartialSearcher.ts
new file mode 100644
index 000000000..634d4573a
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FolderByPartialSearcher.ts
@@ -0,0 +1,10 @@
+import { Folder, FolderAttributes } from '../domain/Folder';
+import { FolderRepository } from '../domain/FolderRepository';
+
+export class FolderByPartialSearcher {
+  constructor(private readonly repository: FolderRepository) {}
+
+  run(partial: Partial<FolderAttributes>): Folder | undefined {
+    return this.repository.searchByPartial(partial);
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/FolderCreator.ts b/src/context/virtual-drive/folders/application/FolderCreator.ts
new file mode 100644
index 000000000..6b09c3eea
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FolderCreator.ts
@@ -0,0 +1,36 @@
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
+import { EventBus } from '../../shared/domain/EventBus';
+import { Folder } from '../domain/Folder';
+import { FolderRepository } from '../domain/FolderRepository';
+import { OfflineFolder } from '../domain/OfflineFolder';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+
+export class FolderCreator {
+  constructor(
+    private readonly repository: FolderRepository,
+    private readonly remote: RemoteFileSystem,
+    private readonly ipc: SyncEngineIpc,
+    private readonly eventBus: EventBus
+  ) {}
+
+  async run(offlineFolder: OfflineFolder): Promise<Folder> {
+    this.ipc.send('FOLDER_CREATING', {
+      name: offlineFolder.name,
+    });
+
+    const attributes = await this.remote.persist(offlineFolder);
+
+    const folder = Folder.create(attributes);
+
+    await this.repository.add(folder);
+
+    const events = folder.pullDomainEvents();
+    this.eventBus.publish(events);
+
+    this.ipc.send('FOLDER_CREATED', {
+      name: offlineFolder.name,
+    });
+
+    return folder;
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/FolderCreatorFromServerFolder.ts b/src/context/virtual-drive/folders/application/FolderCreatorFromServerFolder.ts
new file mode 100644
index 000000000..b24150cc5
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FolderCreatorFromServerFolder.ts
@@ -0,0 +1,19 @@
+import { ServerFolder } from '../../../shared/domain/ServerFolder';
+import { Folder } from '../domain/Folder';
+
+export function createFolderFromServerFolder(
+  server: ServerFolder,
+  relativePath: string
+): Folder {
+  const path = relativePath.replaceAll('//', '/');
+
+  return Folder.from({
+    id: server.id,
+    uuid: server.uuid,
+    parentId: server.parentId as number,
+    updatedAt: server.updatedAt,
+    createdAt: server.createdAt,
+    path: path,
+    status: server.status,
+  });
+}
diff --git a/src/context/virtual-drive/folders/application/FolderDeleter.ts b/src/context/virtual-drive/folders/application/FolderDeleter.ts
new file mode 100644
index 000000000..03348721d
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FolderDeleter.ts
@@ -0,0 +1,52 @@
+import Logger from 'electron-log';
+import { Folder } from '../domain/Folder';
+import { ActionNotPermittedError } from '../domain/errors/ActionNotPermittedError';
+import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
+import { AllParentFoldersStatusIsExists } from './AllParentFoldersStatusIsExists';
+import { FolderRepository } from '../domain/FolderRepository';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+
+export class FolderDeleter {
+  constructor(
+    private readonly repository: FolderRepository,
+    private readonly remote: RemoteFileSystem,
+    private readonly local: LocalFileSystem,
+    private readonly allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists
+  ) {}
+
+  async run(uuid: Folder['uuid']): Promise<void> {
+    const folder = this.repository.searchByPartial({ uuid });
+
+    if (!folder) {
+      throw new FolderNotFoundError(uuid);
+    }
+
+    try {
+      if (!folder.parentId) {
+        throw new ActionNotPermittedError('Trash root folder');
+      }
+
+      const allParentsExists = this.allParentFoldersStatusIsExists.run(
+        // TODO: Create a new aggregate root for root folder so the rest have the parent Id as number
+        folder.parentId as number
+      );
+
+      if (!allParentsExists) {
+        Logger.warn(
+          `Skipped folder deletion for ${folder.path}. A folder in a higher level is already marked as trashed`
+        );
+        return;
+      }
+
+      folder.trash();
+
+      await this.remote.trash(folder.id);
+      await this.repository.delete(folder.id);
+    } catch (error: unknown) {
+      Logger.error(`Error deleting the folder ${folder.name}: `, error);
+
+      this.local.createPlaceHolder(folder);
+    }
+  }
+}
diff --git a/src/workers/webdav/modules/folders/application/WebdavFolderFinder.ts b/src/context/virtual-drive/folders/application/FolderFinder.ts
similarity index 50%
rename from src/workers/webdav/modules/folders/application/WebdavFolderFinder.ts
rename to src/context/virtual-drive/folders/application/FolderFinder.ts
index 6a27c4e63..8f50d9b46 100644
--- a/src/workers/webdav/modules/folders/application/WebdavFolderFinder.ts
+++ b/src/context/virtual-drive/folders/application/FolderFinder.ts
@@ -1,12 +1,13 @@
+import { FilePath } from '../../files/domain/FilePath';
 import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
 import { Folder } from '../domain/Folder';
 import { FolderRepository } from '../domain/FolderRepository';
 
-export class WebdavFolderFinder {
+export class FolderFinder {
   constructor(private readonly repository: FolderRepository) {}
 
   run(path: string): Folder {
-    const folder = this.repository.search(path);
+    const folder = this.repository.searchByPartial({ path });
 
     if (!folder) {
       throw new FolderNotFoundError(path);
@@ -14,4 +15,14 @@ export class WebdavFolderFinder {
 
     return folder;
   }
+
+  findFromFilePath(path: FilePath): Folder {
+    const folder = this.repository.searchByPartial({ path: path.dirname() });
+
+    if (!folder) {
+      throw new FolderNotFoundError(path.dirname());
+    }
+
+    return folder;
+  }
 }
diff --git a/src/context/virtual-drive/folders/application/FolderMover.ts b/src/context/virtual-drive/folders/application/FolderMover.ts
new file mode 100644
index 000000000..f185e9fd8
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FolderMover.ts
@@ -0,0 +1,37 @@
+import { ActionNotPermittedError } from '../domain/errors/ActionNotPermittedError';
+import { FolderPath } from '../domain/FolderPath';
+import { Folder } from '../domain/Folder';
+import { FolderFinder } from './FolderFinder';
+import { FolderRepository } from '../domain/FolderRepository';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+
+export class FolderMover {
+  constructor(
+    private readonly repository: FolderRepository,
+    private readonly remote: RemoteFileSystem,
+    private readonly folderFinder: FolderFinder
+  ) {}
+
+  private async move(folder: Folder, parentFolder: Folder) {
+    folder.moveTo(parentFolder);
+
+    await this.remote.move(folder);
+    await this.repository.update(folder);
+  }
+
+  async run(folder: Folder, destination: FolderPath): Promise<void> {
+    const resultFolder = this.repository.searchByPartial({
+      path: destination.value,
+    });
+
+    const shouldBeMerge = resultFolder !== undefined;
+
+    if (shouldBeMerge) {
+      throw new ActionNotPermittedError('overwrite');
+    }
+
+    const destinationFolder = this.folderFinder.run(destination.dirname());
+
+    await this.move(folder, destinationFolder);
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/FolderPathUpdater.ts b/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
new file mode 100644
index 000000000..f80062723
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
@@ -0,0 +1,47 @@
+import Logger from 'electron-log';
+import { Folder } from '../domain/Folder';
+import { FolderPath } from '../domain/FolderPath';
+import { FolderRepository } from '../domain/FolderRepository';
+import { ActionNotPermittedError } from '../domain/errors/ActionNotPermittedError';
+import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
+import { FolderMover } from './FolderMover';
+import { FolderRenamer } from './FolderRenamer';
+
+export class FolderPathUpdater {
+  constructor(
+    private readonly repository: FolderRepository,
+    private readonly folderMover: FolderMover,
+    private readonly folderRenamer: FolderRenamer
+  ) {}
+
+  async run(uuid: Folder['uuid'], posixRelativePath: string) {
+    const folder = this.repository.searchByPartial({ uuid });
+
+    if (!folder) {
+      throw new FolderNotFoundError(uuid);
+    }
+
+    const desiredPath = new FolderPath(posixRelativePath);
+
+    Logger.debug('desired path', desiredPath);
+    Logger.debug('folder', folder.attributes());
+
+    const dirnameChanged = folder.dirname !== desiredPath.dirname();
+    const nameChanged = folder.name !== desiredPath.name();
+
+    if (dirnameChanged && nameChanged) {
+      throw new ActionNotPermittedError('Move and rename (at the same time)');
+    }
+
+    if (dirnameChanged) {
+      return await this.folderMover.run(folder, desiredPath);
+    }
+
+    if (nameChanged) {
+      Logger.debug('about to rename');
+      return await this.folderRenamer.run(folder, desiredPath);
+    }
+
+    throw new Error('No path change detected for folder path update');
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/FolderRenamer.ts b/src/context/virtual-drive/folders/application/FolderRenamer.ts
new file mode 100644
index 000000000..8304e025c
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FolderRenamer.ts
@@ -0,0 +1,30 @@
+import { FolderPath } from '../domain/FolderPath';
+import { Folder } from '../domain/Folder';
+import { FolderRepository } from '../domain/FolderRepository';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
+
+export class FolderRenamer {
+  constructor(
+    private readonly repository: FolderRepository,
+    private readonly remote: RemoteFileSystem,
+    private readonly ipc: SyncEngineIpc
+  ) {}
+
+  async run(folder: Folder, destination: FolderPath) {
+    this.ipc.send('FOLDER_RENAMING', {
+      oldName: folder.name,
+      newName: destination.name(),
+    });
+
+    folder.rename(destination);
+
+    await this.remote.rename(folder);
+    await this.repository.update(folder);
+
+    this.ipc.send('FOLDER_RENAMED', {
+      oldName: folder.name,
+      newName: destination.name(),
+    });
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/FolderRepositoryInitiator.ts b/src/context/virtual-drive/folders/application/FolderRepositoryInitiator.ts
new file mode 100644
index 000000000..edf162185
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FolderRepositoryInitiator.ts
@@ -0,0 +1,14 @@
+import { Folder } from '../domain/Folder';
+import { FolderRepository } from '../domain/FolderRepository';
+
+export class FolderRepositoryInitiator {
+  constructor(private readonly repository: FolderRepository) {}
+
+  async run(folders: Array<Folder>): Promise<void> {
+    const addPromises = folders.map((folder: Folder) =>
+      this.repository.add(folder)
+    );
+
+    await Promise.all(addPromises);
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/FoldersPlaceholderCreator.ts b/src/context/virtual-drive/folders/application/FoldersPlaceholderCreator.ts
new file mode 100644
index 000000000..62bbf1fb5
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FoldersPlaceholderCreator.ts
@@ -0,0 +1,14 @@
+import { Folder } from '../domain/Folder';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+
+export class FoldersPlaceholderCreator {
+  constructor(private readonly local: LocalFileSystem) {}
+
+  async run(folders: Array<Folder>): Promise<void> {
+    const createPromises = folders.map((folder) =>
+      this.local.createPlaceHolder(folder)
+    );
+
+    await Promise.all(createPromises);
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts b/src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts
new file mode 100644
index 000000000..30650be19
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts
@@ -0,0 +1,33 @@
+import { FolderPath } from '../../domain/FolderPath';
+import { OfflineFolder } from '../../domain/OfflineFolder';
+import { OfflineFolderRepository } from '../../domain/OfflineFolderRepository';
+import { FolderFinder } from '../FolderFinder';
+import { FolderRepository } from '../../domain/FolderRepository';
+
+export class OfflineFolderCreator {
+  constructor(
+    private readonly folderFinder: FolderFinder,
+    private readonly offlineRepository: OfflineFolderRepository,
+    private readonly repository: FolderRepository
+  ) {}
+
+  run(posixRelativePath: string): OfflineFolder {
+    const folderPath = new FolderPath(posixRelativePath);
+
+    const onlineFolder = this.repository.searchByPartial({
+      path: folderPath.value,
+    });
+
+    if (onlineFolder) {
+      throw new Error('The folder already exists on remote');
+    }
+
+    const parent = this.folderFinder.run(folderPath.dirname());
+
+    const folder = OfflineFolder.create(folderPath, parent.id);
+
+    this.offlineRepository.update(folder);
+
+    return folder;
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/Offline/OfflineFolderMover.ts b/src/context/virtual-drive/folders/application/Offline/OfflineFolderMover.ts
new file mode 100644
index 000000000..21694eeeb
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/Offline/OfflineFolderMover.ts
@@ -0,0 +1,29 @@
+import { FolderPath } from '../../domain/FolderPath';
+import { OfflineFolder } from '../../domain/OfflineFolder';
+import { OfflineFolderRepository } from '../../domain/OfflineFolderRepository';
+import { ActionNotPermittedError } from '../../domain/errors/ActionNotPermittedError';
+import { FolderFinder } from '../FolderFinder';
+
+export class OfflineFolderMover {
+  constructor(
+    private readonly offlineFolderRepository: OfflineFolderRepository,
+    private readonly folderFinder: FolderFinder
+  ) {}
+
+  async run(folder: OfflineFolder, destination: FolderPath) {
+    const resultFolder = this.offlineFolderRepository.searchByPartial({
+      path: destination.value,
+    });
+
+    const shouldBeMerge = resultFolder !== undefined;
+
+    if (shouldBeMerge) {
+      throw new ActionNotPermittedError('overwrite');
+    }
+
+    const destinationFolder = this.folderFinder.run(destination.dirname());
+
+    folder.moveTo(destinationFolder);
+    this.offlineFolderRepository.update(folder);
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/Offline/OfflineFolderPathUpdater.ts b/src/context/virtual-drive/folders/application/Offline/OfflineFolderPathUpdater.ts
new file mode 100644
index 000000000..480312755
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/Offline/OfflineFolderPathUpdater.ts
@@ -0,0 +1,42 @@
+import { OfflineFolder } from '../../domain/OfflineFolder';
+import { ActionNotPermittedError } from '../../domain/errors/ActionNotPermittedError';
+import { OfflineFolderMover } from './OfflineFolderMover';
+import { OfflineFolderRepository } from '../../domain/OfflineFolderRepository';
+import { OfflineFolderRenamer } from './OfflineFolderRenamer';
+import { FolderPath } from '../../domain/FolderPath';
+
+// TODO: Can be unified with FolderPathUpdater
+export class OfflineFolderPathUpdater {
+  constructor(
+    private readonly offlineFoldersRepository: OfflineFolderRepository,
+    private readonly offlineFolderMover: OfflineFolderMover,
+    private readonly offlineFolderRenamer: OfflineFolderRenamer
+  ) {}
+
+  async run(uuid: OfflineFolder['uuid'], posixRelativePath: string) {
+    const folder = this.offlineFoldersRepository.searchByPartial({ uuid });
+
+    if (!folder) {
+      throw new Error(`Folder ${uuid} not found in offline folders`);
+    }
+
+    const desiredPath = new FolderPath(posixRelativePath);
+
+    const dirnameChanged = folder.dirname !== desiredPath.dirname();
+    const nameChanged = folder.name !== desiredPath.name();
+
+    if (dirnameChanged && nameChanged) {
+      throw new ActionNotPermittedError('Move and rename (at the same time)');
+    }
+
+    if (dirnameChanged) {
+      return await this.offlineFolderMover.run(folder, desiredPath);
+    }
+
+    if (nameChanged) {
+      return this.offlineFolderRenamer.run(folder, desiredPath);
+    }
+
+    throw new Error('No path change detected for folder path update');
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/Offline/OfflineFolderRenamer.ts b/src/context/virtual-drive/folders/application/Offline/OfflineFolderRenamer.ts
new file mode 100644
index 000000000..957fe0f3d
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/Offline/OfflineFolderRenamer.ts
@@ -0,0 +1,12 @@
+import { FolderPath } from '../../domain/FolderPath';
+import { OfflineFolder } from '../../domain/OfflineFolder';
+import { OfflineFolderRepository } from '../../domain/OfflineFolderRepository';
+
+export class OfflineFolderRenamer {
+  constructor(private readonly offlineFiles: OfflineFolderRepository) {}
+
+  run(folder: OfflineFolder, destination: FolderPath) {
+    folder.rename(destination);
+    this.offlineFiles.update(folder);
+  }
+}
diff --git a/src/workers/webdav/modules/folders/application/WebdavFolderDeleter.ts b/src/context/virtual-drive/folders/application/RetrieveAllFolders.ts
similarity index 55%
rename from src/workers/webdav/modules/folders/application/WebdavFolderDeleter.ts
rename to src/context/virtual-drive/folders/application/RetrieveAllFolders.ts
index 31577a5a9..0363affb6 100644
--- a/src/workers/webdav/modules/folders/application/WebdavFolderDeleter.ts
+++ b/src/context/virtual-drive/folders/application/RetrieveAllFolders.ts
@@ -1,11 +1,10 @@
 import { Folder } from '../domain/Folder';
 import { FolderRepository } from '../domain/FolderRepository';
 
-export class WebdavFolderDeleter {
+export class RetrieveAllFolders {
   constructor(private readonly repository: FolderRepository) {}
 
-  async run(folder: Folder): Promise<void> {
-    folder.trash();
-    await this.repository.trash(folder);
+  run(): Promise<Array<Folder>> {
+    return this.repository.all();
   }
 }
diff --git a/src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts b/src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts
new file mode 100644
index 000000000..3f6a24fb0
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts
@@ -0,0 +1,58 @@
+import { Folder } from '../domain/Folder';
+import { OfflineFolderRepository } from '../domain/OfflineFolderRepository';
+import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
+import { FolderRenamedDomainEvent } from '../domain/events/FolderRenamedDomainEvent';
+import { FolderRenamer } from './FolderRenamer';
+import Logger from 'electron-log';
+import { FolderRepository } from '../domain/FolderRepository';
+import { EventRepository } from '../../shared/domain/EventRepository';
+
+export class SynchronizeOfflineModifications {
+  constructor(
+    private readonly offlineRepository: OfflineFolderRepository,
+    private readonly repository: FolderRepository,
+    private readonly renamer: FolderRenamer,
+    private readonly eventsRepository: EventRepository
+  ) {}
+
+  async run(uuid: Folder['uuid']) {
+    Logger.debug('Synchronize potential offline changes for folder: ', uuid);
+
+    const offlineFolder = this.offlineRepository.searchByPartial({ uuid });
+
+    if (!offlineFolder) {
+      Logger.debug(`There is no offline folder with ${uuid}`);
+      return;
+    }
+
+    const events = await this.eventsRepository.search(uuid);
+
+    for (const event of events) {
+      if (event.eventName !== FolderRenamedDomainEvent.EVENT_NAME) {
+        continue;
+      }
+
+      const rename = event as FolderRenamedDomainEvent;
+
+      const folder = this.repository.searchByPartial({ uuid });
+
+      if (!folder) {
+        throw new FolderNotFoundError(uuid);
+      }
+
+      if (rename.previousPath !== folder.path) {
+        continue;
+      }
+
+      try {
+        Logger.debug('Updating the folder with path: ', offlineFolder.path);
+        await this.renamer.run(folder, offlineFolder.path);
+        Logger.debug('Folder updated with the path: ', offlineFolder.path);
+      } catch (error: unknown) {
+        Logger.error(error);
+      }
+    }
+
+    this.offlineRepository.remove(offlineFolder);
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/SynchronizeOfflineModificationsOnFolderCreated.ts b/src/context/virtual-drive/folders/application/SynchronizeOfflineModificationsOnFolderCreated.ts
new file mode 100644
index 000000000..78abd9b4d
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/SynchronizeOfflineModificationsOnFolderCreated.ts
@@ -0,0 +1,19 @@
+import { DomainEventClass } from '../../../shared/domain/DomainEvent';
+import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
+import { FolderCreatedDomainEvent } from '../domain/events/FolderCreatedDomainEvent';
+import { SynchronizeOfflineModifications } from './SynchronizeOfflineModifications';
+
+export class SynchronizeOfflineModificationsOnFolderCreated
+  implements DomainEventSubscriber<FolderCreatedDomainEvent>
+{
+  constructor(
+    private readonly synchronizeOfflineModifications: SynchronizeOfflineModifications
+  ) {}
+
+  subscribedTo(): DomainEventClass[] {
+    return [FolderCreatedDomainEvent];
+  }
+  async on(domainEvent: FolderCreatedDomainEvent): Promise<void> {
+    await this.synchronizeOfflineModifications.run(domainEvent.aggregateId);
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts b/src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts
new file mode 100644
index 000000000..1a6a22618
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts
@@ -0,0 +1,144 @@
+import { promises as fs, constants as FsConstants } from 'fs';
+import { Folder } from '../domain/Folder';
+import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
+import Logger from 'electron-log';
+import path from 'path';
+import { FolderStatuses } from '../domain/FolderStatus';
+import { FolderRepository } from '../domain/FolderRepository';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+
+export class FolderPlaceholderUpdater {
+  constructor(
+    private readonly repository: FolderRepository,
+    private readonly local: LocalFileSystem,
+    private readonly relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter
+  ) {}
+
+  private async renameFolderRecursive(
+    currentWin32AbsolutePath: string,
+    newWin32AbsolutePath: string
+  ) {
+    //Ensure it exists
+    await fs.stat(currentWin32AbsolutePath);
+
+    await fs.rename(currentWin32AbsolutePath, newWin32AbsolutePath);
+
+    const children = await fs.readdir(newWin32AbsolutePath);
+
+    for (const child of children) {
+      const childWin32AbsolutePath = path.win32.join(
+        newWin32AbsolutePath,
+        child
+      );
+      const newChildWin32AbsolutePath = path.win32.join(
+        newWin32AbsolutePath,
+        child
+      );
+
+      const stat = await fs.stat(childWin32AbsolutePath);
+
+      if (stat.isDirectory()) {
+        await this.renameFolderRecursive(
+          childWin32AbsolutePath,
+          newChildWin32AbsolutePath
+        );
+      } else {
+        await fs.rename(childWin32AbsolutePath, newChildWin32AbsolutePath);
+      }
+    }
+  }
+
+  private async folderExists(win32AbsolutePath: string): Promise<boolean> {
+    try {
+      await fs.stat(win32AbsolutePath);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  private canWrite(win32AbsolutePath: string) {
+    try {
+      fs.access(win32AbsolutePath, FsConstants.R_OK | FsConstants.W_OK);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  private hasToBeDeleted(local: Folder, remote: Folder) {
+    const localExists = local.status.is(FolderStatuses.EXISTS);
+    const remoteIsTrashed = remote.status.is(FolderStatuses.TRASHED);
+    const remoteIsDeleted = remote.status.is(FolderStatuses.DELETED);
+    return localExists && (remoteIsTrashed || remoteIsDeleted);
+  }
+
+  private async update(remote: Folder): Promise<void> {
+    if (remote.path === path.posix.sep) {
+      return;
+    }
+
+    const local = this.repository.searchByPartial({
+      uuid: remote.uuid,
+    });
+
+    if (!local) {
+      if (remote.status.is(FolderStatuses.EXISTS)) {
+        Logger.debug('Creating folder placeholder: ', remote.path);
+        await this.repository.add(remote);
+        this.local.createPlaceHolder(remote);
+      }
+      return;
+    }
+
+    if (remote.name !== local.name || remote.parentId !== local.parentId) {
+      Logger.debug('Updating folder placeholder: ', remote.path);
+      await this.repository.update(remote);
+
+      try {
+        const stat = await fs.stat(remote.path);
+        Logger.debug('Placeholder already exists: ', stat);
+        // Do nothing
+      } catch {
+        const win32AbsolutePath = this.relativePathToAbsoluteConverter.run(
+          local.path
+        );
+
+        const canBeWritten = this.canWrite(win32AbsolutePath);
+
+        if (!canBeWritten) {
+          Logger.warn(`Cannot modify the folder placeholder ${local.path}`);
+          return;
+        }
+
+        try {
+          const exists = await this.folderExists(win32AbsolutePath);
+          if (exists) {
+            const newWin32AbsolutePath =
+              this.relativePathToAbsoluteConverter.run(remote.path);
+            await this.renameFolderRecursive(
+              win32AbsolutePath,
+              newWin32AbsolutePath
+            );
+          }
+        } catch (error) {
+          Logger.error(error);
+        }
+      }
+    }
+
+    if (this.hasToBeDeleted(local, remote)) {
+      const win32AbsolutePath = this.relativePathToAbsoluteConverter.run(
+        local.path
+      );
+      await fs.rm(win32AbsolutePath, { recursive: true });
+      return;
+    }
+  }
+
+  async run(remotes: Array<Folder>): Promise<void> {
+    const updatePromises = remotes.map((remote) => this.update(remote));
+
+    await Promise.all(updatePromises);
+  }
+}
diff --git a/src/workers/webdav/modules/folders/domain/Folder.ts b/src/context/virtual-drive/folders/domain/Folder.ts
similarity index 68%
rename from src/workers/webdav/modules/folders/domain/Folder.ts
rename to src/context/virtual-drive/folders/domain/Folder.ts
index c37b2e689..bc916a2cd 100644
--- a/src/workers/webdav/modules/folders/domain/Folder.ts
+++ b/src/context/virtual-drive/folders/domain/Folder.ts
@@ -1,10 +1,14 @@
-import { Primitives } from 'shared/types/Primitives';
-import { AggregateRoot } from '../../shared/domain/AggregateRoot';
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
 import { FolderPath } from './FolderPath';
 import { FolderStatus, FolderStatuses } from './FolderStatus';
+import { FolderUuid } from './FolderUuid';
+import { FolderCreatedDomainEvent } from './events/FolderCreatedDomainEvent';
+import { FolderRenamedDomainEvent } from './events/FolderRenamedDomainEvent';
+import { createFolderPlaceholderId } from './FolderPlaceholderId';
 
 export type FolderAttributes = {
   id: number;
+  uuid: string;
   parentId: null | number;
   path: string;
   updatedAt: string;
@@ -15,6 +19,7 @@ export type FolderAttributes = {
 export class Folder extends AggregateRoot {
   private constructor(
     public id: number,
+    private _uuid: FolderUuid,
     private _path: FolderPath,
     private _parentId: null | number,
     public createdAt: Date,
@@ -24,8 +29,12 @@ export class Folder extends AggregateRoot {
     super();
   }
 
-  public get path() {
-    return this._path;
+  public get uuid(): string {
+    return this._uuid.value;
+  }
+
+  public get path(): string {
+    return this._path.value;
   }
 
   public get name() {
@@ -49,6 +58,10 @@ export class Folder extends AggregateRoot {
     return 0;
   }
 
+  public get placeholderId() {
+    return createFolderPlaceholderId(this.uuid);
+  }
+
   public update(attributes: Partial<FolderAttributes>) {
     if (attributes.path) {
       this._path = new FolderPath(attributes.path);
@@ -80,6 +93,7 @@ export class Folder extends AggregateRoot {
   static from(attributes: FolderAttributes): Folder {
     return new Folder(
       attributes.id,
+      new FolderUuid(attributes.uuid),
       new FolderPath(attributes.path),
       attributes.parentId,
       new Date(attributes.updatedAt),
@@ -88,15 +102,23 @@ export class Folder extends AggregateRoot {
     );
   }
 
-  static create(attributes: FolderAttributes) {
-    return new Folder(
+  static create(attributes: FolderAttributes): Folder {
+    const folder = new Folder(
       attributes.id,
+      new FolderUuid(attributes.uuid),
       new FolderPath(attributes.path),
       attributes.parentId,
       new Date(attributes.updatedAt),
       new Date(attributes.createdAt),
       FolderStatus.Exists
     );
+
+    const folderCreatedEvent = new FolderCreatedDomainEvent({
+      aggregateId: attributes.uuid,
+    });
+    folder.record(folderCreatedEvent);
+
+    return folder;
   }
 
   moveTo(folder: Folder) {
@@ -108,26 +130,34 @@ export class Folder extends AggregateRoot {
       throw new Error('Cannot move a folder to its current folder');
     }
 
-    this._path = this._path.changeFolder(folder.path.value);
+    this._path = this._path.changeFolder(folder.path);
     this._parentId = folder.id;
 
     //TODO: record moved event
   }
 
   rename(newPath: FolderPath) {
+    const oldPath = this._path;
     if (this._path.hasSameName(newPath)) {
       throw new Error('Cannot rename a folder to the same name');
     }
-
     this._path = this._path.updateName(newPath.name());
+    this.updatedAt = new Date();
+
+    const event = new FolderRenamedDomainEvent({
+      aggregateId: this.uuid,
+      previousPath: oldPath.name(),
+      nextPath: this._path.name(),
+    });
 
-    //TODO: record rename event
+    this.record(event);
   }
 
   trash() {
     this._status = this._status.changeTo(FolderStatuses.TRASHED);
+    this.updatedAt = new Date();
 
-    // TODO: recored trashed event
+    // TODO: record trashed event
   }
 
   isIn(folder: Folder): boolean {
@@ -142,20 +172,25 @@ export class Folder extends AggregateRoot {
     return false;
   }
 
+  isRoot(): boolean {
+    return !this._parentId;
+  }
+
   hasStatus(status: FolderStatuses): boolean {
     return this._status.value === status;
   }
 
-  toPrimitives(): Record<string, Primitives> {
-    const attributes: FolderAttributes = {
+  attributes() {
+    return {
       id: this.id,
+      uuid: this.uuid,
       parentId: this._parentId || 0,
       path: this._path.value,
       updatedAt: this.updatedAt.toISOString(),
       createdAt: this.createdAt.toISOString(),
       status: this.status.value,
     };
-
-    return attributes;
   }
 }
+
+export const RootFolderName = '/' as const;
diff --git a/src/context/virtual-drive/folders/domain/FolderPath.ts b/src/context/virtual-drive/folders/domain/FolderPath.ts
new file mode 100644
index 000000000..d6dc7c0e4
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/FolderPath.ts
@@ -0,0 +1,30 @@
+import path from 'path';
+import { Path } from '../../shared/domain/Path';
+
+export class FolderPath extends Path {
+  constructor(value: string) {
+    super(value);
+  }
+
+  static fromParts(...parts: Array<string>) {
+    const full = path.posix.join(...parts);
+
+    return new FolderPath(path.posix.normalize(full));
+  }
+
+  name(): string {
+    if (this.value === path.posix.sep) {
+      return 'Internxt Drive';
+    }
+
+    return super.name();
+  }
+
+  updateName(name: string): FolderPath {
+    return FolderPath.fromParts(this.dirname(), name);
+  }
+
+  changeFolder(folder: string): FolderPath {
+    return FolderPath.fromParts(folder, this.name());
+  }
+}
diff --git a/src/context/virtual-drive/folders/domain/FolderPlaceholderId.ts b/src/context/virtual-drive/folders/domain/FolderPlaceholderId.ts
new file mode 100644
index 000000000..7d9feaf81
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/FolderPlaceholderId.ts
@@ -0,0 +1,28 @@
+export type FolderPlaceholderIdPrefixType = 'FOLDER:';
+export const FolderPlaceholderIdPrefix = 'FOLDER:';
+
+export type FolderPlaceholderId = `${FolderPlaceholderIdPrefixType}${string}`;
+
+function typedCheck(
+  input: string,
+  prefix: FolderPlaceholderIdPrefixType = 'FOLDER:'
+): input is FolderPlaceholderId {
+  return input.startsWith(prefix);
+}
+
+export function isFolderPlaceholderId(
+  input: string
+): input is FolderPlaceholderId {
+  return typedCheck(input);
+}
+
+function typedCreate(
+  id: string,
+  prefix: FolderPlaceholderIdPrefixType = 'FOLDER:'
+): FolderPlaceholderId {
+  return (prefix + id) as FolderPlaceholderId;
+}
+
+export function createFolderPlaceholderId(id: string): FolderPlaceholderId {
+  return typedCreate(id);
+}
diff --git a/src/context/virtual-drive/folders/domain/FolderRepository.ts b/src/context/virtual-drive/folders/domain/FolderRepository.ts
new file mode 100644
index 000000000..a13870a3d
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/FolderRepository.ts
@@ -0,0 +1,13 @@
+import { Folder, FolderAttributes } from './Folder';
+
+export interface FolderRepository {
+  all(): Promise<Array<Folder>>;
+
+  searchByPartial(partial: Partial<FolderAttributes>): Folder | undefined;
+
+  add(folder: Folder): Promise<void>;
+
+  delete(id: Folder['id']): Promise<void>;
+
+  update(folder: Folder): Promise<void>;
+}
diff --git a/src/workers/webdav/modules/folders/domain/FolderStatus.ts b/src/context/virtual-drive/folders/domain/FolderStatus.ts
similarity index 75%
rename from src/workers/webdav/modules/folders/domain/FolderStatus.ts
rename to src/context/virtual-drive/folders/domain/FolderStatus.ts
index d3901d908..e14364dba 100644
--- a/src/workers/webdav/modules/folders/domain/FolderStatus.ts
+++ b/src/context/virtual-drive/folders/domain/FolderStatus.ts
@@ -1,6 +1,6 @@
-import { InvalidArgumentError } from '../../../../shared/domain/InvalidArgumentError';
-import { EnumValueObject } from '../../../../shared/domain/EnumValueObject';
-import { ActionNotPermitedError } from './errors/ActionNotPermitedError';
+import { EnumValueObject } from '../../../shared/domain/EnumValueObject';
+import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { ActionNotPermittedError } from './errors/ActionNotPermittedError';
 
 export enum FolderStatuses {
   EXISTS = 'EXISTS',
@@ -25,10 +25,11 @@ export class FolderStatus extends EnumValueObject<FolderStatuses> {
 
   static Exists = new FolderStatus(FolderStatuses.EXISTS);
   static Trashed = new FolderStatus(FolderStatuses.TRASHED);
+  static Deleted = new FolderStatus(FolderStatuses.DELETED);
 
   changeTo(status: FolderStatuses): FolderStatus {
     if (this.value === 'TRASHED') {
-      throw new ActionNotPermitedError('restore from trash');
+      throw new ActionNotPermittedError('restore from trash');
     }
 
     return new FolderStatus(FolderStatuses[status]);
diff --git a/src/context/virtual-drive/folders/domain/FolderUuid.ts b/src/context/virtual-drive/folders/domain/FolderUuid.ts
new file mode 100644
index 000000000..01538a9ad
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/FolderUuid.ts
@@ -0,0 +1,20 @@
+import * as uuid from 'uuid';
+import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { ValueObject } from '../../../shared/domain/ValueObject';
+
+export class FolderUuid extends ValueObject<string> {
+  constructor(value: string) {
+    super(value);
+    this.ensureIsValid(value);
+  }
+
+  private ensureIsValid(value: string) {
+    if (!uuid.validate(value)) {
+      throw new InvalidArgumentError(`Value: ${value} is not a valid uuid`);
+    }
+  }
+
+  static random(): FolderUuid {
+    return new FolderUuid(uuid.v4());
+  }
+}
diff --git a/src/context/virtual-drive/folders/domain/ManagedFolderRepository.ts b/src/context/virtual-drive/folders/domain/ManagedFolderRepository.ts
new file mode 100644
index 000000000..cbc06f16a
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/ManagedFolderRepository.ts
@@ -0,0 +1,7 @@
+import { Folder } from './Folder';
+
+// TODO: Find a better name
+export interface ManagedFolderRepository {
+  insert(folder: Folder): Promise<void>;
+  overwrite(oldFolder: Folder, newFolder: Folder): Promise<void>;
+}
diff --git a/src/context/virtual-drive/folders/domain/OfflineFolder.ts b/src/context/virtual-drive/folders/domain/OfflineFolder.ts
new file mode 100644
index 000000000..4ff81e1e7
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/OfflineFolder.ts
@@ -0,0 +1,126 @@
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
+import { FolderPath } from './FolderPath';
+import { FolderStatus, FolderStatuses } from './FolderStatus';
+import { FolderUuid } from './FolderUuid';
+import { Folder } from './Folder';
+import { FolderRenamedDomainEvent } from './events/FolderRenamedDomainEvent';
+
+export type OfflineFolderAttributes = {
+  uuid: string;
+  parentId: number;
+  path: string;
+  updatedAt: string;
+  createdAt: string;
+  status: string;
+};
+
+export class OfflineFolder extends AggregateRoot {
+  private constructor(
+    private _uuid: FolderUuid,
+    private _path: FolderPath,
+    private _parentId: number,
+    public createdAt: Date,
+    public updatedAt: Date,
+    private _status: FolderStatus
+  ) {
+    super();
+  }
+
+  public get uuid(): string {
+    return this._uuid.value;
+  }
+
+  public get path() {
+    return this._path;
+  }
+
+  public get name() {
+    return this._path.name();
+  }
+
+  public get dirname() {
+    return this._path.dirname();
+  }
+
+  public get parentId() {
+    return this._parentId;
+  }
+
+  public get status() {
+    return this._status;
+  }
+
+  public get size() {
+    // Currently we cannot acquire the folder size.
+    return 0;
+  }
+
+  static from(attributes: OfflineFolderAttributes): OfflineFolder {
+    return new OfflineFolder(
+      new FolderUuid(attributes.uuid),
+      new FolderPath(attributes.path),
+      attributes.parentId,
+      new Date(attributes.updatedAt),
+      new Date(attributes.createdAt),
+      FolderStatus.fromValue(attributes.status)
+    );
+  }
+
+  static create(path: FolderPath, parentId: number): OfflineFolder {
+    return new OfflineFolder(
+      FolderUuid.random(),
+      path,
+      parentId,
+      new Date(),
+      new Date(),
+      FolderStatus.Exists
+    );
+  }
+
+  moveTo(destinationFolder: Folder) {
+    this._parentId = destinationFolder.id;
+  }
+
+  rename(destination: FolderPath) {
+    const oldPath = this._path;
+    if (this._path.hasSameName(destination)) {
+      throw new Error('Cannot rename a folder to the same name');
+    }
+
+    this._path = this._path.updateName(destination.name());
+    this.updatedAt = new Date();
+
+    const event = new FolderRenamedDomainEvent({
+      aggregateId: this.uuid,
+      previousPath: oldPath.value,
+      nextPath: this._path.value,
+    });
+
+    this.record(event);
+  }
+
+  isFolder(): this is OfflineFolder {
+    return true;
+  }
+
+  isFile(): this is File {
+    return false;
+  }
+
+  hasStatus(status: FolderStatuses): boolean {
+    return this._status.value === status;
+  }
+
+  attributes(): OfflineFolderAttributes {
+    const attributes: OfflineFolderAttributes = {
+      uuid: this.uuid,
+      parentId: this._parentId,
+      path: this._path.value,
+      updatedAt: this.updatedAt.toISOString(),
+      createdAt: this.createdAt.toISOString(),
+      status: this.status.value,
+    };
+
+    return attributes;
+  }
+}
diff --git a/src/context/virtual-drive/folders/domain/OfflineFolderRepository.ts b/src/context/virtual-drive/folders/domain/OfflineFolderRepository.ts
new file mode 100644
index 000000000..6b253498c
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/OfflineFolderRepository.ts
@@ -0,0 +1,9 @@
+import { OfflineFolder, OfflineFolderAttributes } from './OfflineFolder';
+
+export interface OfflineFolderRepository {
+  searchByPartial(
+    partial: Partial<OfflineFolderAttributes>
+  ): OfflineFolder | undefined;
+  update(folder: OfflineFolder): void;
+  remove(folder: OfflineFolder): void;
+}
diff --git a/src/workers/webdav/modules/folders/domain/FolderRepository.ts b/src/context/virtual-drive/folders/domain/OldFolderRepository.ts
similarity index 53%
rename from src/workers/webdav/modules/folders/domain/FolderRepository.ts
rename to src/context/virtual-drive/folders/domain/OldFolderRepository.ts
index 3c2b6474b..1563e2499 100644
--- a/src/workers/webdav/modules/folders/domain/FolderRepository.ts
+++ b/src/context/virtual-drive/folders/domain/OldFolderRepository.ts
@@ -1,13 +1,17 @@
 import { Folder, FolderAttributes } from './Folder';
-import { Nullable } from '../../../../../shared/types/Nullable';
 import { FolderPath } from './FolderPath';
 
-export interface FolderRepository {
-  search(path: string): Nullable<Folder>;
+export interface OldFolderRepository {
+  all(): Promise<Array<Folder>>;
+
+  search(path: string): Folder | undefined;
+
+  searchByPartial(partial: Partial<FolderAttributes>): Folder | undefined;
 
   create(
     name: FolderPath,
-    parentId: FolderAttributes['parentId']
+    parentId: FolderAttributes['parentId'],
+    uuid: Folder['uuid']
   ): Promise<Folder>;
 
   updateName(folder: Folder): Promise<void>;
@@ -17,4 +21,7 @@ export interface FolderRepository {
   searchOn(folder: Folder): Promise<Array<Folder>>;
 
   trash(folder: Folder): Promise<void>;
+
+  /** @deprecated */
+  clear(): void;
 }
diff --git a/src/context/virtual-drive/folders/domain/errors/ActionNotPermittedError.ts b/src/context/virtual-drive/folders/domain/errors/ActionNotPermittedError.ts
new file mode 100644
index 000000000..aed1f9ece
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/errors/ActionNotPermittedError.ts
@@ -0,0 +1,5 @@
+export class ActionNotPermittedError extends Error {
+  constructor(action: string) {
+    super(`${action} is not permitted on folders`);
+  }
+}
diff --git a/src/workers/webdav/modules/folders/domain/errors/FolderNotFoundError.ts b/src/context/virtual-drive/folders/domain/errors/FolderNotFoundError.ts
similarity index 100%
rename from src/workers/webdav/modules/folders/domain/errors/FolderNotFoundError.ts
rename to src/context/virtual-drive/folders/domain/errors/FolderNotFoundError.ts
diff --git a/src/context/virtual-drive/folders/domain/events/FolderCreatedDomainEvent.ts b/src/context/virtual-drive/folders/domain/events/FolderCreatedDomainEvent.ts
new file mode 100644
index 000000000..e6445781b
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/events/FolderCreatedDomainEvent.ts
@@ -0,0 +1,18 @@
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
+
+export class FolderCreatedDomainEvent extends DomainEvent {
+  static readonly EVENT_NAME = 'folder.created';
+
+  constructor({ aggregateId }: { aggregateId: string }) {
+    super({
+      eventName: FolderCreatedDomainEvent.EVENT_NAME,
+      aggregateId,
+    });
+  }
+
+  toPrimitives() {
+    return {
+      uuid: this.aggregateId,
+    };
+  }
+}
diff --git a/src/context/virtual-drive/folders/domain/events/FolderRenamedDomainEvent.ts b/src/context/virtual-drive/folders/domain/events/FolderRenamedDomainEvent.ts
new file mode 100644
index 000000000..69cfe385f
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/events/FolderRenamedDomainEvent.ts
@@ -0,0 +1,34 @@
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
+
+export class FolderRenamedDomainEvent extends DomainEvent {
+  static readonly EVENT_NAME = 'folder.renamed';
+
+  previousPath: string;
+  nextPath: string;
+
+  constructor({
+    aggregateId,
+    previousPath: previousName,
+    nextPath: nextName,
+  }: {
+    aggregateId: string;
+    previousPath: string;
+    nextPath: string;
+  }) {
+    super({
+      eventName: FolderRenamedDomainEvent.EVENT_NAME,
+      aggregateId,
+    });
+
+    this.previousPath = previousName;
+    this.nextPath = nextName;
+  }
+
+  toPrimitives() {
+    return {
+      aggregateId: this.aggregateId,
+      previousPath: this.previousPath,
+      nextPath: this.nextPath,
+    };
+  }
+}
diff --git a/src/context/virtual-drive/folders/domain/file-systems/LocalFileSystem.ts b/src/context/virtual-drive/folders/domain/file-systems/LocalFileSystem.ts
new file mode 100644
index 000000000..b16434a46
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/file-systems/LocalFileSystem.ts
@@ -0,0 +1,5 @@
+import { Folder } from '../Folder';
+
+export interface LocalFileSystem {
+  createPlaceHolder(folder: Folder): Promise<void>;
+}
diff --git a/src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem.ts b/src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem.ts
new file mode 100644
index 000000000..109e1c62f
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem.ts
@@ -0,0 +1,12 @@
+import { Folder, FolderAttributes } from '../Folder';
+import { OfflineFolder } from '../OfflineFolder';
+
+export interface RemoteFileSystem {
+  persist(offline: OfflineFolder): Promise<FolderAttributes>;
+
+  trash(id: Folder['id']): Promise<void>;
+
+  move(folder: Folder): Promise<void>;
+
+  rename(folder: Folder): Promise<void>;
+}
diff --git a/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
new file mode 100644
index 000000000..fa86fe46c
--- /dev/null
+++ b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
@@ -0,0 +1,104 @@
+import { Axios } from 'axios';
+import Logger from 'electron-log';
+import * as uuid from 'uuid';
+import { Folder, FolderAttributes } from '../domain/Folder';
+import { FolderStatuses } from '../domain/FolderStatus';
+import { UpdateFolderNameDTO } from './dtos/UpdateFolderNameDTO';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { OfflineFolder } from '../domain/OfflineFolder';
+import { ServerFolder } from '../../../shared/domain/ServerFolder';
+import { CreateFolderDTO } from './dtos/CreateFolderDTO';
+
+export class HttpRemoteFileSystem implements RemoteFileSystem {
+  public folders: Record<string, Folder> = {};
+
+  constructor(
+    private readonly driveClient: Axios,
+    private readonly trashClient: Axios
+  ) {}
+
+  async persist(offline: OfflineFolder): Promise<FolderAttributes> {
+    if (!offline.name) {
+      throw new Error('Bad folder name');
+    }
+
+    const body: CreateFolderDTO = {
+      folderName: offline.name,
+      parentFolderId: offline.parentId,
+      uuid: offline.uuid,
+    };
+
+    const response = await this.driveClient.post(
+      `${process.env.API_URL}/api/storage/folder`,
+      body
+    );
+
+    if (response.status !== 201) {
+      throw new Error('Folder creation failed');
+    }
+
+    const serverFolder = response.data as ServerFolder | null;
+
+    if (!serverFolder) {
+      throw new Error('Folder creation failed, no data returned');
+    }
+
+    return {
+      id: serverFolder.id,
+      uuid: serverFolder.uuid,
+      parentId: serverFolder.parentId,
+      updatedAt: serverFolder.updatedAt,
+      createdAt: serverFolder.createdAt,
+      path: offline.path.value,
+      status: FolderStatuses.EXISTS,
+    };
+  }
+
+  async trash(id: Folder['id']): Promise<void> {
+    const result = await this.trashClient.post(
+      `${process.env.NEW_DRIVE_URL}/drive/storage/trash/add`,
+      {
+        items: [{ type: 'folder', id }],
+      }
+    );
+
+    if (result.status !== 200) {
+      Logger.error(
+        '[FOLDER FILE SYSTEM] Folder deletion failed with status: ',
+        result.status,
+        result.statusText
+      );
+
+      throw new Error('Error when deleting folder');
+    }
+  }
+
+  async rename(folder: Folder): Promise<void> {
+    const url = `${process.env.API_URL}/api/storage/folder/${folder.id}/meta`;
+
+    const body: UpdateFolderNameDTO = {
+      metadata: { itemName: folder.name },
+      relativePath: uuid.v4(),
+    };
+
+    const res = await this.driveClient.post(url, body);
+
+    if (res.status !== 200) {
+      throw new Error(
+        `[FOLDER FILE SYSTEM] Error updating item metadata: ${res.status}`
+      );
+    }
+  }
+
+  async move(folder: Folder): Promise<void> {
+    const url = `${process.env.API_URL}/api/storage/move/folder`;
+
+    const body = { destination: folder.parentId, folderId: folder.id };
+
+    const res = await this.driveClient.post(url, body);
+
+    if (res.status !== 200) {
+      throw new Error(`[FOLDER FILE SYSTEM] Error moving item: ${res.status}`);
+    }
+  }
+}
diff --git a/src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts b/src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts
new file mode 100644
index 000000000..6c02495e5
--- /dev/null
+++ b/src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts
@@ -0,0 +1,58 @@
+import { Folder, FolderAttributes } from '../domain/Folder';
+import { FolderRepository } from '../domain/FolderRepository';
+
+export class InMemoryFolderRepository implements FolderRepository {
+  private folders: Map<Folder['id'], FolderAttributes>;
+
+  constructor() {
+    this.folders = new Map();
+  }
+
+  private get values(): Array<FolderAttributes> {
+    return Array.from(this.folders.values());
+  }
+
+  all(): Promise<Folder[]> {
+    const folders = [...this.folders.values()].map((attributes) =>
+      Folder.from(attributes)
+    );
+
+    return Promise.resolve(folders);
+  }
+
+  searchByPartial(partial: Partial<FolderAttributes>): Folder | undefined {
+    const keys = Object.keys(partial) as Array<keyof Partial<FolderAttributes>>;
+
+    const folder = this.values.find((attributes) => {
+      return keys.every(
+        (key: keyof FolderAttributes) => attributes[key] === partial[key]
+      );
+    });
+
+    if (folder) {
+      return Folder.from(folder);
+    }
+
+    return undefined;
+  }
+
+  async add(folder: Folder): Promise<void> {
+    this.folders.set(folder.id, folder.attributes());
+  }
+
+  async delete(id: number): Promise<void> {
+    const deleted = this.folders.delete(id);
+
+    if (!deleted) {
+      throw new Error('Folder not found');
+    }
+  }
+
+  async update(folder: Folder): Promise<void> {
+    if (!this.folders.has(folder.id)) {
+      throw new Error('Folder not found');
+    }
+
+    return this.add(folder);
+  }
+}
diff --git a/src/context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository.ts b/src/context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository.ts
new file mode 100644
index 000000000..474b19e5b
--- /dev/null
+++ b/src/context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository.ts
@@ -0,0 +1,47 @@
+import {
+  OfflineFolder,
+  OfflineFolderAttributes,
+} from '../domain/OfflineFolder';
+import { OfflineFolderRepository } from '../domain/OfflineFolderRepository';
+
+export class InMemoryOfflineFolderRepository
+  implements OfflineFolderRepository
+{
+  private foldersByUuid: Record<
+    OfflineFolder['uuid'],
+    OfflineFolderAttributes
+  > = {};
+
+  private get values(): Array<OfflineFolderAttributes> {
+    return Object.values(this.foldersByUuid);
+  }
+
+  searchByPartial(
+    partial: Partial<OfflineFolderAttributes>
+  ): OfflineFolder | undefined {
+    const keys = Object.keys(partial) as Array<
+      keyof Partial<OfflineFolderAttributes>
+    >;
+
+    const folderAttributes = this.values.find((attributes) =>
+      keys.every(
+        (key: keyof Partial<OfflineFolderAttributes>) =>
+          attributes[key] === partial[key]
+      )
+    );
+
+    if (!folderAttributes) {
+      return undefined;
+    }
+
+    return OfflineFolder.from(folderAttributes);
+  }
+
+  update(folder: OfflineFolder): void {
+    this.foldersByUuid[folder.uuid] = folder.attributes();
+  }
+
+  remove(folder: OfflineFolder): void {
+    delete this.foldersByUuid[folder.uuid];
+  }
+}
diff --git a/src/context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem.ts b/src/context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem.ts
new file mode 100644
index 000000000..1c1a2d5b2
--- /dev/null
+++ b/src/context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem.ts
@@ -0,0 +1,24 @@
+import { VirtualDrive } from 'virtual-drive/dist';
+import { Folder } from '../domain/Folder';
+import { FolderStatuses } from '../domain/FolderStatus';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+
+export class NodeWinLocalFileSystem implements LocalFileSystem {
+  constructor(private readonly virtualDrive: VirtualDrive) {}
+
+  async createPlaceHolder(folder: Folder): Promise<void> {
+    if (!folder.hasStatus(FolderStatuses.EXISTS)) {
+      return;
+    }
+
+    const folderPath = `${folder.path}/`;
+
+    this.virtualDrive.createFolderByPath(
+      folderPath,
+      folder.placeholderId,
+      0,
+      folder.createdAt.getTime(),
+      folder.updatedAt.getTime()
+    );
+  }
+}
diff --git a/src/context/virtual-drive/folders/infrastructure/dtos/CreateFolderDTO.ts b/src/context/virtual-drive/folders/infrastructure/dtos/CreateFolderDTO.ts
new file mode 100644
index 000000000..b40526c3c
--- /dev/null
+++ b/src/context/virtual-drive/folders/infrastructure/dtos/CreateFolderDTO.ts
@@ -0,0 +1,5 @@
+export interface CreateFolderDTO {
+  folderName: string;
+  parentFolderId: number;
+  uuid?: string;
+}
diff --git a/src/workers/webdav/modules/folders/infrastructure/dtos/UpdateFolderNameDTO.ts b/src/context/virtual-drive/folders/infrastructure/dtos/UpdateFolderNameDTO.ts
similarity index 100%
rename from src/workers/webdav/modules/folders/infrastructure/dtos/UpdateFolderNameDTO.ts
rename to src/context/virtual-drive/folders/infrastructure/dtos/UpdateFolderNameDTO.ts
diff --git a/src/context/virtual-drive/items/application/FileCreatorFromServerFile.ts b/src/context/virtual-drive/items/application/FileCreatorFromServerFile.ts
new file mode 100644
index 000000000..75dfcb3d2
--- /dev/null
+++ b/src/context/virtual-drive/items/application/FileCreatorFromServerFile.ts
@@ -0,0 +1,18 @@
+import { ServerFile } from '../../../shared/domain/ServerFile';
+import { File } from '../../files/domain/File';
+
+export function createFileFromServerFile(
+  server: ServerFile,
+  relativePath: string
+): File {
+  return File.from({
+    folderId: server.folderId,
+    contentsId: server.fileId,
+    modificationTime: server.modificationTime,
+    size: server.size,
+    createdAt: server.createdAt,
+    updatedAt: server.updatedAt,
+    path: relativePath,
+    status: server.status,
+  });
+}
diff --git a/src/context/virtual-drive/items/application/FolderCreatorFromServerFolder.ts b/src/context/virtual-drive/items/application/FolderCreatorFromServerFolder.ts
new file mode 100644
index 000000000..e1816c7b1
--- /dev/null
+++ b/src/context/virtual-drive/items/application/FolderCreatorFromServerFolder.ts
@@ -0,0 +1,17 @@
+import { ServerFolder } from '../../../shared/domain/ServerFolder';
+import { Folder } from '../../folders/domain/Folder';
+
+export function createFolderFromServerFolder(
+  server: ServerFolder,
+  relativePath: string
+): Folder {
+  return Folder.from({
+    id: server.id,
+    uuid: server.uuid,
+    parentId: server.parentId as number,
+    updatedAt: server.updatedAt,
+    createdAt: server.createdAt,
+    path: relativePath,
+    status: server.status,
+  });
+}
diff --git a/src/context/virtual-drive/items/application/ItemsSearcher.ts b/src/context/virtual-drive/items/application/ItemsSearcher.ts
new file mode 100644
index 000000000..9a7b4f963
--- /dev/null
+++ b/src/context/virtual-drive/items/application/ItemsSearcher.ts
@@ -0,0 +1,26 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+export class ItemsSearcher {
+  listFilesAndFolders(directory: string): string[] {
+    let result: string[] = [];
+
+    // Lee el contenido del directorio
+    const items = fs.readdirSync(directory);
+
+    for (const item of items) {
+      const fullPath = path.join(directory, item);
+      const stat = fs.statSync(fullPath);
+
+      if (stat.isDirectory()) {
+        result.push(fullPath);
+        // Si es un directorio, explora su contenido de forma recursiva
+        result = result.concat(this.listFilesAndFolders(fullPath));
+      } else if (stat.isFile()) {
+        result.push(fullPath);
+      }
+    }
+
+    return result;
+  }
+}
diff --git a/src/workers/webdav/modules/items/application/RemoteItemsGenerator.ts b/src/context/virtual-drive/items/application/RemoteItemsGenerator.ts
similarity index 82%
rename from src/workers/webdav/modules/items/application/RemoteItemsGenerator.ts
rename to src/context/virtual-drive/items/application/RemoteItemsGenerator.ts
index cfc013d9e..fb09c825e 100644
--- a/src/workers/webdav/modules/items/application/RemoteItemsGenerator.ts
+++ b/src/context/virtual-drive/items/application/RemoteItemsGenerator.ts
@@ -1,15 +1,16 @@
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 import {
   ServerFile,
   ServerFileStatus,
-} from '../../../../filesystems/domain/ServerFile';
+} from '../../../shared/domain/ServerFile';
 import {
   ServerFolder,
   ServerFolderStatus,
-} from '../../../../filesystems/domain/ServerFolder';
-import { WebdavIpc } from 'workers/webdav/ipc';
+} from '../../../shared/domain/ServerFolder';
 
 export class RemoteItemsGenerator {
-  constructor(private readonly ipc: WebdavIpc) {}
+  constructor(private readonly ipc: SyncEngineIpc) {}
+
   async getAll(): Promise<{ files: ServerFile[]; folders: ServerFolder[] }> {
     const updatedRemoteItems = await this.ipc.invoke(
       'GET_UPDATED_REMOTE_ITEMS'
@@ -25,6 +26,7 @@ export class RemoteItemsGenerator {
         id: updatedFile.id,
         modificationTime: updatedFile.modificationTime,
         name: updatedFile.name,
+        plainName: updatedFile.plainName,
         size: updatedFile.size,
         type: updatedFile.type ?? null,
         updatedAt: updatedFile.updatedAt,
@@ -44,6 +46,7 @@ export class RemoteItemsGenerator {
           updatedAt: updatedFolder.updatedAt,
           plain_name: updatedFolder.plainName ?? null,
           status: updatedFolder.status as ServerFolderStatus,
+          uuid: updatedFolder.uuid,
         };
       }
     );
diff --git a/src/context/virtual-drive/items/application/Traverser.ts b/src/context/virtual-drive/items/application/Traverser.ts
new file mode 100644
index 000000000..53c964a71
--- /dev/null
+++ b/src/context/virtual-drive/items/application/Traverser.ts
@@ -0,0 +1,154 @@
+import Logger from 'electron-log';
+import {
+  FolderStatus,
+  FolderStatuses,
+} from '../../folders/domain/FolderStatus';
+import { Folder } from '../../folders/domain/Folder';
+import { EitherTransformer } from '../../shared/application/EitherTransformer';
+import { createFileFromServerFile } from '../../files/application/FileCreatorFromServerFile';
+import { createFolderFromServerFolder } from '../../folders/application/FolderCreatorFromServerFolder';
+import { NameDecrypt } from '../domain/NameDecrypt';
+import { Tree } from '../domain/Tree';
+import {
+  ServerFile,
+  ServerFileStatus,
+} from '../../../shared/domain/ServerFile';
+import {
+  ServerFolder,
+  ServerFolderStatus,
+} from '../../../shared/domain/ServerFolder';
+
+type Items = {
+  files: Array<ServerFile>;
+  folders: Array<ServerFolder>;
+};
+
+export class Traverser {
+  constructor(
+    private readonly decrypt: NameDecrypt,
+    private readonly baseFolderId: number,
+    private readonly fileStatusesToFilter: Array<ServerFileStatus>,
+    private readonly folderStatusesToFilter: Array<ServerFolderStatus>
+  ) {}
+
+  static existingItems(decrypt: NameDecrypt, baseFolderId: number): Traverser {
+    return new Traverser(
+      decrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS],
+      [ServerFolderStatus.EXISTS]
+    );
+  }
+
+  static allItems(decrypt: NameDecrypt, baseFolderId: number): Traverser {
+    return new Traverser(decrypt, baseFolderId, [], []);
+  }
+
+  private createRootFolder(): Folder {
+    const rootFolderUuid = '43711926-15c2-5ebf-8c24-5099fa9af3c3';
+
+    return Folder.from({
+      id: this.baseFolderId,
+      uuid: rootFolderUuid,
+      parentId: null,
+      updatedAt: new Date().toISOString(),
+      createdAt: new Date().toISOString(),
+      path: '/',
+      status: FolderStatus.Exists.value,
+    });
+  }
+
+  private traverse(tree: Tree, items: Items, currentFolder: Folder) {
+    if (!items) return;
+
+    const filesInThisFolder = items.files.filter(
+      (file) => file.folderId === currentFolder.id
+    );
+
+    const foldersInThisFolder = items.folders.filter((folder) => {
+      return folder.parentId === currentFolder.id;
+    });
+
+    filesInThisFolder.forEach((file) => {
+      if (!this.fileStatusesToFilter.includes(file.status)) {
+        return;
+      }
+
+      const decryptedName = this.decrypt.decryptName(
+        file.name,
+        file.folderId.toString(),
+        file.encrypt_version
+      );
+      const extensionToAdd = file.type ? `.${file.type}` : '';
+
+      const relativeFilePath =
+        `${currentFolder.path}/${decryptedName}${extensionToAdd}`.replaceAll(
+          '//',
+          '/'
+        );
+
+      EitherTransformer.handleWithEither(() =>
+        createFileFromServerFile(file, relativeFilePath)
+      ).fold(
+        (error) => {
+          Logger.warn(
+            `[Traverser] File with path ${relativeFilePath} could not be created: `,
+            error
+          );
+        },
+        (file) => {
+          tree.addFile(currentFolder, file);
+        }
+      );
+    });
+
+    foldersInThisFolder.forEach((serverFolder: ServerFolder) => {
+      const plainName =
+        serverFolder.plain_name ||
+        this.decrypt.decryptName(
+          serverFolder.name,
+          (serverFolder.parentId as number).toString(),
+          '03-aes'
+        ) ||
+        serverFolder.name;
+
+      const name = `${currentFolder.path}/${plainName}`;
+
+      if (!this.folderStatusesToFilter.includes(serverFolder.status)) {
+        return;
+      }
+
+      EitherTransformer.handleWithEither(() =>
+        createFolderFromServerFolder(serverFolder, name)
+      ).fold(
+        (error) => {
+          Logger.warn(
+            `[Traverser] Folder with path ${name} could not be created: `,
+            error
+          );
+        },
+        (folder) => {
+          tree.addFolder(currentFolder, folder);
+
+          if (folder.hasStatus(FolderStatuses.EXISTS)) {
+            // The folders and the files inside trashed or deleted folders
+            // will have the status "EXISTS", to avoid filtering witch folders and files
+            // are in a deleted or trashed folder they not included on the collection.
+            // We cannot perform any action on them either way
+            this.traverse(tree, items, folder);
+          }
+        }
+      );
+    });
+  }
+
+  public run(items: Items): Tree {
+    const rootFolder = this.createRootFolder();
+
+    const tree = new Tree(rootFolder);
+
+    this.traverse(tree, items, rootFolder);
+
+    return tree;
+  }
+}
diff --git a/src/context/virtual-drive/items/application/TreeBuilder.ts b/src/context/virtual-drive/items/application/TreeBuilder.ts
new file mode 100644
index 000000000..75c1da182
--- /dev/null
+++ b/src/context/virtual-drive/items/application/TreeBuilder.ts
@@ -0,0 +1,16 @@
+import { Tree } from '../domain/Tree';
+import { RemoteItemsGenerator } from './RemoteItemsGenerator';
+import { Traverser } from './Traverser';
+
+export class TreeBuilder {
+  constructor(
+    private readonly remoteItemsGenerator: RemoteItemsGenerator,
+    private readonly traverser: Traverser
+  ) {}
+
+  async run(): Promise<Tree> {
+    const items = await this.remoteItemsGenerator.getAll();
+
+    return this.traverser.run(items);
+  }
+}
diff --git a/src/context/virtual-drive/items/domain/FileNode.ts b/src/context/virtual-drive/items/domain/FileNode.ts
new file mode 100644
index 000000000..b49b14b8d
--- /dev/null
+++ b/src/context/virtual-drive/items/domain/FileNode.ts
@@ -0,0 +1,22 @@
+import { File } from '../../files/domain/File';
+import { FolderNode } from './FolderNode';
+
+export class FileNode {
+  private constructor(public readonly file: File) {}
+
+  static from(file: File): FileNode {
+    return new FileNode(file);
+  }
+
+  public get id(): string {
+    return this.file.path;
+  }
+
+  public isFile(): this is FileNode {
+    return true;
+  }
+
+  public isFolder(): this is FolderNode {
+    return false;
+  }
+}
diff --git a/src/context/virtual-drive/items/domain/FolderNode.ts b/src/context/virtual-drive/items/domain/FolderNode.ts
new file mode 100644
index 000000000..0efeaf2c7
--- /dev/null
+++ b/src/context/virtual-drive/items/domain/FolderNode.ts
@@ -0,0 +1,33 @@
+import { Folder } from '../../folders/domain/Folder';
+import { FileNode } from './FileNode';
+import { Node } from './Node';
+export class FolderNode {
+  private constructor(
+    public readonly folder: Folder,
+    private childern: Map<string, Node>
+  ) {}
+
+  static from(folder: Folder): FolderNode {
+    return new FolderNode(folder, new Map());
+  }
+
+  public get id(): string {
+    return this.folder.path;
+  }
+
+  addChild(node: Node): void {
+    if (this.childern.has(node.id)) {
+      throw new Error('Child already exists');
+    }
+
+    this.childern.set(node.id, node);
+  }
+
+  public isFile(): this is FileNode {
+    return false;
+  }
+
+  public isFolder(): this is FolderNode {
+    return true;
+  }
+}
diff --git a/src/workers/webdav/modules/items/domain/ItemsIndexedByPath.ts b/src/context/virtual-drive/items/domain/ItemsIndexedByPath.ts
similarity index 100%
rename from src/workers/webdav/modules/items/domain/ItemsIndexedByPath.ts
rename to src/context/virtual-drive/items/domain/ItemsIndexedByPath.ts
diff --git a/src/context/virtual-drive/items/domain/NameDecrypt.ts b/src/context/virtual-drive/items/domain/NameDecrypt.ts
new file mode 100644
index 000000000..858580764
--- /dev/null
+++ b/src/context/virtual-drive/items/domain/NameDecrypt.ts
@@ -0,0 +1,7 @@
+export interface NameDecrypt {
+  decryptName: (
+    name: string,
+    folderId: string,
+    encryptVersion: string
+  ) => string | null;
+}
diff --git a/src/context/virtual-drive/items/domain/Node.ts b/src/context/virtual-drive/items/domain/Node.ts
new file mode 100644
index 000000000..27d930a89
--- /dev/null
+++ b/src/context/virtual-drive/items/domain/Node.ts
@@ -0,0 +1,4 @@
+import { FileNode } from './FileNode';
+import { FolderNode } from './FolderNode';
+
+export type Node = FileNode | FolderNode;
diff --git a/src/context/virtual-drive/items/domain/Tree.ts b/src/context/virtual-drive/items/domain/Tree.ts
new file mode 100644
index 000000000..076f7234b
--- /dev/null
+++ b/src/context/virtual-drive/items/domain/Tree.ts
@@ -0,0 +1,77 @@
+import { File } from '../../files/domain/File';
+import { Folder } from '../../folders/domain/Folder';
+import { FileNode } from './FileNode';
+import { FolderNode } from './FolderNode';
+import { Node } from './Node';
+
+export class Tree {
+  private tree = new Map<string, Node>();
+
+  constructor(rootFolder: Folder) {
+    const node = FolderNode.from(rootFolder);
+
+    this.tree.set('/', node);
+  }
+
+  public get files(): Array<File> {
+    const files: Array<File> = [];
+
+    this.tree.forEach((node) => {
+      if (node.isFile()) {
+        files.push(node.file);
+      }
+    });
+
+    return files;
+  }
+
+  public get filePaths(): Array<string> {
+    return this.files.map((f) => f.path);
+  }
+
+  public get folders(): Array<Folder> {
+    const folders: Array<Folder> = [];
+
+    this.tree.forEach((node) => {
+      if (node.isFolder()) {
+        folders.push(node.folder);
+      }
+    });
+
+    return folders;
+  }
+
+  public get folderPaths(): Array<string> {
+    return this.folders.map((f) => f.path);
+  }
+
+  private addNode(node: Node): void {
+    this.tree.set(node.id, node);
+  }
+
+  addFile(parentNode: Folder, file: File) {
+    const parent = this.tree.get(parentNode.path) as FolderNode;
+
+    if (!parent) {
+      throw new Error('Parent node not found');
+    }
+
+    const node = FileNode.from(file);
+
+    parent.addChild(node);
+    this.addNode(node);
+  }
+
+  addFolder(parentNode: Folder, folder: Folder) {
+    const parent = this.tree.get(parentNode.path) as FolderNode;
+
+    if (!parent) {
+      throw new Error('Parent node not found');
+    }
+
+    const node = FolderNode.from(folder);
+
+    parent.addChild(node);
+    this.addNode(node);
+  }
+}
diff --git a/src/context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt.ts b/src/context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt.ts
new file mode 100644
index 000000000..940f31cba
--- /dev/null
+++ b/src/context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt.ts
@@ -0,0 +1,12 @@
+import crypto from '../../../shared/infrastructure/crypt';
+import { NameDecrypt } from '../domain/NameDecrypt';
+
+export class CryptoJsNameDecrypt implements NameDecrypt {
+  decryptName(
+    name: string,
+    folderId: string,
+    encryptVersion: string
+  ): string | null {
+    return crypto.decryptName(name, folderId, encryptVersion);
+  }
+}
diff --git a/src/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.ts b/src/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.ts
new file mode 100644
index 000000000..c71fdc5b6
--- /dev/null
+++ b/src/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.ts
@@ -0,0 +1,20 @@
+import path from 'path';
+
+export class AbsolutePathToRelativeConverter {
+  constructor(private readonly baseFolder: string) {}
+
+  private calculateRelativePath(basePath: string, folderPath: string): string {
+    const relativePath = path.relative(basePath, folderPath);
+    const relativeFolders = path.dirname(relativePath);
+    const fileName = path.basename(folderPath);
+
+    return path.join(relativeFolders, fileName);
+  }
+
+  run(absolutePath: string): string {
+    const normalized = path.normalize(absolutePath);
+    const relative = this.calculateRelativePath(this.baseFolder, normalized);
+
+    return path.win32.sep + relative;
+  }
+}
diff --git a/src/workers/webdav/modules/shared/application/AllWebdavItemsSearcher.ts b/src/context/virtual-drive/shared/application/AllWebdavItemsSearcher.ts
similarity index 56%
rename from src/workers/webdav/modules/shared/application/AllWebdavItemsSearcher.ts
rename to src/context/virtual-drive/shared/application/AllWebdavItemsSearcher.ts
index d1c74d802..8ab4113af 100644
--- a/src/workers/webdav/modules/shared/application/AllWebdavItemsSearcher.ts
+++ b/src/context/virtual-drive/shared/application/AllWebdavItemsSearcher.ts
@@ -1,12 +1,12 @@
-import { FileRepository } from '../../files/domain/FileRepository';
-import { WebdavFolderFinder } from '../../folders/application/WebdavFolderFinder';
-import { FolderRepository } from '../../folders/domain/FolderRepository';
+import { OldFileRepository } from '../../files/domain/OldFileRepository';
+import { FolderFinder } from '../../folders/application/FolderFinder';
+import { OldFolderRepository } from '../../folders/domain/OldFolderRepository';
 
 export class AllWebdavItemsNameLister {
   constructor(
-    private readonly filesRepository: FileRepository,
-    private readonly folderRepository: FolderRepository,
-    private readonly folderfinder: WebdavFolderFinder
+    private readonly filesRepository: OldFileRepository,
+    private readonly folderRepository: OldFolderRepository,
+    private readonly folderfinder: FolderFinder
   ) {}
 
   async run(path: string): Promise<Array<string>> {
diff --git a/src/context/virtual-drive/shared/application/EitherTransformer.ts b/src/context/virtual-drive/shared/application/EitherTransformer.ts
new file mode 100644
index 000000000..8e1482b04
--- /dev/null
+++ b/src/context/virtual-drive/shared/application/EitherTransformer.ts
@@ -0,0 +1,15 @@
+import { Either, left, right } from '../../../shared/domain/Either';
+
+export class EitherTransformer {
+  static handleWithEither<T>(fn: () => T): Either<Error, T> {
+    try {
+      const result = fn();
+      return right(result);
+    } catch (error: unknown) {
+      if (error instanceof Error) {
+        return left(error);
+      }
+      return left(new Error('unknown error'));
+    }
+  }
+}
diff --git a/src/context/virtual-drive/shared/application/LocalFileIdProvider.ts b/src/context/virtual-drive/shared/application/LocalFileIdProvider.ts
new file mode 100644
index 000000000..e07239c22
--- /dev/null
+++ b/src/context/virtual-drive/shared/application/LocalFileIdProvider.ts
@@ -0,0 +1,16 @@
+import { RelativePathToAbsoluteConverter } from './RelativePathToAbsoluteConverter';
+import fs from 'fs/promises';
+
+export class LocalFileIdProvider {
+  constructor(
+    private readonly relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter
+  ) {}
+
+  async run(path: string): Promise<string> {
+    const win32AbsolutePath = this.relativePathToAbsoluteConverter.run(path);
+
+    const { ino, dev } = await fs.stat(win32AbsolutePath);
+
+    return `${dev}-${ino}`;
+  }
+}
diff --git a/src/context/virtual-drive/shared/application/PlatformPathConverter.ts b/src/context/virtual-drive/shared/application/PlatformPathConverter.ts
new file mode 100644
index 000000000..634c9273f
--- /dev/null
+++ b/src/context/virtual-drive/shared/application/PlatformPathConverter.ts
@@ -0,0 +1,21 @@
+import path from 'path';
+
+export class PlatformPathConverter {
+  static convertAnyToCurrent(anyPlatformPath: string): string {
+    const fromPlatform = anyPlatformPath.includes(path.posix.sep)
+      ? path.posix
+      : path.win32;
+
+    const toPlatform = path.sep === path.posix.sep ? path.posix : path.win32;
+
+    return anyPlatformPath.split(fromPlatform.sep).join(toPlatform.sep);
+  }
+
+  static winToPosix(win: string): string {
+    return win.split(path.win32.sep).join(path.posix.sep);
+  }
+
+  static posixToWin(posix: string): string {
+    return posix.split(path.posix.sep).join(path.win32.sep);
+  }
+}
diff --git a/src/context/virtual-drive/shared/application/RelativePathToAbsoluteConverter.ts b/src/context/virtual-drive/shared/application/RelativePathToAbsoluteConverter.ts
new file mode 100644
index 000000000..c050a1a5f
--- /dev/null
+++ b/src/context/virtual-drive/shared/application/RelativePathToAbsoluteConverter.ts
@@ -0,0 +1,9 @@
+import path from 'path';
+
+export class RelativePathToAbsoluteConverter {
+  constructor(private readonly baseFolder: string) {}
+
+  run(relativePath: string): string {
+    return path.join(this.baseFolder, relativePath);
+  }
+}
diff --git a/src/workers/webdav/modules/shared/application/WebdavUnknownItemTypeSearcher.ts b/src/context/virtual-drive/shared/application/WebdavUnknownItemTypeSearcher.ts
similarity index 62%
rename from src/workers/webdav/modules/shared/application/WebdavUnknownItemTypeSearcher.ts
rename to src/context/virtual-drive/shared/application/WebdavUnknownItemTypeSearcher.ts
index 3c958d87f..790a29f47 100644
--- a/src/workers/webdav/modules/shared/application/WebdavUnknownItemTypeSearcher.ts
+++ b/src/context/virtual-drive/shared/application/WebdavUnknownItemTypeSearcher.ts
@@ -1,13 +1,13 @@
 import { FilePath } from '../../files/domain/FilePath';
 import { File } from '../../files/domain/File';
-import { FileRepository } from '../../files/domain/FileRepository';
+import { OldFileRepository } from '../../files/domain/OldFileRepository';
 import { Folder } from '../../folders/domain/Folder';
-import { FolderRepository } from '../../folders/domain/FolderRepository';
+import { OldFolderRepository } from '../../folders/domain/OldFolderRepository';
 
 export class WebdavUnknownItemTypeSearcher {
   constructor(
-    private readonly filesRepository: FileRepository,
-    private readonly folderRepository: FolderRepository
+    private readonly filesRepository: OldFileRepository,
+    private readonly folderRepository: OldFolderRepository
   ) {}
 
   run(path: string): File | Folder | undefined {
diff --git a/src/context/virtual-drive/shared/domain/BucketEntry.ts b/src/context/virtual-drive/shared/domain/BucketEntry.ts
new file mode 100644
index 000000000..96f9e45fd
--- /dev/null
+++ b/src/context/virtual-drive/shared/domain/BucketEntry.ts
@@ -0,0 +1,20 @@
+import { ValueObject } from '../../../shared/domain/ValueObject';
+
+export class BucketEntry extends ValueObject<number> {
+  public static MAX_SIZE = 20 * 1024 * 1024 * 1024;
+
+  constructor(value: number) {
+    super(value);
+    this.ensureIsValid(value);
+  }
+
+  private ensureIsValid(value: number) {
+    if (value > BucketEntry.MAX_SIZE) {
+      throw new Error('File size to big');
+    }
+
+    if (value < 0) {
+      throw new Error('File size cannot be negative');
+    }
+  }
+}
diff --git a/src/context/virtual-drive/shared/domain/BucketEntryId.ts b/src/context/virtual-drive/shared/domain/BucketEntryId.ts
new file mode 100644
index 000000000..c150ec958
--- /dev/null
+++ b/src/context/virtual-drive/shared/domain/BucketEntryId.ts
@@ -0,0 +1,17 @@
+import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { ValueObject } from '../../../shared/domain/ValueObject';
+
+export class BucketEntryId extends ValueObject<string> {
+  static readonly VALID_LENGTH = 24;
+
+  constructor(value: string) {
+    super(value);
+    this.ensureIsValid(value);
+  }
+
+  private ensureIsValid(value: string) {
+    if (value.length !== BucketEntryId.VALID_LENGTH) {
+      throw new InvalidArgumentError('Invalid content id');
+    }
+  }
+}
diff --git a/src/workers/webdav/modules/shared/domain/Crypt.ts b/src/context/virtual-drive/shared/domain/Crypt.ts
similarity index 86%
rename from src/workers/webdav/modules/shared/domain/Crypt.ts
rename to src/context/virtual-drive/shared/domain/Crypt.ts
index 3c1354d71..c5e4aebf7 100644
--- a/src/workers/webdav/modules/shared/domain/Crypt.ts
+++ b/src/context/virtual-drive/shared/domain/Crypt.ts
@@ -1,4 +1,4 @@
-export type Crypt = {
+export interface Crypt {
   decryptName: (
     cipherText: string,
     salt: string,
@@ -6,4 +6,4 @@ export type Crypt = {
   ) => string | null;
 
   encryptName: (name: string, salt: string) => string | null;
-};
+}
diff --git a/src/context/virtual-drive/shared/domain/DelayQueue.ts b/src/context/virtual-drive/shared/domain/DelayQueue.ts
new file mode 100644
index 000000000..dd7a44c34
--- /dev/null
+++ b/src/context/virtual-drive/shared/domain/DelayQueue.ts
@@ -0,0 +1,59 @@
+import Logger from 'electron-log';
+
+export class DelayQueue {
+  private static readonly DELAY = 3_000;
+  private queue: Map<string, void>;
+  private timeout: NodeJS.Timeout | null = null;
+
+  constructor(
+    private readonly name: string,
+    private readonly fn: (item: string) => Promise<void>,
+    private readonly canLoop: () => boolean
+  ) {
+    this.queue = new Map();
+  }
+
+  private clearTimeout() {
+    if (this.timeout) {
+      clearTimeout(this.timeout);
+      this.timeout = null;
+    }
+  }
+
+  private setTimeout() {
+    this.clearTimeout();
+    this.timeout = setTimeout(async () => {
+      Logger.debug('Will try to run delay queue for: ', this.name);
+      if (this.canLoop()) {
+        Logger.debug('Running delay queue for: ', this.name);
+
+        const reversedItems = Array.from(this.queue.entries()).reverse();
+
+        for (const [item] of reversedItems) {
+          await this.fn(item);
+          this.queue.delete(item);
+        }
+
+        return;
+      }
+
+      Logger.debug(this.name, 'delay queue blocked');
+      this.setTimeout();
+    }, DelayQueue.DELAY);
+  }
+
+  push(value: string) {
+    this.setTimeout();
+
+    this.queue.set(value);
+  }
+
+  get size(): number {
+    return this.queue.size;
+  }
+
+  clear() {
+    this.clearTimeout();
+    this.queue.clear();
+  }
+}
diff --git a/src/workers/webdav/modules/shared/domain/WebdavServerEventBus.ts b/src/context/virtual-drive/shared/domain/EventBus.ts
similarity index 68%
rename from src/workers/webdav/modules/shared/domain/WebdavServerEventBus.ts
rename to src/context/virtual-drive/shared/domain/EventBus.ts
index af0aeaa2b..9c692a629 100644
--- a/src/workers/webdav/modules/shared/domain/WebdavServerEventBus.ts
+++ b/src/context/virtual-drive/shared/domain/EventBus.ts
@@ -1,7 +1,7 @@
 import { DomainEventSubscribers } from '../infrastructure/DomainEventSubscribers';
-import { DomainEvent } from './DomainEvent';
+import { DomainEvent } from '../../../shared/domain/DomainEvent';
 
-export interface WebdavServerEventBus {
+export interface EventBus {
   publish(events: Array<DomainEvent>): Promise<void>;
   addSubscribers(subscribers: DomainEventSubscribers): void;
 }
diff --git a/src/context/virtual-drive/shared/domain/EventRepository.ts b/src/context/virtual-drive/shared/domain/EventRepository.ts
new file mode 100644
index 000000000..803e68a85
--- /dev/null
+++ b/src/context/virtual-drive/shared/domain/EventRepository.ts
@@ -0,0 +1,6 @@
+import { DomainEvent } from '../../../shared/domain/DomainEvent';
+
+export interface EventRepository {
+  store(event: DomainEvent): Promise<void>;
+  search(aggregateId: string): Promise<Array<DomainEvent>>;
+}
diff --git a/src/context/virtual-drive/shared/domain/MapObserver.ts b/src/context/virtual-drive/shared/domain/MapObserver.ts
new file mode 100644
index 000000000..e22a3d7f2
--- /dev/null
+++ b/src/context/virtual-drive/shared/domain/MapObserver.ts
@@ -0,0 +1,26 @@
+export class MapObserver {
+  constructor(
+    private readonly mapToObserve: Map<any, any>,
+    private readonly callback: () => void,
+    private intervalId: NodeJS.Timeout | null = null
+  ) {}
+
+  startObserving() {
+    if (this.intervalId === null) {
+      this.intervalId = setInterval(() => {
+        if (this.mapToObserve.size === 0) {
+          clearInterval(this.intervalId!);
+          this.intervalId = null;
+          this.callback();
+        }
+      }, 1_000);
+    }
+  }
+
+  stopObserving() {
+    if (this.intervalId !== null) {
+      clearInterval(this.intervalId);
+      this.intervalId = null;
+    }
+  }
+}
diff --git a/src/context/virtual-drive/shared/domain/Path.ts b/src/context/virtual-drive/shared/domain/Path.ts
new file mode 100644
index 000000000..d864f5b20
--- /dev/null
+++ b/src/context/virtual-drive/shared/domain/Path.ts
@@ -0,0 +1,62 @@
+import path from 'path';
+import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { ValueObject } from '../../../shared/domain/ValueObject';
+
+const isWindowsRootDirectory = /[a-zA-Z]:[\\/]/;
+const containsNullCharacter = /\0/g;
+
+export abstract class Path extends ValueObject<string> {
+  private static readonly maliciousPathValidations = [
+    (name: string) => name.includes('../'),
+    (name: string) => name.startsWith('..'),
+    (name: string) => isWindowsRootDirectory.test(name),
+    (name: string) => containsNullCharacter.test(name),
+  ];
+
+  constructor(value: string) {
+    super(value);
+
+    this.ensurePathIsPosix(value);
+    this.ensurePathIsNotMalicious(value);
+  }
+
+  private ensurePathIsNotMalicious(value: string) {
+    const isMalicious = Path.maliciousPathValidations.some((validation) =>
+      validation(value)
+    );
+
+    if (isMalicious) {
+      throw new InvalidArgumentError(`Path ${value} might be malicious.`);
+    }
+  }
+
+  private ensurePathIsPosix(value: string) {
+    const isPosix = value.indexOf('/') !== -1;
+
+    if (!isPosix) {
+      throw new InvalidArgumentError(`Paths have to be posix, path: ${value}`);
+    }
+  }
+
+  name(): string {
+    const base = path.posix.basename(this.value);
+    const { name } = path.posix.parse(base);
+    return name;
+  }
+
+  dirname(): string {
+    const dirname = path.posix.dirname(this.value);
+    if (dirname === '.') {
+      return path.posix.sep;
+    }
+
+    return dirname;
+  }
+
+  hasSameName(other: Path) {
+    const name = this.name();
+    const otherName = other.name();
+
+    return name === otherName;
+  }
+}
diff --git a/src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers.ts b/src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers.ts
new file mode 100644
index 000000000..237aae79f
--- /dev/null
+++ b/src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers.ts
@@ -0,0 +1,18 @@
+import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
+import { DomainEvent } from '../../../shared/domain/DomainEvent';
+import { DependencyContainer } from '../../../../apps/sync-engine/dependency-injection/DependencyContainer';
+import { DependencyContainerFactory } from '../../../../apps/sync-engine/dependency-injection/DependencyContainerFactory';
+
+export class DomainEventSubscribers {
+  constructor(public items: Array<DomainEventSubscriber<DomainEvent>>) {}
+
+  static from(container: DependencyContainer): DomainEventSubscribers {
+    const subscribers = DependencyContainerFactory.subscribers.map(
+      (subscriber) => {
+        return container[subscriber];
+      }
+    ) as unknown as Array<DomainEventSubscriber<DomainEvent>>;
+
+    return new DomainEventSubscribers(subscribers);
+  }
+}
diff --git a/src/context/virtual-drive/shared/infrastructure/EnvironmentDownloader.ts b/src/context/virtual-drive/shared/infrastructure/EnvironmentDownloader.ts
new file mode 100644
index 000000000..78b81111c
--- /dev/null
+++ b/src/context/virtual-drive/shared/infrastructure/EnvironmentDownloader.ts
@@ -0,0 +1,69 @@
+import { DownloadStrategyFunction } from '@internxt/inxt-js/build/lib/core/download/strategy';
+import { EventEmitter, Readable } from 'stream';
+import { Stopwatch } from '../../../../apps/shared/types/Stopwatch';
+
+export type EnvironmentDownloaderEvents = {
+  start: () => void;
+  progress: (progress: number) => void;
+  finish: (id: string) => void;
+  error: (error: Error) => void;
+};
+
+export abstract class EnvironmentDownloader {
+  private eventEmitter: EventEmitter;
+  private stopwatch: Stopwatch;
+
+  constructor(
+    private readonly fn: DownloadStrategyFunction<unknown>,
+    private readonly bucket: string
+  ) {
+    this.eventEmitter = new EventEmitter();
+    this.stopwatch = new Stopwatch();
+  }
+
+  download(id: string): Promise<Readable> {
+    this.stopwatch.start();
+
+    this.eventEmitter.emit('start');
+
+    return new Promise((resolve, reject) => {
+      this.fn(
+        this.bucket,
+        id,
+        {
+          progressCallback: (progress: number) => {
+            this.eventEmitter.emit('progress', progress);
+          },
+          finishedCallback: async (err: Error, stream: Readable) => {
+            this.stopwatch.finish();
+
+            if (err) {
+              this.eventEmitter.emit('error', err);
+              return reject(err);
+            }
+            this.eventEmitter.emit('finish');
+            resolve(stream);
+          },
+        },
+        {
+          label: 'Dynamic',
+          params: {
+            useProxy: false,
+            concurrency: 10,
+          },
+        }
+      );
+    });
+  }
+
+  on(
+    event: keyof EnvironmentDownloaderEvents,
+    handler: EnvironmentDownloaderEvents[keyof EnvironmentDownloaderEvents]
+  ): void {
+    this.eventEmitter.on(event, handler);
+  }
+
+  elapsedTime(): number {
+    return this.stopwatch.elapsedTime();
+  }
+}
diff --git a/src/context/virtual-drive/shared/infrastructure/EventRecorder.ts b/src/context/virtual-drive/shared/infrastructure/EventRecorder.ts
new file mode 100644
index 000000000..4477b2dfc
--- /dev/null
+++ b/src/context/virtual-drive/shared/infrastructure/EventRecorder.ts
@@ -0,0 +1,22 @@
+import { DomainEvent } from '../../../shared/domain/DomainEvent';
+import { EventBus } from '../domain/EventBus';
+import { EventRepository } from '../domain/EventRepository';
+import { DomainEventSubscribers } from './DomainEventSubscribers';
+
+export class EventRecorder implements EventBus {
+  constructor(
+    private readonly history: EventRepository,
+    private readonly bus: EventBus
+  ) {}
+
+  async publish(events: Array<DomainEvent>): Promise<void> {
+    const stored = events.map((event) => this.history.store(event));
+    await Promise.all(stored);
+
+    await this.bus.publish(events);
+  }
+
+  addSubscribers(subscribers: DomainEventSubscribers): void {
+    this.bus.addSubscribers(subscribers);
+  }
+}
diff --git a/src/context/virtual-drive/shared/infrastructure/InMemoryEventHistory.ts b/src/context/virtual-drive/shared/infrastructure/InMemoryEventHistory.ts
new file mode 100644
index 000000000..7e410855f
--- /dev/null
+++ b/src/context/virtual-drive/shared/infrastructure/InMemoryEventHistory.ts
@@ -0,0 +1,36 @@
+import { DomainEvent } from '../../../shared/domain/DomainEvent';
+import { EventRepository } from '../domain/EventRepository';
+
+export class InMemoryEventRepository implements EventRepository {
+  private static readonly MAX_EVENTS_STORED = 3_000;
+  private events: Array<DomainEvent> = [];
+
+  store(event: DomainEvent): Promise<void> {
+    if (this.events.length >= InMemoryEventRepository.MAX_EVENTS_STORED) {
+      const eventsToRemove =
+        this.events.length - InMemoryEventRepository.MAX_EVENTS_STORED + 1;
+      this.events.splice(0, eventsToRemove);
+    }
+
+    this.events.push(event);
+
+    return Promise.resolve();
+  }
+
+  search(aggregateId: string): Promise<Array<DomainEvent>> {
+    return Promise.resolve(
+      this.events.filter((e) => e.aggregateId === aggregateId)
+    );
+  }
+
+  async filter<Event extends typeof DomainEvent>(
+    aggregateId: string,
+    event: Event
+  ): Promise<Array<Event>> {
+    const events = await this.search(aggregateId);
+
+    const filtered = events.filter((e) => e.eventName === event.EVENT_NAME);
+
+    return filtered as unknown as Event[];
+  }
+}
diff --git a/src/workers/webdav/modules/shared/infrastructure/DuplexEventBus.ts b/src/context/virtual-drive/shared/infrastructure/NodeJsEventBus.ts
similarity index 60%
rename from src/workers/webdav/modules/shared/infrastructure/DuplexEventBus.ts
rename to src/context/virtual-drive/shared/infrastructure/NodeJsEventBus.ts
index 35e31442f..7f5fa3005 100644
--- a/src/workers/webdav/modules/shared/infrastructure/DuplexEventBus.ts
+++ b/src/context/virtual-drive/shared/infrastructure/NodeJsEventBus.ts
@@ -1,12 +1,9 @@
 import EventEmitter from 'events';
-import { DomainEvent } from '../domain/DomainEvent';
-import { WebdavServerEventBus } from '../domain/WebdavServerEventBus';
+import { DomainEvent } from '../../../shared/domain/DomainEvent';
+import { EventBus } from '../domain/EventBus';
 import { DomainEventSubscribers } from './DomainEventSubscribers';
 
-export class NodeJsEventBus
-  extends EventEmitter
-  implements WebdavServerEventBus
-{
+export class NodeJsEventBus extends EventEmitter implements EventBus {
   async publish(events: Array<DomainEvent>): Promise<void> {
     events.forEach((event) => {
       this.emit(event.eventName, event);
@@ -16,7 +13,7 @@ export class NodeJsEventBus
   addSubscribers(subscribers: DomainEventSubscribers): void {
     subscribers.items.forEach((subscriber) => {
       subscriber.subscribedTo().forEach((event) => {
-        this.on(`webdav.${event.EVENT_NAME}`, subscriber.on.bind(subscriber));
+        this.on(`${event.EVENT_NAME}`, subscriber.on.bind(subscriber));
       });
     });
   }
diff --git a/src/context/virtual-drive/thumbnails/domain/ThumbanailContentId.ts b/src/context/virtual-drive/thumbnails/domain/ThumbanailContentId.ts
new file mode 100644
index 000000000..055d196d0
--- /dev/null
+++ b/src/context/virtual-drive/thumbnails/domain/ThumbanailContentId.ts
@@ -0,0 +1,3 @@
+import { BucketEntryId } from '../../shared/domain/BucketEntryId';
+
+export class ThumbnailContentId extends BucketEntryId {}
diff --git a/src/context/virtual-drive/thumbnails/domain/Thumbnail.ts b/src/context/virtual-drive/thumbnails/domain/Thumbnail.ts
new file mode 100644
index 000000000..67bac35c2
--- /dev/null
+++ b/src/context/virtual-drive/thumbnails/domain/Thumbnail.ts
@@ -0,0 +1,45 @@
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
+import { ThumbnailContentId } from './ThumbanailContentId';
+
+export type ThumbnailAtributes = {
+  id: number;
+  contentsId: string;
+  type: string;
+  bucket: string;
+};
+
+export class Thumbnail extends AggregateRoot {
+  private constructor(
+    private _id: number,
+    private _contentsId: ThumbnailContentId,
+    private _type: string,
+    private _bucket: string
+  ) {
+    super();
+  }
+
+  public get id(): number {
+    return this._id;
+  }
+
+  public get contentsId(): string {
+    return this._contentsId.value;
+  }
+
+  public get type(): string {
+    return this._type;
+  }
+
+  public get bucket(): string {
+    return this._bucket;
+  }
+
+  attributes(): ThumbnailAtributes {
+    return {
+      id: this.id,
+      contentsId: this.contentsId,
+      type: this.type,
+      bucket: this.bucket,
+    };
+  }
+}
diff --git a/src/context/virtual-drive/thumbnails/domain/ThumbnailDownloader.ts b/src/context/virtual-drive/thumbnails/domain/ThumbnailDownloader.ts
new file mode 100644
index 000000000..d89e205d5
--- /dev/null
+++ b/src/context/virtual-drive/thumbnails/domain/ThumbnailDownloader.ts
@@ -0,0 +1,20 @@
+import { Readable } from 'stream';
+import { ThumbnailAtributes } from './Thumbnail';
+
+export type ThumbnailDownloadEvents = {
+  start: () => void;
+  progress: (progress: number) => void;
+  finish: (contentsId: ThumbnailAtributes['contentsId']) => void;
+  error: (error: Error) => void;
+};
+
+export interface ThumbnailDownloader {
+  downloadThumbnail(thumbnailContentsId: string): Promise<Readable>;
+
+  on(
+    event: keyof ThumbnailDownloadEvents,
+    handler: ThumbnailDownloadEvents[keyof ThumbnailDownloadEvents]
+  ): void;
+
+  elapsedTime(): number;
+}
diff --git a/src/context/virtual-drive/thumbnails/infrastructrue/EnvironmentThumbnailDownloader.ts b/src/context/virtual-drive/thumbnails/infrastructrue/EnvironmentThumbnailDownloader.ts
new file mode 100644
index 000000000..74519cc92
--- /dev/null
+++ b/src/context/virtual-drive/thumbnails/infrastructrue/EnvironmentThumbnailDownloader.ts
@@ -0,0 +1,12 @@
+import { Readable } from 'stream';
+import { EnvironmentDownloader } from '../../shared/infrastructure/EnvironmentDownloader';
+import { ThumbnailDownloader } from '../domain/ThumbnailDownloader';
+
+export class EnvironmentThumbnailDownloader
+  extends EnvironmentDownloader
+  implements ThumbnailDownloader
+{
+  downloadThumbnail(thumbnailContentsId: string): Promise<Readable> {
+    return this.download(thumbnailContentsId);
+  }
+}
diff --git a/src/workers/webdav/modules/userUsage/application/BytesInBinaryToInternacionalSystem.ts b/src/context/virtual-drive/userUsage/application/BytesInBinaryToInternacionalSystem.ts
similarity index 100%
rename from src/workers/webdav/modules/userUsage/application/BytesInBinaryToInternacionalSystem.ts
rename to src/context/virtual-drive/userUsage/application/BytesInBinaryToInternacionalSystem.ts
diff --git a/src/context/virtual-drive/userUsage/application/DecrementDriveUsageOnFileDeleted.ts b/src/context/virtual-drive/userUsage/application/DecrementDriveUsageOnFileDeleted.ts
new file mode 100644
index 000000000..b77e7fdce
--- /dev/null
+++ b/src/context/virtual-drive/userUsage/application/DecrementDriveUsageOnFileDeleted.ts
@@ -0,0 +1,19 @@
+import { FileCreatedDomainEvent } from '../../files/domain/events/FileCreatedDomainEvent';
+import { DomainEventClass } from '../../../shared/domain/DomainEvent';
+import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
+import { UserUsageIncrementer } from './UserUsageIncrementer';
+import { FileDeletedDomainEvent } from '../../files/domain/events/FileDeletedDomainEvent';
+
+export class DecrementDriveUsageOnFileDeleted
+  implements DomainEventSubscriber<FileCreatedDomainEvent>
+{
+  constructor(private readonly incrementer: UserUsageIncrementer) {}
+
+  subscribedTo(): DomainEventClass[] {
+    return [FileDeletedDomainEvent];
+  }
+
+  on(domainEvent: FileDeletedDomainEvent): Promise<void> {
+    return this.incrementer.run(domainEvent.size);
+  }
+}
diff --git a/src/workers/webdav/modules/userUsage/application/FreeSpacePerEnvironmentCalculator.ts b/src/context/virtual-drive/userUsage/application/FreeSpacePerEnvironmentCalculator.ts
similarity index 100%
rename from src/workers/webdav/modules/userUsage/application/FreeSpacePerEnvironmentCalculator.ts
rename to src/context/virtual-drive/userUsage/application/FreeSpacePerEnvironmentCalculator.ts
diff --git a/src/workers/webdav/modules/userUsage/application/IncrementDriveUsageOnFileCreated.ts b/src/context/virtual-drive/userUsage/application/IncrementDriveUsageOnFileCreated.ts
similarity index 54%
rename from src/workers/webdav/modules/userUsage/application/IncrementDriveUsageOnFileCreated.ts
rename to src/context/virtual-drive/userUsage/application/IncrementDriveUsageOnFileCreated.ts
index ce7e8f23e..53c2e1cbf 100644
--- a/src/workers/webdav/modules/userUsage/application/IncrementDriveUsageOnFileCreated.ts
+++ b/src/context/virtual-drive/userUsage/application/IncrementDriveUsageOnFileCreated.ts
@@ -1,10 +1,10 @@
-import { FileCreatedDomainEvent } from '../../files/domain/FileCreatedDomainEvent';
-import { DomainEventClass } from '../../shared/domain/DomainEvent';
-import { WebdavDomainEventSubscriber } from '../../shared/domain/WebdavDomainEventSubscriber';
+import { FileCreatedDomainEvent } from '../../files/domain/events/FileCreatedDomainEvent';
+import { DomainEventClass } from '../../../shared/domain/DomainEvent';
+import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
 import { UserUsageIncrementer } from './UserUsageIncrementer';
 
 export class IncrementDriveUsageOnFileCreated
-  implements WebdavDomainEventSubscriber<FileCreatedDomainEvent>
+  implements DomainEventSubscriber<FileCreatedDomainEvent>
 {
   constructor(private readonly incrementer: UserUsageIncrementer) {}
 
diff --git a/src/workers/webdav/modules/userUsage/application/UsedSpaceCalculator.ts b/src/context/virtual-drive/userUsage/application/UsedSpaceCalculator.ts
similarity index 100%
rename from src/workers/webdav/modules/userUsage/application/UsedSpaceCalculator.ts
rename to src/context/virtual-drive/userUsage/application/UsedSpaceCalculator.ts
diff --git a/src/workers/webdav/modules/userUsage/application/UserUsageDecrementer.ts b/src/context/virtual-drive/userUsage/application/UserUsageDecrementer.ts
similarity index 100%
rename from src/workers/webdav/modules/userUsage/application/UserUsageDecrementer.ts
rename to src/context/virtual-drive/userUsage/application/UserUsageDecrementer.ts
diff --git a/src/workers/webdav/modules/userUsage/application/UserUsageIncrementer.ts b/src/context/virtual-drive/userUsage/application/UserUsageIncrementer.ts
similarity index 100%
rename from src/workers/webdav/modules/userUsage/application/UserUsageIncrementer.ts
rename to src/context/virtual-drive/userUsage/application/UserUsageIncrementer.ts
diff --git a/src/workers/webdav/modules/userUsage/domain/UserUsage.ts b/src/context/virtual-drive/userUsage/domain/UserUsage.ts
similarity index 100%
rename from src/workers/webdav/modules/userUsage/domain/UserUsage.ts
rename to src/context/virtual-drive/userUsage/domain/UserUsage.ts
diff --git a/src/workers/webdav/modules/userUsage/domain/UserUsageRepository.ts b/src/context/virtual-drive/userUsage/domain/UserUsageRepository.ts
similarity index 100%
rename from src/workers/webdav/modules/userUsage/domain/UserUsageRepository.ts
rename to src/context/virtual-drive/userUsage/domain/UserUsageRepository.ts
diff --git a/src/workers/webdav/modules/userUsage/infrastrucutre/CachedHttpUserUsageRepository.ts b/src/context/virtual-drive/userUsage/infrastrucutre/CachedHttpUserUsageRepository.ts
similarity index 100%
rename from src/workers/webdav/modules/userUsage/infrastrucutre/CachedHttpUserUsageRepository.ts
rename to src/context/virtual-drive/userUsage/infrastrucutre/CachedHttpUserUsageRepository.ts
diff --git a/src/workers/webdav/modules/userUsage/infrastrucutre/dtos/UserUsageLimitDTO.ts b/src/context/virtual-drive/userUsage/infrastrucutre/dtos/UserUsageLimitDTO.ts
similarity index 100%
rename from src/workers/webdav/modules/userUsage/infrastrucutre/dtos/UserUsageLimitDTO.ts
rename to src/context/virtual-drive/userUsage/infrastrucutre/dtos/UserUsageLimitDTO.ts
diff --git a/src/main/analytics/backup-handlers.ts b/src/main/analytics/backup-handlers.ts
deleted file mode 100644
index 3900c192a..000000000
--- a/src/main/analytics/backup-handlers.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { ipcMain } from 'electron';
-
-import { BackupProgressIssue, BackupsArgs } from '../../workers/backups';
-import {
-  backupCompleted,
-  backupError,
-  backupProcessStarted,
-  folderBackupCompleted,
-  folderBackupStarted,
-} from './service';
-
-export type BackupFolder = number;
-
-export type BackupInfo = {
-  scheduled: boolean;
-  backups: Array<BackupsArgs>;
-};
-
-export type BackupFinishedInfo = BackupInfo & {
-  lastExitReason: 'FORCED_BY_USER' | 'PROCESS_FINISHED';
-};
-
-const backupProcessInfo = {
-  shceduled: false,
-  foldersToBackup: 0,
-  items: {} as Record<BackupFolder, number>,
-  errors: {} as Record<BackupFolder, Array<string>>,
-};
-
-ipcMain.on('BACKUP_PROCESS_STARTED', (state: any) => {
-  backupProcessInfo.shceduled = state.scheduled;
-  backupProcessInfo.foldersToBackup = state.foldersToBackup.length;
-  backupProcessStarted(state.scheduled, state.foldersToBackup.length);
-});
-
-ipcMain.on('BACKUP_PROCESS_FINISHED', (state: any) => {
-  backupCompleted(state.scheduled, backupProcessInfo.foldersToBackup);
-});
-
-ipcMain.on(
-  'BACKUP_ACTION_QUEUE_GENERATED',
-  (
-    _,
-    {
-      folderId,
-      items,
-    }: {
-      folderId: number;
-      items: number;
-    }
-  ) => {
-    backupProcessInfo.items[folderId] = items;
-    backupProcessInfo.errors = [];
-
-    folderBackupStarted(backupProcessInfo.shceduled, items);
-  }
-);
-
-ipcMain.on('BACKUP_COMPLETED', (folderId: any) => {
-  const items = backupProcessInfo.items[folderId];
-  const errors = backupProcessInfo.errors[folderId];
-
-  folderBackupCompleted(backupProcessInfo.shceduled, items);
-
-  if (errors?.length > 0) {
-    backupError(backupProcessInfo.shceduled, items, errors);
-  }
-});
-
-ipcMain.on('BACKUP_FATAL_ERROR', (_, { folderId, errorName }) => {
-  const items = backupProcessInfo.items[folderId];
-
-  backupError(backupProcessInfo.shceduled, items, errorName);
-});
-
-ipcMain.on('BACKUP_ISSUE', (_, issue: BackupProgressIssue) => {
-  if (!backupProcessInfo.errors[issue.folderId]) {
-    backupProcessInfo.errors[issue.folderId] = [];
-  }
-
-  backupProcessInfo.errors[issue.folderId].push(
-    `${issue.errorName} error when ${issue.errorDetails.action}`
-  );
-});
diff --git a/src/main/app-info/AvaliableAppQuery.ts b/src/main/app-info/AvaliableAppQuery.ts
deleted file mode 100644
index abccce72c..000000000
--- a/src/main/app-info/AvaliableAppQuery.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-const availableMethodsToQuery = ['getPreferredSystemLanguages'] as const;
-
-export type AvaliableMethods = (typeof availableMethodsToQuery)[number];
diff --git a/src/main/app-info/handlers.ts b/src/main/app-info/handlers.ts
deleted file mode 100644
index aeaa9e68b..000000000
--- a/src/main/app-info/handlers.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ipcMain, app } from 'electron';
-
-import { executeQuery } from './service';
-import axios from 'axios';
-
-ipcMain.handle('execute-app-query', (_, query) => executeQuery(query));
-
-ipcMain.handle('get-download-urls', async () => {
-  const response = await axios.get('https://internxt.com/api/download');
-
-  return response.data;
-});
-
-ipcMain.handle('get-path', (_, path) => {
-  const result = app.getPath(path);
-  return result;
-});
diff --git a/src/main/app-info/service.ts b/src/main/app-info/service.ts
deleted file mode 100644
index c5ca8ea64..000000000
--- a/src/main/app-info/service.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { App, app } from 'electron';
-
-import { AvaliableMethods } from './AvaliableAppQuery';
-
-type OverridedApp = Omit<App, 'getPreferredSystemLanguages'> & {
-  getPreferredSystemLanguages: () => Array<string>;
-};
-
-export type AppQuery<T extends AvaliableMethods> = {
-  method: string;
-  params: Parameters<OverridedApp[T]>;
-};
-
-export const executeQuery = ({
-  method,
-  params = [],
-}: AppQuery<AvaliableMethods>): ReturnType<OverridedApp[AvaliableMethods]> => {
-  const fn = (app as OverridedApp)[method as AvaliableMethods];
-
-  return params.length === 0 ? fn() : fn(...params);
-};
diff --git a/src/main/background-processes/backups.ts b/src/main/background-processes/backups.ts
deleted file mode 100644
index 0b19d06fc..000000000
--- a/src/main/background-processes/backups.ts
+++ /dev/null
@@ -1,298 +0,0 @@
-import { app, BrowserWindow, ipcMain, powerSaveBlocker } from 'electron';
-import Logger from 'electron-log';
-import path from 'path';
-
-import { BackupsArgs } from '../../workers/backups';
-import { ProcessFatalErrorName } from '../../workers/types';
-import { getIsLoggedIn } from '../auth/handlers';
-import configStore from '../config';
-import { getBackupsFromDevice, getOrCreateDevice } from '../device/service';
-import eventBus from '../event-bus';
-import { broadcastToWindows } from '../windows';
-import { clearBackupsIssues } from './process-issues';
-import { BackupFatalError } from './types/BackupFatalError';
-
-ipcMain.handle('get-backups-interval', () => {
-  return configStore.get('backupInterval');
-});
-
-ipcMain.handle('set-backups-interval', (_, newValue: number) => {
-  return configStore.set('backupInterval', newValue);
-});
-
-export type BackupsStatus = 'STANDBY' | 'RUNNING';
-export type BackupExitReason = 'FORCED_BY_USER' | 'PROCESS_FINISHED';
-
-let backupsStatus: BackupsStatus = 'STANDBY';
-let backupsProcessRerun: null | ReturnType<typeof setTimeout> = null;
-let backupsLastExitReason: BackupExitReason | null = null;
-
-ipcMain.handle('get-backups-status', () => backupsStatus);
-
-ipcMain.handle('get-backups-enabled', () => configStore.get('backupsEnabled'));
-
-ipcMain.handle('toggle-backups-enabled', () => {
-  configStore.set('backupsEnabled', !configStore.get('backupsEnabled'));
-});
-
-ipcMain.handle('get-last-backup-timestamp', () =>
-  configStore.get('lastBackup')
-);
-
-ipcMain.handle('get-last-backup-exit-reason', () => backupsLastExitReason);
-
-function clearBackupsLastExitReason() {
-  backupsLastExitReason = null;
-}
-
-function clearBackupsTimeout() {
-  if (backupsProcessRerun) {
-    clearTimeout(backupsProcessRerun);
-  }
-}
-
-function scheduleBackups(milliseconds: number) {
-  backupsProcessRerun = setTimeout(
-    () => startBackupProcess(true),
-    milliseconds
-  );
-}
-
-function changeBackupsStatus(newStatus: BackupsStatus) {
-  backupsStatus = newStatus;
-  broadcastToWindows('backups-status-changed', newStatus);
-}
-
-ipcMain.on('start-backups-process', () => startBackupProcess(false));
-
-export type BackupProgress = {
-  currentFolder: number;
-  totalFolders: number;
-  completedItems?: number;
-  totalItems?: number;
-};
-
-async function startBackupProcess(scheduled: boolean) {
-  const backupsEnabled = configStore.get('backupsEnabled');
-
-  if (backupsStatus === 'RUNNING' || !backupsEnabled) {
-    return;
-  }
-
-  const suspensionBlockId = powerSaveBlocker.start('prevent-display-sleep');
-
-  changeBackupsStatus('RUNNING');
-  clearBackupsIssues();
-  clearBackupFatalErrors();
-
-  // It's an object to pass it to
-  // the individual item processors
-  const hasBeenStopped = { value: false };
-
-  ipcMain.once('stop-backups-process', () => {
-    hasBeenStopped.value = true;
-  });
-
-  const device = await getOrCreateDevice();
-
-  const enabledBackupEntries = await getBackupsFromDevice();
-
-  const items: BackupsArgs[] = enabledBackupEntries.map((backup) => ({
-    path: backup.pathname,
-    folderId: backup.id,
-    tmpPath: app.getPath('temp'),
-    backupsBucket: device.bucket,
-  }));
-
-  let currentFolder = 1;
-  const totalFolders = items.length;
-
-  ipcMain.on('BACKUP_PROGRESS', (_, { completedItems, totalItems }) => {
-    broadcastToWindows('backup-progress', {
-      currentFolder,
-      totalFolders,
-      completedItems,
-      totalItems,
-    });
-  });
-
-  ipcMain.emit('BACKUP_PROCESS_STARTED', {
-    scheduled,
-    foldersToBackup: items,
-  });
-
-  for (const item of items) {
-    broadcastToWindows('backup-progress', { currentFolder, totalFolders });
-
-    if (!hasBeenStopped.value) {
-      await processBackupsItem(item, hasBeenStopped);
-    }
-
-    currentFolder++;
-  }
-
-  const currentTimestamp = new Date().valueOf();
-
-  configStore.set('lastBackup', currentTimestamp);
-
-  clearBackupsTimeout();
-
-  const backupsInterval = configStore.get('backupInterval');
-
-  if (backupsInterval !== -1 && getIsLoggedIn()) {
-    scheduleBackups(backupsInterval);
-  }
-
-  changeBackupsStatus('STANDBY');
-
-  ipcMain.removeAllListeners('stop-backups-process');
-
-  powerSaveBlocker.stop(suspensionBlockId);
-
-  backupsLastExitReason = hasBeenStopped.value
-    ? 'FORCED_BY_USER'
-    : 'PROCESS_FINISHED';
-
-  ipcMain.emit('BACKUP_PROCESS_FINISHED', {
-    scheduled,
-    foldersToBackup: items.length,
-    lastExitReason: backupsLastExitReason,
-  });
-
-  ipcMain.removeAllListeners('BACKUP_PROGRESS');
-}
-
-function processBackupsItem(
-  item: BackupsArgs,
-  hasBeenStopped: { value: boolean }
-) {
-  return new Promise<void>((resolve) => {
-    const onExitFuncs: (() => void)[] = [];
-
-    function onExit(
-      payload:
-        | { reason: 'USER_STOPPED' | 'PROCESS_FINISHED' }
-        | { reason: 'FATAL_ERROR'; errorName: ProcessFatalErrorName }
-    ) {
-      Logger.log(
-        `[onBackupsExit] ${item.path} (${item.folderId}) reason: ${payload.reason}`
-      );
-      onExitFuncs.forEach((f) => f());
-
-      if (payload.reason === 'FATAL_ERROR') {
-        addBackupFatalError({ errorName: payload.errorName, ...item });
-      }
-
-      resolve();
-    }
-
-    if (hasBeenStopped.value) {
-      return onExit({ reason: 'USER_STOPPED' });
-    }
-
-    ipcMain.handleOnce('get-backups-details', () => item);
-    onExitFuncs.push(() => ipcMain.removeHandler('get-backups-details'));
-
-    ipcMain.once('BACKUP_FATAL_ERROR', (_, _folderId, errorName) =>
-      onExit({ reason: 'FATAL_ERROR', errorName })
-    );
-    onExitFuncs.push(() => ipcMain.removeAllListeners('BACKUP_FATAL_ERROR'));
-
-    ipcMain.once('BACKUP_EXIT', (_, folderId) => {
-      onExit({ reason: 'PROCESS_FINISHED' });
-      ipcMain.emit('BACKUP_COMPLETED', folderId);
-    });
-    onExitFuncs.push(() => ipcMain.removeAllListeners('BACKUP_EXIT'));
-
-    const worker = spawnBackupsWorker();
-    onExitFuncs.push(() => worker.destroy());
-
-    if (hasBeenStopped.value) {
-      return onExit({ reason: 'USER_STOPPED' });
-    }
-
-    const onUserStopped = () => onExit({ reason: 'USER_STOPPED' });
-    ipcMain.once('stop-backups-process', onUserStopped);
-    onExitFuncs.push(() =>
-      ipcMain.removeListener('stop-backups-process', onUserStopped)
-    );
-  });
-}
-
-function spawnBackupsWorker() {
-  const worker = new BrowserWindow({
-    webPreferences: {
-      nodeIntegration: true,
-      contextIsolation: false,
-    },
-    show: false,
-  });
-
-  worker
-    .loadFile(
-      process.env.NODE_ENV === 'development'
-        ? '../../release/app/dist/backups/index.html'
-        : `${path.join(__dirname, '..', 'backups')}/index.html`
-    )
-    .catch(Logger.error);
-
-  return worker;
-}
-
-let fatalErrors: BackupFatalError[] = [];
-
-function onBackupFatalErrorsChanged() {
-  broadcastToWindows('backup-fatal-errors-changed', fatalErrors);
-}
-
-ipcMain.handle('get-backup-fatal-errors', () => fatalErrors);
-ipcMain.on('add-backup-fatal-errors', (e, errors: Array<BackupFatalError>) => {
-  if (!errors) {
-    (e as unknown as Array<BackupFatalError>).forEach(addBackupFatalError);
-  }
-  errors.forEach(addBackupFatalError);
-});
-
-ipcMain.handle('delete-backup-error', (_event, folderId: number) => {
-  fatalErrors = fatalErrors.filter((error) => error.folderId !== folderId);
-  onBackupFatalErrorsChanged();
-});
-
-function clearBackupFatalErrors() {
-  fatalErrors = [];
-  onBackupFatalErrorsChanged();
-}
-
-function addBackupFatalError(error: BackupFatalError) {
-  fatalErrors.push(error);
-  onBackupFatalErrorsChanged();
-}
-
-eventBus.on('WIDGET_IS_READY', () => {
-  // Check if we should launch backup process
-  const lastBackup = configStore.get('lastBackup');
-  const backupsInterval = configStore.get('backupInterval');
-
-  if (lastBackup !== -1 && backupsInterval !== -1) {
-    const currentTimestamp = new Date().valueOf();
-
-    const millisecondsToNextBackup =
-      lastBackup + backupsInterval - currentTimestamp;
-
-    if (millisecondsToNextBackup <= 0) {
-      startBackupProcess(true);
-    } else {
-      scheduleBackups(millisecondsToNextBackup);
-    }
-  }
-});
-
-function stopAndClearBackups() {
-  ipcMain.emit('stop-backups-process');
-  clearBackupsTimeout();
-  clearBackupFatalErrors();
-  clearBackupsLastExitReason();
-}
-
-eventBus.on('USER_LOGGED_OUT', stopAndClearBackups);
-eventBus.on('USER_WAS_UNAUTHORIZED', stopAndClearBackups);
diff --git a/src/main/background-processes/sync.ts b/src/main/background-processes/sync.ts
deleted file mode 100644
index ae74464c2..000000000
--- a/src/main/background-processes/sync.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { ipcMain } from 'electron';
-
-import { ProcessResult } from '../../workers/process';
-import {
-  ProcessFatalErrorName,
-  ProcessInfoUpdatePayload,
-} from '../../workers/types';
-
-import eventBus from '../event-bus';
-import { setTrayStatus } from '../tray/tray';
-import { broadcastToWindows } from '../windows';
-
-export type SyncStatus = 'STANDBY' | 'RUNNING' | 'FAILED';
-
-let syncStatus: SyncStatus = 'STANDBY';
-
-export function getSyncStatus() {
-  return syncStatus;
-}
-
-ipcMain.handle('get-sync-status', getSyncStatus);
-
-export function changeSyncStatus(newStatus: SyncStatus) {
-  syncStatus = newStatus;
-  broadcastToWindows('sync-status-changed', newStatus);
-}
-
-export type SyncStoppedPayload =
-  | {
-      reason: 'STOPPED_BY_USER';
-    }
-  | {
-      reason: 'FATAL_ERROR';
-      errorName: ProcessFatalErrorName;
-    }
-  | { reason: 'EXIT'; result: ProcessResult };
-
-ipcMain.on('SYNC_INFO_UPDATE', (_, payload: ProcessInfoUpdatePayload) => {
-  broadcastToWindows('sync-info-update', payload);
-});
-
-eventBus.on('USER_LOGGED_OUT', () => {
-  ipcMain.emit('stop-sync-process');
-  setTrayStatus('STANDBY');
-});
-
-eventBus.on('USER_WAS_UNAUTHORIZED', () => {
-  ipcMain.emit('stop-sync-process');
-  setTrayStatus('STANDBY');
-});
diff --git a/src/main/background-processes/types/BackupFatalError.ts b/src/main/background-processes/types/BackupFatalError.ts
deleted file mode 100644
index 5003298d2..000000000
--- a/src/main/background-processes/types/BackupFatalError.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { ProcessFatalErrorName } from '../../../workers/types';
-
-export type BackupFatalError = {
-  path: string;
-  folderId: number;
-  errorName: ProcessFatalErrorName;
-};
diff --git a/src/main/background-processes/webdav.ts b/src/main/background-processes/webdav.ts
deleted file mode 100644
index 05a86fcb7..000000000
--- a/src/main/background-processes/webdav.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { BrowserWindow, ipcMain, app } from 'electron';
-import { ipcWebdav } from '../ipcs/webdav';
-import path from 'path';
-import Logger from 'electron-log';
-import eventBus from '../event-bus';
-import {
-  ejectMacOSInstallerDisks,
-  unmountDrive,
-} from '../../workers/webdav/VirtualDrive';
-
-let webdavWorker: BrowserWindow | null = null;
-
-function spawnWebdavServerWorker() {
-  Logger.log('Spawning webdav server!');
-
-  webdavWorker = new BrowserWindow({
-    webPreferences: {
-      nodeIntegration: true,
-      contextIsolation: false,
-      backgroundThrottling: false,
-    },
-    show: false,
-  });
-  webdavWorker
-    .loadFile(
-      process.env.NODE_ENV === 'development'
-        ? '../../release/app/dist/webdav/index.html'
-        : `${path.join(__dirname, '..', 'webdav')}/index.html`
-    )
-    .catch((err) => {
-      Logger.error('Error loading worker', err);
-    });
-
-  return webdavWorker;
-}
-
-ipcWebdav.once('WEBDAV_SERVER_START_ERROR', (_, err: Error) => {
-  Logger.error('ERROR STARTING WEBDAV SERVER', err);
-});
-
-ipcWebdav.once('WEBDAV_SERVER_ADDING_ROOT_FOLDER_ERROR', (_, err: Error) => {
-  Logger.error('ERROR ADDING ROOT FOLDER TO WEBDAV SERVER', err);
-});
-
-function stopWebDavServer() {
-  ipcWebdav.once('WEBDAV_SERVER_STOP_ERROR', (_, err: Error) => {
-    Logger.error('ERROR STOPING WEBDAV SERVER', err);
-  });
-  webdavWorker?.webContents.send('STOP_WEBDAV_SERVER_PROCESS');
-}
-
-eventBus.on('USER_LOGGED_OUT', stopWebDavServer);
-eventBus.on('USER_WAS_UNAUTHORIZED', stopWebDavServer);
-
-if (process.platform === 'darwin') {
-  eventBus.on('APP_IS_READY', ejectMacOSInstallerDisks);
-}
-
-ipcMain.handle('retry-virtual-drive-mount', () => {
-  webdavWorker?.webContents.send('RETRY_VIRTUAL_DRIVE_MOUNT');
-});
-
-ipcMain.handle('unmount-virtual-drive-and-quit', async () => {
-  try {
-    await unmountDrive();
-  } catch (onMenuQuitClickError) {
-    Logger.error({ onMenuQuitClickError });
-  }
-  await app.quit();
-});
diff --git a/src/main/ipcs/webdav.ts b/src/main/ipcs/webdav.ts
deleted file mode 100644
index 32b731681..000000000
--- a/src/main/ipcs/webdav.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ipcMain } from 'electron';
-import {
-  WebdavFlowEvents,
-  WebdavFlowEventsErrors,
-  WebdavMainEvents,
-  WebDavProcessEvents,
-} from '../../shared/IPC/events/webdav';
-import { CustomIpc } from '../../shared/IPC/IPCs';
-
-export const ipcWebdav = ipcMain as unknown as CustomIpc<
-  WebdavMainEvents,
-  WebDavProcessEvents
->;
-
-type NoEvents = Record<string, (...args: Array<any>) => any>;
-
-export type IpcWebdavFlow = CustomIpc<NoEvents, WebdavFlowEvents>;
-
-export type IpcWebdavFlowErrors = CustomIpc<NoEvents, WebdavFlowEventsErrors>;
diff --git a/src/main/sync-root-folder/handlers.ts b/src/main/sync-root-folder/handlers.ts
deleted file mode 100644
index 2be8c58de..000000000
--- a/src/main/sync-root-folder/handlers.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ipcMain, shell } from 'electron';
-import { getVirtualDrivePath } from '../../workers/webdav/VirtualDrive';
-
-import configStore from '../config';
-import { chooseSyncRootWithDialog } from './service';
-
-ipcMain.handle('get-sync-root', () => {
-  return configStore.get('syncRoot');
-});
-
-ipcMain.handle('choose-sync-root-with-dialog', chooseSyncRootWithDialog);
-
-ipcMain.handle('open-sync-folder', async () => {
-  const syncFolderPath = getVirtualDrivePath();
-
-  const errorMessage = await shell.openPath(syncFolderPath);
-
-  if (errorMessage) throw new Error(errorMessage);
-});
diff --git a/src/main/thumbnails/application/extract-pdf-page.ts b/src/main/thumbnails/application/extract-pdf-page.ts
deleted file mode 100644
index 4a9e56cd5..000000000
--- a/src/main/thumbnails/application/extract-pdf-page.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import Logger from 'electron-log';
-import fs from 'fs';
-import gm from 'gm';
-import { Readable } from 'stream';
-
-export async function extractFirstPageAsReadablePNG(
-  pdfPath: string
-): Promise<Readable | undefined> {
-  return new Promise((resolve, reject) => {
-    const pdf = fs.createReadStream(pdfPath);
-
-    gm(pdf)
-      .selectFrame(0)
-      .stream('png', (err: Error | null, stream: Readable) => {
-        if (err) {
-          Logger.error(
-            '[THUMBNAIL] Error generating thumbnail for a pdf: ',
-            err
-          );
-          reject(err);
-        }
-
-        resolve(stream);
-      });
-  });
-}
diff --git a/src/main/thumbnails/application/resize-image.ts b/src/main/thumbnails/application/resize-image.ts
deleted file mode 100644
index bae270a2e..000000000
--- a/src/main/thumbnails/application/resize-image.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// import sharp from 'sharp';
-import gm from 'gm';
-import { Readable } from 'stream';
-
-import { ThumbnailProperties } from '../domain/ThumbnailProperties';
-
-export function reziseImage(file: Readable): Buffer {
-  //const sharpStream = sharp({ failOn: 'error' });
-  /*const promises = [];
-
-  const gm2 = (gm(file).resize(300, 300).stream()).read() as Buffer;
-  promises.push(
-    gm(file).resize(ThumbnailProperties.dimensions, ThumbnailProperties.dimensions).stream()
-    sharpStream
-      .clone()
-      .resize(ThumbnailProperties.dimensions, ThumbnailProperties.dimensions)
-      .png({ quality: 10, compressionLevel: 9 })
-      .toBuffer()
-  );*/
-
-  //file.pipe(sharpStream);
-
-  return gm(file)
-    .resize(ThumbnailProperties.dimensions, ThumbnailProperties.dimensions)
-    .stream()
-    .read() as Buffer;
-}
diff --git a/src/main/virtual-drive/handlers.ts b/src/main/virtual-drive/handlers.ts
deleted file mode 100644
index 4e3aaf653..000000000
--- a/src/main/virtual-drive/handlers.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { VirtualDriveStatus } from '../../shared/types/VirtualDriveStatus';
-import { ipcMainVirtualDrive } from '../ipcs/mainVirtualDrive';
-import Logger from 'electron-log';
-
-let lastVirtualDriveStatus: VirtualDriveStatus = VirtualDriveStatus.MOUNTING;
-
-ipcMainVirtualDrive.handle(
-  'get-virtual-drive-status',
-  () => lastVirtualDriveStatus
-);
-
-ipcMainVirtualDrive.on('VIRTUAL_DRIVE_STARTING', () => {
-  lastVirtualDriveStatus = VirtualDriveStatus.MOUNTING;
-  Logger.info('VIRTUAL_DRIVE_STARTING');
-});
-
-ipcMainVirtualDrive.on('VIRTUAL_DRIVE_MOUNTED_SUCCESSFULLY', () => {
-  lastVirtualDriveStatus = VirtualDriveStatus.MOUNTED;
-  Logger.info('VIRTUAL_DRIVE_MOUNTED_SUCCESSFULLY');
-});
-
-ipcMainVirtualDrive.on('VIRTUAL_DRIVE_MOUNT_ERROR', (_, err: Error) => {
-  Logger.info('VIRTUAL_DRIVE_MOUNT_ERROR', err.message);
-  lastVirtualDriveStatus = VirtualDriveStatus.FAILED_TO_MOUNT;
-});
-
-ipcMainVirtualDrive.on('VIRTUAL_DRIVE_UNMOUNT_ERROR', (_, err: Error) => {
-  Logger.info('VIRTUAL_DRIVE_UNMOUNT_ERROR', err.message);
-});
diff --git a/src/renderer/actions/backsups-error-actions.ts b/src/renderer/actions/backsups-error-actions.ts
deleted file mode 100644
index fa66cd4f5..000000000
--- a/src/renderer/actions/backsups-error-actions.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { tryAgain } from './shared-actions';
-import { FatalErrorActionMap } from './types';
-
-const findBackupFolder = async (error: { path: string }) => {
-  const result = await window.electron.changeBackupPath(error.path);
-  if (result) {
-    window.electron.startBackupsProcess();
-  }
-};
-
-export const backupsErrorActions: FatalErrorActionMap = {
-  CANNOT_ACCESS_BASE_DIRECTORY: {
-    name: 'issues.actions.find-folder',
-    func: findBackupFolder,
-  },
-  CANNOT_ACCESS_TMP_DIRECTORY: tryAgain,
-  CANNOT_GET_CURRENT_LISTINGS: tryAgain,
-  NO_INTERNET: tryAgain,
-  NO_REMOTE_CONNECTION: tryAgain,
-  BASE_DIRECTORY_DOES_NOT_EXIST: {
-    name: 'issues.actions.find-folder',
-    func: findBackupFolder,
-  },
-  INSUFICIENT_PERMISION_ACCESSING_BASE_DIRECTORY: tryAgain,
-  UNKNOWN: tryAgain,
-};
diff --git a/src/renderer/actions/types.ts b/src/renderer/actions/types.ts
deleted file mode 100644
index fe730af8a..000000000
--- a/src/renderer/actions/types.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BackupFatalError } from '../../main/background-processes/backups';
-import { ProcessFatalErrorName } from '../../workers/types';
-
-export interface Action {
-  name: string;
-  func: (error: BackupFatalError | undefined) => Promise<void> | void;
-}
-
-export type FatalErrorActionMap = Record<ProcessFatalErrorName, Action>;
diff --git a/src/renderer/hooks/BackupFatalErrors.tsx b/src/renderer/hooks/BackupFatalErrors.tsx
deleted file mode 100644
index e765c5400..000000000
--- a/src/renderer/hooks/BackupFatalErrors.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import { BackupFatalError } from '../../main/background-processes/types/BackupFatalError';
-
-export default function useBackupFatalErrors() {
-  const [errors, setErrors] = useState<BackupFatalError[]>([]);
-
-  useEffect(() => {
-    window.electron.getBackupFatalErrors().then(setErrors);
-    const removeListener =
-      window.electron.onBackupFatalErrorsChanged(setErrors);
-
-    return removeListener;
-  }, []);
-
-  function thereAreErrors() {
-    return errors.length > 0;
-  }
-
-  function deleteError(folderId: number) {
-    window.electron.deleteBackupError(folderId);
-  }
-
-  return { backupFatalErrors: errors, thereAreErrors, deleteError };
-}
diff --git a/src/renderer/hooks/BackupStatus.tsx b/src/renderer/hooks/BackupStatus.tsx
deleted file mode 100644
index 7f6936fb4..000000000
--- a/src/renderer/hooks/BackupStatus.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { useEffect, useState } from 'react';
-
-import { BackupsStatus } from '../../main/background-processes/backups';
-
-export default function useBackupStatus(): BackupsStatus {
-  const [backupStatus, setBackupStatus] = useState<BackupsStatus>('STANDBY');
-  useEffect(() => {
-    window.electron.getBackupsStatus().then(setBackupStatus);
-
-    const removeListener =
-      window.electron.onBackupsStatusChanged(setBackupStatus);
-
-    return removeListener;
-  }, []);
-
-  return backupStatus;
-}
diff --git a/src/renderer/hooks/VirtualDriveStatus.tsx b/src/renderer/hooks/VirtualDriveStatus.tsx
deleted file mode 100644
index 9dc551885..000000000
--- a/src/renderer/hooks/VirtualDriveStatus.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { useEffect, useState } from 'react';
-import { reportError } from 'renderer/utils/errors';
-import { VirtualDriveStatus } from '../../shared/types/VirtualDriveStatus';
-
-export default function useVirtualDriveStatus() {
-  const [status, setStatus] = useState<VirtualDriveStatus>();
-  useEffect(() => {
-    window.electron
-      .getVirtualDriveStatus()
-      .then(setStatus)
-      .catch((err) => {
-        reportError(err);
-      });
-
-    const removeListener = window.electron.onVirtualDriveStatusChange(
-      ({ status }) => {
-        setStatus(status);
-      }
-    );
-
-    return removeListener;
-  }, []);
-
-  return { status };
-}
diff --git a/src/renderer/pages/Settings/Backups/BackupsFolderList.tsx b/src/renderer/pages/Settings/Backups/BackupsFolderList.tsx
deleted file mode 100644
index 0d140e6ef..000000000
--- a/src/renderer/pages/Settings/Backups/BackupsFolderList.tsx
+++ /dev/null
@@ -1,254 +0,0 @@
-import { Dialog, Transition } from '@headlessui/react';
-import { Minus, Plus } from '@phosphor-icons/react';
-import { Fragment, ReactNode, useEffect, useState } from 'react';
-import { useTranslationContext } from 'renderer/context/LocalContext';
-import { useBackups } from '../../../hooks/useBackups';
-import { BackupFatalError } from '../../../../main/background-processes/types/BackupFatalError';
-import useBackupFatalErrors from '../../../hooks/BackupFatalErrors';
-
-import { Backup } from '../../../../main/device/service';
-import FolderIcon from '../../../assets/folder.svg';
-import Spinner from '../../../assets/spinner.svg';
-import Button from '../../../components/Button';
-import Checkbox from '../../../components/Checkbox';
-
-export interface BackupFolderListProps {
-  onGoToPanel: () => void;
-}
-
-export default function BackupsFolderList({
-  onGoToPanel,
-}: BackupFolderListProps) {
-  const { translate } = useTranslationContext();
-
-  const { backups, addBackup, disableBackup, deleteBackup } = useBackups();
-
-  const [selected, setSelected] = useState<Backup | null>(null);
-  const [showDeleteModal, setShowDeleteModal] = useState(false);
-
-  const { deleteError } = useBackupFatalErrors();
-
-  async function handleAddBackup() {
-    await addBackup();
-  }
-
-  async function handleOnCloseDeleteModal(
-    result: 'CANCEL' | 'DELETE' | 'DISABLE',
-    dontAksAgain?: boolean
-  ) {
-    setShowDeleteModal(false);
-    if (result === 'CANCEL') {
-      return;
-    }
-
-    if (dontAksAgain) {
-      localStorage.setItem('dont-ask-again-on-delete-backup', 'yes');
-    }
-
-    if (result === 'DISABLE') {
-      await disableBackup(selected as Backup);
-    } else {
-      await deleteBackup(selected as Backup);
-    }
-
-    if (selected) {
-      deleteError(selected.id);
-    }
-  }
-
-  const del = () => {
-    const dontAskAgainOnDeleteBackup = localStorage.getItem(
-      'dont-ask-again-on-delete-backup'
-    );
-    if (dontAskAgainOnDeleteBackup === 'yes') {
-      handleOnCloseDeleteModal('DISABLE');
-    } else {
-      setShowDeleteModal(true);
-    }
-  };
-
-  let content: ReactNode;
-
-  if (backups.status === 'SUCCESS' && backups.backups.length) {
-    content = backups.backups.map((folder) => (
-      <li
-        onClick={(e) => {
-          e.stopPropagation();
-          setSelected(folder);
-        }}
-        key={folder.id}
-        className={`flex h-8 w-full items-center space-x-2 truncate px-3 outline-none ${
-          selected?.id === folder.id
-            ? 'bg-primary text-white'
-            : 'bg-surface even:bg-gray-5'
-        }`}
-        title={folder.name}
-      >
-        <FolderIcon className="h-5 w-5 flex-shrink-0" />
-
-        <p className="truncate">{folder.name}</p>
-      </li>
-    ));
-  } else {
-    content = (
-      <div className="flex h-full items-center justify-center">
-        {backups.status === 'LOADING' ? (
-          <Spinner className="h-5 w-5 animate-spin text-gray-100" />
-        ) : backups.status === 'ERROR' ? (
-          <p className="text-sm font-medium">We could not load your backups</p>
-        ) : (
-          <p className="text-sm text-gray-50">
-            {translate('settings.backups.folders.no-folders')}
-          </p>
-        )}
-      </div>
-    );
-  }
-
-  return (
-    <div className="flex flex-col space-y-2">
-      <p className="text-sm font-medium text-gray-100">
-        {translate('settings.backups.folders.explanation')}
-      </p>
-
-      <ul
-        className="h-48 list-none overflow-y-auto rounded-lg border border-gray-20 bg-surface shadow-sm"
-        onClick={() => setSelected(null)}
-        role="none"
-      >
-        {content}
-      </ul>
-
-      <div className="flex items-center justify-between">
-        <div className="flex items-center space-x-1">
-          <Button
-            variant="secondary"
-            disabled={backups.status === 'LOADING'}
-            onClick={handleAddBackup}
-          >
-            <Plus size={16} />
-          </Button>
-          <Button
-            variant="secondary"
-            disabled={selected === null}
-            onClick={() => del()}
-          >
-            <Minus size={16} />
-          </Button>
-        </div>
-
-        <Button onClick={onGoToPanel}>
-          {translate('settings.backups.folders.done')}
-        </Button>
-      </div>
-
-      <Modal
-        isOpen={showDeleteModal}
-        onClose={handleOnCloseDeleteModal}
-        nameOfBackup={selected?.name}
-      />
-    </div>
-  );
-}
-
-function Modal({
-  nameOfBackup,
-  isOpen,
-  onClose,
-}: {
-  nameOfBackup?: string;
-  isOpen: boolean;
-  onClose: (
-    result: 'CANCEL' | 'DISABLE' | 'DELETE',
-    dontAksAgain: boolean
-  ) => void;
-}) {
-  const { translate } = useTranslationContext();
-  const [checkbox, setCheckbox] = useState(false);
-  const [dontAksAgain, setDontAskAgain] = useState(false);
-
-  useEffect(() => {
-    if (isOpen) {
-      setCheckbox(false);
-    }
-  }, [isOpen]);
-
-  return (
-    <Transition appear show={isOpen} as={Fragment}>
-      <Dialog
-        as="div"
-        className="fixed inset-0 z-10 flex h-full items-center justify-center overflow-y-auto"
-        onClose={() => onClose('CANCEL', dontAksAgain)}
-      >
-        <div className="min-h-screen">
-          <Transition.Child
-            as={Fragment}
-            enter="ease-out duration-200"
-            enterFrom="opacity-0"
-            enterTo="opacity-100"
-            leave="ease-in duration-100"
-            leaveFrom="opacity-100"
-            leaveTo="opacity-0"
-          >
-            <Dialog.Overlay className="fixed inset-0 bg-black/40 dark:bg-gray-50/40" />
-          </Transition.Child>
-
-          <Transition.Child
-            as={Fragment}
-            enter="ease-out duration-300"
-            enterFrom="opacity-0 scale-95"
-            enterTo="opacity-100 scale-100"
-            leave="ease-in duration-200"
-            leaveFrom="opacity-100 scale-100"
-            leaveTo="opacity-0 scale-95"
-          >
-            <div className="absolute left-1/2 top-1/2 flex w-80 -translate-x-1/2 -translate-y-1/2 transform flex-col items-stretch space-y-6 overflow-hidden rounded-2xl bg-surface p-5 shadow-xl transition-all dark:bg-gray-1">
-              <div className="flex flex-col space-y-2">
-                <Dialog.Title
-                  as="h3"
-                  className="line-clamp-3 text-lg font-medium leading-6 text-gray-100"
-                >
-                  {translate('settings.backups.folders.stop-baking-up.title')}
-                  &quot;<span>{nameOfBackup}</span>&quot;?
-                </Dialog.Title>
-
-                <p className="text-sm text-gray-50">
-                  {translate(
-                    'settings.backups.folders.stop-baking-up.explanation'
-                  )}
-                </p>
-              </div>
-
-              <Checkbox
-                label={translate(
-                  'settings.backups.folders.stop-baking-up.dont-ask-again'
-                )}
-                checked={dontAksAgain}
-                onClick={() => setDontAskAgain(!dontAksAgain)}
-              />
-
-              <div className="flex flex-col items-stretch space-y-2">
-                <Button
-                  variant="secondary"
-                  size="lg"
-                  onClick={() =>
-                    onClose(checkbox ? 'DELETE' : 'DISABLE', dontAksAgain)
-                  }
-                >
-                  {translate('settings.backups.folders.stop-baking-up.confirm')}
-                </Button>
-                <Button
-                  variant="primary"
-                  size="lg"
-                  onClick={() => onClose('CANCEL', false)}
-                >
-                  {translate('settings.backups.folders.stop-baking-up.cancel')}
-                </Button>
-              </div>
-            </div>
-          </Transition.Child>
-        </div>
-      </Dialog>
-    </Transition>
-  );
-}
diff --git a/src/renderer/pages/Settings/Backups/BackupsPreferences.tsx b/src/renderer/pages/Settings/Backups/BackupsPreferences.tsx
deleted file mode 100644
index 25b2ed392..000000000
--- a/src/renderer/pages/Settings/Backups/BackupsPreferences.tsx
+++ /dev/null
@@ -1,227 +0,0 @@
-import dayjs from 'dayjs';
-import relativeTime from 'dayjs/plugin/relativeTime';
-import { useEffect, useState } from 'react';
-import { BackupProgress } from '../../../../main/background-processes/backups';
-import Button from '../../../components/Button';
-import Select, { SelectOptionsType } from 'renderer/components/Select';
-import Checkbox from '../../../components/Checkbox';
-import { useTranslationContext } from '../../../context/LocalContext';
-import useBackupStatus from '../../../hooks/BackupStatus';
-import { getPercentualProgress } from '../../../utils/backups-progress';
-import useBackupFatalErrors from '../../../hooks/BackupFatalErrors';
-import { WarningCircle } from '@phosphor-icons/react';
-
-dayjs.extend(relativeTime);
-
-interface BackupsIntervalType extends SelectOptionsType {
-  interval: number;
-}
-
-type BackupIntervalType = '6h' | '12h' | '24h' | 'manual';
-
-export interface BackupsPreferencesProps {
-  showFolderList: () => void;
-}
-
-export default function BackupsPreferences({
-  showFolderList,
-}: BackupsPreferencesProps) {
-  const { translate } = useTranslationContext();
-  const backupStatus = useBackupStatus();
-
-  const DEFAULT_INTERVAL = '24h';
-  const [backupsInterval, setBackupsInterval] =
-    useState<BackupIntervalType | null>(null);
-  const [backupsEnabled, setBackupsEnabled] = useState(false);
-  const [lastBackupTimestamp, setLastBackupTimestamp] = useState(-1);
-  const [backupProgress, setBackupProgress] = useState<null | BackupProgress>(
-    null
-  );
-
-  const { thereAreErrors } = useBackupFatalErrors();
-
-  const BackupsIntervals: BackupsIntervalType[] = [
-    {
-      value: '6h',
-      name: translate('settings.backups.frequency.options.6h'),
-      interval: 21_600_000,
-    },
-    {
-      value: '12h',
-      name: translate('settings.backups.frequency.options.12h'),
-      interval: 43_200_000,
-    },
-    {
-      value: '24h',
-      name: translate('settings.backups.frequency.options.24h'),
-      interval: 86_400_000,
-    },
-    {
-      value: 'manual',
-      name: translate('settings.backups.frequency.options.manually'),
-      interval: -1,
-    },
-  ];
-
-  const getIntervalValue = (interval: number): BackupIntervalType =>
-    (BackupsIntervals.find((option) => option.interval === interval)
-      ?.value as BackupIntervalType) ?? DEFAULT_INTERVAL;
-
-  function refreshBackupsInterval() {
-    window.electron
-      .getBackupsInterval()
-      .then((interval) => setBackupsInterval(getIntervalValue(interval)));
-  }
-
-  function refreshBackupsEnabled() {
-    window.electron.getBackupsEnabled().then(setBackupsEnabled);
-  }
-
-  function refreshLastBackupTimestamp() {
-    window.electron.getLastBackupTimestamp().then(setLastBackupTimestamp);
-  }
-
-  useEffect(() => {
-    if (backupStatus === 'STANDBY') {
-      setBackupProgress(null);
-    }
-  }, [backupStatus]);
-
-  useEffect(() => {
-    refreshBackupsInterval();
-    refreshBackupsEnabled();
-  }, []);
-
-  useEffect(() => {
-    const removeListener = window.electron.onBackupProgress(setBackupProgress);
-    return removeListener;
-  }, []);
-
-  useEffect(refreshLastBackupTimestamp, [backupStatus]);
-
-  async function onBackupsIntervalChanged(value: string) {
-    const interval = BackupsIntervals.filter(
-      (option) => option.value === value
-    )[0].interval;
-
-    await window.electron.setBackupsInterval(interval);
-    refreshBackupsInterval();
-  }
-
-  async function onBackupsEnabledClicked() {
-    await window.electron.toggleBackupsEnabled();
-    refreshBackupsEnabled();
-  }
-
-  const progressDisplay = backupProgress
-    ? `(${getPercentualProgress(backupProgress).toFixed(0)}%)`
-    : '(...)';
-
-  const handleOpenURL = async (URL: string) => {
-    try {
-      await window.electron.openUrl(URL);
-    } catch (error) {
-      reportError(error);
-    }
-  };
-
-  return (
-    <div className="flex flex-col space-y-5">
-      <Checkbox
-        checked={backupsEnabled}
-        label={translate('settings.backups.activate')}
-        onClick={onBackupsEnabledClicked}
-      />
-
-      {thereAreErrors() && (
-        <section className="relative z-0 flex items-center space-x-2 overflow-hidden rounded-lg border border-red bg-surface p-3 font-normal text-red shadow-sm ring-3 ring-red/10 before:absolute before:inset-0 before:-z-1 before:bg-red/5 dark:ring-red/35 dark:before:bg-red/10">
-          <div className="relative z-0 flex w-6 items-center justify-center text-red before:absolute before:-z-1 before:h-3 before:w-3 before:bg-white">
-            <WarningCircle size={24} weight="fill" />
-          </div>
-          <span
-            className="flex-1 truncate"
-            title={translate('settings.backups.last-backup-had-issues')}
-          >
-            {translate('settings.backups.last-backup-had-issues')}
-          </span>
-          <Button
-            variant="secondary"
-            size="sm"
-            onClick={() => window.electron.openProcessIssuesWindow()}
-            customClassName="ml-auto"
-          >
-            {translate('settings.backups.see-issues')}
-          </Button>
-        </section>
-      )}
-
-      <div className="flex flex-col space-y-1.5">
-        <div className="flex items-center space-x-2">
-          <Button
-            variant={backupStatus === 'STANDBY' ? 'primary' : 'danger'}
-            disabled={!backupsEnabled}
-            onClick={
-              backupStatus === 'STANDBY'
-                ? window.electron.startBackupsProcess
-                : window.electron.stopBackupsProcess
-            }
-          >
-            {backupStatus === 'STANDBY'
-              ? translate('settings.backups.action.start')
-              : translate('settings.backups.action.stop')}
-          </Button>
-
-          <Button
-            variant="secondary"
-            disabled={!backupsEnabled || backupStatus === 'RUNNING'}
-            onClick={showFolderList}
-          >
-            {translate('settings.backups.select-folders')}
-          </Button>
-        </div>
-
-        <div className="flex h-5 items-center justify-start text-sm text-gray-60">
-          {backupStatus === 'STANDBY'
-            ? lastBackupTimestamp !== -1
-              ? `${translate('settings.backups.action.last-run')} ${dayjs(
-                  lastBackupTimestamp
-                ).fromNow()}`
-              : ''
-            : translate('settings.backups.action.running', {
-                progress: progressDisplay,
-              })}
-        </div>
-      </div>
-
-      <div className="flex items-end justify-between">
-        <div className="flex flex-1 flex-col items-start space-y-2">
-          <p
-            className={`text-sm font-medium leading-4 ${
-              backupsEnabled ? 'text-gray-80' : 'text-gray-40'
-            }`}
-          >
-            {translate('settings.backups.frequency.title')}
-          </p>
-
-          {backupsInterval && (
-            <Select
-              disabled={!backupsEnabled}
-              options={BackupsIntervals}
-              value={backupsInterval}
-              onValueChange={onBackupsIntervalChanged}
-            />
-          )}
-        </div>
-
-        <Button
-          variant="secondary"
-          onClick={() =>
-            handleOpenURL('https://drive.internxt.com/app/backups')
-          }
-        >
-          {translate('settings.backups.view-backups')}
-        </Button>
-      </div>
-    </div>
-  );
-}
diff --git a/src/renderer/pages/Settings/Backups/index.tsx b/src/renderer/pages/Settings/Backups/index.tsx
deleted file mode 100644
index 2599ed53f..000000000
--- a/src/renderer/pages/Settings/Backups/index.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { ReactNode, useContext, useState, useEffect } from 'react';
-
-import Spinner from '../../../assets/spinner.svg';
-import { DeviceContext } from '../../../context/DeviceContext';
-import BackupsFolderList from './BackupsFolderList';
-import BackupsPreferences from './BackupsPreferences';
-
-export default function BackupsSection({ active }: { active: boolean }) {
-  const [showFolderList, setShowFolderList] = useState<boolean>(false);
-  const [deviceState] = useContext(DeviceContext);
-
-  useEffect(() => {
-    if (!active) {
-      setShowFolderList(false);
-    }
-  }, [active]);
-
-  let content: ReactNode;
-
-  if (deviceState.status === 'LOADING') {
-    content = (
-      <div className="flex h-32 items-center justify-center">
-        <Spinner className="h-5 w-5 animate-spin text-gray-100" />
-      </div>
-    );
-  } else if (deviceState.status === 'ERROR') {
-    content = (
-      <div className="flex h-32 items-center justify-center">
-        <p className="font-medium">There was an error loading your backups</p>
-      </div>
-    );
-  } else {
-    content = showFolderList ? (
-      <BackupsFolderList onGoToPanel={() => setShowFolderList(false)} />
-    ) : (
-      <BackupsPreferences showFolderList={() => setShowFolderList(true)} />
-    );
-  }
-
-  return <div className={active ? 'block' : 'hidden'}>{content}</div>;
-}
diff --git a/src/renderer/pages/Widget/BackupsErrorBanner.tsx b/src/renderer/pages/Widget/BackupsErrorBanner.tsx
deleted file mode 100644
index 8bf0c749a..000000000
--- a/src/renderer/pages/Widget/BackupsErrorBanner.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import { useTranslationContext } from 'renderer/context/LocalContext';
-
-import { ProcessFatalErrorName } from '../../../workers/types';
-import Warn from '../../assets/warn.svg';
-import useBackupFatalErrors from '../../hooks/BackupFatalErrors';
-import obtainErrorAction from '../../messages/backups/backups-actions-map';
-import obtainErrorMessage from '../../messages/backups/backups-fatal-errors';
-
-function ErrorBanner({ errorName }: { errorName: ProcessFatalErrorName }) {
-  const { translate } = useTranslationContext();
-
-  const action = obtainErrorAction(errorName);
-
-  return (
-    <div className="flex items-center truncate border-b border-yellow-dark/20 bg-yellow/10 px-3 py-3 text-xs text-yellow-dark">
-      <Warn className="h-5 w-5" />
-      <p
-        className="ml-2 inline flex-1 truncate"
-        title={translate(obtainErrorMessage(errorName))}
-      >
-        {translate(obtainErrorMessage(errorName))}
-      </p>
-      {action && (
-        <span
-          onClick={action.fn}
-          role="button"
-          tabIndex={0}
-          onKeyDown={action.fn}
-          className="mr-2 cursor-pointer whitespace-nowrap text-xs text-yellow-dark underline"
-        >
-          {action.name}
-        </span>
-      )}
-    </div>
-  );
-}
-
-export default function BackupsFatalErrorBanner() {
-  const { backupFatalErrors } = useBackupFatalErrors();
-
-  return (
-    <>
-      {backupFatalErrors.map(({ errorName }) => (
-        <ErrorBanner errorName={errorName} />
-      ))}
-    </>
-  );
-}
diff --git a/src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx b/src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx
deleted file mode 100644
index 4d36b5927..000000000
--- a/src/renderer/pages/Widget/MacOSVersionAvailableBanner.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { ArrowRight } from '@phosphor-icons/react';
-import React, { useEffect, useState } from 'react';
-import { useTranslationContext } from '../../context/LocalContext';
-import { reportError } from '../../utils/errors';
-
-const getDownloadUrl = async () => {
-  const { platforms } = await window.electron.getDownloadUrls();
-
-  return platforms['MacOS'];
-};
-export const MacOSVersionAvailableBanner: React.FC = () => {
-  const { translate } = useTranslationContext();
-  const [downloadURL, setDownloadURL] = useState<string>();
-  useEffect(() => {
-    getDownloadUrl().then(setDownloadURL).catch(reportError);
-  }, []);
-
-  const handleDownloadMacOSNative = async () => {
-    try {
-      if (!downloadURL) return;
-      await window.electron.openUrl(downloadURL);
-    } catch (error) {
-      reportError(error);
-    }
-  };
-  return (
-    <div
-      className="flex flex-row bg-primary px-5 py-4"
-      onClick={handleDownloadMacOSNative}
-    >
-      <div className="mr-4">
-        <h2 className="mb-1 text-sm font-semibold">
-          {translate('widget.macos-available.title')}
-        </h2>
-        <h3 className="text-sm">
-          {translate('widget.macos-available.message')}
-        </h3>
-      </div>
-      <div className="flex items-center">
-        <ArrowRight size={24} />
-      </div>
-    </div>
-  );
-};
diff --git a/src/renderer/pages/Widget/SyncInfo.tsx b/src/renderer/pages/Widget/SyncInfo.tsx
deleted file mode 100644
index 9ecf76151..000000000
--- a/src/renderer/pages/Widget/SyncInfo.tsx
+++ /dev/null
@@ -1,525 +0,0 @@
-import { AnimatePresence, motion } from 'framer-motion';
-import { ReactNode, useContext, useEffect, useState } from 'react';
-
-import {
-  BackupExitReason,
-  BackupProgress,
-} from '../../../main/background-processes/backups';
-import { SyncStatus } from '../../../main/background-processes/sync';
-import {
-  ProcessErrorName,
-  ProcessInfoUpdatePayload,
-} from '../../../workers/types';
-import Error from '../../assets/error.svg';
-import syncedStackLight from '../../assets/illustrations/syncedStack-light.png';
-import syncedStackDark from '../../assets/illustrations/syncedStack-dark.png';
-import Success from '../../assets/success.svg';
-import Warn from '../../assets/warn.svg';
-import { Operation } from '../../components/FileWithOperation';
-import { useTranslationContext } from '../../context/LocalContext';
-import useBackupFatalErrors from '../../hooks/BackupFatalErrors';
-import useBackupStatus from '../../hooks/BackupStatus';
-import useProcessIssues from '../../hooks/ProcessIssues';
-import useSyncStatus from '../../hooks/SyncStatus';
-import useSyncStopped from '../../hooks/SyncStopped';
-import { shortMessages } from '../../messages/process-error';
-import { getPercentualProgress } from '../../utils/backups-progress';
-import { getBaseName, getExtension } from '../../utils/path';
-import { CircularProgressbar, buildStyles } from 'react-circular-progressbar';
-import {
-  Check,
-  ClockCounterClockwise,
-  WarningCircle,
-  X,
-} from '@phosphor-icons/react';
-import { fileIcon } from 'renderer/assets/icons/getIcon';
-import { DeviceContext } from 'renderer/context/DeviceContext';
-
-export default function SyncInfo() {
-  const [items, setItems] = useState<ProcessInfoUpdatePayload[]>([]);
-
-  const [syncStopped] = useSyncStopped();
-
-  const [backupsBannerVisible, setBackupsBannerVisible] = useState(false);
-
-  useEffect(() => {
-    const removeListener = window.electron.onSyncInfoUpdate(onSyncItem);
-
-    return removeListener;
-  }, []);
-
-  function onSyncStatusChanged(value: SyncStatus) {
-    if (value === 'RUNNING') {
-      clearItems();
-    }
-  }
-
-  useSyncStatus(onSyncStatusChanged);
-
-  function onSyncItem(item: ProcessInfoUpdatePayload) {
-    const MAX_ITEMS = 50;
-
-    setItems((currentItems) => {
-      const itemsWithoutGivenItem = currentItems.filter(
-        (i) => i.name !== item.name
-      );
-
-      const itemIsAnError = [
-        'UPLOAD_ERROR',
-        'DOWNLOAD_ERROR',
-        'RENAME_ERROR',
-        'DELETE_ERROR',
-        'METADATA_READ_ERROR',
-      ].includes(item.action);
-
-      const newItems = itemIsAnError
-        ? itemsWithoutGivenItem
-        : [item, ...itemsWithoutGivenItem].slice(0, MAX_ITEMS);
-
-      return newItems;
-    });
-  }
-
-  function clearItems() {
-    setItems((current) =>
-      current.filter((item) =>
-        ['UPLOADING', 'DOWNLOADING', 'RENAMING', 'DELETING'].includes(
-          item.action
-        )
-      )
-    );
-  }
-
-  function removeOnProgressItems() {
-    setItems((currentItems) => {
-      return currentItems.filter(
-        (item) =>
-          item.action !== 'UPLOADING' &&
-          item.action !== 'DOWNLOADING' &&
-          item.action !== 'RENAMING' &&
-          item.action !== 'DELETING'
-      );
-    });
-  }
-
-  useEffect(() => {
-    if (syncStopped) {
-      removeOnProgressItems();
-    }
-  }, [syncStopped]);
-
-  return (
-    <div className="no-scrollbar relative flex flex-1 flex-col overflow-y-auto">
-      {/* <div className="absolute left-0 top-0 flex w-full justify-end p-1">
-        <button
-          tabIndex={0}
-          type="button"
-          className={`select-none rounded bg-gray-5 px-2 text-xs font-medium text-gray-50 hover:text-gray-80 ${
-            items.length === 0 ? 'opacity-0' : ''
-          }`}
-          onClick={clearItems}
-          disabled={items.length === 0}
-        >
-          Clear
-        </button>
-      </div> */}
-      {/* [BACKUPS] widget info disabled while beta developing */}
-      {/* <BackupsBanner
-        onVisibilityChanged={setBackupsBannerVisible}
-        className={items.length > 0 ? 'mt-8' : ''}
-      /> */}
-      {items.length === 0 && !backupsBannerVisible && <Empty />}
-      <div className="flex-1">
-        <AnimatePresence>
-          {items.map((item, i) => (
-            <AnimationWrapper key={item.name} i={i}>
-              <Item {...item} />
-            </AnimationWrapper>
-          ))}
-        </AnimatePresence>
-      </div>
-    </div>
-  );
-}
-
-function AnimationWrapper({ children, i }: { children: ReactNode; i: number }) {
-  return (
-    <motion.div
-      initial={{ opacity: 0 }}
-      animate={{ opacity: 1 }}
-      exit={{ opacity: 0, transition: { delay: i * 0.03 } }}
-      transition={{ duration: 0.25, ease: 'easeInOut' }}
-    >
-      {children}
-    </motion.div>
-  );
-}
-
-function Item({
-  name,
-  action,
-  progress,
-  errorName,
-}: ProcessInfoUpdatePayload & {
-  progress?: number;
-  errorName?: ProcessErrorName;
-}) {
-  const { translate } = useTranslationContext();
-  const progressDisplay = progress ? `${Math.ceil(progress * 100)}%` : '';
-
-  let operation: Operation | undefined;
-  if (
-    action === 'DELETING' ||
-    action === 'DELETED' ||
-    action === 'DELETE_ERROR'
-  ) {
-    operation = 'delete';
-  } else if (
-    action === 'DOWNLOADING' ||
-    action === 'DOWNLOADED' ||
-    action === 'DOWNLOAD_ERROR'
-  ) {
-    operation = 'download';
-  } else if (
-    action === 'UPLOADING' ||
-    action === 'UPLOADED' ||
-    action === 'UPLOAD_ERROR'
-  ) {
-    operation = 'upload';
-  } else if (
-    action === 'RENAMING' ||
-    action === 'RENAMED' ||
-    action === 'RENAME_ERROR'
-  ) {
-    operation = 'rename';
-  }
-
-  let description = '';
-
-  if (action === 'DOWNLOADING') {
-    description = progress
-      ? translate('widget.body.activity.operation.downloading')
-      : translate('widget.body.activity.operation.decrypting');
-  } else if (action === 'UPLOADING') {
-    description = progress
-      ? translate('widget.body.activity.operation.uploading')
-      : translate('widget.body.activity.operation.encrypting');
-  } else if (action === 'DOWNLOADED') {
-    description = translate('widget.body.activity.operation.downloaded');
-  } else if (action === 'UPLOADED') {
-    description = translate('widget.body.activity.operation.uploaded');
-  } else if (action === 'DELETING') {
-    description = translate('widget.body.activity.operation.deleting');
-  } else if (action === 'DELETED') {
-    description = translate('widget.body.activity.operation.deleted');
-  } else if (action === 'RENAMING') {
-    description = translate('widget.body.activity.operation.renaming');
-  } else if (action === 'RENAMED') {
-    description = translate('widget.body.activity.operation.renamed');
-  } else if (errorName) {
-    description = shortMessages[errorName];
-  }
-
-  return (
-    <div className="flex h-14 w-full px-3">
-      <div className="flex h-full flex-1 items-center space-x-3 truncate border-b border-gray-5">
-        <div className="flex h-8 w-8 items-center justify-center drop-shadow-sm">
-          {fileIcon(getExtension(name))}
-        </div>
-
-        <div className="flex flex-1 flex-col justify-center space-y-px truncate pr-[14px]">
-          <p
-            className="truncate text-sm text-gray-100"
-            title={getBaseName(name)}
-          >
-            {getBaseName(name)}
-          </p>
-          <p
-            className={`truncate text-xs text-gray-50 ${
-              action &&
-              (action === 'DELETE_ERROR' ||
-                action === 'DOWNLOAD_ERROR' ||
-                action === 'UPLOAD_ERROR' ||
-                action === 'RENAME_ERROR' ||
-                action === 'METADATA_READ_ERROR')
-                ? 'text-red'
-                : undefined
-            }`}
-            title={
-              action &&
-              (action === 'DELETE_ERROR' ||
-                action === 'DOWNLOAD_ERROR' ||
-                action === 'UPLOAD_ERROR' ||
-                action === 'RENAME_ERROR' ||
-                action === 'METADATA_READ_ERROR')
-                ? description
-                : undefined
-            }
-          >
-            {`${description} ${progressDisplay}`}
-          </p>
-        </div>
-
-        <div className="flex w-7 items-center justify-center">
-          {/* PROGRESS */}
-          {action &&
-            (action === 'UPLOADING' ||
-              action === 'DOWNLOADING' ||
-              action === 'RENAMING' ||
-              action === 'DELETING') && (
-              <CircularProgressbar
-                value={progress ?? 0}
-                minValue={0}
-                maxValue={1}
-                strokeWidth={16}
-                styles={buildStyles({
-                  pathTransitionDuration: 0.25,
-                  pathColor: 'rgb(var(--color-primary) / 1)',
-                  strokeLinecap: 'round',
-                })}
-                className="aspect-square w-6 rounded-full ring-4 ring-inset ring-primary/15 dark:ring-gray-10"
-              />
-            )}
-
-          {/* DONE */}
-          {action &&
-            (action === 'DELETED' ||
-              action === 'DOWNLOADED' ||
-              action === 'UPLOADED' ||
-              action === 'RENAMED') && (
-              <Check size={24} className="text-green" weight="bold" />
-            )}
-
-          {/* ERROR */}
-          {action &&
-            (action === 'DELETE_ERROR' ||
-              action === 'DOWNLOAD_ERROR' ||
-              action === 'UPLOAD_ERROR' ||
-              action === 'RENAME_ERROR' ||
-              action === 'METADATA_READ_ERROR') && (
-              <WarningCircle size={24} className="text-red" weight="regular" />
-            )}
-        </div>
-      </div>
-    </div>
-  );
-}
-
-function Empty() {
-  const { translate } = useTranslationContext();
-
-  return (
-    <AnimatePresence>
-      <motion.div
-        initial={{ opacity: 0 }}
-        animate={{ opacity: 1, transition: { delay: 0.4 } }}
-        exit={{ opacity: 0 }}
-        transition={{ duration: 0.5, ease: 'easeInOut' }}
-      >
-        <div className="trasform absolute left-1/2 top-1/2 flex w-full -translate-x-1/2 -translate-y-1/2 flex-col items-center space-y-6 text-center">
-          <div>
-            <img
-              src={syncedStackLight}
-              className="dark:hidden"
-              width={128}
-              draggable={false}
-            />
-            <img
-              src={syncedStackDark}
-              className="hidden dark:flex"
-              width={128}
-              draggable={false}
-            />
-          </div>
-
-          <div className="flex flex-col">
-            <p className="text-base font-medium text-gray-100">
-              {translate('widget.body.upToDate.title')}
-            </p>
-            <p className="text-sm text-gray-60">
-              {translate('widget.body.upToDate.subtitle')}
-            </p>
-          </div>
-        </div>
-      </motion.div>
-    </AnimatePresence>
-  );
-}
-
-function BackupsBanner({
-  className = '',
-  onVisibilityChanged,
-}: {
-  className?: string;
-  onVisibilityChanged: (value: boolean) => void;
-}) {
-  const [deviceState] = useContext(DeviceContext);
-  const status = useBackupStatus();
-  const { backupFatalErrors } = useBackupFatalErrors();
-  const issues = useProcessIssues().filter(
-    (issue) => issue.process === 'BACKUPS'
-  );
-
-  const [backupProgress, setBackupProgress] = useState<null | BackupProgress>(
-    null
-  );
-
-  const [hidden, setHidden] = useState(false);
-
-  useEffect(() => {
-    setHidden(false);
-  }, [status]);
-
-  const [lastExit, setLastExit] = useState<null | BackupExitReason>(null);
-
-  useEffect(() => {
-    const removeListener = window.electron.onBackupProgress(setBackupProgress);
-
-    return removeListener;
-  }, []);
-
-  useEffect(() => {
-    window.electron.getLastBackupExitReason().then(setLastExit);
-  }, [status]);
-
-  let body = '';
-  let percentage = '';
-  let action = '';
-
-  if (status === 'RUNNING' && backupProgress) {
-    body =
-      backupProgress.totalFolders > 1
-        ? `Backed up ${backupProgress.currentFolder - 1} out of ${
-            backupProgress.totalFolders
-          } folders`
-        : 'Backing up your folder';
-
-    const percentualProgress = getPercentualProgress(backupProgress);
-
-    percentage = `${percentualProgress.toFixed(0)}%`;
-  } else if (backupFatalErrors.length) {
-    body = 'At least one of your backups failed';
-    action = 'See more';
-  } else if (issues.length) {
-    body = 'Backup completed with issues';
-    action = 'See more';
-  } else if (lastExit === 'FORCED_BY_USER') {
-    body = 'Backup stopped';
-    action = 'Start again';
-  } else if (backupProgress) {
-    body =
-      backupProgress.totalFolders > 1
-        ? `Backed up ${backupProgress.totalFolders} folders`
-        : 'Backed up your folder';
-  }
-
-  let iconVariant: 'SUCCESS' | 'WARNING' | 'ERROR' | undefined;
-
-  if (
-    status === 'STANDBY' &&
-    issues.length === 0 &&
-    backupFatalErrors.length === 0 &&
-    lastExit === 'PROCESS_FINISHED'
-  ) {
-    iconVariant = 'SUCCESS';
-  } else if (backupFatalErrors.length) {
-    iconVariant = 'ERROR';
-  } else if (issues.length) {
-    iconVariant = 'WARNING';
-  }
-
-  const show = (status !== 'STANDBY' || backupProgress) && !hidden;
-
-  useEffect(() => {
-    onVisibilityChanged(show as boolean);
-  }, [status, backupProgress, hidden]);
-
-  function onClick() {
-    if (issues.length || backupFatalErrors.length) {
-      window.electron.openProcessIssuesWindow();
-    } else if (lastExit === 'FORCED_BY_USER') {
-      window.electron.startBackupsProcess();
-    } else {
-      window.electron.openSettingsWindow('BACKUPS');
-    }
-
-    if (status !== 'RUNNING') {
-      setHidden(true);
-    }
-  }
-
-  const BackupsIcon = ({
-    variant,
-  }: {
-    variant?: 'SUCCESS' | 'WARNING' | 'ERROR';
-  }) => {
-    return (
-      <div className="relative">
-        <ClockCounterClockwise
-          size={28}
-          weight="light"
-          className="text-gray-100"
-        />
-        {variant === 'SUCCESS' && (
-          <>
-            <div className="absolute bottom-0 right-0 h-3.5 w-3.5 rounded-full bg-white" />
-            <Success className="absolute bottom-0 right-0 h-3.5 w-3.5" />
-          </>
-        )}
-        {variant === 'WARNING' && (
-          <Warn className="absolute bottom-0 right-0 h-3.5 w-3.5" />
-        )}
-        {variant === 'ERROR' && (
-          <Error className="absolute bottom-0 right-0 h-3.5 w-3.5" />
-        )}
-      </div>
-    );
-  };
-
-  return (
-    <AnimatePresence>
-      {show && (
-        <motion.div
-          initial={{ opacity: 0 }}
-          animate={{ opacity: 1 }}
-          exit={{ opacity: 0 }}
-          transition={{ duration: 0.2, ease: 'easeInOut' }}
-          className={`group/backupsBanner relative flex px-3 pt-3 ${className}`}
-          role="none"
-          onClick={onClick}
-        >
-          <div className="flex h-16 flex-1 items-center space-x-2.5 truncate rounded-lg border border-gray-10 bg-gray-1 px-3 shadow-sm dark:bg-gray-5">
-            <BackupsIcon variant={iconVariant} />
-
-            <div className="flex flex-1 flex-col -space-y-0.5 truncate">
-              <div className="flex h-5 max-h-5 min-h-[20px] flex-1 items-start space-x-4 truncate">
-                <h1 className="flex-1 truncate text-sm font-medium leading-4 text-gray-100">
-                  {deviceState.status === 'SUCCESS'
-                    ? deviceState.device.name
-                    : 'Backup'}
-                </h1>
-
-                <X
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    setHidden(true);
-                  }}
-                  size={20}
-                  className={`hidden shrink-0 cursor-pointer text-gray-60 hover:text-gray-80 active:text-gray-60 ${
-                    status === 'STANDBY' ? 'group-hover/backupsBanner:flex' : ''
-                  }`}
-                />
-              </div>
-
-              <p className="truncate text-xs font-medium text-gray-60">
-                {body}
-                <span className="ml-1">{percentage}</span>
-                <span className="ml-1 text-primary">{action}</span>
-              </p>
-            </div>
-          </div>
-        </motion.div>
-      )}
-    </AnimatePresence>
-  );
-}
diff --git a/src/renderer/pages/Widget/index.tsx b/src/renderer/pages/Widget/index.tsx
deleted file mode 100644
index 74c16c402..000000000
--- a/src/renderer/pages/Widget/index.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import BackupsFatalErrorBanner from './BackupsErrorBanner';
-import Header from './Header';
-import SyncAction from './SyncAction';
-import SyncErrorBanner from './SyncErrorBanner';
-import SyncInfo from './SyncInfo';
-import useSyncStatus from '../../hooks/SyncStatus';
-import { useState } from 'react';
-import { SyncStatus } from '../../../main/background-processes/sync';
-import { SyncFailed } from './SyncFailed';
-import useVirtualDriveStatus from 'renderer/hooks/VirtualDriveStatus';
-import { VirtualDriveError } from './VirtualDriveError';
-import { MacOSVersionAvailableBanner } from './MacOSVersionAvailableBanner';
-import useClientPlatform from '../../hooks/ClientPlatform';
-
-export default function Widget() {
-  const [syncStatus, setSyncStatus] = useState<SyncStatus>('RUNNING');
-  useSyncStatus(setSyncStatus);
-
-  const platform = useClientPlatform();
-
-  const { status: virtualDriveStatus } = useVirtualDriveStatus();
-  const handleRetrySync = () => {
-    window.electron.startRemoteSync().catch((err) => {
-      reportError(err);
-    });
-  };
-
-  const handleRetryMountVirtualDrive = () => {
-    window.electron.retryVirtualDriveMount();
-  };
-
-  const displayErrorInWidget =
-    (virtualDriveStatus && virtualDriveStatus === 'FAILED_TO_MOUNT') ||
-    (syncStatus && syncStatus === 'FAILED');
-
-  const renderWidgetError = () => {
-    if (
-      virtualDriveStatus === 'FAILED_TO_MOUNT' ||
-      virtualDriveStatus === 'MOUNTING'
-    ) {
-      return (
-        <VirtualDriveError
-          status={virtualDriveStatus}
-          onRetryVirtualDriveMount={handleRetryMountVirtualDrive}
-        />
-      );
-    }
-
-    if (syncStatus === 'FAILED') {
-      return <SyncFailed onRetrySync={handleRetrySync} />;
-    }
-    return <></>;
-  };
-
-  return (
-    <div className="flex h-screen flex-col overflow-hidden">
-      <Header />
-      {platform === 'darwin' ? <MacOSVersionAvailableBanner /> : null}
-      <SyncErrorBanner />
-      <BackupsFatalErrorBanner />
-      {displayErrorInWidget ? renderWidgetError() : <SyncInfo />}
-      <SyncAction syncStatus={syncStatus} />
-    </div>
-  );
-}
diff --git a/src/renderer/utils/backups-progress.ts b/src/renderer/utils/backups-progress.ts
deleted file mode 100644
index 13a2bbff1..000000000
--- a/src/renderer/utils/backups-progress.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BackupProgress } from '../../main/background-processes/backups';
-
-export function getPercentualProgress(progress: BackupProgress) {
-  const partialProgress = progress.totalItems
-    ? progress.completedItems! / progress.totalItems
-    : 0;
-  const totalProgress =
-    (progress.currentFolder - 1 + partialProgress) / progress.totalFolders;
-
-  return totalProgress * 100;
-}
diff --git a/src/renderer/utils/query.ts b/src/renderer/utils/query.ts
deleted file mode 100644
index 09e566482..000000000
--- a/src/renderer/utils/query.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { AvaliableMethods } from '../../main/app-info/AvaliableAppQuery';
-import { AppQuery } from '../../main/app-info/service';
-import { StoredValues } from '../../main/config/service';
-
-export async function queryApp(
-  input: AvaliableMethods | AppQuery<AvaliableMethods>
-) {
-  const query =
-    typeof input === 'string'
-      ? ({ method: input, params: [] } as AppQuery<AvaliableMethods>)
-      : input;
-
-  return window.electron.query(query);
-}
-
-export async function getConfigKey(key: StoredValues) {
-  return window.electron.getConfigKey(key);
-}
diff --git a/src/shared/IPC/events/webdav.ts b/src/shared/IPC/events/webdav.ts
deleted file mode 100644
index cbde02e16..000000000
--- a/src/shared/IPC/events/webdav.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import { DriveFile } from 'main/database/entities/DriveFile';
-import { DriveFolder } from 'main/database/entities/DriveFolder';
-
-const trackedEvents = [
-  'delete',
-  'upload',
-  'download',
-  'preview',
-  'move',
-  'rename',
-] as const;
-export type TrackedWebdavServerEvents = Capitalize<
-  (typeof trackedEvents)[number]
->;
-
-const trackedEventsActions = [
-  'started',
-  'completed',
-  'aborted',
-  'error',
-] as const;
-type TrackedWebdavServerActions = Capitalize<
-  (typeof trackedEventsActions)[number]
->;
-
-export type TrackedWebdavServerEventsActions =
-  `${TrackedWebdavServerEvents} ${TrackedWebdavServerActions}`;
-
-export type WebdavErrorContext = {
-  action: TrackedWebdavServerEvents;
-  itemType: 'File' | 'Folder';
-  from: string;
-  root: string;
-};
-
-type WebdavServerEvents = {
-  WEBDAV_SERVER_START_SUCCESS: () => void;
-  WEBDAV_SERVER_START_ERROR: (err: Error) => void;
-  WEBDAV_SERVER_STOP_SUCCESS: () => void;
-  WEBDAV_SERVER_STOP_ERROR: (err: Error) => void;
-  WEBDAV_SERVER_ADDING_ROOT_FOLDER_ERROR: (err: Error) => void;
-};
-
-type WebdavVirtualDriveEvents = {
-  WEBDAV_VIRTUAL_DRIVE_RETRYING_MOUNT: () => void;
-  WEBDAV_VIRTUAL_DRIVE_STARTING: () => void;
-  WEBDAV_VIRTUAL_DRIVE_MOUNTED_SUCCESSFULLY: () => void;
-  WEBDAV_VIRTUAL_DRIVE_MOUNT_ERROR: (err: Error) => void;
-  WEBDAV_VIRTUAL_DRIVE_UNMOUNT_ERROR: (err: Error) => void;
-};
-
-type ProcessInfo = {
-  elapsedTime: number;
-  progress?: number;
-};
-
-export type WebdavFlowEvents = {
-  WEBDAV_FOLDER_CREATING: (payload: { name: string }) => void;
-  WEBDAV_FOLDER_CREATED: (payload: { name: string }) => void;
-  WEBDAV_FOLDER_RENAMING: (payload: {
-    oldName: string;
-    newName: string;
-  }) => void;
-  WEBDAV_FOLDER_RENAMED: (payload: {
-    oldName: string;
-    newName: string;
-  }) => void;
-  WEBDAV_FILE_UPLOADING: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    size: number;
-    processInfo: ProcessInfo;
-  }) => void;
-  WEBDAV_FILE_UPLOADED: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    size: number;
-    processInfo: ProcessInfo;
-  }) => void;
-  WEBDAV_FILE_DOWNLOADING: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    size: number;
-    processInfo: ProcessInfo;
-  }) => void;
-  WEBDAV_FILE_DOWNLOADED: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    size: number;
-    processInfo: ProcessInfo;
-  }) => void;
-  WEBDAV_FILE_DELETED: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    size: number;
-  }) => void;
-  WEBDAV_FILE_DELETING: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    size: number;
-  }) => void;
-  WEBDAV_FILE_RENAMING: (payload: {
-    nameWithExtension: string;
-    oldName: string;
-  }) => void;
-  WEBDAV_FILE_RENAMED: (payload: {
-    nameWithExtension: string;
-    oldName: string;
-  }) => void;
-  WEBDAV_FILE_MOVED: (payload: {
-    nameWithExtension: string;
-    folderName: string;
-  }) => void;
-  WEBDAV_FILE_OVERWRITED: (payload: { nameWithExtension: string }) => void;
-  WEBDAV_FILE_CLONNED: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    size: number;
-    processInfo: ProcessInfo;
-  }) => void;
-};
-
-export type WebdavFlowEventsErrors = {
-  WEBDAV_FILE_UPLOAD_ERROR: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    error: string;
-  }) => void;
-  WEBDAV_FILE_DOWNLOAD_ERROR: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    error: string;
-  }) => void;
-  WEBDAV_FILE_DELETE_ERROR: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    error: string;
-  }) => void;
-  WEBDAV_FILE_RENAME_ERROR: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    error: string;
-  }) => void;
-  WEBDAV_ACTION_ERROR: (err: Error, ctx: WebdavErrorContext) => void;
-};
-
-export type WebdavInvokableFunctions = {
-  GET_UPDATED_REMOTE_ITEMS: () => Promise<{
-    files: DriveFile[];
-    folders: DriveFolder[];
-  }>;
-  START_REMOTE_SYNC: () => Promise<void>;
-};
-
-export type WebDavProcessEvents = WebdavServerEvents &
-  WebdavVirtualDriveEvents &
-  WebdavFlowEvents &
-  WebdavFlowEventsErrors &
-  WebdavInvokableFunctions;
-
-export type WebdavMainEvents = {
-  START_WEBDAV_SERVER_PROCESS: () => void;
-  STOP_WEBDAV_SERVER_PROCESS: () => void;
-  RETRY_VIRTUAL_DRIVE_MOUNT: () => void;
-};
diff --git a/src/shared/types/Primitives.ts b/src/shared/types/Primitives.ts
deleted file mode 100644
index 299767c29..000000000
--- a/src/shared/types/Primitives.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type Primitives = string | number | boolean | null;
diff --git a/src/shared/types/Process.ts b/src/shared/types/Process.ts
deleted file mode 100644
index e7913b709..000000000
--- a/src/shared/types/Process.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type Process = 'SYNC' | 'BACKUPS';
diff --git a/src/shared/types/VirtualDriveStatus.ts b/src/shared/types/VirtualDriveStatus.ts
deleted file mode 100644
index 6aa60528a..000000000
--- a/src/shared/types/VirtualDriveStatus.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export enum VirtualDriveStatus {
-  MOUNTING = 'MOUNTING',
-  MOUNTED = 'MOUNTED',
-  FAILED_TO_MOUNT = 'FAILED_TO_MOUNT',
-  UNMOUNTED = 'UNMOUNTED',
-}
diff --git a/src/workers/backups/backups.ts b/src/workers/backups/backups.ts
deleted file mode 100644
index 747238599..000000000
--- a/src/workers/backups/backups.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import Logger from 'electron-log';
-import _ from 'lodash';
-
-import Process, { ProcessEvents, ProcessResult } from '../process';
-
-class Backups extends Process {
-  private static NUMBER_OF_PARALLEL_QUEUES_FOR_SMALL_FILES = 16;
-
-  private static NUMBER_OF_PARALLEL_QUEUES_FOR_MEDIUM_FILES = 6;
-
-  private static NUMBER_OF_PARALLEL_QUEUES_FOR_BIG_FILES = 2;
-
-  private static MAX_SMALL_FILE_SIZE = 1024 * 1024;
-
-  private static MAX_MEDIUM_FILE_SIZE = 20 * 1024 * 1024;
-
-  async run(): Promise<ProcessResult> {
-    this.emit('SMOKE_TESTING');
-
-    await this.local.smokeTest();
-    await this.remote.smokeTest();
-
-    this.emit('GENERATING_ACTIONS_NEEDED_TO_SYNC');
-
-    const { currentLocal, currentRemote } = await this.getCurrentListings({
-      emitErrors: true,
-    });
-
-    Logger.debug('Current local before', currentLocal);
-    Logger.debug('Current remote before', currentRemote);
-
-    const {
-      filesNotInLocal: deleteInRemote,
-      filesNotInRemote,
-      filesWithDifferentModtime,
-    } = this.getListingsDiff(currentLocal, currentRemote);
-
-    const pullFromRemote = filesNotInRemote.concat(filesWithDifferentModtime);
-
-    Logger.debug('Queue pull from remote', pullFromRemote);
-    Logger.debug('Queue delete from remote', deleteInRemote);
-
-    this.emit(
-      'ACTION_QUEUE_GENERATED',
-      pullFromRemote.length + deleteInRemote.length
-    );
-
-    function getChunkSize(numberOfFiles: number, numberOfQueues: number) {
-      return Math.ceil(numberOfFiles / numberOfQueues);
-    }
-
-    const smallFiles = pullFromRemote.filter(
-      (name) => currentLocal[name].size <= Backups.MAX_SMALL_FILE_SIZE
-    );
-    Logger.debug('Small files: ', smallFiles);
-
-    const smallFileChunks = _.chunk(
-      smallFiles,
-      getChunkSize(
-        smallFiles.length,
-        Backups.NUMBER_OF_PARALLEL_QUEUES_FOR_SMALL_FILES
-      )
-    );
-    Logger.debug('Small file chunks: ', smallFileChunks);
-
-    const smallFileQueues = smallFileChunks.map((chunk) =>
-      this.consumePullQueue(chunk, this.remote, this.local)
-    );
-
-    await Promise.all(smallFileQueues);
-
-    const mediumFiles = pullFromRemote.filter((name) => {
-      const { size } = currentLocal[name];
-
-      return (
-        size > Backups.MAX_SMALL_FILE_SIZE &&
-        size <= Backups.MAX_MEDIUM_FILE_SIZE
-      );
-    });
-    Logger.debug('Medium files: ', mediumFiles);
-
-    const mediumFileChunks = _.chunk(
-      mediumFiles,
-      getChunkSize(
-        mediumFiles.length,
-        Backups.NUMBER_OF_PARALLEL_QUEUES_FOR_MEDIUM_FILES
-      )
-    );
-    Logger.debug('Medium file chunks: ', mediumFileChunks);
-
-    const mediumFileQueues = mediumFileChunks.map((chunk) =>
-      this.consumePullQueue(chunk, this.remote, this.local)
-    );
-
-    await Promise.all(mediumFileQueues);
-
-    const bigFiles = pullFromRemote.filter(
-      (name) => currentLocal[name].size > Backups.MAX_MEDIUM_FILE_SIZE
-    );
-
-    Logger.debug('Big files: ', bigFiles);
-
-    const bigFileChunks = _.chunk(
-      bigFiles,
-      getChunkSize(
-        bigFiles.length,
-        Backups.NUMBER_OF_PARALLEL_QUEUES_FOR_BIG_FILES
-      )
-    );
-    Logger.debug('Big file chunks: ', bigFileChunks);
-
-    const bigFileQueues = bigFileChunks.map((chunk) =>
-      this.consumePullQueue(chunk, this.remote, this.local)
-    );
-
-    await Promise.all([
-      ...bigFileQueues,
-      this.consumeDeleteQueue(deleteInRemote, this.remote),
-    ]);
-
-    const result = await this.generateResult();
-
-    if (result.status === 'IN_SYNC') {
-      const { listing, ...rest } = result;
-
-      return rest;
-    }
-
-    return result;
-  }
-}
-
-interface BackupsEvents extends ProcessEvents {
-  ACTION_QUEUE_GENERATED: (totalItems: number) => void;
-}
-
-/**
- * Enable event typing
- */
-declare interface Backups {
-  on<U extends keyof BackupsEvents>(event: U, listener: BackupsEvents[U]): this;
-
-  emit<U extends keyof BackupsEvents>(
-    event: U,
-    ...args: Parameters<BackupsEvents[U]>
-  ): boolean;
-}
-
-export default Backups;
diff --git a/src/workers/backups/index.ts b/src/workers/backups/index.ts
deleted file mode 100644
index c64b73357..000000000
--- a/src/workers/backups/index.ts
+++ /dev/null
@@ -1,252 +0,0 @@
-import { ipcRenderer as electronIpcRenderer } from 'electron';
-import Logger from 'electron-log';
-
-import { getUser } from '../../main/auth/service';
-import configStore from '../../main/config';
-import { getClients } from '../../shared/HttpClient/backgroud-process-clients';
-import { getLocalFilesystem } from '../filesystems/local-filesystem';
-import { getRemoteFilesystem } from '../filesystems/remote-filesystem';
-import {
-  ProcessFatalError,
-  ProcessFatalErrorName,
-  ProcessIssue,
-} from '../types';
-import Backups from './backups';
-
-export type BackupsArgs = {
-  folderId: number;
-  path: string;
-  tmpPath: string;
-  backupsBucket: string;
-};
-
-export type BackupProgressIssue = ProcessIssue & {
-  folderId: number;
-};
-
-export interface BackupsEvents {
-  BACKUP_FATAL_ERROR: (
-    folderId: number,
-    errorName: ProcessFatalErrorName
-  ) => void;
-  BACKUP_PROGRESS: (payload: {
-    completedItems: number;
-    totalItems: number;
-  }) => void;
-  BACKUP_ISSUE: (issue: BackupProgressIssue) => void;
-  BACKUP_EXIT: (folderId: number) => void;
-  BACKUP_ACTION_DONE: () => void;
-  BACKUP_ACTION_QUEUE_GENERATED: ({
-    folderId,
-    items,
-  }: {
-    folderId: number;
-    items: number;
-  }) => void;
-}
-
-interface IpcRenderer {
-  send<U extends keyof BackupsEvents>(
-    event: U,
-    ...args: Parameters<BackupsEvents[U]>
-  ): void;
-  invoke(channel: 'get-backups-details'): Promise<BackupsArgs>;
-  invoke(channel: 'get-headers'): Promise<HeadersInit>;
-}
-
-const ipcRenderer = electronIpcRenderer as IpcRenderer;
-
-let completedItems = 0;
-let totalItems = 0;
-
-function onCompletedItem() {
-  completedItems++;
-  ipcRenderer.send('BACKUP_PROGRESS', { completedItems, totalItems });
-}
-
-async function setUp() {
-  const { tmpPath, path, folderId, backupsBucket } = await ipcRenderer.invoke(
-    'get-backups-details'
-  );
-  const headers = await ipcRenderer.invoke('get-headers');
-  const user = getUser();
-
-  if (!user) {
-    throw new Error('No user');
-  }
-
-  const clients = getClients();
-
-  const remote = getRemoteFilesystem({
-    baseFolderId: folderId,
-    headers,
-    bucket: backupsBucket,
-    mnemonic: configStore.get('mnemonic'),
-    userInfo: user,
-    clients,
-  });
-  const local = getLocalFilesystem(path, tmpPath);
-
-  const backups = new Backups(local, remote);
-
-  backups.on('SMOKE_TESTING', () => Logger.log('Smoke testing'));
-
-  backups.on('GENERATING_ACTIONS_NEEDED_TO_SYNC', () =>
-    Logger.log('Generating actions needed to sync')
-  );
-
-  backups.on('ACTION_QUEUE_GENERATED', (n) => {
-    totalItems = n;
-    ipcRenderer.send('BACKUP_ACTION_QUEUE_GENERATED', { folderId, items: n });
-  });
-
-  backups.on('PULLING_FILE', (name, progress, kind) => {
-    Logger.debug(`Pulling file ${name} from ${kind}: ${progress * 100}%`);
-  });
-
-  backups.on('FILE_PULLED', (name, kind) => {
-    onCompletedItem();
-    Logger.debug(`File ${name} pulled from ${kind}`);
-    ipcRenderer.send('BACKUP_ACTION_DONE');
-  });
-
-  backups.on('ERROR_PULLING_FILE', (name, kind, errorName, errorDetails) => {
-    Logger.error(
-      `Error pulling file in ${kind} (${errorName}), details: ${JSON.stringify(
-        errorDetails,
-        null,
-        2
-      )}`
-    );
-    ipcRenderer.send('BACKUP_ISSUE', {
-      action: 'PULL_ERROR',
-      kind,
-      name,
-      errorName,
-      errorDetails,
-      process: 'BACKUPS',
-      folderId,
-    });
-  });
-
-  backups.on('RENAMING_FILE', (oldName, newName, kind) => {
-    Logger.debug(`Renaming file ${oldName} -> ${newName} in ${kind}`);
-  });
-
-  backups.on('FILE_RENAMED', (oldName, newName, kind) => {
-    Logger.debug(`File ${oldName} renamed -> ${newName} in ${kind}`);
-    ipcRenderer.send('BACKUP_ACTION_DONE');
-  });
-
-  backups.on(
-    'ERROR_RENAMING_FILE',
-    (oldName, newName, kind, errorName, errorDetails) => {
-      Logger.error(
-        `Error renaming file ${oldName} -> ${newName} in ${kind} (${errorName}), details: ${JSON.stringify(
-          errorDetails,
-          null,
-          2
-        )}`
-      );
-    }
-  );
-
-  backups.on('DELETING_FILE', (name, kind) => {
-    Logger.debug(`Deleting file ${name} in ${kind}`);
-  });
-
-  backups.on('FILE_DELETED', (name, kind) => {
-    onCompletedItem();
-    Logger.debug(`Deleted file ${name} in ${kind}`);
-    ipcRenderer.send('BACKUP_ACTION_DONE');
-  });
-
-  backups.on('ERROR_DELETING_FILE', (name, kind, errorName, errorDetails) => {
-    Logger.error(
-      `Error deleting file ${name} in ${kind} (${errorName}), details: ${JSON.stringify(
-        errorDetails,
-        null,
-        2
-      )}`
-    );
-    ipcRenderer.send('BACKUP_ISSUE', {
-      action: 'DELETE_ERROR',
-      kind,
-      name,
-      errorName,
-      errorDetails,
-      process: 'BACKUPS',
-      folderId,
-    });
-  });
-
-  backups.on('DELETING_FOLDER', (name, kind) => {
-    Logger.debug(`Deleting folder ${name} in ${kind}`);
-  });
-
-  backups.on('FOLDER_DELETED', (name, kind) => {
-    Logger.debug(`Deleted folder ${name} in ${kind}`);
-    ipcRenderer.send('BACKUP_ACTION_DONE');
-  });
-
-  backups.on('ERROR_DELETING_FOLDER', (name, kind, errorName, errorDetails) =>
-    Logger.error(
-      `Error deleting folder ${name} in ${kind} (${errorName}), details: ${JSON.stringify(
-        errorDetails,
-        null,
-        2
-      )}`
-    )
-  );
-
-  backups.on(
-    'ERROR_READING_METADATA',
-    (name, kind, errorName, errorDetails) => {
-      Logger.error(
-        `Error reading metadata ${name} in ${kind} (${errorName}), details: ${JSON.stringify(
-          errorDetails,
-          null,
-          2
-        )}`
-      );
-      ipcRenderer.send('BACKUP_ISSUE', {
-        action: 'METADATA_READ_ERROR',
-        kind,
-        name,
-        errorName,
-        errorDetails,
-        process: 'BACKUPS',
-        folderId,
-      });
-    }
-  );
-
-  try {
-    await backups.run();
-    Logger.log(`Backup done, folderId: ${folderId} & path: ${path}`);
-    ipcRenderer.send('BACKUP_EXIT', folderId);
-  } catch (err) {
-    if (err instanceof ProcessFatalError) {
-      Logger.error(
-        `Backups fatal error (${err.name}), details: ${JSON.stringify(
-          err.details,
-          null,
-          2
-        )}`
-      );
-      ipcRenderer.send(
-        'BACKUP_FATAL_ERROR',
-        folderId,
-        err.name as ProcessFatalErrorName
-      );
-    } else {
-      Logger.error(
-        'Completely unhandled backups fatal error',
-        JSON.stringify(err, null, 2)
-      );
-      ipcRenderer.send('BACKUP_FATAL_ERROR', folderId, 'UNKNOWN');
-    }
-  }
-}
-
-setUp();
diff --git a/src/workers/backups/test/backups.test.ts b/src/workers/backups/test/backups.test.ts
deleted file mode 100644
index 1afa7dfb0..000000000
--- a/src/workers/backups/test/backups.test.ts
+++ /dev/null
@@ -1,191 +0,0 @@
-/* eslint-disable @typescript-eslint/no-empty-function */
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-nocheck
-import { Readable } from 'stream';
-
-import { FileSystem } from '../../types';
-import Backups from '../backups';
-
-describe('backups tests', () => {
-  const mockBase: () => FileSystem = () => ({
-    kind: 'LOCAL',
-    async getCurrentListing() {
-      return { listing: {}, readingMetaErrors: [] };
-    },
-    async deleteFile() {},
-    async pullFile() {},
-    async renameFile() {},
-    async existsFolder() {
-      return false;
-    },
-    async deleteFolder() {},
-    async getSource() {
-      return {
-        modTime: 4,
-        size: 4,
-        stream: {} as Readable,
-      };
-    },
-    async smokeTest() {},
-  });
-
-  function setupEventSpies(backups: Backups) {
-    const smokeTestingCB = jest.fn();
-    const generatingActionsCB = jest.fn();
-    const pullingFileCB = jest.fn();
-    const pulledFileCB = jest.fn();
-    const deletingFileCB = jest.fn();
-    const deletedFileCB = jest.fn();
-    const deletingFolderCB = jest.fn();
-    const deletedFolderCB = jest.fn();
-    const renamingFileCB = jest.fn();
-    const renamedFileCB = jest.fn();
-    const actionQueueGeneratedCB = jest.fn();
-
-    backups.on('SMOKE_TESTING', smokeTestingCB);
-    backups.on('GENERATING_ACTIONS_NEEDED_TO_SYNC', generatingActionsCB);
-    backups.on('PULLING_FILE', pullingFileCB);
-    backups.on('FILE_PULLED', pulledFileCB);
-    backups.on('DELETING_FILE', deletingFileCB);
-    backups.on('FILE_DELETED', deletedFileCB);
-    backups.on('DELETING_FOLDER', deletingFolderCB);
-    backups.on('FOLDER_DELETED', deletedFolderCB);
-    backups.on('RENAMING_FILE', renamingFileCB);
-    backups.on('FILE_RENAMED', renamedFileCB);
-    backups.on('ACTION_QUEUE_GENERATED', actionQueueGeneratedCB);
-
-    return {
-      smokeTestingCB,
-      generatingActionsCB,
-      pullingFileCB,
-      pulledFileCB,
-      deletingFileCB,
-      deletedFileCB,
-      deletingFolderCB,
-      deletedFolderCB,
-      renamingFileCB,
-      renamedFileCB,
-      actionQueueGeneratedCB,
-    };
-  }
-
-  it('should run correctly', async () => {
-    const local: FileSystem = {
-      ...mockBase(),
-      async getCurrentListing() {
-        return {
-          listing: {
-            notExistInLocal: { modtime: 40, size: 1 },
-            existInBothButIsTheSame: { modtime: 30, size: 1 },
-            'folder/nested/existInBoth.txt': { modtime: 44, size: 1 },
-          },
-          readingMetaErrors: [],
-        };
-      },
-    };
-
-    const remote: FileSystem = {
-      ...mockBase(),
-      async getCurrentListing() {
-        return {
-          listing: {
-            notExistInRemote: { modtime: 40, size: 1 },
-            existInBothButIsTheSame: { modtime: 30, size: 1 },
-            'folder/nested/existInBoth.txt': { modtime: 55, size: 1 },
-          },
-          readingMetaErrors: [],
-        };
-      },
-    };
-
-    const backups = new Backups(local, remote);
-
-    const {
-      smokeTestingCB,
-      generatingActionsCB,
-      pullingFileCB,
-      pulledFileCB,
-      deletingFileCB,
-      deletedFileCB,
-      renamingFileCB,
-      renamedFileCB,
-      actionQueueGeneratedCB,
-    } = setupEventSpies(backups);
-
-    const spyRemotePull = jest.spyOn(remote, 'pullFile');
-
-    const spyRemoteDelete = jest.spyOn(remote, 'deleteFile');
-
-    await backups.run();
-
-    expect(spyRemotePull).toHaveBeenCalledTimes(2);
-
-    expect(spyRemotePull).toHaveBeenNthCalledWith(
-      1,
-      'notExistInLocal',
-      expect.anything(),
-      expect.anything(),
-      expect.anything()
-    );
-
-    expect(spyRemotePull).toHaveBeenNthCalledWith(
-      2,
-      'folder/nested/existInBoth.txt',
-      expect.anything(),
-      expect.anything(),
-      expect.anything()
-    );
-
-    expect(spyRemoteDelete).toHaveBeenCalledWith('notExistInRemote');
-
-    expect(smokeTestingCB).toBeCalledTimes(1);
-    expect(generatingActionsCB).toBeCalledTimes(1);
-    expect(pullingFileCB).toBeCalledTimes(2);
-    expect(pulledFileCB).toBeCalledTimes(2);
-    expect(deletingFileCB).toBeCalledTimes(1);
-    expect(deletedFileCB).toBeCalledTimes(1);
-    expect(renamingFileCB).toBeCalledTimes(0);
-    expect(renamedFileCB).toBeCalledTimes(0);
-    expect(actionQueueGeneratedCB).toBeCalledTimes(1);
-  });
-
-  it('should emit a fatal error if get current listings fails', async () => {
-    expect.assertions(1);
-
-    const fsFailing = mockBase();
-    const backups = new Backups(fsFailing, mockBase());
-
-    jest.spyOn(fsFailing, 'getCurrentListing').mockImplementation(async () => {
-      throw new Error();
-    });
-
-    try {
-      await backups.run();
-    } catch (err) {
-      expect(err.name).toBe('CANNOT_GET_CURRENT_LISTINGS');
-    }
-  });
-
-  it('Emits BACKUP_FATAL_ERROR when a file is empty', async () => {
-    const fsFailing = mockBase();
-    const fatalCB = jest.fn();
-
-    jest.spyOn(fsFailing, 'getCurrentListing').mockResolvedValueOnce({
-      listing: {},
-      readingMetaErrors: [
-        {
-          name: 'my file is awesome',
-          errorName: 'TEST_ERROR',
-          errorDetails: 'duno',
-        },
-      ],
-    });
-
-    const backups = new Backups(fsFailing, mockBase());
-    backups.on('ERROR_READING_METADATA', fatalCB);
-
-    const result = await backups.run();
-    expect(fatalCB).toBeCalledTimes(1);
-    expect.assertions(1);
-  });
-});
diff --git a/src/workers/filesystems/domain/FileSystem.ts b/src/workers/filesystems/domain/FileSystem.ts
deleted file mode 100644
index f8d3b73ff..000000000
--- a/src/workers/filesystems/domain/FileSystem.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-/* eslint-disable no-unused-vars */
-import { PartialListing } from '../../sync/Listings/domain/Listing';
-import {
-  FileSystemKind,
-  FileSystemProgressCallback,
-  ReadingMetaErrorEntry,
-  Source,
-} from '../../types';
-
-export interface FileSystem<T extends PartialListing> {
-  /**
-   * The kind of filesystem, it's emitted
-   * in some fs events
-   */
-  kind: FileSystemKind;
-
-  /**
-   * Returns the listing of the current files
-   * in this FileSystem
-   */
-  getCurrentListing(): Promise<{
-    listing: T;
-    readingMetaErrors: ReadingMetaErrorEntry[];
-  }>;
-
-  /**
-   * Renames a file in the FileSystem
-   * @param oldName
-   * @param newName
-   */
-  renameFile(oldName: string, newName: string): Promise<void>;
-
-  /**
-   * Deletes a file in the FileSystem,
-   * doesn't throw if the file doesn't exist anymore
-   * @param name
-   */
-  deleteFile(name: string): Promise<void>;
-
-  /**
-   * Pulls a file from other FileSystem into this FileSystem,
-   * overwriting it if already exists
-   * @param name
-   * @param source
-   * @param progressCallback
-   */
-  pullFile(
-    name: string,
-    source: Source,
-    progressCallback: FileSystemProgressCallback,
-    abortSignal?: AbortSignal
-  ): Promise<number | void>;
-
-  /**
-   * Creates a folder into this FileSystem and updates its modtime
-   * @param name
-   * @param modtime
-   */
-  pullFolder(name: string, modtime: number): Promise<void>;
-
-  /**
-   * Checks if a folder exists in the filesystem
-   * @param name
-   */
-  existsFolder(name: string): Promise<boolean>;
-
-  /**
-   * Deletes a folder in the filesystem
-   * doesn't throw if the folder doesn't exist anymore
-   * @param name
-   */
-  deleteFolder(name: string): Promise<void>;
-
-  /**
-   * Returns an object source that contains
-   * anything that another filesystem would need
-   * to pull it
-   * @param name
-   * @param progressCallback
-   */
-  getSource(
-    name: string,
-    progressCallback: FileSystemProgressCallback
-  ): Promise<Source>;
-
-  /**
-   * Check critical resources of this filesystem
-   * and throw an error if it's not operative
-   */
-  smokeTest(): Promise<void>;
-
-  getFolderData(folderFullPath: string): Promise<{ modtime: number }>;
-}
diff --git a/src/workers/filesystems/domain/Transfer.ts b/src/workers/filesystems/domain/Transfer.ts
deleted file mode 100644
index 0326bdfca..000000000
--- a/src/workers/filesystems/domain/Transfer.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export enum TransferLimits {
-  MultipartUploadThreshold = 5 * 1024 * 1024 * 1024,
-  UploadFileSize = 10 * 1024 * 1024 * 1024,
-}
diff --git a/src/workers/filesystems/local-filesystem.ts b/src/workers/filesystems/local-filesystem.ts
deleted file mode 100644
index d4b59e25d..000000000
--- a/src/workers/filesystems/local-filesystem.ts
+++ /dev/null
@@ -1,362 +0,0 @@
-import Logger from 'electron-log';
-import { constants, createReadStream, createWriteStream } from 'fs';
-import * as fs from 'fs/promises';
-import ignore from 'ignore';
-import path from 'path';
-import glob from 'tiny-glob';
-import * as uuid from 'uuid';
-
-import ignoredFiles from '../../../ignored-files.json';
-import {
-  FileSystem,
-  Listing,
-  ProcessError,
-  ProcessFatalError,
-  ReadingMetaErrorEntry,
-  Source,
-} from '../types';
-import { getDateFromSeconds } from '../utils/date';
-import { fileNameIsValid } from '../utils/name-verification';
-import { createErrorDetails } from '../utils/reporting';
-
-export function getLocalFilesystem(
-  localPath: string,
-  tempDirectory: string
-): FileSystem {
-  /**
-   *
-   * @param actualPath OS Specific absolute path
-   * @returns Listing path relative to localPath with '/' as separator
-   */
-  function getListingPath(actualPath: string) {
-    return actualPath.split(localPath)[1].replaceAll(path.sep, '/');
-  }
-
-  /**
-   *
-   * @param listingPath Relative to localPath with '/' as separator
-   * @returns OS Specific absolute path
-   */
-  function getActualPath(listingPath: string) {
-    const osSpecificRelative = listingPath.replaceAll('/', path.sep);
-
-    return path.join(localPath, osSpecificRelative);
-  }
-
-  async function saferRenameFile(oldPath: string, newPath: string) {
-    try {
-      await fs.rename(oldPath, newPath);
-    } catch (e) {
-      const err = e as { code?: string };
-      if (err.code === 'EXDEV') {
-        await fs.copyFile(oldPath, newPath);
-        await fs.unlink(oldPath);
-      } else {
-        throw new ProcessError(
-          'UNKNOWN',
-          createErrorDetails(
-            err,
-            'Doing a safe rename',
-            `oldPath: ${oldPath}, newPath: ${newPath}`
-          )
-        );
-      }
-    }
-  }
-
-  function getTempFilePath() {
-    return path.join(tempDirectory, `${uuid.v4()}.tmp`);
-  }
-
-  async function getLocalMeta(
-    pathname: string
-  ): Promise<{ modTimeInSeconds: number; size: number }> {
-    const stat = await fs.stat(pathname);
-
-    return {
-      modTimeInSeconds: Math.trunc(stat.mtimeMs / 1000),
-      size: stat.size,
-    };
-  }
-
-  return {
-    kind: 'LOCAL',
-    async getCurrentListing() {
-      const ig = ignore().add(ignoredFiles);
-
-      const list = (
-        await glob('**', {
-          filesOnly: true,
-          absolute: true,
-          dot: true,
-          cwd: localPath,
-        })
-      ).filter((fileName) => {
-        const relativeFileName = path.relative(localPath, fileName);
-
-        if (ig.ignores(relativeFileName)) {
-          return false;
-        }
-
-        const isValid = fileNameIsValid(relativeFileName);
-        if (!isValid) {
-          Logger.warn(
-            `${this.kind} file with name ${relativeFileName} will be ignored due an invalid name`
-          );
-
-          return false;
-        }
-
-        return true;
-      });
-
-      const listing: Listing = {};
-      const readingMetaErrors: ReadingMetaErrorEntry[] = [];
-
-      for (const fileName of list) {
-        const relativeName = getListingPath(fileName);
-        try {
-          const { modTimeInSeconds, size } = await getLocalMeta(fileName);
-
-          if (size) {
-            listing[relativeName] = { modtime: modTimeInSeconds, size };
-          } else {
-            const emptyFileError = {
-              message: 'Internxt does not support empty files',
-              code: '',
-              stack: '',
-            };
-            readingMetaErrors.push({
-              name: relativeName,
-              errorName: 'EMPTY_FILE',
-              errorDetails: createErrorDetails(
-                emptyFileError,
-                'Reading metadata of file',
-                `Size of file is ${size}`
-              ),
-            });
-          }
-        } catch (e) {
-          const err = e as { code?: string };
-
-          readingMetaErrors.push({
-            name: relativeName,
-            errorName: err.code === 'EPERM' ? 'NO_PERMISSION' : 'UNKNOWN',
-            errorDetails: createErrorDetails(
-              err,
-              'Reading metadata of file',
-              `File name is ${fileName}`
-            ),
-          });
-        }
-      }
-
-      return { listing, readingMetaErrors };
-    },
-
-    async deleteFile(name: string) {
-      const actualPath = getActualPath(name);
-      try {
-        await fs.unlink(actualPath);
-      } catch (e) {
-        const err = e as { code?: string };
-
-        if (err.code !== 'ENOENT') {
-          throw new ProcessError(
-            'UNKNOWN',
-            createErrorDetails(err, 'Deleting a file locally', `Name: ${name}`)
-          );
-        }
-      }
-    },
-
-    pullFile(name: string, source: Source) {
-      return new Promise((resolve, reject) => {
-        const tmpFilePath = getTempFilePath();
-
-        const { stream, ...sourceWithoutStream } = source;
-
-        Logger.debug(`Downloading ${name} to temp location ${tmpFilePath}`);
-
-        const writeStream = createWriteStream(tmpFilePath);
-
-        stream.on('data', (chunk) => writeStream.write(chunk));
-
-        stream.on('error', (err) => {
-          reject(
-            new ProcessError(
-              'UNKNOWN',
-              createErrorDetails(
-                err,
-                'Pulling file locally',
-                `Name: ${name}, source: ${JSON.stringify(
-                  sourceWithoutStream,
-                  null,
-                  2
-                )}`
-              )
-            )
-          );
-        });
-
-        stream.on('end', async () => {
-          try {
-            writeStream.close();
-
-            const actualPath = getActualPath(name);
-
-            await fs.mkdir(path.parse(actualPath).dir, { recursive: true });
-
-            await saferRenameFile(tmpFilePath, actualPath);
-
-            const modTime = getDateFromSeconds(source.modTime);
-            fs.utimes(actualPath, modTime, modTime);
-
-            resolve();
-          } catch (err) {
-            if (err instanceof ProcessError) {
-              reject(err);
-            } else {
-              reject(
-                new ProcessError(
-                  'UNKNOWN',
-                  createErrorDetails(
-                    err,
-                    'Making local directory if needed and updating local modtime',
-                    `Name: ${name}, source: ${JSON.stringify(
-                      sourceWithoutStream,
-                      null,
-                      2
-                    )}`
-                  )
-                )
-              );
-            }
-          }
-        });
-      });
-    },
-
-    renameFile(oldName: string, newName: string) {
-      const oldActualPath = getActualPath(oldName);
-      const newActualPath = getActualPath(newName);
-
-      return saferRenameFile(oldActualPath, newActualPath);
-    },
-
-    async existsFolder(name: string): Promise<boolean> {
-      const actualPath = getActualPath(name);
-      try {
-        await fs.access(actualPath);
-
-        return true;
-      } catch {
-        return false;
-      }
-    },
-
-    deleteFolder(name: string): Promise<void> {
-      const actualPath = getActualPath(name);
-
-      return fs.rm(actualPath, { recursive: true, force: true });
-    },
-
-    async getSource(name: string): Promise<Source> {
-      const actualPath = getActualPath(name);
-      const tmpFilePath = getTempFilePath();
-
-      let modTime: number | undefined;
-      let size: number | undefined;
-
-      try {
-        const localMeta = await getLocalMeta(actualPath);
-        modTime = localMeta.modTimeInSeconds;
-        size = localMeta.size;
-
-        await fs.copyFile(actualPath, tmpFilePath);
-      } catch (e) {
-        const err = e as { code?: string };
-        const action =
-          'Getting local meta and copying file to a temp directory';
-        const additional = `Actual path: ${actualPath}, temp path: ${tmpFilePath}, size: ${size}, modTime: ${modTime}`;
-        if (err.code === 'ENOENT') {
-          throw new ProcessError(
-            'NOT_EXISTS',
-            createErrorDetails(err, action, additional)
-          );
-        } else if (err.code === 'EACCES') {
-          throw new ProcessError(
-            'NO_PERMISSION',
-            createErrorDetails(err, action, additional)
-          );
-        } else {
-          throw new ProcessError(
-            'UNKNOWN',
-            createErrorDetails(err, action, additional)
-          );
-        }
-      }
-
-      const stream = createReadStream(tmpFilePath);
-
-      const onEndOrError = () => fs.unlink(tmpFilePath);
-
-      stream.once('end', onEndOrError);
-      stream.once('error', onEndOrError);
-
-      Logger.debug(`Uploading ${name} from temp location ${tmpFilePath}`);
-
-      return { stream, modTime, size };
-    },
-
-    async smokeTest() {
-      try {
-        await fs.access(localPath, constants.R_OK | constants.W_OK);
-        await fs.lstat(localPath);
-      } catch (err) {
-        const systemError = err as { code?: string };
-        if (systemError.code === 'ENOENT') {
-          throw new ProcessFatalError(
-            'BASE_DIRECTORY_DOES_NOT_EXIST',
-            createErrorDetails(
-              err,
-              'Error accessing local base directory',
-              `localPath: ${localPath}`
-            )
-          );
-        }
-        if (systemError.code === 'EACCES') {
-          throw new ProcessFatalError(
-            'INSUFICIENT_PERMISION_ACCESSING_BASE_DIRECTORY',
-            createErrorDetails(
-              err,
-              'Error accessing local base directory',
-              `localPath: ${localPath}`
-            )
-          );
-        }
-        throw new ProcessFatalError(
-          'CANNOT_ACCESS_BASE_DIRECTORY',
-          createErrorDetails(
-            err,
-            'Error accessing local base directory',
-            `localPath: ${localPath}`
-          )
-        );
-      }
-
-      try {
-        await fs.access(tempDirectory, constants.R_OK | constants.W_OK);
-      } catch (err) {
-        throw new ProcessFatalError(
-          'CANNOT_ACCESS_TMP_DIRECTORY',
-          createErrorDetails(
-            err,
-            'Error accessing local temp directory',
-            `localPath: ${tempDirectory}`
-          )
-        );
-      }
-    },
-  };
-}
diff --git a/src/workers/filesystems/remote-filesystem.ts b/src/workers/filesystems/remote-filesystem.ts
deleted file mode 100644
index 2a6b51edf..000000000
--- a/src/workers/filesystems/remote-filesystem.ts
+++ /dev/null
@@ -1,698 +0,0 @@
-import { Environment } from '@internxt/inxt-js';
-import { ipcRenderer } from 'electron';
-import Logger from 'electron-log';
-import EventEmitter from 'events';
-import path from 'path';
-import { Readable } from 'stream';
-import * as uuid from 'uuid';
-
-import { AuthorizedClients } from '../../shared/HttpClient/Clients';
-import { FileCreatedResponseDTO } from '../../shared/HttpClient/responses/file-created';
-import {
-  FileSystem,
-  FileSystemProgressCallback,
-  Listing,
-  ProcessError,
-  ProcessFatalError,
-  ReadingMetaErrorEntry,
-  Source,
-} from '../types';
-import crypt from '../utils/crypt';
-import { getDateFromSeconds, getSecondsFromDateString } from '../utils/date';
-import httpRequest from '../utils/http-request';
-import isOnline from '../utils/is-online';
-import { fileNameIsValid } from '../utils/name-verification';
-import { createErrorDetails, serializeRes } from '../utils/reporting';
-import { TransferLimits } from './domain/Transfer';
-
-/**
- * Server cannot find a file given its route,
- * while we traverse the tree we also store in a cache
- * the info of every file by its route so we can operate with them
- */
-type RemoteCache = Record<
-  string,
-  {
-    id: number;
-    parentId: number;
-    isFolder: boolean;
-    bucket: string | null;
-    fileId?: string;
-    modificationTime?: number;
-    size?: number;
-  }
->;
-
-type ServerFile = {
-  bucket: string;
-  createdAt: string;
-  encrypt_version: string;
-  fileId: string;
-  folderId: number;
-  id: number;
-  modificationTime: string;
-  name: string;
-  size: number;
-  type: string;
-  updatedAt: string;
-  userId: number;
-};
-
-type ServerFolder = {
-  bucket: string | null;
-  created_at: string;
-  id: number;
-  name: string;
-  parent_id: null | number;
-  updated_at: string;
-};
-
-export function getRemoteFilesystem({
-  baseFolderId,
-  headers,
-  userInfo,
-  mnemonic,
-  bucket,
-  clients,
-}: {
-  baseFolderId: number;
-  headers: HeadersInit;
-  userInfo: { email: string; userId: string; bridgeUser: string };
-  mnemonic: string;
-  bucket: string;
-  clients: AuthorizedClients;
-}): FileSystem {
-  const cache: RemoteCache = {};
-  const createFolderQueue = new EventEmitter().setMaxListeners(0);
-
-  async function getTree(): Promise<{
-    files: ServerFile[];
-    folders: ServerFolder[];
-  }> {
-    const PAGE_SIZE = 5000;
-
-    let thereIsMore = true;
-    let offset = 0;
-
-    const files: ServerFile[] = [];
-    const folders: ServerFolder[] = [];
-
-    while (thereIsMore) {
-      try {
-        const batch = await httpRequest(
-          `${process.env.API_URL}/api/desktop/list/${offset}`,
-          {
-            method: 'GET',
-            headers,
-          }
-        ).then((res) => res.json());
-
-        // We can't use spread operator with big arrays
-        // see: https://anchortagdev.com/range-error-maximum-call-stack-size-exceeded-error-using-spread-operator-in-node-js-javascript/
-
-        for (const file of batch.files) {
-          files.push(file);
-        }
-
-        for (const folder of batch.folders) {
-          folders.push(folder);
-        }
-
-        thereIsMore = batch.folders.length === PAGE_SIZE;
-
-        if (thereIsMore) {
-          offset += PAGE_SIZE;
-        }
-      } catch (err) {
-        await handleFetchError(err, 'Fetching tree', `offset: ${offset}`);
-      }
-    }
-
-    return { files, folders };
-  }
-
-  async function handleFetchError(
-    err: any,
-    action: string,
-    additionalInfo?: string
-  ) {
-    if (err instanceof ProcessError) {
-      throw err;
-    }
-
-    const details = createErrorDetails(err, action, additionalInfo);
-
-    if (await isOnline()) {
-      throw new ProcessError('NO_REMOTE_CONNECTION', details);
-    } else {
-      throw new ProcessError('NO_INTERNET', details);
-    }
-  }
-
-  return {
-    kind: 'REMOTE',
-
-    async getCurrentListing() {
-      const tree = await getTree();
-
-      const listing: Listing = {};
-      const readingMetaErrors: Array<ReadingMetaErrorEntry> = [];
-
-      traverse(baseFolderId);
-
-      function traverse(currentId: number, currentName = '') {
-        const filesInThisFolder = tree.files.filter(
-          (file) => file.folderId === currentId
-        );
-        const foldersInThisFolder = tree.folders.filter(
-          (folder) => folder.parent_id === currentId
-        );
-
-        filesInThisFolder
-          .map((file) => ({
-            name:
-              currentName +
-              crypt.decryptName(
-                file.name,
-                file.folderId.toString(),
-                file.encrypt_version
-              ) +
-              (file.type ? `.${file.type}` : ''),
-            file,
-          }))
-          .filter(({ name }) => {
-            const isValid = fileNameIsValid(name);
-
-            if (!isValid) {
-              Logger.warn(
-                `REMOTE file with name ${name} will be ignored due an invalid name`
-              );
-
-              return false;
-            }
-
-            return true;
-          })
-          .forEach(({ file, name }) => {
-            const modificationTime = getSecondsFromDateString(
-              file.modificationTime
-            );
-            listing[name] = { modtime: modificationTime, size: file.size };
-            cache[name] = {
-              id: file.id,
-              parentId: file.folderId,
-              isFolder: false,
-              bucket: file.bucket,
-              fileId: file.fileId,
-              modificationTime,
-              size: file.size,
-            };
-          });
-
-        foldersInThisFolder.forEach((folder) => {
-          const name =
-            currentName +
-            crypt.decryptName(
-              folder.name,
-              (folder.parent_id as number).toString(),
-              '03-aes'
-            );
-          cache[name] = {
-            id: folder.id,
-            parentId: folder.parent_id as number,
-            isFolder: true,
-            bucket: folder.bucket,
-          };
-          traverse(folder.id, `${name}/`);
-        });
-      }
-
-      return { listing, readingMetaErrors };
-    },
-
-    async deleteFile(name: string): Promise<void> {
-      const fileInCache = cache[name];
-
-      const result = await clients.newDrive.post(
-        `${process.env.NEW_DRIVE_URL}/drive/storage/trash/add`,
-        {
-          items: [
-            {
-              type: 'file',
-              id: fileInCache.fileId,
-            },
-          ],
-        }
-      );
-
-      if (result.status !== 200) {
-        await handleFetchError(
-          result.data(),
-          'Moving remote file to trash',
-          `Name: ${name}, fileInCache: ${JSON.stringify(fileInCache, null, 2)}`
-        );
-      }
-    },
-
-    async renameFile(oldName: string, newName: string): Promise<void> {
-      const fileInCache = cache[oldName];
-      const newNameBase = path.parse(newName).name;
-
-      try {
-        const res = await httpRequest(
-          `${process.env.API_URL}/api/storage/file/${fileInCache.fileId}/meta`,
-          {
-            method: 'POST',
-            headers: { ...headers, 'internxt-mnemonic': mnemonic },
-            body: JSON.stringify({
-              metadata: { itemName: newNameBase },
-              bucketId: fileInCache.bucket,
-              relativePath: uuid.v4(),
-            }),
-          }
-        );
-        if (!res.ok) {
-          throw new ProcessError(
-            'BAD_RESPONSE',
-            createErrorDetails(
-              {},
-              'Renaming remote file',
-              `oldName: ${oldName}, newName: ${newName}, fileInCache: ${JSON.stringify(
-                fileInCache,
-                null,
-                2
-              )}, res: ${await serializeRes(res)}`
-            )
-          );
-        }
-        delete cache[oldName];
-        cache[newName] = fileInCache;
-      } catch (err) {
-        await handleFetchError(
-          err,
-          'Renaming remote file',
-          `oldName: ${oldName}, newName: ${newName}, fileInCache: ${JSON.stringify(
-            fileInCache,
-            null,
-            2
-          )}`
-        );
-      }
-    },
-
-    async pullFile(
-      name: string,
-      source: Source,
-      progressCallback: (progress: number) => void
-    ): Promise<number> {
-      const { size, modTime: modTimeInSeconds } = source;
-      const route = name.split('/');
-
-      const { name: baseNameWithoutExt, ext } = path.parse(
-        route.pop() as string
-      );
-      const fileType = ext.slice(1);
-
-      let lastParentId = baseFolderId;
-
-      if (route.length > 0) {
-        for (const [i, folderName] of route.entries()) {
-          const routeToThisPoint = route.slice(0, i + 1).join('/');
-
-          const folderInCache = cache[routeToThisPoint];
-
-          if (folderInCache) {
-            lastParentId = folderInCache.id;
-          } else {
-            if (createFolderQueue.listeners(routeToThisPoint).length === 0) {
-              httpRequest(`${process.env.API_URL}/api/storage/folder`, {
-                method: 'POST',
-                headers,
-                body: JSON.stringify({
-                  folderName,
-                  parentFolderId: lastParentId,
-                }),
-              })
-                .then(async (res) => {
-                  if (!res.ok) {
-                    throw new ProcessError(
-                      'BAD_RESPONSE',
-                      createErrorDetails(
-                        {},
-                        'Creating folder in drive server',
-                        `res: ${await serializeRes(
-                          res
-                        )}, folderName: ${folderName}, parentFolderId: ${lastParentId}`
-                      )
-                    );
-                  } else {
-                    return res;
-                  }
-                })
-                .then((res) => res.json())
-                .then((createdFolder: ServerFolder) => {
-                  cache[routeToThisPoint] = {
-                    id: createdFolder.id,
-                    parentId: createdFolder.parent_id as number,
-                    isFolder: true,
-                    bucket: createdFolder.bucket,
-                  };
-                  createFolderQueue.emit(routeToThisPoint, createdFolder.id);
-                })
-                .catch(async (err) => {
-                  createFolderQueue.emit(routeToThisPoint, err);
-                });
-            }
-
-            try {
-              lastParentId = await new Promise((resolve, reject) =>
-                createFolderQueue.once(routeToThisPoint, (value) => {
-                  if (value instanceof Error) {
-                    reject(value);
-                  } else {
-                    resolve(value);
-                  }
-                })
-              );
-            } catch (err) {
-              await handleFetchError(
-                err,
-                'Creating remote folder',
-                `name: ${name}, folderName: ${folderName}, lastParentId: ${lastParentId}`
-              );
-            }
-          }
-        }
-      }
-
-      const folderIdOfTheNewFile = lastParentId;
-
-      const localUpload = new Environment({
-        bridgeUrl: process.env.BRIDGE_URL,
-        bridgeUser: userInfo.bridgeUser,
-        bridgePass: userInfo.userId,
-        encryptionKey: mnemonic,
-      });
-
-      if (source.size > TransferLimits.UploadFileSize) {
-        throw new ProcessError(
-          'FILE_TOO_BIG',
-          createErrorDetails(
-            {},
-            'Uploading a file',
-            `name: ${name}, source: ${JSON.stringify(source, null, 2)}`
-          )
-        );
-      }
-
-      const uploadedFileId: string = await new Promise((resolve, reject) => {
-        if (source.size > TransferLimits.MultipartUploadThreshold) {
-          localUpload.uploadMultipartFile(bucket, {
-            progressCallback,
-            finishedCallback: async (err: any, fileId: string | null) => {
-              if (err) {
-                // Don't include the stream in the details
-                const { stream, ...sourceWithoutStream } = source;
-
-                const details = createErrorDetails(
-                  err,
-                  'Uploading a file with multipart',
-                  `bucket: ${bucket}, source: ${JSON.stringify(
-                    sourceWithoutStream,
-                    null,
-                    2
-                  )}, name: ${name}, userInfo: ${JSON.stringify(
-                    userInfo,
-                    null,
-                    2
-                  )}`
-                );
-                reject(
-                  (await isOnline())
-                    ? new ProcessError('UNKNOWN', details)
-                    : new ProcessError('NO_INTERNET', details)
-                );
-              } else {
-                resolve(fileId as string);
-              }
-            },
-            fileSize: source.size,
-            source: source.stream,
-          });
-        } else {
-          localUpload.upload(bucket, {
-            progressCallback,
-            finishedCallback: async (err: any, fileId: string) => {
-              if (err) {
-                // Don't include the stream in the details
-                const { stream, ...sourceWithoutStream } = source;
-
-                const details = createErrorDetails(
-                  err,
-                  'Uploading a file',
-                  `bucket: ${bucket}, source: ${JSON.stringify(
-                    sourceWithoutStream,
-                    null,
-                    2
-                  )}, name: ${name}, userInfo: ${JSON.stringify(
-                    userInfo,
-                    null,
-                    2
-                  )}`
-                );
-                reject(
-                  (await isOnline())
-                    ? new ProcessError('UNKNOWN', details)
-                    : new ProcessError('NO_INTERNET', details)
-                );
-              } else {
-                resolve(fileId);
-              }
-            },
-            fileSize: source.size,
-            source: source.stream,
-          });
-        }
-      });
-
-      const oldFileInCache = cache[name];
-
-      if (oldFileInCache) {
-        try {
-          const res = await httpRequest(
-            `${process.env.API_URL}/api/storage/folder/${oldFileInCache.parentId}/file/${oldFileInCache.id}`,
-            {
-              method: 'DELETE',
-              headers,
-            }
-          );
-          if (!res.ok) {
-            Logger.warn(
-              `Error trying to delete outdated remote file. res: ${await serializeRes(
-                res
-              )} fileInCache: ${JSON.stringify(oldFileInCache, null, 2)}`
-            );
-          }
-        } catch (e) {
-          const err = e as Error & { code: string };
-          Logger.warn(
-            `Error trying to delete outdated remote file. ${err.name} ${
-              err.code
-            } ${err.stack} fileInCache: ${JSON.stringify(
-              oldFileInCache,
-              null,
-              2
-            )}`
-          );
-        }
-      }
-
-      const encryptedName = crypt.encryptName(
-        baseNameWithoutExt,
-        folderIdOfTheNewFile.toString()
-      );
-
-      const modificationTime = getDateFromSeconds(modTimeInSeconds);
-
-      try {
-        const res = await httpRequest(
-          `${process.env.API_URL}/api/storage/file`,
-          {
-            headers,
-            method: 'POST',
-            body: JSON.stringify({
-              file: {
-                bucket,
-                encrypt_version: '03-aes',
-                fileId: uploadedFileId,
-                file_id: uploadedFileId,
-                folder_id: folderIdOfTheNewFile,
-                name: encryptedName,
-                plain_name: baseNameWithoutExt,
-                size,
-                type: fileType,
-                modificationTime,
-              },
-            }),
-          }
-        );
-        if (!res.ok) {
-          throw new ProcessError(
-            'BAD_RESPONSE',
-            createErrorDetails(
-              {},
-              'Creating file in drive server',
-              `res: ${await serializeRes(
-                res
-              )}, encryptedName: ${encryptedName}, modificationTime: ${modificationTime}`
-            )
-          );
-        }
-
-        const fileCreated: FileCreatedResponseDTO = await res.json();
-
-        return fileCreated.id;
-      } catch (err) {
-        await handleFetchError(
-          err,
-          'Creating file in drive server',
-          `encryptedName: ${encryptedName}, modificationTime: ${modificationTime}`
-        );
-      }
-
-      return Promise.reject();
-    },
-
-    async existsFolder(name: string): Promise<boolean> {
-      return name in cache;
-    },
-
-    async deleteFolder(name: string): Promise<void> {
-      const folderInCache = cache[name];
-
-      const { id } = folderInCache;
-
-      try {
-        const result = await clients.newDrive.post(
-          `${process.env.NEW_DRIVE_URL}/drive/storage/trash/add`,
-          {
-            items: [
-              {
-                type: 'folder',
-                id,
-              },
-            ],
-          }
-        );
-
-        if (result.status !== 200) {
-          throw new ProcessError(
-            'BAD_RESPONSE',
-            createErrorDetails(
-              {},
-              'Deleting folder from server',
-              `res: ${await serializeRes(
-                result.data
-              )}, folderInCache: ${JSON.stringify(folderInCache, null, 2)}`
-            )
-          );
-        }
-      } catch (err) {
-        await handleFetchError(
-          err,
-          'Deleting folder from server',
-          `folderInCache: ${JSON.stringify(folderInCache, null, 2)}`
-        );
-      }
-    },
-
-    getSource(
-      name: string,
-      progressCallback: FileSystemProgressCallback
-    ): Promise<Source> {
-      const fileInCache = cache[name];
-
-      Logger.log(`Getting source of ${name} fileId: ${fileInCache.fileId}`);
-
-      const environment = new Environment({
-        bridgeUrl: process.env.BRIDGE_URL,
-        bridgeUser: userInfo.bridgeUser,
-        bridgePass: userInfo.userId,
-        encryptionKey: mnemonic,
-      });
-
-      return new Promise((resolve, reject) => {
-        environment.download(
-          fileInCache.bucket as string,
-          fileInCache.fileId as string,
-          {
-            progressCallback,
-            finishedCallback: async (err: any, downloadStream: Readable) => {
-              if (err) {
-                const details = createErrorDetails(
-                  err,
-                  'Downloading a file',
-                  `fileInCache: ${JSON.stringify(
-                    fileInCache,
-                    null,
-                    2
-                  )}, name: ${name}, userInfo: ${JSON.stringify(
-                    userInfo,
-                    null,
-                    2
-                  )}`
-                );
-                reject(
-                  (await isOnline())
-                    ? new ProcessError('UNKNOWN', details)
-                    : new ProcessError('NO_INTERNET', details)
-                );
-              } else {
-                resolve({
-                  stream: downloadStream,
-                  size: fileInCache.size as number,
-                  modTime: fileInCache.modificationTime as number,
-                });
-              }
-            },
-          },
-          {
-            label: 'Dynamic',
-            params: {
-              useProxy: false,
-              concurrency: 10,
-            },
-          }
-        );
-      });
-    },
-
-    async smokeTest() {
-      if (!(await isOnline())) {
-        throw new ProcessFatalError(
-          'NO_INTERNET',
-          createErrorDetails({}, 'Remote smoke test (online test)')
-        );
-      }
-
-      const res = await httpRequest(
-        `${process.env.API_URL}/api/storage/v2/folder/${baseFolderId}`,
-        { headers }
-      );
-
-      if (!res.ok) {
-        if (res.status === 401) {
-          ipcRenderer.emit('user-is-unauthorized');
-        }
-        throw new ProcessFatalError(
-          'NO_REMOTE_CONNECTION',
-          createErrorDetails(
-            {},
-            'Remote smoke test (get base folder test)',
-            `res: ${await serializeRes(res)}`
-          )
-        );
-      }
-    },
-  };
-}
diff --git a/src/workers/filesystems/test/__mocks__/FileSystemMock.ts b/src/workers/filesystems/test/__mocks__/FileSystemMock.ts
deleted file mode 100644
index be7aa3a6a..000000000
--- a/src/workers/filesystems/test/__mocks__/FileSystemMock.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { PartialListing } from '../../../sync/Listings/domain/Listing';
-import {
-  FileSystemKind,
-  FileSystemProgressCallback,
-  ReadingMetaErrorEntry,
-  Source,
-} from '../../../types';
-import { FileSystem } from '../../domain/FileSystem';
-
-export class FileSystemMock implements FileSystem<PartialListing> {
-  private mockGetCurrentListing = jest.fn();
-
-  private mockRenameFile = jest.fn();
-
-  private mockDeleteFile = jest.fn();
-
-  private mockPullFile = jest.fn();
-
-  public mockPullFolder = jest.fn();
-
-  private mockExistsFolder = jest.fn();
-
-  private mockDeleteFolder = jest.fn();
-
-  private mockGetSource = jest.fn();
-
-  public mockGetFolderData = jest.fn();
-
-  private mockSmokeTest = jest.fn();
-
-  public kind: FileSystemKind = 'LOCAL';
-
-  getCurrentListing(): Promise<{
-    listing: PartialListing;
-    readingMetaErrors: ReadingMetaErrorEntry[];
-  }> {
-    return this.mockGetCurrentListing();
-  }
-
-  renameFile(oldName: string, newName: string): Promise<void> {
-    return this.mockRenameFile(oldName, newName);
-  }
-
-  deleteFile(name: string): Promise<void> {
-    return this.mockDeleteFile(name);
-  }
-
-  pullFile(
-    name: string,
-    source: Source,
-    progressCallback: FileSystemProgressCallback
-  ): Promise<void> {
-    return this.mockPullFile(name, source, progressCallback);
-  }
-
-  pullFolder = (name: string): Promise<void> => {
-    return this.mockPullFolder(name);
-  };
-
-  existsFolder(name: string): Promise<boolean> {
-    return this.mockExistsFolder(name);
-  }
-
-  deleteFolder = (name: string): Promise<void> => {
-    return this.mockDeleteFolder(name);
-  };
-
-  getSource(
-    name: string,
-    progressCallback: FileSystemProgressCallback
-  ): Promise<Source> {
-    return this.mockGetSource(name, progressCallback);
-  }
-
-  getFolderData(folderFullPath: string): Promise<{ modtime: number }> {
-    return this.mockGetFolderData(folderFullPath);
-  }
-
-  smokeTest(): Promise<void> {
-    return this.mockSmokeTest();
-  }
-
-  assertNumberOfFoldersPulled(n: number) {
-    expect(this.mockPullFolder).toBeCalledTimes(n);
-  }
-
-  assertOrderOfFoldersPulled(names: Array<string>) {
-    names.forEach((name: string) =>
-      expect(this.mockPullFolder).toBeCalledWith(name)
-    );
-  }
-
-  assertFolderWasNeverPulled(folder: string) {
-    expect(this.mockPullFolder).not.toBeCalledWith(folder);
-  }
-
-  assertFolderHasBeenPulledBeforeThan(before: string, ...after: Array<string>) {
-    const calls = (
-      this.mockPullFolder.mock.calls as Array<Array<string>>
-    ).flat();
-
-    const expectedBeforeCall = calls.indexOf(before);
-    const expectedAfterCalls = after.map((a) => calls.indexOf(a));
-
-    expectedAfterCalls.forEach((expectedAfterCall) => {
-      expect(expectedBeforeCall).toBeLessThan(expectedAfterCall);
-    });
-  }
-}
diff --git a/src/workers/process.ts b/src/workers/process.ts
deleted file mode 100644
index d70a7a969..000000000
--- a/src/workers/process.ts
+++ /dev/null
@@ -1,439 +0,0 @@
-import Logger from 'electron-log';
-import { EventEmitter } from 'events';
-import _ from 'lodash';
-import path from 'path';
-
-import { FileSystem as NewFileSystem } from './filesystems/domain/FileSystem';
-import { PartialListing } from './sync/Listings/domain/Listing';
-import {
-  ErrorDetails,
-  FileSystem,
-  FileSystemKind,
-  Listing,
-  ProcessError,
-  ProcessErrorName,
-  ProcessFatalError,
-  ReadingMetaErrorEntry,
-} from './types';
-import { createErrorDetails } from './utils/reporting';
-
-abstract class Process extends EventEmitter {
-  constructor(
-    protected readonly local: FileSystem,
-    protected readonly remote: FileSystem
-  ) {
-    super();
-  }
-
-  protected rename(name: string, sufix: string): string {
-    const { dir, ext, name: base } = path.parse(name);
-
-    return `${dir ? `${dir}/` : ''}${base}_${sufix}${ext}`;
-  }
-
-  protected async consumeRenameQueue(
-    queue: [string, string][],
-    fileSystem: FileSystem
-  ): Promise<void> {
-    for (const [oldName, newName] of queue) {
-      this.emit('RENAMING_FILE', oldName, newName, fileSystem.kind);
-
-      try {
-        await fileSystem.renameFile(oldName, newName);
-        this.emit('FILE_RENAMED', oldName, newName, fileSystem.kind);
-      } catch (err) {
-        const syncError =
-          err instanceof ProcessError
-            ? err
-            : new ProcessError(
-                'UNKNOWN',
-                createErrorDetails(
-                  err,
-                  'Renaming file',
-                  `oldName: ${oldName}, newName: ${newName}, kind: ${fileSystem.kind}`
-                )
-              );
-
-        this.emit(
-          'ERROR_RENAMING_FILE',
-          oldName,
-          newName,
-          fileSystem.kind,
-          syncError.name as ProcessErrorName,
-          syncError.details
-        );
-      }
-    }
-  }
-
-  protected async consumePullQueue(
-    queue: string[],
-    destFs: Pick<
-      FileSystem | NewFileSystem<PartialListing>,
-      'pullFile' | 'kind'
-    >,
-    srcFs: Pick<FileSystem | NewFileSystem<PartialListing>, 'getSource'>
-  ): Promise<void> {
-    const controllers: Array<AbortController> = [];
-
-    this.on('LOST_CONNECTION', () => {
-      Logger.log('[PROCESS] Aborting upload');
-      controllers.every((controller) => controller.abort('LOST_CONNECTION'));
-    });
-
-    for (const name of queue) {
-      const progressCallback = (progress: number) =>
-        this.emit('PULLING_FILE', name, progress, destFs.kind);
-      progressCallback(0);
-
-      try {
-        const source = await srcFs.getSource(name, progressCallback);
-
-        const abortController = new AbortController();
-
-        controllers.push(abortController);
-
-        const id = await destFs.pullFile(
-          name,
-          source,
-          progressCallback,
-          abortController.signal
-        );
-        this.emit('FILE_PULLED', name, destFs.kind, id);
-      } catch (err) {
-        const syncError =
-          err instanceof ProcessError
-            ? err
-            : new ProcessError(
-                'UNKNOWN',
-                createErrorDetails(
-                  err,
-                  'Pulling file',
-                  `name: ${name}, kind: ${destFs.kind}`
-                )
-              );
-        this.emit(
-          'ERROR_PULLING_FILE',
-          name,
-          destFs.kind,
-          syncError.name as ProcessErrorName,
-          syncError.details
-        );
-      }
-    }
-  }
-
-  protected async consumeDeleteQueue(
-    queue: string[],
-    fileSystem: FileSystem
-  ): Promise<void> {
-    for (const name of queue) {
-      this.emit('DELETING_FILE', name, fileSystem.kind);
-
-      try {
-        await fileSystem.deleteFile(name);
-        this.emit('FILE_DELETED', name, fileSystem.kind);
-      } catch (err) {
-        const syncError =
-          err instanceof ProcessError
-            ? err
-            : new ProcessError(
-                'UNKNOWN',
-                createErrorDetails(
-                  err,
-                  'Deleting file',
-                  `name: ${name}, kind: ${fileSystem.kind}`
-                )
-              );
-        this.emit(
-          'ERROR_DELETING_FILE',
-          name,
-          fileSystem.kind,
-          syncError.name as ProcessErrorName,
-          syncError.details
-        );
-      }
-    }
-  }
-
-  protected async consumeDeleteFolderQueue(
-    queue: string[],
-    fileSystem: FileSystem
-  ): Promise<void> {
-    for (const name of queue) {
-      this.emit('DELETING_FOLDER', name, fileSystem.kind);
-
-      try {
-        await fileSystem.deleteFolder(name);
-        this.emit('FOLDER_DELETED', name, fileSystem.kind);
-      } catch (err) {
-        const syncError =
-          err instanceof ProcessError
-            ? err
-            : new ProcessError(
-                'UNKNOWN',
-                createErrorDetails(
-                  err,
-                  'Deleting folder',
-                  `name: ${name}, kind: ${fileSystem.kind}`
-                )
-              );
-        this.emit(
-          'ERROR_DELETING_FOLDER',
-          name,
-          fileSystem.kind,
-          syncError.name as ProcessErrorName,
-          syncError.details
-        );
-      }
-    }
-  }
-
-  protected getListingsDiff(local: Listing, remote: Listing): ListingsDiff {
-    const filesNotInLocal = [];
-    const filesNotInRemote = [];
-    const filesWithDifferentModtime = [];
-    const filesInSync: Listing = {};
-
-    for (const [localName, { modtime: localModtime }] of Object.entries(
-      local
-    )) {
-      const entryInRemote = remote[localName];
-
-      if (!entryInRemote) {
-        filesNotInRemote.push(localName);
-      } else if (localModtime !== entryInRemote.modtime) {
-        filesWithDifferentModtime.push(localName);
-      } else {
-        filesInSync[localName] = entryInRemote;
-      }
-    }
-
-    for (const remoteName of Object.keys(remote)) {
-      if (!(remoteName in local)) {
-        filesNotInLocal.push(remoteName);
-      }
-    }
-
-    return {
-      filesNotInLocal,
-      filesNotInRemote,
-      filesWithDifferentModtime,
-      filesInSync,
-    };
-  }
-
-  protected async getCurrentListings(options: {
-    emitErrors: boolean;
-  }): Promise<{
-    currentLocal: Listing;
-    currentRemote: Listing;
-  }> {
-    try {
-      const [localResult, remoteResult] = await Promise.all([
-        this.local.getCurrentListing(),
-        this.remote.getCurrentListing(),
-      ]);
-
-      if (options.emitErrors) {
-        this.emitReadingMetaErrors(localResult.readingMetaErrors, 'LOCAL');
-        this.emitReadingMetaErrors(remoteResult.readingMetaErrors, 'REMOTE');
-      }
-
-      return {
-        currentLocal: localResult.listing,
-        currentRemote: remoteResult.listing,
-      };
-    } catch (err) {
-      const syncError =
-        err instanceof ProcessError
-          ? new ProcessFatalError('CANNOT_GET_CURRENT_LISTINGS', err.details)
-          : new ProcessFatalError(
-              'CANNOT_GET_CURRENT_LISTINGS',
-              createErrorDetails(err, 'Getting current listings')
-            );
-
-      throw syncError;
-    }
-  }
-
-  protected emitReadingMetaErrors(
-    errors: ReadingMetaErrorEntry[],
-    kind: FileSystemKind
-  ) {
-    errors.forEach((entry) => {
-      this.emit(
-        'ERROR_READING_METADATA',
-        entry.name,
-        kind,
-        entry.errorName,
-        entry.errorDetails
-      );
-    });
-  }
-
-  protected async generateResult(): Promise<
-    (SuccessfulProcessResult & { listing: Listing }) | UnsuccessfulProcessResult
-  > {
-    const { currentLocal, currentRemote } = await this.getCurrentListings({
-      emitErrors: false,
-    });
-
-    if (_.isEqual(currentLocal, currentRemote)) {
-      const currentInBoth = currentLocal;
-      Logger.debug('Current in both:', currentInBoth);
-
-      return { status: 'IN_SYNC', listing: currentInBoth };
-    }
-    Logger.debug('Current local:', currentLocal);
-    Logger.debug('Current remote:', currentRemote);
-
-    const diff = this.getListingsDiff(currentLocal, currentRemote);
-
-    return { status: 'NOT_IN_SYNC', diff };
-  }
-
-  abstract run(): Promise<ProcessResult>;
-}
-
-export interface ProcessEvents {
-  /**
-   * Triggered when the process tries to test
-   * whether the filesystems are operational
-   */
-  SMOKE_TESTING: () => void;
-  /**
-   * Triggered when processing what changes
-   * need to be done in remote/local to be
-   * properly synced
-   */
-  GENERATING_ACTIONS_NEEDED_TO_SYNC: () => void;
-
-  /**
-   * Triggered when a file is being pulled
-   */
-  PULLING_FILE: (
-    name: string,
-    progress: number,
-    fileSystemKind: FileSystemKind
-  ) => void;
-  /**
-   * Triggered when a file has been pulled
-   */
-  FILE_PULLED: (
-    name: string,
-    fileSystemKind: FileSystemKind,
-    fileId: number | undefined
-  ) => void;
-  /**
-   * Triggered when an error has occurred while pulling a file
-   */
-  ERROR_PULLING_FILE: (
-    name: string,
-    fileSystemKind: FileSystemKind,
-    errName: ProcessErrorName,
-    errDetails: ErrorDetails
-  ) => void;
-
-  /**
-   * Triggered when a file is being deleted
-   */
-  DELETING_FILE: (name: string, fileSystemKind: FileSystemKind) => void;
-  /**
-   * Triggered when a file has been deleted
-   */
-  FILE_DELETED: (name: string, fileSystemKind: FileSystemKind) => void;
-  /**
-   * Triggered when an error has occurred while deleting a file
-   */
-  ERROR_DELETING_FILE: (
-    name: string,
-    fileSystemKind: FileSystemKind,
-    errName: ProcessErrorName,
-    errDetails: ErrorDetails
-  ) => void;
-
-  /**
-   * Triggered when a folder is being created
-   */
-  PULLING_FOLDER: (name: string, fileSystemKind: FileSystemKind) => void;
-  /**
-   * Triggered when a folder has been created
-   */
-  FOLDER_PULLED: (name: string, fileSystemKind: FileSystemKind) => void;
-
-  /**
-   * Triggered when a folder is being deleted
-   */
-  DELETING_FOLDER: (name: string, fileSystemKind: FileSystemKind) => void;
-  /**
-   * Triggered when a folder has been deleted
-   */
-  FOLDER_DELETED: (name: string, fileSystemKind: FileSystemKind) => void;
-  /**
-   * Triggered when an error has occurred while deleting a folder
-   */
-  ERROR_DELETING_FOLDER: (
-    name: string,
-    fileSystemKind: FileSystemKind,
-    errName: ProcessErrorName,
-    errDetails: ErrorDetails
-  ) => void;
-
-  /**
-   * Triggered when a file is being renamed
-   */
-  RENAMING_FILE: (
-    oldName: string,
-    newName: string,
-    fileSystemKind: FileSystemKind
-  ) => void;
-  /**
-   * Triggered when a file has been renamed
-   */
-  FILE_RENAMED: (
-    oldName: string,
-    newName: string,
-    fileSystemKind: FileSystemKind
-  ) => void;
-  /**
-   * Triggered when an error has occurred while renaming a file
-   */
-  ERROR_RENAMING_FILE: (
-    oldName: string,
-    newName: string,
-    fileSystemKind: FileSystemKind,
-    errName: ProcessErrorName,
-    errDetails: ErrorDetails
-  ) => void;
-
-  /**
-   * Triggered when an error has occurred while reading the metadata of a file
-   */
-  ERROR_READING_METADATA: (
-    name: string,
-    fileSystemKind: FileSystemKind,
-    errName: ProcessErrorName,
-    errDetails: ErrorDetails
-  ) => void;
-}
-
-export type ListingsDiff = {
-  filesNotInLocal: string[];
-  filesNotInRemote: string[];
-  filesWithDifferentModtime: string[];
-  filesInSync: Listing;
-};
-
-export type ProcessResult = SuccessfulProcessResult | UnsuccessfulProcessResult;
-
-export type SuccessfulProcessResult = {
-  status: 'IN_SYNC';
-};
-
-export type UnsuccessfulProcessResult = {
-  status: 'NOT_IN_SYNC';
-  diff: ListingsDiff;
-};
-
-export default Process;
diff --git a/src/workers/sync/Listings/domain/Listing.ts b/src/workers/sync/Listings/domain/Listing.ts
deleted file mode 100644
index b64c8359b..000000000
--- a/src/workers/sync/Listings/domain/Listing.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { LocalItemMetaData } from './LocalItemMetaData';
-import { RemoteItemMetaData } from './RemoteItemMetaData';
-import { SynchronizedItemMetaData } from './SynchronizedItemMetaData';
-
-export type Listing = Record<string, SynchronizedItemMetaData>;
-
-export type LocalListing = Record<string, LocalItemMetaData>;
-
-export type RemoteListing = Record<string, RemoteItemMetaData>;
-
-export type PartialListing = LocalListing | RemoteListing;
diff --git a/src/workers/webdav/VirtualDrive.ts b/src/workers/webdav/VirtualDrive.ts
deleted file mode 100644
index 9b8e7656e..000000000
--- a/src/workers/webdav/VirtualDrive.ts
+++ /dev/null
@@ -1,558 +0,0 @@
-import Logger from 'electron-log';
-import { exec } from 'child_process';
-import configStore from '../../main/config';
-import { homedir } from 'os';
-
-const driveObject = {
-  host: 'Virtual.Drive.Internxt.com',
-  port: '1900',
-};
-
-const driveURL = `http://${driveObject.host}:${driveObject.port}`;
-const driveName = 'Internxt Drive';
-
-export const mountDrive = async (): Promise<void> => {
-  if (process.platform === 'win32') {
-    try {
-      await unmountDrive();
-    } catch (err) {
-      Logger.error('Ignoring error on unmount', { err });
-    }
-
-    const driveLetter = await getLetterDrive();
-    Logger.log(`[VirtualDrive] Drive letter available: ${driveLetter}`);
-    if (driveLetter) {
-      configStore.set('virtualdriveWindowsLetter', driveLetter);
-
-      const isHyperVenabled = await getWindowsHyperVEnabled();
-      if (!isHyperVenabled) {
-        await enableWindowsHyperV();
-      }
-
-      const mounted = await mountVHDWindowsDrive(driveLetter);
-      if (mounted) {
-        await renameWindowsDrive();
-      }
-    }
-    return;
-  } else if (process.platform === 'darwin') {
-    await mountMacOSDrive(driveName);
-    return;
-  } else if (process.platform === 'linux') {
-    await mountLinuxDrive();
-    return;
-  }
-
-  return Promise.reject(
-    new Error(`Platform ${process.platform} not supported`)
-  );
-};
-
-export const unmountDrive = async (): Promise<boolean> => {
-  if (process.platform === 'win32') {
-    await ejectMountedVHDDrives();
-    return removeVHDDrive();
-  } else if (process.platform === 'darwin') {
-    return unmountMacOSDrive();
-  } else if (process.platform === 'linux') {
-    return unmountLinuxDrive();
-  }
-  return false;
-};
-
-export const getVirtualDrivePath = () => {
-  if (process.platform === 'win32') {
-    return getSavedLetter() + ':\\';
-  } else {
-    return homedir() + '/InternxtDrive';
-  }
-};
-
-/**
- * Retry the virtual drive mounting by trying to unmount it first,
- * and mount it again
- */
-export const retryVirtualDriveMount = async () => {
-  await unmountDrive();
-  await mountDrive();
-};
-
-const getSavedLetter = () => {
-  return configStore.get('virtualdriveWindowsLetter') || 'I';
-};
-
-const getUsedLetterDrives = (): Promise<string[]> => {
-  Logger.log('[VirtualDrive] Getting used drive letters');
-  return new Promise(function (resolve, reject) {
-    exec(
-      '(Get-PSDrive -PSProvider FileSystem).Name',
-      { shell: 'powershell.exe' },
-      (errList, stdoutList) => {
-        if (errList) {
-          Logger.log(
-            `[VirtualDrive] Error getting used drive letters: ${errList}`
-          );
-          reject(`[VirtualDrive] Error getting used drive letters: ${errList}`);
-        } else {
-          const arrayUsedLetterDrive = stdoutList
-            .split(/\r?\n/)
-            .filter((l) => l && l.length === 1);
-
-          Logger.log(
-            `[VirtualDrive] Used drive letters: ${arrayUsedLetterDrive.toString()}`
-          );
-          resolve(arrayUsedLetterDrive);
-        }
-      }
-    );
-  });
-};
-
-const getLetterDrive = async (): Promise<string | false> => {
-  const savedLetter = getSavedLetter() || 'I';
-  const usedLetters = await getUsedLetterDrives();
-  const windowsAllowedDriveLetters = 'IXTABCDEFGHJKLMNOPQRSUVWYZ'.split('');
-  const allowedLetters = windowsAllowedDriveLetters.filter(
-    (l) => !usedLetters.includes(l)
-  );
-  Logger.log('[VirtualDrive] Getting drive letter', {
-    savedLetter,
-    usedLetters,
-    allowedLetters,
-  });
-
-  if (usedLetters.includes(savedLetter)) {
-    // current saved drive letter is in use
-    if (allowedLetters.length > 0) {
-      return allowedLetters[0];
-    } else {
-      return false;
-    }
-  } else {
-    return savedLetter;
-  }
-};
-
-const mountWebdavWindowsDrive = (driveLetter: string): Promise<boolean> => {
-  Logger.log('[VirtualDrive] Mounting drive: ' + driveLetter);
-  return new Promise(function (resolve, reject) {
-    exec(
-      `(New-Object -Com WScript.Network).MapNetworkDrive("${driveLetter}:", "${driveURL}")`,
-      { shell: 'powershell.exe' },
-      (errMount, stdoutMount) => {
-        if (errMount) {
-          Logger.log(`[VirtualDrive] Error creating drive: ${errMount}`);
-          reject(`[VirtualDrive] Error creating drive: ${errMount}`);
-        } else {
-          Logger.log(
-            `[VirtualDrive] Drive created and mounted successfully: ${stdoutMount}`
-          );
-          resolve(true);
-        }
-      }
-    );
-  });
-};
-
-const mountVHDWindowsDrive = (driveLetter: string): Promise<boolean> => {
-  Logger.log('[VirtualDrive] Mounting VHD drive: ' + driveLetter);
-  return new Promise(function (resolve, reject) {
-    exec(
-      `New-VHD -Path .\\Internxt.vhdx -Dynamic -SizeBytes 10GB |Mount-VHD -Passthru |Initialize-Disk -Passthru |
-      New-Partition -DriveLetter ${driveLetter} -UseMaximumSize |Format-Volume -FileSystem NTFS -Confirm:$false -Force`,
-      { shell: 'powershell.exe' },
-      (errMount, stdoutMount) => {
-        if (errMount) {
-          Logger.log(`[VirtualDrive] Error creating VHD drive: ${errMount}`);
-          reject(`[VirtualDrive] Error creating VHD drive: ${errMount}`);
-        } else {
-          Logger.log(
-            `[VirtualDrive] VHD Drive created and mounted successfully: ${stdoutMount}`
-          );
-          resolve(true);
-        }
-      }
-    );
-  });
-};
-
-const removeVHDDrive = (): Promise<boolean> => {
-  Logger.log('[VirtualDrive] Removing VHD drive');
-  return new Promise(function (resolve, reject) {
-    exec(
-      'Remove-Item .\\Internxt.vhdx',
-      { shell: 'powershell.exe' },
-      (errMount, stdoutMount) => {
-        if (errMount) {
-          Logger.log(`[VirtualDrive] Error removing VHD drive: ${errMount}`);
-          reject(`[VirtualDrive] Error removing VHD drive: ${errMount}`);
-        } else {
-          Logger.log(
-            `[VirtualDrive] VHD Drive removed successfully: ${stdoutMount}`
-          );
-          resolve(true);
-        }
-      }
-    );
-  });
-};
-
-const renameWindowsDrive = (): Promise<boolean> => {
-  Logger.log('[VirtualDrive] Renaming drive');
-  return new Promise(function (resolve, reject) {
-    exec(
-      `(New-Object -ComObject shell.application).NameSpace("${getVirtualDrivePath()}").self.name = "${driveName}"`,
-      { shell: 'powershell.exe' },
-      (errNaming, stdoutNaming) => {
-        if (errNaming) {
-          Logger.log(`[VirtualDrive] Error renaming drive: ${errNaming}`);
-          reject(`[VirtualDrive] Error renaming drive: ${errNaming}`);
-        } else {
-          Logger.log(
-            `[VirtualDrive] Drive renamed successfully: ${stdoutNaming}`
-          );
-          resolve(true);
-        }
-      }
-    );
-  });
-};
-
-const unmountWindowsWebdavDrive = (driveLetter: string): Promise<boolean> => {
-  Logger.log('[VirtualDrive] Unmounting drive: ' + driveLetter);
-  return new Promise(function (resolve, reject) {
-    exec(
-      `(New-Object -Com WScript.Network).RemoveNetworkDrive("${driveLetter}:")`,
-      { shell: 'powershell.exe' },
-      (err, stdout) => {
-        if (err) {
-          Logger.log(`[VirtualDrive] Error unmounting drive: ${err}`);
-          reject(`[VirtualDrive] Error unmounting drive: ${err}`);
-        } else {
-          Logger.log(`[VirtualDrive] Drive unmounted successfully: ${stdout}`);
-          resolve(true);
-        }
-      }
-    );
-  });
-};
-
-const ejectVHDDrive = (driveLetter: string): Promise<boolean> => {
-  Logger.log('[VirtualDrive] ejecting VHD drive: ' + driveLetter);
-  return new Promise(function (resolve, _) {
-    exec(
-      `(New-Object -comObject Shell.Application).NameSpace(17).ParseName("${driveLetter}:").InvokeVerb("Eject")`,
-      { shell: 'powershell.exe' },
-      (err, stdout) => {
-        if (err) {
-          Logger.log(`[VirtualDrive] Error ejecting drive: ${err}`);
-          resolve(false);
-        } else {
-          Logger.log(`[VirtualDrive] Drive ejected successfully: ${stdout}`);
-          resolve(true);
-        }
-      }
-    );
-  });
-};
-
-const ejectMountedVHDDrives = async () => {
-  const mountedVHDs = await getCurrentWindowsMountedVHDs();
-  for (const mountedVHD of mountedVHDs) {
-    await ejectVHDDrive(mountedVHD);
-  }
-};
-
-const getWindowsHyperVEnabled = (): Promise<boolean> => {
-  Logger.log('[VirtualDrive] Getting Windows HyperV is enabled');
-  return new Promise(function (resolve, reject) {
-    exec(
-      '(Get-WindowsOptionalFeature -FeatureName Microsoft-Hyper-V-All -Online).State',
-      { shell: 'powershell.exe' },
-      (err, stdout) => {
-        if (err) {
-          Logger.log(`[VirtualDrive] Error getting Windows HyperV: ${err}`);
-          reject(`[VirtualDrive] Error getting Windows HyperV: ${err}`);
-        } else {
-          const stateHyperV = stdout.trim().toLowerCase();
-          Logger.log('[VirtualDrive] Is Windows HyperV enabled:', {
-            stateHyperV,
-          });
-          resolve(stateHyperV === 'enabled');
-        }
-      }
-    );
-  });
-};
-
-const enableWindowsHyperV = (): Promise<boolean> => {
-  Logger.log('[VirtualDrive] Enabling HyperV');
-  return new Promise(function (resolve, reject) {
-    exec(
-      'Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All',
-      { shell: 'powershell.exe' },
-      (err, stdout) => {
-        if (err) {
-          Logger.log(`[VirtualDrive] Error enabling HyperV: ${err}`);
-          reject(`[VirtualDrive] Error enabling HyperV: ${err}`);
-        } else {
-          Logger.log(`[VirtualDrive] Enabled HyperV successfully: ${stdout}`);
-          resolve(true);
-        }
-      }
-    );
-  });
-};
-
-const getCurrentWindowsMountedVHDs = (): Promise<string[]> => {
-  Logger.log('[VirtualDrive] Getting CurrentMountedVHD');
-  return new Promise(function (resolve, _) {
-    exec(
-      '(Get-Volume | Where-Object {$_.FileSystemLabel -eq "Internxt Drive"}).DriveLetter',
-      { shell: 'powershell.exe' },
-      (err, stdout) => {
-        if (err) {
-          Logger.log(`[VirtualDrive] Error getting mounted VHDs: ${err}`);
-          resolve([] as string[]);
-        } else {
-          const currentWebdavMountedVHDs = stdout
-            .split(/\r?\n/)
-            .filter((l) => l && l.length === 1);
-          Logger.log('[VirtualDrive] Current mounted VHDs:', {
-            currentWebdavMountedVHDs,
-          });
-          resolve(currentWebdavMountedVHDs);
-        }
-      }
-    );
-  });
-};
-
-const getCurrentWindowsMountedWebdavDrives = (): Promise<string[]> => {
-  Logger.log('[VirtualDrive] Getting CurrentMountedDrives');
-  return new Promise(function (resolve, reject) {
-    exec(
-      `(Get-PSDrive -PSProvider FileSystem | Where-Object {$_.DisplayRoot -match '\\\\\\\\${driveObject.host}@${driveObject.port}\\\\DavWWWRoot'}).Name`,
-      { shell: 'powershell.exe' },
-      (err, stdout) => {
-        if (err) {
-          Logger.log(`[VirtualDrive] Error getting drives: ${err}`);
-          reject(`[VirtualDrive] Error getting drives: ${err}`);
-        } else {
-          const currentWebdavMountedDrives = stdout
-            .split(/\r?\n/)
-            .filter((l) => l && l.length === 1);
-          Logger.log('[VirtualDrive] Current webdav mounted drives:', {
-            currentWebdavMountedDrives,
-          });
-          resolve(currentWebdavMountedDrives);
-        }
-      }
-    );
-  });
-};
-
-const createUnixFolder = (): Promise<boolean> => {
-  Logger.log('[VirtualDrive] Creating drive folder');
-  return new Promise(function (resolve, reject) {
-    exec(
-      `mkdir -p ${getVirtualDrivePath()}`,
-      { shell: '/bin/bash' },
-      (errFolder, stdoutFolder) => {
-        if (errFolder) {
-          Logger.log(
-            `[VirtualDrive] Error creating drive folder: ${errFolder}`
-          );
-          reject(`[VirtualDrive] Error creating drive folder: ${errFolder}`);
-        } else {
-          Logger.log(
-            `[VirtualDrive] Drive folder created successfully: ${stdoutFolder}`
-          );
-          resolve(true);
-        }
-      }
-    );
-  });
-};
-
-const mountMacOSDrive = (driveName: string): Promise<boolean> => {
-  Logger.log('[VirtualDrive] Mounting drive');
-  return new Promise(function (resolve, reject) {
-    createUnixFolder()
-      .then(() => {
-        exec(
-          `mount_webdav -S -v '${driveName}' ${driveURL} ${getVirtualDrivePath()}`,
-          { shell: '/bin/bash' },
-          (errMount, stdoutMount) => {
-            if (errMount) {
-              Logger.log(`[VirtualDrive] Error mounting drive: ${errMount}`);
-              reject(`[VirtualDrive] Error mounting drive: ${errMount}`);
-            } else {
-              Logger.log(
-                `[VirtualDrive] Drive mounted successfully: ${stdoutMount}`
-              );
-              resolve(true);
-            }
-          }
-        );
-      })
-      .catch((err) => {
-        reject(err);
-      });
-  });
-};
-
-const unmountMacOSDrive = (): Promise<boolean> => {
-  Logger.log('[VirtualDrive] Unmounting drive');
-  return new Promise(function (resolve, reject) {
-    exec(
-      `umount ${getVirtualDrivePath()}`,
-      { shell: '/bin/bash' },
-      (err, stdout) => {
-        if (err) {
-          Logger.log(`[VirtualDrive] Error unmounting drive: ${err}`);
-          reject(`[VirtualDrive] Error unmounting drive: ${err}`);
-        } else {
-          Logger.log(`[VirtualDrive] Drive unmounted successfully: ${stdout}`);
-          resolve(true);
-        }
-      }
-    );
-  });
-};
-
-const ejectMacOSDisk = (disk: string): Promise<boolean> => {
-  Logger.log('[VirtualDrive] Ejecting disk');
-  return new Promise(function (resolve, reject) {
-    exec(`diskutil eject "${disk}"`, { shell: '/bin/bash' }, (err, stdout) => {
-      if (err) {
-        Logger.log(`[VirtualDrive] Error ejecting disk: ${err}`);
-        reject(`[VirtualDrive] Error ejecting disk: ${err}`);
-      } else {
-        Logger.log(`[VirtualDrive] Disk ejected successfully: ${stdout}`);
-        resolve(true);
-      }
-    });
-  });
-};
-
-const getMacOSMountedInstallerDisks = (): Promise<string[]> => {
-  Logger.log('[VirtualDrive] Getting Current Mounted Installer Disks');
-  return new Promise(function (resolve, reject) {
-    exec(
-      // eslint-disable-next-line quotes
-      "find /Volumes -type d -name 'Internxt Drive *' -maxdepth 1",
-      { shell: '/bin/bash' },
-      (err, stdout) => {
-        if (err) {
-          Logger.log(`[VirtualDrive] Error installer disks: ${err}`);
-          reject(`[VirtualDrive] Error installer disks: ${err}`);
-        } else {
-          const currentMountedInstallerDisks = stdout
-            .split(/\r?\n/)
-            .filter(
-              (l) =>
-                l && l.length > 0 && l.startsWith('/Volumes/Internxt Drive ')
-            );
-          Logger.log('[VirtualDrive] Current mounted installer disks:', {
-            currentMountedInstallerDisks,
-          });
-          resolve(currentMountedInstallerDisks);
-        }
-      }
-    );
-  });
-};
-
-export const ejectMacOSInstallerDisks = async (): Promise<void> => {
-  const installerDisks = await getMacOSMountedInstallerDisks();
-  installerDisks.forEach((installerDisk) => {
-    ejectMacOSDisk(installerDisk).catch();
-  });
-};
-
-const mountLinuxDrive = async (): Promise<boolean> => {
-  const mount = (uri: string) => {
-    return new Promise<void>((resolve, reject) => {
-      exec(`gio mount ${uri}`, { shell: '/bin/bash' }, (errMount) => {
-        if (errMount) {
-          reject(errMount);
-        } else {
-          resolve();
-        }
-      });
-    });
-  };
-
-  const createdSimlink = (uri: string) => {
-    return new Promise<void>((resolve, reject) => {
-      exec(
-        `gio info ${uri} | awk -F': ' '/^local path: /{print $2}' | xargs -I_ ln -s _  ${getVirtualDrivePath()}`,
-        { shell: '/bin/bash' },
-        (errMount) => {
-          if (errMount) {
-            reject(errMount);
-          } else {
-            resolve();
-          }
-        }
-      );
-    });
-  };
-
-  try {
-    Logger.log('[VirtualDrive] Mounting drive');
-    const davUri = `dav://${driveObject.host}:${driveObject.port}`;
-
-    await mount(davUri);
-
-    await createdSimlink(davUri);
-
-    Logger.log('[VirtualDrive] Drive mounted successfully');
-    return true;
-  } catch (err: unknown) {
-    Logger.log(
-      `[VirtualDrive] Error mounting drive: ${(err as Error).message}`
-    );
-    return false;
-  }
-};
-
-async function unmountLinuxDrive(): Promise<boolean> {
-  Logger.log('[VirtualDrive] Unmounting drive');
-  const unlink = new Promise<boolean>(function (resolve, reject) {
-    exec(
-      `rm ${getVirtualDrivePath()}`,
-      { shell: '/bin/bash' },
-      (err, stdout) => {
-        if (err) {
-          Logger.log(`[VirtualDrive] Error unmounting drive: ${err}`);
-          reject(`[VirtualDrive] Error unmounting drive: ${err}`);
-        } else {
-          Logger.log(`[VirtualDrive] Drive unmounted successfully: ${stdout}`);
-          resolve(true);
-        }
-      }
-    );
-  });
-
-  const unmont = new Promise<boolean>(function (resolve, reject) {
-    exec(
-      `gio mount -u dav://${driveObject.host}:${driveObject.port}`,
-      { shell: '/bin/bash' },
-      (err, stdout) => {
-        if (err) {
-          Logger.log(`[VirtualDrive] Error unmounting drive: ${err}`);
-          reject(`[VirtualDrive] Error unmounting drive: ${err}`);
-        } else {
-          Logger.log(`[VirtualDrive] Drive unmounted successfully: ${stdout}`);
-          resolve(true);
-        }
-      }
-    );
-  });
-
-  const settled = await Promise.allSettled([unlink, unmont]);
-
-  return settled.every((promise) => promise.status === 'fulfilled');
-}
diff --git a/src/workers/webdav/dependencyInjection/DependencyContainer.ts b/src/workers/webdav/dependencyInjection/DependencyContainer.ts
deleted file mode 100644
index 9e697f519..000000000
--- a/src/workers/webdav/dependencyInjection/DependencyContainer.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Axios } from 'axios';
-import { WebdavFileClonner } from '../modules/files/application/WebdavFileClonner';
-import { WebdavFileCreator } from '../modules/files/application/WebdavFileCreator';
-import { WebdavFileDeleter } from '../modules/files/application/WebdavFileDeleter';
-import { WebdavFileDownloader } from '../modules/files/application/WebdavFileDownloader';
-import { WebdavFileMimeTypeResolver } from '../modules/files/application/WebdavFileMimeTypeResolver';
-import { WebdavFileMover } from '../modules/files/application/WebdavFileMover';
-import { WebdavFileRenamer } from '../modules/files/application/WebdavFileRenamer';
-import { WebdavFolderCreator } from '../modules/folders/application/WebdavFolderCreator';
-import { WebdavFolderDeleter } from '../modules/folders/application/WebdavFolderDeleter';
-import { WebdavFolderFinder } from '../modules/folders/application/WebdavFolderFinder';
-import { WebdavFolderMover } from '../modules/folders/application/WebdavFolderMover';
-import { WebdavFolderRenamer } from '../modules/folders/application/WebdavFolderRenamer';
-import { AllWebdavItemsNameLister } from '../modules/shared/application/AllWebdavItemsSearcher';
-import { WebdavUnknownItemTypeSearcher } from '../modules/shared/application/WebdavUnknownItemTypeSearcher';
-import { WebdavUnkownItemMetadataDealer } from '../modules/shared/application/WebdavUnkownItemMetadataDealer';
-import { WebdavServerEventBus } from '../modules/shared/domain/WebdavServerEventBus';
-import { FreeSpacePerEnvironmentCalculator } from '../modules/userUsage/application/FreeSpacePerEnvironmentCalculator';
-import { IncrementDriveUsageOnFileCreated } from '../modules/userUsage/application/IncrementDriveUsageOnFileCreated';
-import { UsedSpaceCalculator } from '../modules/userUsage/application/UsedSpaceCalculator';
-import { UserUsageDecrementer } from '../modules/userUsage/application/UserUsageDecrementer';
-import { UserUsageIncrementer } from '../modules/userUsage/application/UserUsageIncrementer';
-import { UserUsageRepository } from '../modules/userUsage/domain/UserUsageRepository';
-
-export interface DependencyContainer {
-  drive: Axios;
-  newDrive: Axios;
-
-  userUsageRepository: UserUsageRepository;
-  freeUsageCalculator: FreeSpacePerEnvironmentCalculator;
-  usedSpaceCalculator: UsedSpaceCalculator;
-  userUsageIncrementer: UserUsageIncrementer;
-  userUsageDecrementer: UserUsageDecrementer;
-  incrementDriveUsageOnFileCreated: IncrementDriveUsageOnFileCreated;
-
-  fileClonner: WebdavFileClonner;
-  fileDeleter: WebdavFileDeleter;
-  fileMover: WebdavFileMover;
-  fileCreator: WebdavFileCreator;
-  fileDownloader: WebdavFileDownloader;
-  fileMimeTypeResolver: WebdavFileMimeTypeResolver;
-  fileRenamer: WebdavFileRenamer;
-
-  folderCreator: WebdavFolderCreator;
-
-  folderMover: WebdavFolderMover;
-  folderFinder: WebdavFolderFinder;
-  folderDeleter: WebdavFolderDeleter;
-  folderRenamer: WebdavFolderRenamer;
-
-  itemMetadataDealer: WebdavUnkownItemMetadataDealer;
-  itemSearcher: WebdavUnknownItemTypeSearcher;
-  allItemsLister: AllWebdavItemsNameLister;
-
-  eventBus: WebdavServerEventBus;
-}
diff --git a/src/workers/webdav/dependencyInjection/DependencyContainerFactory.ts b/src/workers/webdav/dependencyInjection/DependencyContainerFactory.ts
deleted file mode 100644
index ffac495ea..000000000
--- a/src/workers/webdav/dependencyInjection/DependencyContainerFactory.ts
+++ /dev/null
@@ -1,232 +0,0 @@
-import { Environment } from '@internxt/inxt-js';
-import PhotosSubmodule from '@internxt/sdk/dist/photos/photos';
-import { ipcRenderer } from 'electron';
-import { getUser } from 'main/auth/service';
-import configStore from 'main/config';
-import { getClients } from '../../../shared/HttpClient/backgroud-process-clients';
-import crypt from '../../utils/crypt';
-import { WebdavFileClonner } from '../modules/files/application/WebdavFileClonner';
-import { WebdavFileCreator } from '../modules/files/application/WebdavFileCreator';
-import { WebdavFileDeleter } from '../modules/files/application/WebdavFileDeleter';
-import { WebdavFileDownloader } from '../modules/files/application/WebdavFileDownloader';
-import { WebdavFileMimeTypeResolver } from '../modules/files/application/WebdavFileMimeTypeResolver';
-import { WebdavFileMover } from '../modules/files/application/WebdavFileMover';
-import { HttpFileRepository } from '../modules/files/infrastructure/persistance/HttpFileRepository';
-import { InMemoryTemporalFileMetadataCollection } from '../modules/files/infrastructure/persistance/InMemoryTemporalFileMetadataCollection';
-import { WebdavFolderCreator } from '../modules/folders/application/WebdavFolderCreator';
-import { WebdavFolderDeleter } from '../modules/folders/application/WebdavFolderDeleter';
-import { WebdavFolderFinder } from '../modules/folders/application/WebdavFolderFinder';
-import { WebdavFolderMover } from '../modules/folders/application/WebdavFolderMover';
-import { HttpFolderRepository } from '../modules/folders/infrastructure/HttpFolderRepository';
-import { Traverser } from '../modules/items/application/Traverser';
-import { AllWebdavItemsNameLister } from '../modules/shared/application/AllWebdavItemsSearcher';
-import { WebdavUnknownItemTypeSearcher } from '../modules/shared/application/WebdavUnknownItemTypeSearcher';
-import { WebdavUnkownItemMetadataDealer } from '../modules/shared/application/WebdavUnkownItemMetadataDealer';
-import { NodeJsEventBus } from '../modules/shared/infrastructure/DuplexEventBus';
-import { FreeSpacePerEnvironmentCalculator } from '../modules/userUsage/application/FreeSpacePerEnvironmentCalculator';
-import { IncrementDriveUsageOnFileCreated } from '../modules/userUsage/application/IncrementDriveUsageOnFileCreated';
-import { UsedSpaceCalculator } from '../modules/userUsage/application/UsedSpaceCalculator';
-import { UserUsageDecrementer } from '../modules/userUsage/application/UserUsageDecrementer';
-import { UserUsageIncrementer } from '../modules/userUsage/application/UserUsageIncrementer';
-import { CachedHttpUserUsageRepository } from '../modules/userUsage/infrastrucutre/CachedHttpUserUsageRepository';
-import { DependencyContainer } from './DependencyContainer';
-import { ipc } from '../ipc';
-import { WebdavFolderRenamer } from '../modules/folders/application/WebdavFolderRenamer';
-import { WebdavFileRenamer } from '../modules/files/application/WebdavFileRenamer';
-import { EnvironmentRemoteFileContentsManagersFactory } from '../modules/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
-import { FSContentsCacheRepository } from '../modules/contents/infrastructure/FSContentsCacheRepository';
-
-export class DependencyContainerFactory {
-  private _container: DependencyContainer | undefined;
-
-  static readonly subscriptors: Array<keyof DependencyContainer> = [
-    'incrementDriveUsageOnFileCreated',
-  ];
-
-  eventSubscriptors(
-    key: keyof DependencyContainer
-  ): DependencyContainer[keyof DependencyContainer] | undefined {
-    if (!this._container) return undefined;
-
-    return this._container[key];
-  }
-
-  public get containter() {
-    return this._container;
-  }
-
-  async build(): Promise<DependencyContainer> {
-    if (this._container !== undefined) {
-      return this._container;
-    }
-    const user = getUser();
-
-    if (!user) {
-      throw new Error('');
-    }
-
-    const clients = getClients();
-
-    const mnemonic = configStore.get('mnemonic');
-
-    const token = await ipcRenderer.invoke('get-new-token');
-
-    const photosSubmodule = new PhotosSubmodule({
-      baseUrl: process.env.PHOTOS_URL,
-      accessToken: token,
-    });
-
-    const userUsageRepository = new CachedHttpUserUsageRepository(
-      clients.drive,
-      photosSubmodule
-    );
-
-    const environment = new Environment({
-      bridgeUrl: process.env.BRIDGE_URL,
-      bridgeUser: user.bridgeUser,
-      bridgePass: user.userId,
-      encryptionKey: mnemonic,
-    });
-
-    const traverser = new Traverser(crypt, user.root_folder_id);
-
-    const fileRepository = new HttpFileRepository(
-      crypt,
-      clients.drive,
-      clients.newDrive,
-      traverser,
-      user.bucket,
-      ipc
-    );
-
-    const folderRepository = new HttpFolderRepository(
-      clients.drive,
-      clients.newDrive,
-      traverser,
-      ipc
-    );
-
-    await fileRepository.init();
-    await folderRepository.init();
-
-    const cachePath = await ipcRenderer.invoke('get-path', 'userData');
-
-    const localFileConentsRepository = new FSContentsCacheRepository(cachePath);
-
-    await localFileConentsRepository.initialize();
-
-    // const cachedContentsManagerFactory =
-    //   new CachedRemoteFileContentsManagersFactory(
-    //     localFileConentsRepository,
-    //     new EnvironmentRemoteFileContentsManagersFactory(
-    //       environment,
-    //       user.bucket
-    //     )
-    //   );
-    const contentsManagerFactory =
-      new EnvironmentRemoteFileContentsManagersFactory(
-        environment,
-        user.bucket
-      );
-
-    const eventBus = new NodeJsEventBus();
-
-    const fileRenamer = new WebdavFileRenamer(
-      fileRepository,
-      contentsManagerFactory,
-      eventBus,
-      ipc
-    );
-
-    const folderFinder = new WebdavFolderFinder(folderRepository);
-    const folderRenamer = new WebdavFolderRenamer(folderRepository, ipc);
-
-    const temporalFileCollection = new InMemoryTemporalFileMetadataCollection();
-
-    const unknownItemSearcher = new WebdavUnknownItemTypeSearcher(
-      fileRepository,
-      folderRepository
-    );
-
-    const userUsageIncrementer = new UserUsageIncrementer(userUsageRepository);
-
-    const container = {
-      drive: clients.drive,
-      newDrive: clients.newDrive,
-
-      userUsageRepository,
-      freeUsageCalculator: new FreeSpacePerEnvironmentCalculator(
-        userUsageRepository
-      ),
-      usedSpaceCalculator: new UsedSpaceCalculator(userUsageRepository),
-
-      userUsageDecrementer: new UserUsageDecrementer(userUsageRepository),
-      userUsageIncrementer,
-      incrementDriveUsageOnFileCreated: new IncrementDriveUsageOnFileCreated(
-        userUsageIncrementer
-      ),
-
-      fileClonner: new WebdavFileClonner(
-        fileRepository,
-        folderFinder,
-        contentsManagerFactory,
-        eventBus,
-        ipc
-      ),
-      fileDeleter: new WebdavFileDeleter(fileRepository, eventBus, ipc),
-      fileMover: new WebdavFileMover(
-        fileRepository,
-        folderFinder,
-        fileRenamer,
-        eventBus,
-        ipc
-      ),
-      fileCreator: new WebdavFileCreator(
-        fileRepository,
-        folderFinder,
-        contentsManagerFactory,
-        temporalFileCollection,
-        eventBus,
-        ipc
-      ),
-      fileDownloader: new WebdavFileDownloader(
-        fileRepository,
-        contentsManagerFactory,
-        eventBus,
-        ipc
-      ),
-      fileRenamer,
-      fileMimeTypeResolver: new WebdavFileMimeTypeResolver(),
-
-      folderFinder,
-      folderRenamer,
-      folderCreator: new WebdavFolderCreator(
-        folderRepository,
-        folderFinder,
-        ipc
-      ),
-      folderMover: new WebdavFolderMover(
-        folderRepository,
-        folderFinder,
-        folderRenamer
-      ),
-      folderDeleter: new WebdavFolderDeleter(folderRepository),
-
-      itemMetadataDealer: new WebdavUnkownItemMetadataDealer(
-        unknownItemSearcher,
-        temporalFileCollection
-      ),
-      allItemsLister: new AllWebdavItemsNameLister(
-        fileRepository,
-        folderRepository,
-        folderFinder
-      ),
-      itemSearcher: unknownItemSearcher,
-      eventBus,
-    };
-
-    this._container = container;
-
-    return container;
-  }
-}
diff --git a/src/workers/webdav/index.ts b/src/workers/webdav/index.ts
deleted file mode 100644
index cfd14650f..000000000
--- a/src/workers/webdav/index.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import Logger from 'electron-log';
-import { DependencyContainerFactory } from './dependencyInjection/DependencyContainerFactory';
-import { ipc } from './ipc';
-import {
-  mountDrive,
-  retryVirtualDriveMount,
-  unmountDrive,
-} from './VirtualDrive';
-import { InternxtFileSystemFactory } from './worker/InternxtFileSystem/InternxtFileSystemFactory';
-import { InternxtStorageManagerFactory } from './worker/InternxtStorageManager/InternxtSotrageManagerFactory';
-import { InternxtWebdavServer } from './worker/server';
-import { ipcRenderer } from 'electron';
-import { InternxtFileSystem } from './worker/InternxtFileSystem/InternxtFileSystem';
-
-const PORT = 1900;
-
-/**
- * Tries to mount the Virtual Drive again by
- * unmounting and mounting it back
- */
-const retryVirtualDriveMountAndSendEvents = () => {
-  Logger.info('RETRYING VIRTUAL DRIVE MOUNT FROM WORKER');
-  ipc.send('WEBDAV_VIRTUAL_DRIVE_RETRYING_MOUNT');
-  ipc.send('WEBDAV_VIRTUAL_DRIVE_STARTING');
-  retryVirtualDriveMount()
-    .then(() => {
-      ipc.send('WEBDAV_VIRTUAL_DRIVE_MOUNTED_SUCCESSFULLY');
-    })
-    .catch((error) => {
-      Logger.error(error);
-      ipc.send('WEBDAV_VIRTUAL_DRIVE_MOUNT_ERROR', error);
-    });
-};
-
-async function setUp() {
-  try {
-    ipc.send('WEBDAV_VIRTUAL_DRIVE_STARTING');
-    const containerFactory = new DependencyContainerFactory();
-    const container = await containerFactory.build();
-
-    const fileSystem = await InternxtFileSystemFactory.build(container);
-    const storageManager =
-      process.platform !== 'win32'
-        ? await InternxtStorageManagerFactory.build(container)
-        : undefined;
-
-    const server = new InternxtWebdavServer(PORT, container, storageManager);
-
-    ipcRenderer.on('RETRY_VIRTUAL_DRIVE_MOUNT', () => {
-      Logger.info('Retrying virtual drive mount');
-      retryVirtualDriveMountAndSendEvents();
-    });
-
-    ipc.on('STOP_WEBDAV_SERVER_PROCESS', () => {
-      unmountDrive().catch((err) => {
-        Logger.error('Failed to unmount the Virtual Drive ', err);
-      });
-      server
-        .stop()
-        .then(() => {
-          Logger.log('[WEBDAB] Server stopped succesfully');
-          ipc.send('WEBDAV_SERVER_STOP_SUCCESS');
-        })
-        .catch((err) => {
-          Logger.log('[WEBDAB] Server stopped with error', err);
-          ipc.send('WEBDAV_SERVER_STOP_ERROR', err);
-        });
-    });
-
-    ipc.on('START_WEBDAV_SERVER_PROCESS', () => {
-      startWebdavServer(server, fileSystem);
-    });
-
-    await startWebdavServer(server, fileSystem);
-  } catch (error) {
-    ipc.send('WEBDAV_VIRTUAL_DRIVE_MOUNT_ERROR', error as Error);
-  }
-}
-
-const startWebdavServer = async (
-  server: InternxtWebdavServer,
-  fileSystem: InternxtFileSystem
-) => {
-  await server.start([{ path: '/', fs: fileSystem }], { debug: false });
-  await mountDrive();
-  ipc.send('WEBDAV_VIRTUAL_DRIVE_MOUNTED_SUCCESSFULLY');
-};
-
-setUp().catch((err) => {
-  Logger.error(err);
-});
diff --git a/src/workers/webdav/ipc.ts b/src/workers/webdav/ipc.ts
deleted file mode 100644
index 69ccbd5e8..000000000
--- a/src/workers/webdav/ipc.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ipcRenderer } from 'electron';
-import {
-  WebdavMainEvents,
-  WebDavProcessEvents,
-} from '../../shared/IPC/events/webdav';
-import { CustomIpc } from '../../shared/IPC/IPCs';
-
-export type WebdavIpc = CustomIpc<WebDavProcessEvents, WebdavMainEvents>;
-
-export const ipc = ipcRenderer as unknown as WebdavIpc;
diff --git a/src/workers/webdav/modules/contents/domain/ContentFileClonner.ts b/src/workers/webdav/modules/contents/domain/ContentFileClonner.ts
deleted file mode 100644
index 6892cec71..000000000
--- a/src/workers/webdav/modules/contents/domain/ContentFileClonner.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { ContentsId } from './ContentsId';
-
-export type FileCloneEvents = {
-  start: () => void;
-  'start-download': () => void;
-  'start-upload': () => void;
-  'download-progress': (progress: number) => void;
-  'upload-progress': (progress: number) => void;
-  'download-finished': (fileId: ContentsId) => void;
-  'upload-finished': (fileId: ContentsId) => void;
-  finish: (fileId: ContentsId) => void;
-  error: (error: Error) => void;
-};
-
-export interface ContentFileClonner {
-  clone(): Promise<ContentsId>;
-
-  on(
-    event: keyof FileCloneEvents,
-    handler: FileCloneEvents[keyof FileCloneEvents]
-  ): void;
-
-  elapsedTime(): number;
-}
diff --git a/src/workers/webdav/modules/contents/domain/Contents.ts b/src/workers/webdav/modules/contents/domain/Contents.ts
deleted file mode 100644
index c308b9548..000000000
--- a/src/workers/webdav/modules/contents/domain/Contents.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Readable } from 'stream';
-import { AggregateRoot } from '../../shared/domain/AggregateRoot';
-import { ContentsDownloadedDomainEvent } from './events/FileDownloadedDomainEvent';
-import { ContentsId } from './ContentsId';
-
-export class Contents extends AggregateRoot {
-  private constructor(
-    private readonly _id: ContentsId,
-    public readonly stream: Readable
-  ) {
-    super();
-  }
-
-  public get id() {
-    return this._id.value;
-  }
-
-  static from(id: ContentsId, contents: Readable): Contents {
-    const remoteContents = new Contents(id, contents);
-
-    const event = new ContentsDownloadedDomainEvent({
-      aggregateId: id.value,
-    });
-
-    remoteContents.record(event);
-
-    return remoteContents;
-  }
-
-  toPrimitives(): Record<string, string | number | boolean> {
-    return {
-      id: this._id.value,
-    };
-  }
-}
diff --git a/src/workers/webdav/modules/contents/domain/ContentsCacheRepository.ts b/src/workers/webdav/modules/contents/domain/ContentsCacheRepository.ts
deleted file mode 100644
index f4476a0e3..000000000
--- a/src/workers/webdav/modules/contents/domain/ContentsCacheRepository.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Readable } from 'stream';
-
-export interface ContentsCacheRepository {
-  exists(fileId: string): boolean;
-
-  read(fileId: string): Readable;
-
-  write(fileId: string, content: Readable, size: number): Promise<void>;
-
-  delete(fileId: string): Promise<void>;
-
-  usage(): Promise<number>;
-}
diff --git a/src/workers/webdav/modules/contents/domain/ContentsManagersFactory.ts b/src/workers/webdav/modules/contents/domain/ContentsManagersFactory.ts
deleted file mode 100644
index ef35f3013..000000000
--- a/src/workers/webdav/modules/contents/domain/ContentsManagersFactory.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ContentFileClonner } from './ContentFileClonner';
-import { ContentFileDownloader } from './ContentFileDownloader';
-import { ContentFileUploader } from './ContentFileUploader';
-import { FileSize } from '../../files/domain/FileSize';
-import { File } from '../../files/domain/File';
-
-export interface ContentsManagersFactory {
-  downloader(): ContentFileDownloader;
-
-  uploader(size: FileSize): ContentFileUploader;
-
-  clonner(file: File): ContentFileClonner;
-}
diff --git a/src/workers/webdav/modules/contents/domain/events/FileDownloadedDomainEvent.ts b/src/workers/webdav/modules/contents/domain/events/FileDownloadedDomainEvent.ts
deleted file mode 100644
index 2785c716c..000000000
--- a/src/workers/webdav/modules/contents/domain/events/FileDownloadedDomainEvent.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { DomainEvent } from '../../../shared/domain/DomainEvent';
-
-export class ContentsDownloadedDomainEvent extends DomainEvent {
-  static readonly EVENT_NAME: 'contents.downloaded';
-
-  constructor({
-    aggregateId,
-    eventId,
-  }: {
-    aggregateId: string;
-    eventId?: string;
-  }) {
-    super({
-      eventName: 'contents.downloaded',
-      aggregateId,
-      eventId,
-    });
-  }
-
-  toPrimitives() {
-    return {
-      aggregateId: this.aggregateId,
-      eventId: this.eventId,
-    };
-  }
-}
diff --git a/src/workers/webdav/modules/contents/infrastructure/CachedRemoteFileContentsManagersFactory.ts b/src/workers/webdav/modules/contents/infrastructure/CachedRemoteFileContentsManagersFactory.ts
deleted file mode 100644
index 2e5efc379..000000000
--- a/src/workers/webdav/modules/contents/infrastructure/CachedRemoteFileContentsManagersFactory.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { FileSize } from '../../files/domain/FileSize';
-import { ContentFileClonner } from '../domain/ContentFileClonner';
-import { ContentFileDownloader } from '../domain/ContentFileDownloader';
-import { ContentFileUploader } from '../domain/ContentFileUploader';
-import { ContentsCacheRepository } from '../domain/ContentsCacheRepository';
-import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
-import { CachedContentFileDownloader } from './download/CachedContentFileDownloader';
-import { CachedContentFileUploader } from './upload/CachedContentFileUploader';
-import { File } from '../../files/domain/File';
-
-export class CachedRemoteFileContentsManagersFactory
-  implements ContentsManagersFactory
-{
-  constructor(
-    private readonly repository: ContentsCacheRepository,
-    private readonly factory: ContentsManagersFactory
-  ) {}
-
-  downloader(): ContentFileDownloader {
-    return new CachedContentFileDownloader(
-      this.factory.downloader(),
-      this.repository
-    );
-  }
-
-  uploader(size: FileSize): ContentFileUploader {
-    return new CachedContentFileUploader(
-      this.factory.uploader(size),
-      this.repository
-    );
-  }
-
-  clonner(file: File): ContentFileClonner {
-    return this.clonner(file);
-  }
-}
diff --git a/src/workers/webdav/modules/contents/infrastructure/EnvironmentContentFileClonner.ts b/src/workers/webdav/modules/contents/infrastructure/EnvironmentContentFileClonner.ts
deleted file mode 100644
index 75b1a4a73..000000000
--- a/src/workers/webdav/modules/contents/infrastructure/EnvironmentContentFileClonner.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { DownloadStrategyFunction } from '@internxt/inxt-js/build/lib/core';
-import { UploadStrategyFunction } from '@internxt/inxt-js/build/lib/core/upload/strategy';
-import EventEmitter from 'events';
-import { Readable } from 'stream';
-import { Stopwatch } from '../../../../../shared/types/Stopwatch';
-import {
-  ContentFileClonner,
-  FileCloneEvents,
-} from '../domain/ContentFileClonner';
-import { File } from '../../files/domain/File';
-import { ContentsId } from '../domain/ContentsId';
-
-export class EnvironmentContentFileClonner implements ContentFileClonner {
-  private readonly eventEmitter: EventEmitter;
-  private stopwatch: Stopwatch;
-
-  constructor(
-    private readonly upload: UploadStrategyFunction,
-    private readonly download: DownloadStrategyFunction<unknown>,
-    private readonly bucket: string,
-    private readonly file: File
-  ) {
-    this.eventEmitter = new EventEmitter();
-    this.stopwatch = new Stopwatch();
-  }
-
-  private downloadFile(): Promise<Readable> {
-    this.eventEmitter.emit('start-download');
-    this.stopwatch.start();
-    return new Promise((resolve, reject) => {
-      this.download(
-        this.bucket,
-        this.file.contentsId,
-        {
-          progressCallback: (progress: number) => {
-            this.eventEmitter.emit('download-progress', progress);
-          },
-          finishedCallback: async (err: Error, stream: Readable) => {
-            if (err) {
-              this.stopwatch.finish();
-              this.eventEmitter.emit('error', err);
-              return reject(err);
-            }
-            this.eventEmitter.emit('download-finished');
-            resolve(stream);
-          },
-        },
-        {
-          label: 'Dynamic',
-          params: {
-            useProxy: false,
-            concurrency: 10,
-          },
-        }
-      );
-    });
-  }
-
-  private uploadFile(source: Readable, file: File): Promise<string> {
-    this.eventEmitter.emit('start-upload');
-    return new Promise((resolve, reject) => {
-      this.upload(this.bucket, {
-        source,
-        fileSize: file.size,
-        finishedCallback: (err: Error | null, fileId: string) => {
-          this.stopwatch.finish();
-          if (err) {
-            this.eventEmitter.emit('error', err);
-            return reject(err);
-          }
-          this.eventEmitter.emit('upload-finished', fileId);
-          resolve(fileId);
-        },
-        progressCallback: (progress: number) => {
-          this.eventEmitter.emit('upload-progress', progress);
-        },
-      });
-    });
-  }
-
-  async clone() {
-    this.eventEmitter.emit('start');
-
-    const stream = await this.downloadFile();
-    const id = await this.uploadFile(stream, this.file);
-
-    const contentsId = new ContentsId(id);
-
-    this.eventEmitter.emit('finish', contentsId);
-
-    return contentsId;
-  }
-
-  on(
-    event: keyof FileCloneEvents,
-    handler: FileCloneEvents[keyof FileCloneEvents]
-  ): void {
-    this.eventEmitter.on(event, handler);
-  }
-
-  elapsedTime(): number {
-    return this.stopwatch.elapsedTime();
-  }
-}
diff --git a/src/workers/webdav/modules/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts b/src/workers/webdav/modules/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
deleted file mode 100644
index 6c4fb44c3..000000000
--- a/src/workers/webdav/modules/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Environment } from '@internxt/inxt-js';
-import { FileSize } from '../../files/domain/FileSize';
-import { ContentFileClonner } from '../domain/ContentFileClonner';
-import { ContentFileDownloader } from '../domain/ContentFileDownloader';
-import { ContentFileUploader } from '../domain/ContentFileUploader';
-import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
-import { EnvironmentContentFileDownloader } from './download/EnvironmentContnetFileDownloader';
-import { EnvironmentContentFileClonner } from './EnvironmentContentFileClonner';
-import { EnvironmentContentFileUpoader } from './upload/EnvironmentContentFileUpoader';
-import { File } from '../../files/domain/File';
-
-export class EnvironmentRemoteFileContentsManagersFactory
-  implements ContentsManagersFactory
-{
-  private static MULTIPART_UPLOADE_SIZE_THRESHOLD = 5 * 1024 * 1024 * 1024;
-
-  constructor(
-    private readonly environment: Environment,
-    private readonly bucket: string
-  ) {}
-
-  clonner(file: File): ContentFileClonner {
-    const uploadFunciton =
-      file.size >
-      EnvironmentRemoteFileContentsManagersFactory.MULTIPART_UPLOADE_SIZE_THRESHOLD
-        ? this.environment.uploadMultipartFile
-        : this.environment.upload;
-
-    const clonner = new EnvironmentContentFileClonner(
-      uploadFunciton,
-      this.environment.download,
-      this.bucket,
-      file
-    );
-
-    return clonner;
-  }
-
-  downloader(): ContentFileDownloader {
-    return new EnvironmentContentFileDownloader(
-      this.environment.download,
-      this.bucket
-    );
-  }
-
-  uploader(size: FileSize): ContentFileUploader {
-    const fn =
-      size.value >
-      EnvironmentRemoteFileContentsManagersFactory.MULTIPART_UPLOADE_SIZE_THRESHOLD
-        ? this.environment.uploadMultipartFile
-        : this.environment.upload;
-
-    return new EnvironmentContentFileUpoader(fn, this.bucket);
-  }
-}
diff --git a/src/workers/webdav/modules/contents/infrastructure/FSContentsCacheRepository.ts b/src/workers/webdav/modules/contents/infrastructure/FSContentsCacheRepository.ts
deleted file mode 100644
index b3518db0f..000000000
--- a/src/workers/webdav/modules/contents/infrastructure/FSContentsCacheRepository.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { Readable } from 'stream';
-import fs from 'fs/promises';
-import { createReadStream } from 'fs';
-import path from 'path';
-import Logger from 'electron-log';
-import glob from 'tiny-glob';
-import { ContentsCacheRepository } from '../domain/ContentsCacheRepository';
-
-export class FSContentsCacheRepository implements ContentsCacheRepository {
-  private static readonly TWO_GB = 2 * 1024 * 1024 * 1024;
-  private static readonly directoryName = 'File Cache';
-
-  private readonly cachedFilesAccessTime = new Map<string, number>();
-  private readonly directory: string;
-  private readonly maxCacheSize: number;
-
-  constructor(where: string, maxCacheSize: number | null = null) {
-    this.directory = path.join(where, FSContentsCacheRepository.directoryName);
-    this.maxCacheSize = maxCacheSize || FSContentsCacheRepository.TWO_GB;
-  }
-
-  private getOldestAccessedFile(): string | undefined {
-    if (this.cachedFilesAccessTime.size === 0) {
-      return undefined;
-    }
-
-    let oldestTimestamp: number | null = null;
-    let oldestId: string | null = null;
-
-    for (const [id, accessed] of this.cachedFilesAccessTime) {
-      if (oldestTimestamp === null || accessed < oldestTimestamp) {
-        oldestTimestamp = accessed;
-        oldestId = id;
-      }
-    }
-
-    return oldestId || undefined;
-  }
-
-  private async ensureFileCacheContained(size: number): Promise<void> {
-    if (size >= this.maxCacheSize) {
-      return Promise.reject('File is too large to be cached');
-    }
-
-    let current = await this.usage();
-
-    while (
-      current + size >= this.maxCacheSize &&
-      this.cachedFilesAccessTime.size > 0
-    ) {
-      const oldestAccessed = this.getOldestAccessedFile();
-
-      if (oldestAccessed) {
-        // eslint-disable-next-line no-await-in-loop
-        await this.delete(oldestAccessed);
-
-        this.cachedFilesAccessTime.delete(oldestAccessed);
-      }
-
-      // eslint-disable-next-line no-await-in-loop
-      current = await this.usage();
-    }
-  }
-
-  private assemblePath(fileId: string) {
-    return path.join(this.directory, fileId);
-  }
-
-  async initialize(): Promise<void> {
-    Logger.info('Initializing, file cache...');
-    fs.mkdir(this.directory);
-
-    const cached = await glob('**', {
-      filesOnly: true,
-      absolute: false,
-      dot: false,
-      flush: true,
-      cwd: this.directory,
-    });
-
-    const populate = cached.map(async (id) => {
-      const { atimeMs } = await fs.stat(path.join(this.directory, id));
-
-      this.cachedFilesAccessTime.set(id, atimeMs);
-    });
-
-    await Promise.all(populate);
-  }
-
-  exists(fileId: string): boolean {
-    return this.cachedFilesAccessTime.has(fileId);
-  }
-
-  read(fileId: string): Readable {
-    const stream = createReadStream(this.assemblePath(fileId));
-
-    this.cachedFilesAccessTime.set(fileId, Date.now());
-
-    return stream;
-  }
-
-  async write(fileId: string, content: Readable, size: number): Promise<void> {
-    await this.ensureFileCacheContained(size);
-
-    await fs.writeFile(this.assemblePath(fileId), content, { flag: 'w' });
-
-    this.cachedFilesAccessTime.set(fileId, Date.now());
-  }
-
-  delete(fileId: string): Promise<void> {
-    return fs.unlink(this.assemblePath(fileId));
-  }
-
-  async usage(): Promise<number> {
-    const stats = await fs.stat(this.directory);
-
-    return stats.size;
-  }
-}
diff --git a/src/workers/webdav/modules/contents/infrastructure/download/CachedContentFileDownloader.ts b/src/workers/webdav/modules/contents/infrastructure/download/CachedContentFileDownloader.ts
deleted file mode 100644
index 39d4f364d..000000000
--- a/src/workers/webdav/modules/contents/infrastructure/download/CachedContentFileDownloader.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Readable } from 'stream';
-import { File } from '../../../files/domain/File';
-import Logger from 'electron-log';
-import {
-  ContentFileDownloader,
-  FileDownloadEvents,
-} from '../../domain/ContentFileDownloader';
-import { ContentsCacheRepository } from '../../domain/ContentsCacheRepository';
-
-export class CachedContentFileDownloader implements ContentFileDownloader {
-  elapsedTime: () => number;
-  on: (
-    event: keyof FileDownloadEvents,
-    handler: FileDownloadEvents[keyof FileDownloadEvents]
-  ) => void;
-
-  constructor(
-    private readonly fileDownloader: ContentFileDownloader,
-    private readonly cachedRepository: ContentsCacheRepository
-  ) {
-    this.on = fileDownloader.on.bind(fileDownloader);
-    this.elapsedTime = fileDownloader.elapsedTime.bind(fileDownloader);
-  }
-
-  async download(file: File): Promise<Readable> {
-    const isCached = await this.cachedRepository.exists(file.contentsId);
-
-    if (isCached) {
-      Logger.info(
-        `File with id ${file.contentsId} is cached. Skiping downloading it.`
-      );
-      return this.cachedRepository.read(file.contentsId);
-    }
-
-    const contents = await this.fileDownloader.download(file);
-
-    this.cachedRepository
-      .write(file.contentsId, contents, file.size)
-      .catch((error) => {
-        Logger.error('Error caching file: ', file.contentsId, error);
-      });
-
-    return contents;
-  }
-}
diff --git a/src/workers/webdav/modules/contents/infrastructure/upload/CachedContentFileUploader.ts b/src/workers/webdav/modules/contents/infrastructure/upload/CachedContentFileUploader.ts
deleted file mode 100644
index e3036196b..000000000
--- a/src/workers/webdav/modules/contents/infrastructure/upload/CachedContentFileUploader.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Readable } from 'stream';
-import Logger from 'electron-log';
-import {
-  ContentFileUploader,
-  FileUploadEvents,
-} from '../../domain/ContentFileUploader';
-import { ContentsCacheRepository } from '../../domain/ContentsCacheRepository';
-
-export class CachedContentFileUploader implements ContentFileUploader {
-  elapsedTime: () => number;
-  on: (
-    event: keyof FileUploadEvents,
-    handler: FileUploadEvents[keyof FileUploadEvents]
-  ) => void;
-
-  constructor(
-    private readonly uploader: ContentFileUploader,
-    private readonly localFileContentsRepository: ContentsCacheRepository
-  ) {
-    this.on = uploader.on.bind(uploader);
-    this.elapsedTime = uploader.elapsedTime.bind(uploader);
-  }
-
-  async upload(contents: Readable, size: number): Promise<string> {
-    const id = await this.uploader.upload(contents, size);
-
-    this.localFileContentsRepository
-      .write(id, contents, size)
-      .catch((error) => {
-        Logger.error('Error caching file: ', id, error);
-      });
-
-    return id;
-  }
-}
diff --git a/src/workers/webdav/modules/contents/test/__mocks__/ContentFileClonnerMock.ts b/src/workers/webdav/modules/contents/test/__mocks__/ContentFileClonnerMock.ts
deleted file mode 100644
index 1e68629d9..000000000
--- a/src/workers/webdav/modules/contents/test/__mocks__/ContentFileClonnerMock.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import {
-  ContentFileClonner,
-  FileCloneEvents,
-} from '../../domain/ContentFileClonner';
-import { ContentsId } from '../../domain/ContentsId';
-
-export class ContentFileClonnerMock implements ContentFileClonner {
-  mock = jest.fn();
-  onMock = jest.fn();
-  elapsedTimeMock = jest.fn();
-
-  clone(): Promise<ContentsId> {
-    return this.mock();
-  }
-
-  on(
-    event: keyof FileCloneEvents,
-    fn:
-      | (() => void)
-      | ((progress: number) => void)
-      | ((fileId: ContentsId) => void)
-      | ((error: Error) => void)
-  ): void {
-    return this.onMock(event, fn);
-  }
-
-  elapsedTime(): number {
-    return this.elapsedTimeMock();
-  }
-}
diff --git a/src/workers/webdav/modules/contents/test/__mocks__/ContentsCacheRepositoryMock.ts b/src/workers/webdav/modules/contents/test/__mocks__/ContentsCacheRepositoryMock.ts
deleted file mode 100644
index fea33873a..000000000
--- a/src/workers/webdav/modules/contents/test/__mocks__/ContentsCacheRepositoryMock.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { Readable } from 'stream';
-import { ContentsCacheRepository } from '../../domain/ContentsCacheRepository';
-
-export class ContentsCacheRepositoryMock implements ContentsCacheRepository {
-  existsMock = jest.fn();
-  readMock = jest.fn();
-  writeMock = jest.fn();
-  deleteMock = jest.fn();
-  usageMock = jest.fn();
-
-  exists(fileId: string): boolean {
-    return this.existsMock(fileId);
-  }
-  read(fileId: string): Readable {
-    return this.readMock(fileId);
-  }
-  write(fileId: string, content: Readable, size: number): Promise<void> {
-    return this.writeMock(fileId, content, size);
-  }
-  delete(fileId: string): Promise<void> {
-    return this.deleteMock(fileId);
-  }
-  usage(): Promise<number> {
-    return this.usageMock();
-  }
-}
diff --git a/src/workers/webdav/modules/contents/test/__mocks__/RemoteFileContentsManagersFactoryMock.ts b/src/workers/webdav/modules/contents/test/__mocks__/RemoteFileContentsManagersFactoryMock.ts
deleted file mode 100644
index f6c0a7319..000000000
--- a/src/workers/webdav/modules/contents/test/__mocks__/RemoteFileContentsManagersFactoryMock.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { ContentsManagersFactory } from '../../domain/ContentsManagersFactory';
-import { FileSize } from '../../../files/domain/FileSize';
-import { File } from '../../../files/domain/File';
-import { ContentFileUploader } from '../../domain/ContentFileUploader';
-import { ContentFileClonner } from '../../domain/ContentFileClonner';
-import { ContentFileUploaderMock } from './ContentFileUploaderMock';
-import { ContentFileClonnerMock } from './ContentFileClonnerMock';
-import { ContentFileDownloaderMock } from './ContentFileDownloaderMock';
-import { ContentFileDownloader } from '../../domain/ContentFileDownloader';
-
-export class RemoteFileContentsManagersFactoryMock
-  implements ContentsManagersFactory
-{
-  public mockClone = new ContentFileClonnerMock();
-  public mockDownload = new ContentFileDownloaderMock();
-  public mockUpload = new ContentFileUploaderMock();
-
-  clonner(_file: File): ContentFileClonner {
-    return this.mockClone;
-  }
-
-  downloader(): ContentFileDownloader {
-    return this.mockDownload;
-  }
-
-  uploader(_size: FileSize): ContentFileUploader {
-    return this.mockUpload;
-  }
-}
diff --git a/src/workers/webdav/modules/contents/test/infrastructure/EnvironmentContentFileClonner.test.ts b/src/workers/webdav/modules/contents/test/infrastructure/EnvironmentContentFileClonner.test.ts
deleted file mode 100644
index 48e239ee7..000000000
--- a/src/workers/webdav/modules/contents/test/infrastructure/EnvironmentContentFileClonner.test.ts
+++ /dev/null
@@ -1,464 +0,0 @@
-import { Readable } from 'stream';
-import { FileMother } from '../../../files/test/domain/FileMother';
-import { EnvironmentContentFileClonner } from '../../infrastructure/EnvironmentContentFileClonner';
-import { ContentsIdMother } from '../domain/ContentsIdMother';
-import { createDownloadStrategy } from '../__mocks__/environment/DownloadStratgeyFunctionMock';
-import { createUploadStrategy } from '../__mocks__/environment/UploadStrategyFunciontMock';
-
-describe('Environment Content File Clonner', () => {
-  const bucket = 'b1d067f9-d0a9-5e24-96f5-81c116f7f254';
-  const file = FileMother.any();
-
-  describe('event emitter', () => {
-    it('emits an event when a file is cloned', async () => {
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        callbacks.finishedCallback(null as unknown as Error, Readable.from(''));
-      });
-      const uploadStrategy = createUploadStrategy((callbacks) => {
-        callbacks.finishedCallback(null, ContentsIdMother.raw());
-      });
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      const handler = jest.fn();
-
-      clonner.on('start', handler);
-
-      await clonner.clone();
-
-      expect(handler).toBeCalled();
-    });
-
-    it('emits an event with a file id when a file is cloned', async () => {
-      const uploadedFileId = ContentsIdMother.random();
-
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        callbacks.finishedCallback(null as unknown as Error, Readable.from(''));
-      });
-      const uploadStrategy = createUploadStrategy((callbacks) => {
-        callbacks.finishedCallback(null, uploadedFileId.value);
-      });
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      const handler = jest.fn();
-
-      clonner.on('finish', handler);
-
-      await clonner.clone();
-
-      expect(handler).toBeCalledWith(uploadedFileId);
-    });
-
-    it('emits an event when the file is being downloaded', async () => {
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        callbacks.finishedCallback(null as unknown as Error, Readable.from(''));
-      });
-      const uploadStrategy = createUploadStrategy((callbacks) => {
-        callbacks.finishedCallback(null, ContentsIdMother.raw());
-      });
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      const handler = jest.fn();
-
-      clonner.on('start-download', handler);
-
-      await clonner.clone();
-
-      expect(handler).toBeCalled();
-    });
-
-    it('emits an event when there is a progress update on download', async () => {
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        callbacks.progressCallback(25);
-        callbacks.progressCallback(50);
-        callbacks.progressCallback(75);
-        callbacks.finishedCallback(null as unknown as Error, Readable.from(''));
-      });
-      const uploadStrategy = createUploadStrategy((callbacks) => {
-        callbacks.finishedCallback(null, ContentsIdMother.raw());
-      });
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      const handler = jest.fn();
-
-      clonner.on('download-progress', handler);
-
-      await clonner.clone();
-
-      expect(handler.mock.calls).toEqual([[25], [50], [75]]);
-    });
-
-    it('emits an event when the file has been downloaded', async () => {
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        callbacks.finishedCallback(null as unknown as Error, Readable.from(''));
-      });
-      const uploadStrategy = createUploadStrategy((callbacks) => {
-        callbacks.finishedCallback(null, ContentsIdMother.raw());
-      });
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      const handler = jest.fn();
-
-      clonner.on('download-finished', handler);
-
-      await clonner.clone();
-
-      expect(handler).toHaveBeenCalled();
-    });
-
-    it('emits an event when the upload starts', async () => {
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        callbacks.finishedCallback(null as unknown as Error, Readable.from(''));
-      });
-      const uploadStrategy = createUploadStrategy((callbacks) => {
-        callbacks.finishedCallback(null, ContentsIdMother.raw());
-      });
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      const handler = jest.fn();
-
-      clonner.on('start-upload', handler);
-
-      await clonner.clone();
-
-      expect(handler).toHaveBeenCalled();
-    });
-
-    it('emits an event when the is an upload progress update', async () => {
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        callbacks.finishedCallback(null as unknown as Error, Readable.from(''));
-      });
-      const uploadStrategy = createUploadStrategy((callbacks) => {
-        callbacks.progressCallback(25, 1, 4);
-        callbacks.progressCallback(50, 2, 4);
-        callbacks.progressCallback(75, 3, 4);
-        callbacks.finishedCallback(null, ContentsIdMother.raw());
-      });
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      const handler = jest.fn();
-
-      clonner.on('upload-progress', handler);
-
-      await clonner.clone();
-
-      expect(handler).toHaveBeenCalled();
-    });
-
-    it('emits an event when the file has been uploaded', async () => {
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        callbacks.finishedCallback(null as unknown as Error, Readable.from(''));
-      });
-      const uploadStrategy = createUploadStrategy((callbacks) => {
-        callbacks.finishedCallback(null, ContentsIdMother.raw());
-      });
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      const handler = jest.fn();
-
-      clonner.on('upload-finished', handler);
-
-      await clonner.clone();
-
-      expect(handler).toHaveBeenCalled();
-    });
-
-    it('emits an event when a file has been cloned', async () => {
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        callbacks.finishedCallback(null as unknown as Error, Readable.from(''));
-      });
-      const uploadStrategy = createUploadStrategy((callbacks) => {
-        callbacks.finishedCallback(null, ContentsIdMother.raw());
-      });
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      const handler = jest.fn();
-
-      clonner.on('finish', handler);
-
-      await clonner.clone();
-
-      expect(handler).toHaveBeenCalled();
-    });
-
-    it('does not emit finish events or start upload when an error event has been emitted on download', async () => {
-      const message = 'error downloading';
-
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        callbacks.finishedCallback(
-          { message } as unknown as Error,
-          null as unknown as Readable
-        );
-      });
-
-      const uploadFunction = jest.fn();
-
-      const uploadStrategy = createUploadStrategy(uploadFunction);
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      const finishHandler = jest.fn();
-      const startUploadHandler = jest.fn();
-      const errorHandler = jest.fn();
-
-      clonner.on('error', errorHandler);
-      clonner.on('finish', finishHandler);
-      clonner.on('start-upload', finishHandler);
-
-      await clonner.clone().catch(() => {
-        // no-op
-      });
-
-      expect(errorHandler).toHaveBeenCalled();
-      expect(finishHandler).not.toHaveBeenCalled();
-      expect(startUploadHandler).not.toHaveBeenCalled();
-    });
-
-    it('does not emit finish events when an error event has been emitted on upload', async () => {
-      const message = 'error uploading';
-
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        callbacks.finishedCallback(null as unknown as Error, Readable.from(''));
-      });
-
-      const uploadStrategy = createUploadStrategy((callbacks) => {
-        callbacks.finishedCallback(
-          { message } as unknown as Error,
-          null as unknown as string
-        );
-      });
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      const errorHandler = jest.fn();
-      const startUploadHandler = jest.fn();
-      const finishHandler = jest.fn();
-
-      clonner.on('error', errorHandler);
-      clonner.on('finish', finishHandler);
-      clonner.on('start-upload', startUploadHandler);
-
-      await clonner.clone().catch(() => {
-        // no-op
-      });
-
-      expect(errorHandler).toHaveBeenCalled();
-      expect(startUploadHandler).toHaveBeenCalled();
-      expect(finishHandler).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('time watcher', () => {
-    it('starts the timer when the file is being downloaded', async () => {
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        setTimeout(() => callbacks.progressCallback(50), 20);
-        setTimeout(
-          () =>
-            callbacks.finishedCallback(
-              null as unknown as Error,
-              Readable.from('')
-            ),
-          100
-        );
-      });
-      const uploadStrategy = createUploadStrategy((callbacks) => {
-        callbacks.finishedCallback(null, ContentsIdMother.raw());
-      });
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      clonner.on('download-progress', () => {
-        expect(clonner.elapsedTime()).toBeGreaterThan(-1);
-      });
-
-      expect(clonner.elapsedTime()).toBe(-1);
-
-      await clonner.clone();
-    });
-
-    it('stops the stopwatch when the file has been uploaded', async () => {
-      const delay = 100;
-
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        callbacks.finishedCallback(null as unknown as Error, Readable.from(''));
-      });
-      const uploadStrategy = createUploadStrategy((callbacks) => {
-        setTimeout(
-          () => callbacks.finishedCallback(null, ContentsIdMother.raw()),
-          delay
-        );
-      });
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      await clonner.clone();
-
-      setTimeout(() => {
-        expect(clonner.elapsedTime()).toBeGreaterThan(delay - 10);
-        expect(clonner.elapsedTime()).toBeLessThan(delay + 10);
-      }, delay);
-    });
-
-    it('stops the stopwatch when an error occurs during the download', async () => {
-      const delay = 100;
-      let elapsedTimeOnError: number;
-
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        setTimeout(() => callbacks.progressCallback(50), 20);
-        setTimeout(
-          () =>
-            callbacks.finishedCallback(
-              { message: 'error downloading ' } as unknown as Error,
-              null as unknown as Readable
-            ),
-          delay
-        );
-      });
-      const uploadStrategy = createUploadStrategy((callbacks) => {
-        setTimeout(
-          () => callbacks.finishedCallback(null, ContentsIdMother.raw()),
-          delay
-        );
-      });
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      clonner.on('error', () => {
-        elapsedTimeOnError = clonner.elapsedTime();
-      });
-
-      await clonner.clone().catch(() => {
-        // no-op
-      });
-
-      setTimeout(() => {
-        expect(clonner.elapsedTime()).toBeGreaterThan(elapsedTimeOnError - 5);
-        expect(clonner.elapsedTime()).toBeLessThan(elapsedTimeOnError + 5);
-      }, delay);
-    });
-
-    it('stops the stopwatch when an error occurs during the upload', async () => {
-      const delay = 100;
-      let elapsedTimeOnError: number;
-
-      const downloadStragegy = createDownloadStrategy((callbacks) => {
-        setTimeout(
-          () =>
-            callbacks.finishedCallback(
-              null as unknown as Error,
-              Readable.from('')
-            ),
-          delay
-        );
-      });
-      const uploadStrategy = createUploadStrategy((callbacks) => {
-        setTimeout(
-          () =>
-            callbacks.finishedCallback(
-              { message: 'error uploading ' } as unknown as Error,
-              null as unknown as string
-            ),
-          delay
-        );
-      });
-
-      const clonner = new EnvironmentContentFileClonner(
-        uploadStrategy,
-        downloadStragegy,
-        bucket,
-        file
-      );
-
-      clonner.on('error', () => {
-        elapsedTimeOnError = clonner.elapsedTime();
-      });
-
-      await clonner.clone().catch(() => {
-        // no-op
-      });
-
-      setTimeout(() => {
-        expect(clonner.elapsedTime()).toBeGreaterThan(elapsedTimeOnError - 5);
-        expect(clonner.elapsedTime()).toBeLessThan(elapsedTimeOnError + 5);
-      }, delay);
-    });
-  });
-});
diff --git a/src/workers/webdav/modules/contents/test/infrastructure/FSContentsCacheRepository.test.ts b/src/workers/webdav/modules/contents/test/infrastructure/FSContentsCacheRepository.test.ts
deleted file mode 100644
index 3dcfad582..000000000
--- a/src/workers/webdav/modules/contents/test/infrastructure/FSContentsCacheRepository.test.ts
+++ /dev/null
@@ -1,203 +0,0 @@
-import glob from 'tiny-glob';
-import fs from 'fs/promises';
-import { createReadStream } from 'fs';
-import { Readable } from 'stream';
-import { FSContentsCacheRepository } from '../../infrastructure/FSContentsCacheRepository';
-
-jest.mock('tiny-glob', () => jest.fn());
-jest.mock('fs/promises');
-jest.mock('fs');
-
-const whereToCreateIt = '/Getziujo/Turfiri/Ipfugiri';
-
-const contents = Readable.from('FILE CONTENTS');
-
-describe('fs contents cache repository', () => {
-  const mocked = {
-    createReadStream: <jest.Mock>createReadStream,
-    stat: <jest.Mock>fs.stat,
-    writeFile: <jest.Mock>fs.writeFile,
-    unlink: <jest.Mock>fs.unlink,
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  describe('exists', () => {
-    it('returns true when the file exists', async () => {
-      const fileId = '9f66fbdc-a618-5a1b-876c-619f207c2b62';
-      const size = 1907851052;
-      const repository = new FSContentsCacheRepository(whereToCreateIt);
-
-      mocked.stat.mockResolvedValueOnce(size + 1);
-      mocked.writeFile.mockReturnValueOnce(Promise.resolve());
-
-      await repository.write(fileId, contents, size);
-
-      const result = repository.exists(fileId);
-
-      expect(result).toBe(true);
-    });
-
-    it('returns false when the file does not exist', async () => {
-      const repository = new FSContentsCacheRepository(whereToCreateIt);
-
-      const result = repository.exists('544b943d-c663-5fe3-bd89-6a52bb80880e');
-
-      expect(result).toBe(false);
-    });
-  });
-
-  describe('read', () => {
-    it('creates a readable for file given an existing file name', async () => {
-      mocked.createReadStream.mockResolvedValueOnce(contents);
-
-      const repository = new FSContentsCacheRepository(whereToCreateIt);
-
-      repository.read('544b943d-c663-5fe3-bd89-6a52bb80880e');
-
-      expect(mocked.createReadStream.mock.calls[0][0]).toEqual(
-        '/Getziujo/Turfiri/Ipfugiri/File Cache/544b943d-c663-5fe3-bd89-6a52bb80880e'
-      );
-    });
-  });
-
-  describe('write', () => {
-    it('saves a file with the given name and override it if exists', async () => {
-      const fileSize = 4212153063;
-      mocked.writeFile.mockResolvedValueOnce(Promise.resolve());
-      mocked.stat.mockResolvedValueOnce({ size: fileSize + 1 });
-
-      const repository = new FSContentsCacheRepository(
-        whereToCreateIt,
-        fileSize * 2
-      );
-
-      await repository.write(
-        '544b943d-c663-5fe3-bd89-6a52bb80880e',
-        contents,
-        fileSize
-      );
-
-      expect(mocked.writeFile).toBeCalledWith(
-        '/Getziujo/Turfiri/Ipfugiri/File Cache/544b943d-c663-5fe3-bd89-6a52bb80880e',
-        contents,
-        { flag: 'w' }
-      );
-    });
-
-    it('deletes the least recent accessed files when there is not enought space', async () => {
-      const fileSize = 30;
-      mocked.stat
-        .mockResolvedValueOnce({ size: 80 })
-        .mockResolvedValueOnce({ size: 60 });
-      mocked.unlink.mockReturnValueOnce(Promise.resolve());
-      mocked.writeFile.mockResolvedValueOnce(Promise.resolve());
-
-      const repository = new FSContentsCacheRepository(whereToCreateIt, 100);
-
-      (repository as any).cachedFilesAccessTime.set(
-        'baaf80d1-8c0b-50ad-a370-11450428a8cc',
-        Date.now()
-      );
-      (repository as any).cachedFilesAccessTime.set(
-        'b595b2b5-92ed-5744-97f5-4acd8e69e0ee',
-        Date.now()
-      );
-      (repository as any).cachedFilesAccessTime.set(
-        '940c9bac-bc1c-5ff7-9fc9-573d78df8c39',
-        Date.now()
-      );
-
-      await repository.write(
-        'd30cd495-d20e-513f-b1a3-2865f605999b',
-        contents,
-        fileSize
-      );
-      expect(mocked.stat).toBeCalledTimes(2);
-      expect(mocked.unlink).toBeCalledTimes(1);
-    });
-
-    it('does not cache the file if its size is larger than the cache space', async () => {
-      const fileId = '8cebd95f-2397-57f8-aa8f-c549cbd8b942';
-      const fileSize = 4212153063;
-      mocked.writeFile.mockResolvedValueOnce(Promise.resolve());
-
-      const repository = new FSContentsCacheRepository(
-        whereToCreateIt,
-        fileSize - 1
-      );
-
-      await repository.write(fileId, contents, fileSize).catch((err) => {
-        expect(err).toBeDefined();
-      });
-
-      expect(mocked.writeFile).not.toBeCalled();
-      expect(repository.exists(fileId)).toBe(false);
-    });
-  });
-
-  describe('delete', () => {
-    it('deletes a file from the cahce', async () => {
-      mocked.unlink.mockResolvedValue(Promise.resolve());
-
-      const repository = new FSContentsCacheRepository(whereToCreateIt);
-
-      await repository.delete('544b943d-c663-5fe3-bd89-6a52bb80880e');
-
-      expect(mocked.unlink.mock.calls[0][0]).toBe(
-        '/Getziujo/Turfiri/Ipfugiri/File Cache/544b943d-c663-5fe3-bd89-6a52bb80880e'
-      );
-    });
-  });
-
-  describe('usage', () => {
-    it('returns the usage used', async () => {
-      const expectedSize = 688489878;
-      mocked.stat.mockResolvedValue(Promise.resolve({ size: expectedSize }));
-      const repository = new FSContentsCacheRepository(whereToCreateIt);
-
-      const result = await repository.usage();
-
-      expect(result).toEqual(expectedSize);
-    });
-
-    it('returns the usage of the folder being used', async () => {
-      mocked.stat.mockResolvedValue(Promise.resolve({ size: 1244487453 }));
-      const repository = new FSContentsCacheRepository(whereToCreateIt);
-
-      await repository.usage();
-
-      expect(mocked.stat).toBeCalledWith(`${whereToCreateIt}/File Cache`);
-    });
-  });
-
-  describe('initialize', () => {
-    it('stores in memory the accessed time of all files on the given folder', async () => {
-      const expectedResult = new Map([
-        ['3ce8d546-517d-557e-8c2b-330b671b92de', 1],
-        ['6de9c7c6-e8ec-5822-a0ea-2e2e0a274de6', 2],
-        ['d166dfda-6677-5e71-b19a-321bb510ca60', 3],
-        ['719ad0fc-403f-5601-8db3-784f01939b70', 4],
-      ]);
-
-      (<jest.Mock>glob).mockResolvedValueOnce(
-        Array.from(expectedResult.keys())
-      );
-      mocked.stat
-        .mockResolvedValueOnce({ atimeMs: 1 })
-        .mockResolvedValueOnce({ atimeMs: 2 })
-        .mockResolvedValueOnce({ atimeMs: 3 })
-        .mockResolvedValueOnce({ atimeMs: 4 });
-
-      const repository = new FSContentsCacheRepository(whereToCreateIt);
-
-      await repository.initialize();
-
-      const internalMap = (repository as any).cachedFilesAccessTime;
-
-      expect(internalMap).toEqual(expectedResult);
-    });
-  });
-});
diff --git a/src/workers/webdav/modules/contents/test/infrastructure/download/CachedContentFileDownloader.test.ts b/src/workers/webdav/modules/contents/test/infrastructure/download/CachedContentFileDownloader.test.ts
deleted file mode 100644
index 70aba03b0..000000000
--- a/src/workers/webdav/modules/contents/test/infrastructure/download/CachedContentFileDownloader.test.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import { Readable } from 'stream';
-import { CachedContentFileDownloader } from '../../../infrastructure/download/CachedContentFileDownloader';
-import { FileMother } from '../../../../files/test/domain/FileMother';
-import { ContentFileDownloaderMock } from '../../__mocks__/ContentFileDownloaderMock';
-import { ContentsCacheRepositoryMock } from '../../__mocks__/ContentsCacheRepositoryMock';
-
-const fileContents = `
-Commodo cillum nulla sit est nulla quis incididunt laboris in ex.
-Proident quis amet quis laborum anim cillum ea quis mollit id.
-Elit duis excepteur irure ex veniam aute pariatur aute exercitation dolor irure voluptate.
-Amet incididunt aliquip laboris consequat officia occaecat est est eiusmod.
-
-Voluptate nostrud duis labore aute laborum occaecat pariatur minim cupidatat aliqua tempor.
-Labore pariatur aliqua elit cupidatat enim dolore.
-Irure laborum et deserunt et nulla et ipsum nostrud.
-Aliquip amet fugiat velit excepteur duis excepteur cupidatat amet voluptate mollit.
-Cillum exercitation sint ex magna consequat dolore.
-`;
-
-function readAll(readable: Readable): Promise<string> {
-  return new Promise((resolve, reject) => {
-    let fileContent = '';
-
-    readable.on('data', (chunk) => {
-      fileContent += chunk;
-    });
-
-    readable.on('end', () => {
-      resolve(fileContent);
-    });
-
-    readable.on('error', (err) => {
-      reject(err);
-    });
-  });
-}
-
-describe('cached content file downloader', () => {
-  const contents = Readable.from(fileContents);
-
-  let downloader: ContentFileDownloaderMock;
-  let cacheRepository: ContentsCacheRepositoryMock;
-  let cachedDownloader: CachedContentFileDownloader;
-
-  beforeEach(() => {
-    downloader = new ContentFileDownloaderMock();
-    cacheRepository = new ContentsCacheRepositoryMock();
-    cachedDownloader = new CachedContentFileDownloader(
-      downloader,
-      cacheRepository
-    );
-  });
-
-  it('returns a readable with the cached file contents', async () => {
-    const file = FileMother.any();
-
-    cacheRepository.existsMock.mockResolvedValueOnce(true);
-    cacheRepository.readMock.mockReturnValue(contents);
-
-    const readable = await cachedDownloader.download(file);
-
-    const result = await readAll(readable);
-
-    expect(result).toBe(fileContents);
-  });
-
-  it('does not download the file if its cached', async () => {
-    const file = FileMother.any();
-
-    cacheRepository.existsMock.mockResolvedValueOnce(true);
-    cacheRepository.readMock.mockResolvedValue(contents);
-
-    await cachedDownloader.download(file);
-
-    expect(downloader.mock).not.toBeCalled();
-  });
-
-  it('downloads the file if the file is not cached', async () => {
-    const file = FileMother.any();
-
-    cacheRepository.writeMock.mockReturnValueOnce(Promise.resolve());
-    downloader.mock.mockResolvedValueOnce(contents);
-
-    await cachedDownloader.download(file);
-
-    expect(downloader.mock).toBeCalled();
-    expect(cacheRepository.readMock).not.toBeCalled();
-  });
-
-  it('caches the file if the file was not cached', async () => {
-    const file = FileMother.any();
-
-    cacheRepository.writeMock.mockReturnValueOnce(Promise.resolve());
-    downloader.mock.mockResolvedValueOnce(contents);
-
-    await cachedDownloader.download(file);
-
-    expect(cacheRepository.writeMock).toBeCalled();
-  });
-
-  it('does not fail if an error occurs during the caching of the file', async () => {
-    const file = FileMother.any();
-
-    cacheRepository.writeMock.mockRejectedValueOnce(new Error('ERROR'));
-    downloader.mock.mockResolvedValueOnce(contents);
-
-    const result = await cachedDownloader.download(file).catch((err) => {
-      expect(err).not.toBeDefined();
-    });
-
-    expect(result).toBeDefined();
-    expect(cacheRepository.writeMock).toBeCalled();
-  });
-});
diff --git a/src/workers/webdav/modules/contents/test/infrastructure/upload/CachedContentFileUploader.test.ts b/src/workers/webdav/modules/contents/test/infrastructure/upload/CachedContentFileUploader.test.ts
deleted file mode 100644
index 21f1681d5..000000000
--- a/src/workers/webdav/modules/contents/test/infrastructure/upload/CachedContentFileUploader.test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Readable } from 'stream';
-import { CachedContentFileUploader } from '../../../infrastructure/upload/CachedContentFileUploader';
-import { ContentFileUploaderMock } from '../../__mocks__/ContentFileUploaderMock';
-import { ContentsCacheRepositoryMock } from '../../__mocks__/ContentsCacheRepositoryMock';
-
-describe('cached content file uploader', () => {
-  const contents = Readable.from('FILE CONTENTS');
-
-  let uploader: ContentFileUploaderMock;
-  let localContentsRepository: ContentsCacheRepositoryMock;
-
-  let SUT: CachedContentFileUploader;
-
-  beforeEach(() => {
-    uploader = new ContentFileUploaderMock();
-    localContentsRepository = new ContentsCacheRepositoryMock();
-
-    SUT = new CachedContentFileUploader(uploader, localContentsRepository);
-  });
-
-  it('returns the id returned from the underlying uploader', async () => {
-    const id = 'ac1c00d5-f3fb-5e81-9ad3-f8300060c2b0';
-
-    uploader.uploadMock.mockResolvedValueOnce(id);
-    localContentsRepository.writeMock.mockReturnValueOnce(Promise.resolve());
-
-    const result = await SUT.upload(contents, 2001833926);
-
-    expect(result).toEqual(id);
-  });
-
-  it('stores the file locally if there is enough space', async () => {
-    const size = 544940296;
-    const id = '50af27f8-9e48-592c-8414-00d1cb64cb43';
-
-    uploader.uploadMock.mockResolvedValueOnce(id);
-    localContentsRepository.writeMock.mockReturnValueOnce(Promise.resolve());
-
-    await SUT.upload(contents, size);
-
-    expect(localContentsRepository.writeMock).toHaveBeenCalledWith(
-      id,
-      contents,
-      size
-    );
-  });
-});
diff --git a/src/workers/webdav/modules/files/application/WebdavFileClonner.ts b/src/workers/webdav/modules/files/application/WebdavFileClonner.ts
deleted file mode 100644
index 12c4249d7..000000000
--- a/src/workers/webdav/modules/files/application/WebdavFileClonner.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { WebdavFolderFinder } from '../../folders/application/WebdavFolderFinder';
-import { FilePath } from '../domain/FilePath';
-import { ContentsManagersFactory } from '../../contents/domain/ContentsManagersFactory';
-import { File } from '../domain/File';
-import { FileRepository } from '../domain/FileRepository';
-import { WebdavServerEventBus } from '../../shared/domain/WebdavServerEventBus';
-import { FileAlreadyExistsError } from '../domain/errors/FileAlreadyExistsError';
-import { WebdavIpc } from '../../../ipc';
-import { ContentFileClonner } from '../../contents/domain/ContentFileClonner';
-
-export class WebdavFileClonner {
-  private static FILE_OVERRIDED = true;
-  private static FILE_NOT_OVERRIDED = false;
-
-  constructor(
-    private readonly repository: FileRepository,
-    private readonly folderFinder: WebdavFolderFinder,
-    private readonly contentRepository: ContentsManagersFactory,
-    private readonly eventBus: WebdavServerEventBus,
-    private readonly ipc: WebdavIpc
-  ) {}
-
-  private registerEvents(clonner: ContentFileClonner, file: File) {
-    clonner.on('finish', () => {
-      this.ipc.send('WEBDAV_FILE_CLONNED', {
-        name: file.name,
-        extension: file.type,
-        nameWithExtension: file.nameWithExtension,
-        size: file.size,
-        processInfo: { elapsedTime: clonner.elapsedTime() },
-      });
-    });
-  }
-
-  private async overwrite(
-    file: File,
-    fileOverwritted: File,
-    destinationPath: FilePath
-  ) {
-    const destinationFolder = this.folderFinder.run(fileOverwritted.dirname);
-
-    const clonner = this.contentRepository.clonner(file);
-
-    this.registerEvents(clonner, file);
-
-    const clonnedFileId = await clonner.clone();
-
-    const newFile = file.overwrite(
-      clonnedFileId.value,
-      destinationFolder.id,
-      destinationPath
-    );
-
-    fileOverwritted.trash();
-
-    try {
-      await this.repository.delete(fileOverwritted);
-      await this.repository.add(newFile);
-
-      await this.eventBus.publish(newFile.pullDomainEvents());
-      await this.eventBus.publish(fileOverwritted.pullDomainEvents());
-    } catch (err: unknown) {
-      if (!(err instanceof Error)) {
-        throw new Error(`${err} was thrown`);
-      }
-    }
-  }
-
-  private async copy(file: File, path: FilePath) {
-    const destinationFolder = this.folderFinder.run(path.dirname());
-
-    const clonner = this.contentRepository.clonner(file);
-
-    this.registerEvents(clonner, file);
-
-    const clonnedFileId = await clonner.clone();
-
-    const clonned = file.clone(clonnedFileId.value, destinationFolder.id, path);
-
-    await this.repository.add(clonned);
-
-    await this.eventBus.publish(clonned.pullDomainEvents());
-  }
-
-  async run(
-    originFile: File,
-    destination: string,
-    overwrite: boolean
-  ): Promise<boolean> {
-    const destinationPath = new FilePath(destination);
-
-    const destinationFile = this.repository.search(destinationPath);
-
-    if (destinationFile && !overwrite) {
-      throw new FileAlreadyExistsError(destination);
-    }
-
-    if (destinationFile) {
-      await this.overwrite(originFile, destinationFile, destinationPath);
-      return WebdavFileClonner.FILE_OVERRIDED;
-    }
-
-    await this.copy(originFile, destinationPath);
-    return WebdavFileClonner.FILE_NOT_OVERRIDED;
-  }
-}
diff --git a/src/workers/webdav/modules/files/application/WebdavFileCreator.ts b/src/workers/webdav/modules/files/application/WebdavFileCreator.ts
deleted file mode 100644
index e33b4794d..000000000
--- a/src/workers/webdav/modules/files/application/WebdavFileCreator.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import { PassThrough, Writable } from 'stream';
-import { WebdavFolderFinder } from '../../folders/application/WebdavFolderFinder';
-import { FilePath } from '../domain/FilePath';
-import { ContentsManagersFactory } from '../../contents/domain/ContentsManagersFactory';
-import { ItemMetadata } from '../../shared/domain/ItemMetadata';
-import { FileMetadataCollection } from '../domain/FileMetadataCollection';
-import { File } from '../domain/File';
-import { FileRepository } from '../domain/FileRepository';
-import { Folder } from '../../folders/domain/Folder';
-import { FileSize } from '../domain/FileSize';
-import { WebdavServerEventBus } from '../../shared/domain/WebdavServerEventBus';
-import { ContentFileUploader } from '../../contents/domain/ContentFileUploader';
-import { WebdavIpc } from '../../../ipc';
-
-export class WebdavFileCreator {
-  constructor(
-    private readonly repository: FileRepository,
-    private readonly folderFinder: WebdavFolderFinder,
-    private readonly remoteContentsManagersFactory: ContentsManagersFactory,
-    private readonly temporalFileCollection: FileMetadataCollection,
-    private readonly eventBus: WebdavServerEventBus,
-    private readonly ipc: WebdavIpc
-  ) {}
-
-  private registerEvents(
-    uploader: ContentFileUploader,
-    metadata: ItemMetadata
-  ) {
-    uploader.on('start', () => {
-      this.ipc.send('WEBDAV_FILE_UPLOADING', {
-        name: metadata.name,
-        extension: metadata.extension,
-        nameWithExtension:
-          metadata.name +
-          (metadata.extension.length >= 0 ? '.' + metadata.extension : ''),
-        size: metadata.size,
-        processInfo: { elapsedTime: uploader.elapsedTime() },
-      });
-    });
-
-    uploader.on('progress', (progress: number) => {
-      this.ipc.send('WEBDAV_FILE_UPLOADING', {
-        name: metadata.name,
-        extension: metadata.extension,
-        nameWithExtension:
-          metadata.name +
-          (metadata.extension.length >= 0 ? '.' + metadata.extension : ''),
-        size: metadata.size,
-        processInfo: { elapsedTime: uploader.elapsedTime(), progress },
-      });
-    });
-
-    uploader.on('error', (error: Error) => {
-      this.ipc.send('WEBDAV_FILE_UPLOAD_ERROR', {
-        name: metadata.name,
-        extension: metadata.extension,
-        nameWithExtension:
-          metadata.name +
-          (metadata.extension.length >= 0 ? '.' + metadata.extension : ''),
-        error: error.message,
-      });
-    });
-
-    uploader.on('finish', () => {
-      this.ipc.send('WEBDAV_FILE_UPLOADED', {
-        name: metadata.name,
-        extension: metadata.extension,
-        nameWithExtension:
-          metadata.name +
-          (metadata.extension.length >= 0 ? '.' + metadata.extension : ''),
-        size: metadata.size,
-        processInfo: { elapsedTime: uploader.elapsedTime() },
-      });
-    });
-  }
-
-  private async createFileEntry(
-    fileId: string,
-    folder: Folder,
-    size: number,
-    filePath: FilePath
-  ): Promise<File> {
-    const file = File.create(fileId, folder, size, filePath);
-
-    await this.repository.add(file);
-
-    this.temporalFileCollection.remove(filePath.value);
-
-    await this.eventBus.publish(file.pullDomainEvents());
-
-    return file;
-  }
-
-  async run(
-    path: string,
-    size: number
-  ): Promise<{
-    stream: Writable;
-    upload: Promise<File['contentsId']>;
-  }> {
-    const fileSize = new FileSize(size);
-    const filePath = new FilePath(path);
-
-    const metadata = ItemMetadata.from({
-      createdAt: Date.now(),
-      updatedAt: Date.now(),
-      name: filePath.name(),
-      size,
-      extension: filePath.extension(),
-      type: 'FILE',
-    });
-
-    this.temporalFileCollection.add(filePath.value, metadata);
-
-    const folder = this.folderFinder.run(filePath.dirname());
-
-    const stream = new PassThrough();
-
-    const uploader = this.remoteContentsManagersFactory.uploader(fileSize);
-
-    this.registerEvents(uploader, metadata);
-
-    const upload = uploader.upload(stream, fileSize.value);
-
-    upload
-      .then(async (fileId) => {
-        return this.createFileEntry(fileId, folder, size, filePath);
-      })
-      .catch((error: Error) => {
-        this.ipc.send('WEBDAV_FILE_UPLOAD_ERROR', {
-          name: metadata.name,
-          extension: metadata.extension,
-          nameWithExtension:
-            metadata.name +
-            (metadata.extension.length >= 0 ? '.' + metadata.extension : ''),
-          error: error.message,
-        });
-      });
-
-    return {
-      stream,
-      upload,
-    };
-  }
-}
diff --git a/src/workers/webdav/modules/files/application/WebdavFileDeleter.ts b/src/workers/webdav/modules/files/application/WebdavFileDeleter.ts
deleted file mode 100644
index 3b96e6ad0..000000000
--- a/src/workers/webdav/modules/files/application/WebdavFileDeleter.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { WebdavIpc } from '../../../ipc';
-import { WebdavServerEventBus } from '../../shared/domain/WebdavServerEventBus';
-import { File } from '../domain/File';
-import { FileRepository } from '../domain/FileRepository';
-
-export class WebdavFileDeleter {
-  constructor(
-    private readonly repository: FileRepository,
-    private readonly eventBus: WebdavServerEventBus,
-    private readonly ipc: WebdavIpc
-  ) {}
-
-  async run(file: File): Promise<void> {
-    this.ipc.send('WEBDAV_FILE_DELETING', {
-      name: file.name,
-      extension: file.type,
-      nameWithExtension: file.nameWithExtension,
-      size: file.size,
-    });
-    file.trash();
-
-    await this.repository.delete(file);
-
-    await this.eventBus.publish(file.pullDomainEvents());
-
-    this.ipc.send('WEBDAV_FILE_DELETED', {
-      name: file.name,
-      extension: file.type,
-      nameWithExtension: file.nameWithExtension,
-      size: file.size,
-    });
-  }
-}
diff --git a/src/workers/webdav/modules/files/application/WebdavFileDownloader.ts b/src/workers/webdav/modules/files/application/WebdavFileDownloader.ts
deleted file mode 100644
index dd3ef6b14..000000000
--- a/src/workers/webdav/modules/files/application/WebdavFileDownloader.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { WebdavServerEventBus } from '../../shared/domain/WebdavServerEventBus';
-import { FileNotFoundError } from '../domain/errors/FileNotFoundError';
-import { ContentsManagersFactory } from '../../contents/domain/ContentsManagersFactory';
-import { Contents } from '../../contents/domain/Contents';
-import { FileRepository } from '../domain/FileRepository';
-import { FilePath } from '../domain/FilePath';
-import { WebdavIpc } from '../../../ipc';
-import { ContentFileDownloader } from '../../contents/domain/ContentFileDownloader';
-import { File } from '../domain/File';
-import { ContentsId } from '../../contents/domain/ContentsId';
-
-export class WebdavFileDownloader {
-  constructor(
-    private readonly repository: FileRepository,
-    private readonly contents: ContentsManagersFactory,
-    private readonly eventBus: WebdavServerEventBus,
-    private readonly ipc: WebdavIpc
-  ) {}
-
-  private registerEvents(downloader: ContentFileDownloader, file: File) {
-    downloader.on('start', () => {
-      this.ipc.send('WEBDAV_FILE_DOWNLOADING', {
-        name: file.name,
-        extension: file.type,
-        nameWithExtension: file.nameWithExtension,
-        size: file.size,
-        processInfo: { elapsedTime: downloader.elapsedTime() },
-      });
-    });
-
-    downloader.on('progress', (progress: number) => {
-      this.ipc.send('WEBDAV_FILE_DOWNLOADING', {
-        name: file.name,
-        extension: file.type,
-        nameWithExtension: file.nameWithExtension,
-        size: file.size,
-        processInfo: { elapsedTime: downloader.elapsedTime(), progress },
-      });
-    });
-
-    downloader.on('error', (error: Error) => {
-      this.ipc.send('WEBDAV_FILE_DOWNLOAD_ERROR', {
-        name: file.name,
-        extension: file.type,
-        nameWithExtension: file.nameWithExtension,
-        error: error.message,
-      });
-    });
-
-    downloader.on('finish', () => {
-      this.ipc.send('WEBDAV_FILE_DOWNLOADED', {
-        name: file.name,
-        extension: file.type,
-        nameWithExtension: file.nameWithExtension,
-        size: file.size,
-        processInfo: { elapsedTime: downloader.elapsedTime() },
-      });
-    });
-  }
-
-  async run(path: string): Promise<Contents> {
-    const filePath = new FilePath(path);
-
-    const file = this.repository.search(filePath);
-
-    if (!file) {
-      throw new FileNotFoundError(path);
-    }
-
-    const downloader = this.contents.downloader();
-
-    this.registerEvents(downloader, file);
-
-    const readable = await downloader.download(file);
-
-    const contentsId = new ContentsId(file.contentsId);
-    const remoteContents = Contents.from(contentsId, readable);
-
-    await this.eventBus.publish(remoteContents.pullDomainEvents());
-
-    return remoteContents;
-  }
-}
diff --git a/src/workers/webdav/modules/files/application/WebdavFileMover.ts b/src/workers/webdav/modules/files/application/WebdavFileMover.ts
deleted file mode 100644
index 8c0490548..000000000
--- a/src/workers/webdav/modules/files/application/WebdavFileMover.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { WebdavFolderFinder } from '../../folders/application/WebdavFolderFinder';
-import { Folder } from '../../folders/domain/Folder';
-import { WebdavServerEventBus } from '../../shared/domain/WebdavServerEventBus';
-import { FileAlreadyExistsError } from '../domain/errors/FileAlreadyExistsError';
-import { UnknownFileActionError } from '../domain/errors/UnknownFileActionError';
-import { FilePath } from '../domain/FilePath';
-import { File } from '../domain/File';
-import { FileRepository } from '../domain/FileRepository';
-import { WebdavFileRenamer } from './WebdavFileRenamer';
-import { WebdavIpc } from '../../../ipc';
-
-export class WebdavFileMover {
-  constructor(
-    private readonly repository: FileRepository,
-    private readonly folderFinder: WebdavFolderFinder,
-    private readonly fileRenamer: WebdavFileRenamer,
-    private readonly eventBus: WebdavServerEventBus,
-    private readonly ipc: WebdavIpc
-  ) {}
-
-  private async move(file: File, folder: Folder) {
-    file.moveTo(folder);
-
-    await this.repository.updateParentDir(file);
-
-    await this.eventBus.publish(file.pullDomainEvents());
-
-    this.ipc.send('WEBDAV_FILE_MOVED', {
-      nameWithExtension: file.nameWithExtension,
-      folderName: file.dirname,
-    });
-  }
-
-  private async overwite(file: File, destinationFile: File, folder: Folder) {
-    file.moveTo(folder);
-    destinationFile.trash();
-
-    await this.repository.delete(destinationFile);
-    await this.repository.updateParentDir(file);
-
-    await this.eventBus.publish(file.pullDomainEvents());
-    await this.eventBus.publish(destinationFile.pullDomainEvents());
-
-    this.ipc.send('WEBDAV_FILE_OVERWRITED', {
-      nameWithExtension: file.nameWithExtension,
-    });
-  }
-
-  private noMoreActionsLeft(action: never) {
-    if (action) throw new UnknownFileActionError('WebdavFileMover');
-  }
-
-  async run(file: File, to: string, overwrite: boolean): Promise<boolean> {
-    const desiredPath = new FilePath(to);
-    const destinationFile = this.repository.search(desiredPath);
-
-    const hasToBeOverwritten =
-      destinationFile !== undefined && destinationFile !== null;
-
-    if (hasToBeOverwritten && !overwrite) {
-      throw new FileAlreadyExistsError(to);
-    }
-
-    const destinationFolder = this.folderFinder.run(desiredPath.dirname());
-
-    if (file.hasParent(destinationFolder.id)) {
-      await this.fileRenamer.run(file, to);
-      return false;
-    }
-
-    if (!hasToBeOverwritten) {
-      await this.move(file, destinationFolder);
-      return false;
-    }
-
-    if (hasToBeOverwritten) {
-      await this.overwite(file, destinationFile, destinationFolder);
-      return true;
-    }
-
-    this.noMoreActionsLeft(hasToBeOverwritten);
-    return false;
-  }
-}
diff --git a/src/workers/webdav/modules/files/application/WebdavFileRenamer.ts b/src/workers/webdav/modules/files/application/WebdavFileRenamer.ts
deleted file mode 100644
index dc499b85c..000000000
--- a/src/workers/webdav/modules/files/application/WebdavFileRenamer.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { WebdavServerEventBus } from '../../shared/domain/WebdavServerEventBus';
-import { ActionNotPermitedError } from '../domain/errors/ActionNotPermitedError';
-import { FileAlreadyExistsError } from '../domain/errors/FileAlreadyExistsError';
-import { FilePath } from '../domain/FilePath';
-import { ContentsManagersFactory } from '../../contents/domain/ContentsManagersFactory';
-import { File } from '../domain/File';
-import { FileRepository } from '../domain/FileRepository';
-import { WebdavIpc } from '../../../ipc';
-
-export class WebdavFileRenamer {
-  constructor(
-    private readonly repository: FileRepository,
-    private readonly contentsRepository: ContentsManagersFactory,
-    private readonly eventBus: WebdavServerEventBus,
-    private readonly ipc: WebdavIpc
-  ) {}
-
-  private async rename(file: File, path: FilePath) {
-    file.rename(path);
-
-    await this.repository.updateName(file);
-
-    await this.eventBus.publish(file.pullDomainEvents());
-  }
-
-  private async reupload(file: File, path: FilePath) {
-    const clonner = this.contentsRepository.clonner(file);
-
-    const clonnedFileId = await clonner.clone();
-
-    const uploaded = file.overwrite(clonnedFileId.value, file.folderId, path);
-
-    file.trash();
-    await this.repository.add(uploaded);
-    await this.repository.delete(file);
-
-    await this.eventBus.publish(uploaded.pullDomainEvents());
-    await this.eventBus.publish(file.pullDomainEvents());
-  }
-
-  async run(file: File, destination: string) {
-    const path = new FilePath(destination);
-
-    this.ipc.send('WEBDAV_FILE_RENAMING', {
-      oldName: file.name,
-      nameWithExtension: path.nameWithExtension(),
-    });
-
-    if (file.dirname !== path.dirname()) {
-      this.ipc.send('WEBDAV_FILE_RENAME_ERROR', {
-        name: file.name,
-        extension: file.type,
-        nameWithExtension: file.nameWithExtension,
-        error: 'Renaming error: rename and change folder',
-      });
-      throw new ActionNotPermitedError('rename and change folder');
-    }
-
-    const destinationFile = this.repository.search(path);
-
-    if (destinationFile) {
-      this.ipc.send('WEBDAV_FILE_RENAME_ERROR', {
-        name: file.name,
-        extension: file.type,
-        nameWithExtension: file.nameWithExtension,
-        error: 'Renaming error: file already exists',
-      });
-      throw new FileAlreadyExistsError(destination);
-    }
-
-    if (path.extensionMatch(file.type)) {
-      await this.rename(file, path);
-      return;
-    }
-
-    await this.reupload(file, path);
-  }
-}
diff --git a/src/workers/webdav/modules/files/application/WebdavFileValidator.ts b/src/workers/webdav/modules/files/application/WebdavFileValidator.ts
deleted file mode 100644
index dec247439..000000000
--- a/src/workers/webdav/modules/files/application/WebdavFileValidator.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Path } from '@internxt/webdav-server';
-
-export class WebdavFileValidator {
-  validateName(filename: string): boolean {
-    if (typeof filename === 'undefined' || !filename.length) return false;
-
-    // On MacOS files that starts with ._ are generated
-    if (filename.startsWith('._')) return false;
-
-    // Ignore DS_Store files
-    if (filename === '.DS_Store') return false;
-
-    return true;
-  }
-
-  validatePath(path: Path) {
-    return this.validateName(path.fileName());
-  }
-}
diff --git a/src/workers/webdav/modules/files/domain/FileMetadataCollection.ts b/src/workers/webdav/modules/files/domain/FileMetadataCollection.ts
deleted file mode 100644
index 5410bbab0..000000000
--- a/src/workers/webdav/modules/files/domain/FileMetadataCollection.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { ItemMetadata } from '../../shared/domain/ItemMetadata';
-
-export interface FileMetadataCollection {
-  add(path: string, metadata: ItemMetadata): void;
-  remove(path: string): void;
-  exists(path: string): boolean;
-  get(path: string): ItemMetadata | undefined;
-}
diff --git a/src/workers/webdav/modules/files/domain/FilePath.ts b/src/workers/webdav/modules/files/domain/FilePath.ts
deleted file mode 100644
index 9166e8313..000000000
--- a/src/workers/webdav/modules/files/domain/FilePath.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import path from 'path';
-import { Path } from '../../shared/domain/Path';
-import { InvalidArgumentError } from '../../../../shared/domain/InvalidArgumentError';
-import { WebdavFileValidator } from '../application/WebdavFileValidator';
-
-export class FilePath extends Path {
-  private fileValidator = new WebdavFileValidator();
-  constructor(value: string) {
-    super(value);
-    this.startsWithSlash(value);
-
-    const isValid = this.fileValidator.validateName(value);
-
-    if (!isValid) {
-      throw new Error(`"${value}" is not a valid filename`);
-    }
-  }
-
-  private startsWithSlash(value: string) {
-    if (!value.startsWith('/')) {
-      throw new InvalidArgumentError(`${value} is not a valid XPath`);
-    }
-  }
-
-  static fromParts(parts: Array<string>) {
-    const full = path.join(...parts);
-
-    return new FilePath(full);
-  }
-
-  extension(): string {
-    const base = path.basename(this.value);
-    const { ext } = path.parse(base);
-    return ext.slice(1);
-  }
-
-  hasExtension(): boolean {
-    const extension = this.extension();
-
-    return extension !== '';
-  }
-
-  name(): string {
-    const base = path.basename(this.value);
-    const { name } = path.parse(base);
-    return name;
-  }
-
-  nameWithExtension(): string {
-    const basename = path.basename(this.value);
-    const { base } = path.parse(basename);
-    return base;
-  }
-
-  hasSameDirname(other: FilePath): boolean {
-    const dirname = path.dirname(this.value);
-    const otherDirname = path.dirname(other.value);
-
-    return dirname === otherDirname;
-  }
-
-  extensionMatch(extension: string): boolean {
-    return this.extension() === extension;
-  }
-
-  hasSameExtension(other: FilePath): boolean {
-    return this.extension() === other.extension();
-  }
-
-  changeFolder(folder: string): FilePath {
-    return FilePath.fromParts([folder, this.name()]);
-  }
-
-  updateName(name: string): FilePath {
-    return FilePath.fromParts([this.dirname(), name]);
-  }
-}
diff --git a/src/workers/webdav/modules/files/domain/FileRepository.ts b/src/workers/webdav/modules/files/domain/FileRepository.ts
deleted file mode 100644
index 42329fe39..000000000
--- a/src/workers/webdav/modules/files/domain/FileRepository.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { File } from './File';
-import { Nullable } from '../../../../../shared/types/Nullable';
-import { WebdavFolderAttributes } from '../../folders/domain/WebdavFolder';
-import { FilePath } from './FilePath';
-
-export interface FileRepository {
-  search(pathLike: FilePath): Nullable<File>;
-
-  delete(file: File): Promise<void>;
-
-  add(file: File): Promise<void>;
-
-  updateName(item: File): Promise<void>;
-
-  updateParentDir(item: File): Promise<void>;
-
-  searchOnFolder(folderId: WebdavFolderAttributes['id']): Promise<Array<File>>;
-}
diff --git a/src/workers/webdav/modules/files/domain/FileSize.ts b/src/workers/webdav/modules/files/domain/FileSize.ts
deleted file mode 100644
index e8cd768a7..000000000
--- a/src/workers/webdav/modules/files/domain/FileSize.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ValueObject } from '../../../../shared/domain/ValueObject';
-import { InvalidArgumentError } from '../../../../shared/domain/InvalidArgumentError';
-
-export class FileSize extends ValueObject<number> {
-  private static MAX_SIZE = 20 * 1024 * 1024 * 1024;
-
-  constructor(value: number) {
-    super(value);
-    this.ensureIsValid(value);
-  }
-
-  private ensureIsValid(value: number) {
-    if (value > FileSize.MAX_SIZE) {
-      throw new InvalidArgumentError('File size to big');
-    }
-
-    if (value < 0) {
-      throw new InvalidArgumentError('File size cannot be negative');
-    }
-  }
-}
diff --git a/src/workers/webdav/modules/files/domain/errors/ActionNotPermitedError.ts b/src/workers/webdav/modules/files/domain/errors/ActionNotPermitedError.ts
deleted file mode 100644
index b60eacf22..000000000
--- a/src/workers/webdav/modules/files/domain/errors/ActionNotPermitedError.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export class ActionNotPermitedError extends Error {
-  constructor(action: string) {
-    super(`${action} is not permited on files`);
-  }
-}
diff --git a/src/workers/webdav/modules/files/domain/errors/FileNotFoundError.ts b/src/workers/webdav/modules/files/domain/errors/FileNotFoundError.ts
deleted file mode 100644
index 278d7423e..000000000
--- a/src/workers/webdav/modules/files/domain/errors/FileNotFoundError.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export class FileNotFoundError extends Error {
-  constructor(path: string) {
-    super(`File ${path} not found`);
-  }
-}
diff --git a/src/workers/webdav/modules/files/infrastructure/persistance/HttpFileRepository.ts b/src/workers/webdav/modules/files/infrastructure/persistance/HttpFileRepository.ts
deleted file mode 100644
index abcd57215..000000000
--- a/src/workers/webdav/modules/files/infrastructure/persistance/HttpFileRepository.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-import { Axios } from 'axios';
-import { FileCreatedResponseDTO } from 'shared/HttpClient/responses/file-created';
-import { Nullable } from 'shared/types/Nullable';
-import { ServerFile } from '../../../../../filesystems/domain/ServerFile';
-import { ServerFolder } from '../../../../../filesystems/domain/ServerFolder';
-import { File } from '../../domain/File';
-import { FileRepository } from '../../domain/FileRepository';
-import * as uuid from 'uuid';
-import { Traverser } from '../../../items/application/Traverser';
-import { AddFileDTO } from './dtos/AddFileDTO';
-import { UpdateFileParentDirDTO } from './dtos/UpdateFileParentDirDTO';
-import { UpdateFileNameDTO } from './dtos/UpdateFileNameDTO';
-import { FilePath } from '../../domain/FilePath';
-import { WebdavIpc } from '../../../../ipc';
-import { RemoteItemsGenerator } from '../../../items/application/RemoteItemsGenerator';
-import { FileStatuses } from '../../domain/FileStatus';
-import { Crypt } from '../../../shared/domain/Crypt';
-
-export class HttpFileRepository implements FileRepository {
-  private files: Record<string, File> = {};
-
-  constructor(
-    private readonly crypt: Crypt,
-    private readonly httpClient: Axios,
-    private readonly trashHttpClient: Axios,
-    private readonly traverser: Traverser,
-    private readonly bucket: string,
-    private readonly ipc: WebdavIpc
-  ) {}
-
-  private async getTree(): Promise<{
-    files: ServerFile[];
-    folders: ServerFolder[];
-  }> {
-    const remoteItemsGenerator = new RemoteItemsGenerator(this.ipc);
-    return remoteItemsGenerator.getAll();
-  }
-
-  public async init(): Promise<void> {
-    const raw = await this.getTree();
-
-    this.traverser.reset();
-    const all = this.traverser.run(raw);
-
-    const files = Object.entries(all).filter(
-      ([_, value]) =>
-        value instanceof File && value.hasStatus(FileStatuses.EXISTS)
-    ) as Array<[string, File]>;
-
-    this.files = files.reduce((items, [key, value]) => {
-      items[key] = value;
-      return items;
-    }, {} as Record<string, File>);
-  }
-
-  search(path: FilePath): Nullable<File> {
-    const item = this.files[path.value];
-
-    if (!item) return;
-
-    return File.from(item.attributes());
-  }
-
-  async delete(file: File): Promise<void> {
-    const result = await this.trashHttpClient.post(
-      `${process.env.NEW_DRIVE_URL}/drive/storage/trash/add`,
-      {
-        items: [
-          {
-            type: 'file',
-            id: file.contentsId,
-          },
-        ],
-      }
-    );
-
-    if (result.status === 200) {
-      await this.ipc.invoke('START_REMOTE_SYNC');
-    }
-  }
-
-  async add(file: File): Promise<void> {
-    const encryptedName = this.crypt.encryptName(
-      file.name,
-      file.folderId.toString()
-    );
-
-    if (!encryptedName) {
-      throw new Error('Failed to encrypt name');
-    }
-
-    const body: AddFileDTO = {
-      file: {
-        bucket: this.bucket,
-        encrypt_version: '03-aes',
-        fileId: file.contentsId,
-        file_id: file.contentsId,
-        folder_id: file.folderId,
-        name: encryptedName,
-        plain_name: file.name,
-        size: file.size,
-        type: file.type,
-        modificationTime: Date.now(),
-      },
-    };
-
-    const result = await this.httpClient.post<FileCreatedResponseDTO>(
-      `${process.env.API_URL}/api/storage/file`,
-      body
-    );
-
-    if (result.status === 500) {
-      throw new Error('Invalid response creating file');
-    }
-
-    const created = File.from({
-      ...result.data,
-      contentsId: result.data.fileId,
-      folderId: result.data.folder_id,
-      size: parseInt(result.data.size, 10),
-      path: file.path.value,
-      status: FileStatuses.EXISTS,
-    });
-
-    this.files[file.path.value] = created;
-
-    await this.ipc.invoke('START_REMOTE_SYNC');
-  }
-
-  async updateName(file: File): Promise<void> {
-    const url = `${process.env.API_URL}/api/storage/file/${file.contentsId}/meta`;
-
-    const body: UpdateFileNameDTO = {
-      metadata: { itemName: file.name },
-      bucketId: this.bucket,
-      relativePath: uuid.v4(),
-    };
-
-    const res = await this.httpClient.post(url, body);
-
-    if (res.status !== 200) {
-      throw new Error(
-        `[REPOSITORY] Error updating item metadata: ${res.status}`
-      );
-    }
-
-    const oldFileEntry = Object.entries(this.files).find(
-      ([_, f]) => f.contentsId === file.contentsId && f.name !== file.name
-    );
-
-    if (oldFileEntry) {
-      delete this.files[oldFileEntry[0]];
-    }
-
-    this.files[file.path.value] = File.from(file.attributes());
-
-    await this.ipc.invoke('START_REMOTE_SYNC');
-  }
-
-  async updateParentDir(item: File): Promise<void> {
-    const url = `${process.env.API_URL}/api/storage/move/file`;
-    const body: UpdateFileParentDirDTO = {
-      destination: item.folderId,
-      fileId: item.contentsId,
-    };
-
-    const res = await this.httpClient.post(url, body);
-
-    if (res.status !== 200) {
-      throw new Error(`[REPOSITORY] Error moving item: ${res.status}`);
-    }
-
-    await this.init();
-
-    await this.ipc.invoke('START_REMOTE_SYNC');
-  }
-
-  async searchOnFolder(folderId: number): Promise<Array<File>> {
-    await this.init();
-    return Object.values(this.files).filter((file) => file.hasParent(folderId));
-  }
-}
diff --git a/src/workers/webdav/modules/files/infrastructure/persistance/InMemoryTemporalFileMetadataCollection.ts b/src/workers/webdav/modules/files/infrastructure/persistance/InMemoryTemporalFileMetadataCollection.ts
deleted file mode 100644
index 044073d2e..000000000
--- a/src/workers/webdav/modules/files/infrastructure/persistance/InMemoryTemporalFileMetadataCollection.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { ItemMetadata } from '../../../shared/domain/ItemMetadata';
-import { FileMetadataCollection } from '../../domain/FileMetadataCollection';
-
-export class InMemoryTemporalFileMetadataCollection
-  implements FileMetadataCollection
-{
-  private collection: Record<string, ItemMetadata> = {};
-
-  add(path: string, metadata: ItemMetadata): void {
-    if (!this.collection[path]) {
-      this.collection[path] = metadata;
-    }
-  }
-
-  remove(path: string): void {
-    delete this.collection[path];
-  }
-
-  exists(path: string): boolean {
-    return (
-      this.collection[path] !== undefined && this.collection[path] !== null
-    );
-  }
-
-  get(path: string): ItemMetadata | undefined {
-    return this.collection[path];
-  }
-}
diff --git a/src/workers/webdav/modules/files/test/__mocks__/FileRepositoryMock.ts b/src/workers/webdav/modules/files/test/__mocks__/FileRepositoryMock.ts
deleted file mode 100644
index a23fb2f80..000000000
--- a/src/workers/webdav/modules/files/test/__mocks__/FileRepositoryMock.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Nullable } from 'shared/types/Nullable';
-import { FilePath } from '../../domain/FilePath';
-import { File } from '../../domain/File';
-import { FileRepository } from '../../domain/FileRepository';
-
-export class FileRepositoryMock implements FileRepository {
-  public mockSearch = jest.fn();
-  public mockDelete = jest.fn();
-  public mockAdd = jest.fn();
-  public mockUpdateName = jest.fn();
-  public mockUpdateParentDir = jest.fn();
-  public mockSearchOnFolder = jest.fn();
-
-  search(pathLike: FilePath): Nullable<File> {
-    return this.mockSearch(pathLike);
-  }
-  delete(file: File): Promise<void> {
-    return this.mockDelete(file);
-  }
-
-  add(file: File): Promise<void> {
-    return this.mockAdd(file);
-  }
-
-  updateName(item: File): Promise<void> {
-    return this.mockUpdateName(item);
-  }
-
-  updateParentDir(item: File): Promise<void> {
-    return this.mockUpdateParentDir(item);
-  }
-
-  searchOnFolder(folderId: number): Promise<Array<File>> {
-    return this.mockSearchOnFolder(folderId);
-  }
-
-  clearMocks() {
-    jest.clearAllMocks();
-  }
-}
diff --git a/src/workers/webdav/modules/files/test/application/WebdavFileClonner.test.ts b/src/workers/webdav/modules/files/test/application/WebdavFileClonner.test.ts
deleted file mode 100644
index da5c14614..000000000
--- a/src/workers/webdav/modules/files/test/application/WebdavFileClonner.test.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import { WebdavIpcMock } from '../../../shared/test/__mock__/WebdavIPC';
-import { WebdavFolderFinder } from '../../../folders/application/WebdavFolderFinder';
-import { FolderMother } from '../../../folders/test/domain/FolderMother';
-import { FolderRepositoryMock } from '../../../folders/test/__mocks__/FolderRepositoryMock';
-import { EventBusMock } from '../../../shared/test/__mock__/EventBusMock';
-import { WebdavFileClonner } from '../../application/WebdavFileClonner';
-import { FileAlreadyExistsError } from '../../domain/errors/FileAlreadyExistsError';
-import { FileMother } from '../domain/FileMother';
-import { RemoteFileContentsManagersFactoryMock } from '../../../contents/test/__mocks__/RemoteFileContentsManagersFactoryMock';
-import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
-import { ContentsIdMother } from '../../../contents/test/domain/ContentsIdMother';
-
-describe('Webdav File Clonner', () => {
-  const OVERWRITE = true;
-  const NOT_OVERWRITE = false;
-
-  let fileReposiotry: FileRepositoryMock;
-  let folderRepository: FolderRepositoryMock;
-  let contentsRepository: RemoteFileContentsManagersFactoryMock;
-  let eventBus: EventBusMock;
-  let ipc: WebdavIpcMock;
-
-  let SUT: WebdavFileClonner;
-
-  beforeEach(() => {
-    fileReposiotry = new FileRepositoryMock();
-    folderRepository = new FolderRepositoryMock();
-    const folderFinder = new WebdavFolderFinder(folderRepository);
-    contentsRepository = new RemoteFileContentsManagersFactoryMock();
-    eventBus = new EventBusMock();
-    ipc = new WebdavIpcMock();
-
-    SUT = new WebdavFileClonner(
-      fileReposiotry,
-      folderFinder,
-      contentsRepository,
-      eventBus,
-      ipc
-    );
-  });
-
-  describe('destination path already exists', () => {
-    it('duplicates a file and overwrites an exisiting one if already exist and overwrite flag is set', async () => {
-      const file = FileMother.any();
-      const folder = FolderMother.containing(file);
-      const destinationPath = file.path;
-      const fileToOverride = FileMother.fromPath(destinationPath.value);
-      const clonnedContentsId = ContentsIdMother.random();
-
-      fileReposiotry.mockSearch.mockReturnValueOnce(fileToOverride);
-      folderRepository.mockSearch.mockReturnValueOnce(folder);
-      contentsRepository.mockClone.mock.mockReturnValueOnce(clonnedContentsId);
-      fileReposiotry.mockAdd.mockImplementationOnce(() => {
-        //
-      });
-
-      const hasBeenOverwritten = await SUT.run(
-        file,
-        file.path.value,
-        OVERWRITE
-      );
-
-      expect(hasBeenOverwritten).toBe(true);
-      expect(fileReposiotry.mockAdd.mock.calls[0][0].contentsId).toBe(
-        clonnedContentsId.value
-      );
-      expect(fileReposiotry.mockAdd.mock.calls[0][0].path).toEqual(
-        destinationPath
-      );
-      expect(eventBus.publishMock).toBeCalled();
-      expect(eventBus.publishMock).toBeCalledTimes(2);
-    });
-
-    it('fails when the destination path already exists and overwrite flag is not set', async () => {
-      const file = FileMother.any();
-
-      fileReposiotry.mockSearch.mockReturnValueOnce(FileMother.any());
-
-      expect(async () => {
-        await SUT.run(file, '/destination/file', NOT_OVERWRITE);
-      }).rejects.toThrow(FileAlreadyExistsError);
-    });
-  });
-
-  describe('destination path does not exist', () => {
-    it('duplicates a file given to the given path', async () => {
-      const file = FileMother.any();
-      const folder = FolderMother.containing(file);
-      const destination = `${file.dirname}/${file.name} (copy).${file.type}`;
-      const clonnedContentsId = ContentsIdMother.random();
-
-      fileReposiotry.mockSearch.mockReturnValueOnce(undefined);
-      folderRepository.mockSearch.mockReturnValueOnce(folder);
-      contentsRepository.mockClone.mock.mockReturnValueOnce(clonnedContentsId);
-      fileReposiotry.mockAdd.mockImplementationOnce(() => {
-        //
-      });
-
-      const hasBeenOverwritten = await SUT.run(
-        file,
-        destination,
-        NOT_OVERWRITE
-      );
-
-      expect(hasBeenOverwritten).toBe(false);
-      expect(fileReposiotry.mockAdd.mock.calls[0][0].contentsId).toBe(
-        clonnedContentsId.value
-      );
-      expect(fileReposiotry.mockAdd.mock.calls[0][0].path.value).toBe(
-        destination
-      );
-      expect(eventBus.publishMock).toBeCalled();
-    });
-  });
-});
diff --git a/src/workers/webdav/modules/files/test/application/WebdavFileCreator.test.ts b/src/workers/webdav/modules/files/test/application/WebdavFileCreator.test.ts
deleted file mode 100644
index c1795e968..000000000
--- a/src/workers/webdav/modules/files/test/application/WebdavFileCreator.test.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { FolderMother } from '../../../folders/test/domain/FolderMother';
-import { FolderRepositoryMock } from '../../../folders/test/__mocks__/FolderRepositoryMock';
-import { WebdavFolderFinder } from '../../../folders/application/WebdavFolderFinder';
-import { WebdavFileCreator } from '../../application/WebdavFileCreator';
-import { FileMetadataCollection } from '../../domain/FileMetadataCollection';
-import { InMemoryTemporalFileMetadataCollection } from '../../infrastructure/persistance/InMemoryTemporalFileMetadataCollection';
-import { RemoteFileContentsManagersFactoryMock } from '../../../contents/test/__mocks__/RemoteFileContentsManagersFactoryMock';
-import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
-import { EventBusMock } from '../../../shared/test/__mock__/EventBusMock';
-import { WebdavIpcMock } from '../../../shared/test/__mock__/WebdavIPC';
-import { ContentsIdMother } from '../../../contents/test/domain/ContentsIdMother';
-
-describe('Webdav File Creator', () => {
-  let fileReposiotry: FileRepositoryMock;
-  let folderRepository: FolderRepositoryMock;
-  let contentsRepository: RemoteFileContentsManagersFactoryMock;
-  let temporalFileCollection: FileMetadataCollection;
-  let eventBus: EventBusMock;
-  let ipc: WebdavIpcMock;
-
-  let SUT: WebdavFileCreator;
-
-  beforeEach(() => {
-    fileReposiotry = new FileRepositoryMock();
-    folderRepository = new FolderRepositoryMock();
-    const folderFinder = new WebdavFolderFinder(folderRepository);
-    contentsRepository = new RemoteFileContentsManagersFactoryMock();
-    temporalFileCollection = new InMemoryTemporalFileMetadataCollection();
-    eventBus = new EventBusMock();
-    ipc = new WebdavIpcMock();
-
-    SUT = new WebdavFileCreator(
-      fileReposiotry,
-      folderFinder,
-      contentsRepository,
-      temporalFileCollection,
-      eventBus,
-      ipc
-    );
-  });
-
-  it('uploads the file contents to the uploader and then creates the file on the drive server', async () => {
-    const path = '/cat.png';
-    const size = 9715019333;
-    const createdFileId = ContentsIdMother.raw();
-
-    const folder = FolderMother.any();
-
-    folderRepository.mockSearch.mockReturnValueOnce(folder);
-    contentsRepository.mockUpload.uploadMock.mockResolvedValueOnce(
-      createdFileId
-    );
-    fileReposiotry.mockAdd.mockImplementationOnce(() => {
-      // returns Promise<void>
-    });
-
-    await SUT.run(path, size);
-
-    expect(contentsRepository.mockUpload.uploadMock).toBeCalledTimes(1);
-    expect(fileReposiotry.mockAdd.mock.calls[0][0].contentsId).toBe(
-      createdFileId
-    );
-    expect(fileReposiotry.mockAdd.mock.calls[0][0].size).toStrictEqual(size);
-    expect(fileReposiotry.mockAdd.mock.calls[0][0].folderId).toBe(folder.id);
-  });
-
-  it('once the file entry is created the creation event should have been emitted', async () => {
-    const path = '/cat.png';
-    const size = 9715019333;
-    const createdFileId = ContentsIdMother.raw();
-
-    const folder = FolderMother.any();
-
-    folderRepository.mockSearch.mockReturnValueOnce(folder);
-    contentsRepository.mockUpload.uploadMock.mockResolvedValueOnce(
-      createdFileId
-    );
-    fileReposiotry.mockAdd.mockImplementationOnce(() => {
-      // returns Promise<void>
-    });
-
-    const { upload } = await SUT.run(path, size);
-
-    await upload;
-
-    expect(eventBus.publishMock.mock.calls[0][0][0].eventName).toBe(
-      'webdav.file.created'
-    );
-    expect(eventBus.publishMock.mock.calls[0][0][0].aggregateId).toBe(
-      createdFileId
-    );
-  });
-
-  it('returns a writable stream when the file folder where is going to be created exists', async () => {
-    const path = '/cat.png';
-    const size = 9715019333;
-
-    const folder = FolderMother.any();
-
-    folderRepository.mockSearch.mockReturnValueOnce(folder);
-    contentsRepository.mockUpload.uploadMock.mockResolvedValueOnce('');
-
-    const { stream } = await SUT.run(path, size);
-
-    expect(stream.writable).toBe(true);
-  });
-
-  it('when the upload fails does not create a file', async () => {
-    const path = '/cat.png';
-    const size = 9715019333;
-
-    const folder = FolderMother.any();
-
-    folderRepository.mockSearch.mockReturnValueOnce(folder);
-    contentsRepository.mockUpload.uploadMock.mockRejectedValueOnce(
-      'TEST ERROR'
-    );
-
-    try {
-      await SUT.run(path, size);
-    } catch (err) {
-      expect(err).toBeDefined();
-    }
-
-    expect(fileReposiotry.mockAdd).not.toHaveBeenCalled();
-  });
-});
diff --git a/src/workers/webdav/modules/files/test/application/WebdavFileDownloader.test.ts b/src/workers/webdav/modules/files/test/application/WebdavFileDownloader.test.ts
deleted file mode 100644
index 524b1c701..000000000
--- a/src/workers/webdav/modules/files/test/application/WebdavFileDownloader.test.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Readable } from 'stream';
-import { EventBusMock } from '../../../shared/test/__mock__/EventBusMock';
-import { WebdavServerEventBus } from '../../../shared/domain/WebdavServerEventBus';
-import { WebdavFileDownloader } from '../../application/WebdavFileDownloader';
-import { FileMother } from '../domain/FileMother';
-import { RemoteFileContentsManagersFactoryMock } from '../../../contents/test/__mocks__/RemoteFileContentsManagersFactoryMock';
-import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
-import { FilePath } from '../../domain/FilePath';
-import { WebdavIpcMock } from '../../../shared/test/__mock__/WebdavIPC';
-describe('Webdav File Downloader', () => {
-  let repository: FileRepositoryMock;
-  let contentsRepository: RemoteFileContentsManagersFactoryMock;
-  let eventBus: WebdavServerEventBus;
-  let SUT: WebdavFileDownloader;
-  let ipc: WebdavIpcMock;
-
-  beforeEach(() => {
-    repository = new FileRepositoryMock();
-    contentsRepository = new RemoteFileContentsManagersFactoryMock();
-    eventBus = new EventBusMock();
-    ipc = new WebdavIpcMock();
-
-    SUT = new WebdavFileDownloader(
-      repository,
-      contentsRepository,
-      eventBus,
-      ipc
-    );
-  });
-
-  it('Gets the a readable stream when the path is founded', async () => {
-    const folderPath = 'Omuseha/Ufbihtot/Wukwige';
-    const file = FileMother.onFolderName(folderPath);
-
-    repository.mockSearch.mockReturnValueOnce(file);
-    contentsRepository.mockDownload.mock.mockResolvedValueOnce(new Readable());
-
-    const readable = await SUT.run(file.path.value);
-
-    expect(readable).toBeDefined();
-
-    expect(repository.mockSearch).toHaveBeenCalledWith(
-      new FilePath(file.path.value)
-    );
-    expect(contentsRepository.mockDownload.mock).toHaveBeenCalled();
-  });
-
-  it('Throws an exception if the path is not founded', async () => {
-    const path = 'Omuseha/Ufbihtot/Wukwige/Invoice.pdf';
-
-    repository.mockSearch.mockReturnValueOnce(undefined);
-
-    try {
-      const readable = await SUT.run(path);
-      expect(readable).not.toBeDefined();
-    } catch (err) {
-      expect(err).toBeDefined();
-    }
-  });
-});
diff --git a/src/workers/webdav/modules/files/test/application/WebdavFileMover.test.ts b/src/workers/webdav/modules/files/test/application/WebdavFileMover.test.ts
deleted file mode 100644
index c5c5f4f81..000000000
--- a/src/workers/webdav/modules/files/test/application/WebdavFileMover.test.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-import { EventBusMock } from '../../../shared/test/__mock__/EventBusMock';
-import { WebdavFolderFinder } from '../../../folders/application/WebdavFolderFinder';
-import { FolderMother } from '../../../folders/test/domain/FolderMother';
-import { FolderRepositoryMock } from '../../../folders/test/__mocks__/FolderRepositoryMock';
-import { WebdavFileMover } from '../../application/WebdavFileMover';
-import { FileAlreadyExistsError } from '../../domain/errors/FileAlreadyExistsError';
-import { FileMother } from '../domain/FileMother';
-import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
-import { FilePath } from '../../domain/FilePath';
-import { WebdavIpcMock } from '../../../shared/test/__mock__/WebdavIPC';
-import { WebdavFileRenamer } from '../../application/WebdavFileRenamer';
-import { RemoteFileContentsManagersFactoryMock } from '../../../contents/test/__mocks__/RemoteFileContentsManagersFactoryMock';
-
-describe('Webdav File Mover', () => {
-  let repository: FileRepositoryMock;
-  let folderRepository: FolderRepositoryMock;
-  let folderFinder: WebdavFolderFinder;
-  let fileRenamer: WebdavFileRenamer;
-  let contentsRepository: RemoteFileContentsManagersFactoryMock;
-  let eventBus: EventBusMock;
-  let ipc: WebdavIpcMock;
-
-  let SUT: WebdavFileMover;
-
-  beforeEach(() => {
-    repository = new FileRepositoryMock();
-    folderRepository = new FolderRepositoryMock();
-    folderFinder = new WebdavFolderFinder(folderRepository);
-    contentsRepository = new RemoteFileContentsManagersFactoryMock();
-    eventBus = new EventBusMock();
-    ipc = new WebdavIpcMock();
-
-    fileRenamer = new WebdavFileRenamer(
-      repository,
-      contentsRepository,
-      eventBus,
-      ipc
-    );
-
-    SUT = new WebdavFileMover(
-      repository,
-      folderFinder,
-      fileRenamer,
-      eventBus,
-      ipc
-    );
-  });
-
-  describe('Move', () => {
-    it('moves a file when does not exists a file with the desired path', async () => {
-      const file = FileMother.any();
-      const desiredPath = new FilePath(
-        `${file.dirname}/_${file.nameWithExtension}`
-      );
-      const override = false;
-
-      folderRepository.mockSearch.mockImplementation(() => FolderMother.any());
-
-      repository.mockSearch.mockImplementation(() => undefined);
-      repository.mockUpdateName.mockImplementation(() => Promise.resolve());
-
-      const hasBeenOverwritten = await SUT.run(
-        file,
-        desiredPath.value,
-        override
-      );
-
-      expect(hasBeenOverwritten).toBe(false);
-      expect(folderRepository.mockSearch).toHaveBeenCalledWith(
-        desiredPath.dirname()
-      );
-      expect(repository.mockSearch).toHaveBeenCalledWith(desiredPath);
-      expect(repository.mockUpdateParentDir).toHaveBeenCalled();
-    });
-
-    it('when a file on the destination already exists but the overwite flag is not set to true the move fails', async () => {
-      const file = FileMother.any();
-      const destination = new FilePath(
-        `${file.dirname}/_${file.nameWithExtension}`
-      );
-      const override = false;
-
-      repository.mockSearch.mockImplementation(() => file);
-
-      try {
-        const hasBeenOverwritten = await SUT.run(
-          file,
-          destination.value,
-          override
-        );
-        expect(hasBeenOverwritten).not.toBeDefined();
-      } catch (err) {
-        expect(err).toBeDefined();
-        expect(err instanceof FileAlreadyExistsError).toBe(true);
-      }
-
-      expect(folderRepository.mockSearch).not.toHaveBeenCalled();
-      expect(repository.mockSearch).toHaveBeenCalledWith(destination);
-      expect(repository.mockUpdateParentDir).not.toHaveBeenCalled();
-    });
-
-    it('when a file on the destination already exists and the overwite flag is set to true the old file gets trashed', async () => {
-      const file = FileMother.any();
-      const existing = FileMother.onFolderName('Ubuwevzuj');
-      const destination = new FilePath(
-        `${existing.dirname}/_${file.nameWithExtension}`
-      );
-
-      const override = true;
-
-      repository.mockSearch.mockImplementation(() => existing);
-      folderRepository.mockSearch.mockImplementation(() =>
-        FolderMother.containing(existing)
-      );
-
-      const hasBeenOverwritten = await SUT.run(
-        file,
-        destination.value,
-        override
-      );
-      expect(hasBeenOverwritten).toBe(true);
-
-      expect(folderRepository.mockSearch).toHaveBeenCalled();
-      expect(repository.mockSearch).toHaveBeenCalledWith(destination);
-      expect(repository.mockDelete).toHaveBeenCalled();
-      expect(repository.mockUpdateParentDir).toHaveBeenCalled();
-    });
-  });
-
-  describe('Rename', () => {
-    it('when a file is moved to the same folder its renamed', async () => {
-      const file = FileMother.any();
-      const destination = new FilePath(
-        `${file.dirname}/_${file.nameWithExtension}`
-      );
-      const override = false;
-
-      folderRepository.mockSearch.mockImplementation(() =>
-        FolderMother.containing(file)
-      );
-
-      repository.mockSearch.mockImplementation(() => undefined);
-      repository.mockUpdateName.mockImplementation(() => Promise.resolve());
-
-      const hasBeenOverwritten = await SUT.run(
-        file,
-        destination.value,
-        override
-      );
-
-      expect(hasBeenOverwritten).toBe(false);
-      expect(folderRepository.mockSearch).toHaveBeenCalledWith(file.dirname);
-      expect(repository.mockSearch).toHaveBeenCalledWith(destination);
-      expect(repository.mockUpdateName).toHaveBeenCalled();
-    });
-
-    it('a file cannot be renamed even with the overwite flag', async () => {
-      const file = FileMother.any();
-      const destination = new FilePath(
-        `${file.dirname}/_${file.nameWithExtension}`
-      );
-      const override = true;
-
-      folderRepository.mockSearch.mockImplementation(() =>
-        FolderMother.containing(file)
-      );
-      repository.mockSearch.mockImplementation(() => FileMother.any());
-
-      try {
-        const hasBeenOverwritten = await SUT.run(
-          file,
-          destination.value,
-          override
-        );
-        expect(hasBeenOverwritten).not.toBeDefined();
-      } catch (err) {
-        expect(err).toBeDefined();
-      }
-
-      expect(repository.mockSearch).toHaveBeenCalledWith(destination);
-      expect(repository.mockUpdateName).not.toHaveBeenCalled();
-    });
-  });
-});
diff --git a/src/workers/webdav/modules/files/test/application/WebdavFileRenamer.test.ts b/src/workers/webdav/modules/files/test/application/WebdavFileRenamer.test.ts
deleted file mode 100644
index 87eb9a8ff..000000000
--- a/src/workers/webdav/modules/files/test/application/WebdavFileRenamer.test.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { EventBusMock } from '../../../shared/test/__mock__/EventBusMock';
-import { WebdavFileRenamer } from '../../application/WebdavFileRenamer';
-import { FilePath } from '../../domain/FilePath';
-import { FileStatus } from '../../domain/FileStatus';
-import { FileMother } from '../domain/FileMother';
-import { RemoteFileContentsManagersFactoryMock } from '../../../contents/test/__mocks__/RemoteFileContentsManagersFactoryMock';
-import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
-import { WebdavIpcMock } from '../../../shared/test/__mock__/WebdavIPC';
-import { ContentsIdMother } from '../../../contents/test/domain/ContentsIdMother';
-
-describe('File Rename', () => {
-  let repository: FileRepositoryMock;
-  let contentsRepository: RemoteFileContentsManagersFactoryMock;
-  let eventBus: EventBusMock;
-  let ipc: WebdavIpcMock;
-  let SUT: WebdavFileRenamer;
-
-  beforeEach(() => {
-    repository = new FileRepositoryMock();
-    contentsRepository = new RemoteFileContentsManagersFactoryMock();
-    eventBus = new EventBusMock();
-    ipc = new WebdavIpcMock();
-    SUT = new WebdavFileRenamer(repository, contentsRepository, eventBus, ipc);
-  });
-
-  it('when the extension does not changes it updates the name of the file', async () => {
-    repository.mockSearch.mockImplementationOnce(() => {
-      //no-op
-    });
-
-    const file = FileMother.any();
-
-    const destination = new FilePath(
-      `${file.dirname}/_${file.nameWithExtension}`
-    );
-
-    await SUT.run(file, destination.value);
-
-    expect(repository.mockUpdateName).toBeCalledWith(
-      expect.objectContaining(file)
-    );
-  });
-
-  it('when the extension does not changes it does not reupload the file', async () => {
-    repository.mockSearch.mockImplementationOnce(() => {
-      //no-op
-    });
-
-    const file = FileMother.any();
-
-    const destination = new FilePath(
-      `${file.dirname}/_${file.nameWithExtension}`
-    );
-
-    await SUT.run(file, destination.value);
-
-    expect(contentsRepository.mockClone.mock).not.toBeCalled();
-  });
-
-  it('when the extension changes reupload the file', async () => {
-    const cloneedContentsId = ContentsIdMother.random();
-
-    repository.mockSearch.mockImplementationOnce(() => {
-      //no-op
-    });
-
-    contentsRepository.mockClone.mock.mockResolvedValueOnce(cloneedContentsId);
-
-    const file = FileMother.any();
-
-    const destination = new FilePath(
-      `${file.dirname}/_${file.name}.${file.type}n`
-    );
-
-    await SUT.run(file, destination.value);
-
-    expect(repository.mockUpdateName).not.toBeCalled();
-    expect(repository.mockAdd).toHaveBeenCalledWith(
-      expect.objectContaining({
-        contentsId: cloneedContentsId.value,
-        status: FileStatus.Exists,
-      })
-    );
-    expect(repository.mockDelete).toHaveBeenCalledWith(
-      expect.objectContaining({
-        contentsId: file.contentsId,
-        status: FileStatus.Trashed,
-      })
-    );
-  });
-
-  it('when the already exists a file on the destination it fails', async () => {
-    const fileOnDestination = FileMother.any();
-
-    repository.mockSearch.mockResolvedValueOnce(fileOnDestination);
-
-    await SUT.run(FileMother.any(), fileOnDestination.path.value).catch(
-      (error) => {
-        expect(error).toBeDefined();
-      }
-    );
-  });
-});
diff --git a/src/workers/webdav/modules/files/test/infrastructure/persistance/HttpFileRepository.test.ts b/src/workers/webdav/modules/files/test/infrastructure/persistance/HttpFileRepository.test.ts
deleted file mode 100644
index 5d33806c5..000000000
--- a/src/workers/webdav/modules/files/test/infrastructure/persistance/HttpFileRepository.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import axios from 'axios';
-import { Traverser } from '../../../../items/application/Traverser';
-import { HttpFileRepository } from '../../../infrastructure/persistance/HttpFileRepository';
-import { WebdavIpcMock } from '../../../../shared/test/__mock__/WebdavIPC';
-import { FilePath } from '../../../domain/FilePath';
-import { ServerFileMother } from './ServerFileMother';
-import { ServerFolderMother } from '../../../../items/test/persistance/ServerFolderMother';
-import { File } from '../../../domain/File';
-import { fakeDecryptor } from '../../../../shared/test/domain/FakeCrypt';
-import Chance from 'chance';
-const chance = new Chance();
-
-jest.mock('axios');
-
-const rootFolderId = 31420;
-
-const rootFolder = ServerFolderMother.fromPartial({
-  parentId: null,
-  id: rootFolderId,
-});
-
-describe('Http File Repository', () => {
-  let traverser: Traverser;
-  let ipc: WebdavIpcMock;
-  let SUT: HttpFileRepository;
-
-  beforeEach(() => {
-    traverser = new Traverser(fakeDecryptor, rootFolderId);
-
-    ipc = new WebdavIpcMock();
-
-    SUT = new HttpFileRepository(
-      fakeDecryptor,
-      axios,
-      axios,
-      traverser,
-      'bucket',
-      ipc
-    );
-  });
-
-  describe('Rename', () => {
-    it('after a file is renamed cannot be found ', async () => {
-      const files = ['a', 'b', 'c', 'd'].map((char: string) =>
-        ServerFileMother.fromPartial({
-          name: char,
-          folderId: rootFolderId,
-          fileId: chance.string({ length: 24 }),
-          type: '',
-        })
-      );
-
-      ipc.onInvokeMock.mockResolvedValueOnce({
-        folders: [rootFolder],
-        files: files,
-      });
-
-      axios.post = jest.fn().mockResolvedValueOnce({ status: 200, data: {} });
-
-      await SUT.init();
-
-      const fileSearchedBeforeRename = SUT.search(new FilePath('/a')) as File;
-
-      fileSearchedBeforeRename.rename(new FilePath('/aa'));
-
-      await SUT.updateName(fileSearchedBeforeRename);
-
-      const fileSearchedAfterRename = SUT.search(new FilePath('/a'));
-
-      expect(fileSearchedAfterRename).not.toBeDefined();
-    });
-  });
-});
diff --git a/src/workers/webdav/modules/folders/application/WebdavFolderCreator.ts b/src/workers/webdav/modules/folders/application/WebdavFolderCreator.ts
deleted file mode 100644
index ace2f7896..000000000
--- a/src/workers/webdav/modules/folders/application/WebdavFolderCreator.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { WebdavIpc } from '../../../ipc';
-import { FolderPath } from '../domain/FolderPath';
-import { FolderRepository } from '../domain/FolderRepository';
-import { WebdavFolderFinder } from './WebdavFolderFinder';
-
-export class WebdavFolderCreator {
-  constructor(
-    private readonly repository: FolderRepository,
-    private readonly folderFinder: WebdavFolderFinder,
-    private readonly ipc: WebdavIpc
-  ) {}
-
-  async run(path: string): Promise<void> {
-    const folderPath = new FolderPath(path);
-    this.ipc.send('WEBDAV_FOLDER_CREATING', {
-      name: folderPath.name(),
-    });
-
-    const parent = this.folderFinder.run(folderPath.dirname());
-
-    await this.repository.create(folderPath, parent.id);
-
-    this.ipc.send('WEBDAV_FOLDER_CREATED', {
-      name: folderPath.name(),
-    });
-  }
-}
diff --git a/src/workers/webdav/modules/folders/application/WebdavFolderMover.ts b/src/workers/webdav/modules/folders/application/WebdavFolderMover.ts
deleted file mode 100644
index 9dff57cbd..000000000
--- a/src/workers/webdav/modules/folders/application/WebdavFolderMover.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { ActionNotPermitedError } from '../domain/errors/ActionNotPermitedError';
-import { FolderPath } from '../domain/FolderPath';
-import { Folder } from '../domain/Folder';
-import { FolderRepository } from '../domain/FolderRepository';
-import { WebdavFolderFinder } from './WebdavFolderFinder';
-import { WebdavFolderRenamer } from './WebdavFolderRenamer';
-
-export class WebdavFolderMover {
-  constructor(
-    private readonly repository: FolderRepository,
-    private readonly folderFinder: WebdavFolderFinder,
-    private readonly folderRenamer: WebdavFolderRenamer
-  ) {}
-
-  private async move(folder: Folder, parentFolder: Folder) {
-    folder.moveTo(parentFolder);
-
-    await this.repository.updateParentDir(folder);
-  }
-
-  async run(folder: Folder, to: string): Promise<void> {
-    const destination = new FolderPath(to);
-    const resultFolder = this.repository.search(destination.value);
-
-    const shouldBeMerge = resultFolder !== undefined;
-
-    if (shouldBeMerge) {
-      throw new ActionNotPermitedError('overwrite');
-    }
-
-    const destinationFolder = this.folderFinder.run(destination.dirname());
-
-    if (folder.isIn(destinationFolder)) {
-      await this.folderRenamer.run(folder, to);
-      return;
-    }
-
-    await this.move(folder, destinationFolder);
-  }
-}
diff --git a/src/workers/webdav/modules/folders/application/WebdavFolderRenamer.ts b/src/workers/webdav/modules/folders/application/WebdavFolderRenamer.ts
deleted file mode 100644
index 2a4afdc0c..000000000
--- a/src/workers/webdav/modules/folders/application/WebdavFolderRenamer.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { WebdavIpc } from '../../../ipc';
-import { FolderPath } from '../domain/FolderPath';
-import { Folder } from '../domain/Folder';
-import { FolderRepository } from '../domain/FolderRepository';
-
-export class WebdavFolderRenamer {
-  constructor(
-    private readonly repository: FolderRepository,
-    private readonly ipc: WebdavIpc
-  ) {}
-
-  async run(folder: Folder, destination: string) {
-    const path = new FolderPath(destination);
-
-    this.ipc.send('WEBDAV_FOLDER_RENAMING', {
-      oldName: folder.name,
-      newName: path.name(),
-    });
-
-    folder.rename(path);
-
-    await this.repository.updateName(folder);
-
-    this.ipc.send('WEBDAV_FOLDER_RENAMED', {
-      oldName: folder.name,
-      newName: path.name(),
-    });
-  }
-}
diff --git a/src/workers/webdav/modules/folders/domain/FolderPath.ts b/src/workers/webdav/modules/folders/domain/FolderPath.ts
deleted file mode 100644
index 61a8e82a1..000000000
--- a/src/workers/webdav/modules/folders/domain/FolderPath.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import path from 'path';
-import { InvalidArgumentError } from '../../../../shared/domain/InvalidArgumentError';
-import { Path } from '../../shared/domain/Path';
-
-export class FolderPath extends Path {
-  constructor(value: string) {
-    super(value);
-    this.startsWithSlash(value);
-  }
-
-  private startsWithSlash(value: string) {
-    if (!value.startsWith('/')) {
-      throw new InvalidArgumentError(`${value} is not a valid FolderPath`);
-    }
-  }
-
-  static fromParts(parts: Array<string>) {
-    const full = path.join(...parts);
-
-    return new FolderPath(full);
-  }
-
-  name(): string {
-    if (this.value === '/') {
-      return 'Internxt Drive';
-    }
-
-    return super.name();
-  }
-
-  updateName(name: string): FolderPath {
-    return FolderPath.fromParts([this.dirname(), name]);
-  }
-
-  changeFolder(folder: string): FolderPath {
-    return FolderPath.fromParts([folder, this.name()]);
-  }
-}
diff --git a/src/workers/webdav/modules/folders/domain/errors/ActionNotPermitedError.ts b/src/workers/webdav/modules/folders/domain/errors/ActionNotPermitedError.ts
deleted file mode 100644
index fff78c4d3..000000000
--- a/src/workers/webdav/modules/folders/domain/errors/ActionNotPermitedError.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export class ActionNotPermitedError extends Error {
-  constructor(action: string) {
-    super(`${action} is not permited on folders`);
-  }
-}
diff --git a/src/workers/webdav/modules/folders/infrastructure/HttpFolderRepository.ts b/src/workers/webdav/modules/folders/infrastructure/HttpFolderRepository.ts
deleted file mode 100644
index 566f14ca6..000000000
--- a/src/workers/webdav/modules/folders/infrastructure/HttpFolderRepository.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import { Axios } from 'axios';
-import { Nullable } from 'shared/types/Nullable';
-import { ServerFile } from '../../../../filesystems/domain/ServerFile';
-import { ServerFolder } from '../../../../filesystems/domain/ServerFolder';
-import { Traverser } from '../../items/application/Traverser';
-import { FolderPath } from '../domain/FolderPath';
-import { Folder } from '../domain/Folder';
-import { FolderRepository } from '../domain/FolderRepository';
-import Logger from 'electron-log';
-import * as uuid from 'uuid';
-import { UpdateFolderNameDTO } from './dtos/UpdateFolderNameDTO';
-import { WebdavIpc } from '../../../ipc';
-import { RemoteItemsGenerator } from '../../items/application/RemoteItemsGenerator';
-import { FolderStatuses } from '../domain/FolderStatus';
-
-export class HttpFolderRepository implements FolderRepository {
-  private folders: Record<string, Folder> = {};
-
-  constructor(
-    private readonly driveClient: Axios,
-    private readonly trashClient: Axios,
-    private readonly traverser: Traverser,
-    private readonly ipc: WebdavIpc
-  ) {}
-
-  private async getTree(): Promise<{
-    files: ServerFile[];
-    folders: ServerFolder[];
-  }> {
-    const remoteItemsGenerator = new RemoteItemsGenerator(this.ipc);
-    return remoteItemsGenerator.getAll();
-  }
-
-  public async init(): Promise<void> {
-    const raw = await this.getTree();
-
-    this.traverser.reset();
-    const all = this.traverser.run(raw);
-
-    const folders = Object.entries(all).filter(
-      ([_key, value]) =>
-        value instanceof Folder && value.hasStatus(FolderStatuses.EXISTS)
-    ) as Array<[string, Folder]>;
-
-    this.folders = folders.reduce((items, [key, value]) => {
-      items[key] = value;
-
-      return items;
-    }, {} as Record<string, Folder>);
-  }
-
-  search(path: string): Nullable<Folder> {
-    return this.folders[path];
-  }
-
-  async create(path: FolderPath, parentId: number): Promise<Folder> {
-    const plainName = path.name();
-
-    if (!plainName) {
-      throw new Error('Bad folder name');
-    }
-
-    const response = await this.driveClient.post(
-      `${process.env.API_URL}/api/storage/folder`,
-      {
-        folderName: plainName,
-        parentFolderId: parentId,
-      }
-    );
-
-    if (response.status !== 201) {
-      throw new Error('Folder creation failded');
-    }
-
-    const serverFolder = response.data as ServerFolder | null;
-
-    if (!serverFolder) {
-      throw new Error('Folder creation failded, no data returned');
-    }
-
-    const folder = Folder.create({
-      id: serverFolder.id,
-      parentId: serverFolder.parentId,
-      updatedAt: serverFolder.updatedAt,
-      createdAt: serverFolder.createdAt,
-      path: path.value,
-      status: FolderStatuses.EXISTS,
-    });
-
-    return folder;
-  }
-
-  async updateName(folder: Folder): Promise<void> {
-    const url = `${process.env.API_URL}/api/storage/folder/${folder.id}/meta`;
-
-    const body: UpdateFolderNameDTO = {
-      metadata: { itemName: folder.name },
-      relativePath: uuid.v4(),
-    };
-
-    const res = await this.driveClient.post(url, body);
-
-    if (res.status !== 200) {
-      throw new Error(
-        `[REPOSITORY] Error updating item metadata: ${res.status}`
-      );
-    }
-  }
-
-  async updateParentDir(folder: Folder): Promise<void> {
-    const url = `${process.env.API_URL}/api/storage/move/folder`;
-
-    const body = { destination: folder.parentId, folderId: folder.id };
-
-    const res = await this.driveClient.post(url, body);
-
-    if (res.status !== 200) {
-      throw new Error(`[REPOSITORY] Error moving item: ${res.status}`);
-    }
-
-    await this.init();
-  }
-
-  async searchOn(folder: Folder): Promise<Array<Folder>> {
-    await this.init();
-    return Object.values(this.folders).filter((f) => f.isIn(folder));
-  }
-
-  async trash(folder: Folder): Promise<void> {
-    const result = await this.trashClient.post(
-      `${process.env.NEW_DRIVE_URL}/drive/storage/trash/add`,
-      {
-        items: [{ type: 'folder', id: folder.id }],
-      }
-    );
-
-    if (result.status === 200) {
-      return;
-    }
-
-    Logger.error(
-      '[FOLDER REPOSITORY] Folder deletion failed with status: ',
-      result.status,
-      result.statusText
-    );
-
-    await this.ipc.invoke('START_REMOTE_SYNC');
-  }
-}
diff --git a/src/workers/webdav/modules/folders/test/__mocks__/FolderRepositoryMock.ts b/src/workers/webdav/modules/folders/test/__mocks__/FolderRepositoryMock.ts
deleted file mode 100644
index d6deeedc3..000000000
--- a/src/workers/webdav/modules/folders/test/__mocks__/FolderRepositoryMock.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Nullable } from 'shared/types/Nullable';
-import { FolderPath } from '../../domain/FolderPath';
-import { Folder } from '../../domain/Folder';
-import { FolderRepository } from '../../domain/FolderRepository';
-
-export class FolderRepositoryMock implements FolderRepository {
-  public mockSearch = jest.fn();
-  public mockAdd = jest.fn();
-  public mockUpdateName = jest.fn();
-  public mockUpdateParentDir = jest.fn();
-  public mockCreate = jest.fn();
-  public mockSearchOnFolder = jest.fn();
-  public mockTrash = jest.fn();
-
-  search(pathLike: string): Nullable<Folder> {
-    return this.mockSearch(pathLike);
-  }
-
-  add(file: Folder): Promise<void> {
-    return this.mockAdd(file);
-  }
-
-  updateName(item: Folder): Promise<void> {
-    return this.mockUpdateName(item);
-  }
-
-  updateParentDir(item: Folder): Promise<void> {
-    return this.mockUpdateParentDir(item);
-  }
-
-  create(name: FolderPath, parentId: number | null): Promise<Folder> {
-    return this.mockCreate(name, parentId);
-  }
-
-  searchOn(folder: Folder): Promise<Folder[]> {
-    return this.mockSearchOnFolder(folder);
-  }
-
-  trash(folder: Folder): Promise<void> {
-    return this.mockTrash(folder);
-  }
-
-  clearMocks() {
-    jest.clearAllMocks();
-  }
-}
diff --git a/src/workers/webdav/modules/folders/test/application/WebdavFolderDeleter.test.ts b/src/workers/webdav/modules/folders/test/application/WebdavFolderDeleter.test.ts
deleted file mode 100644
index 79cb5efc0..000000000
--- a/src/workers/webdav/modules/folders/test/application/WebdavFolderDeleter.test.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { WebdavFolderDeleter } from '../../application/WebdavFolderDeleter';
-import { FolderStatus } from '../../domain/FolderStatus';
-import { FolderMother } from '../domain/FolderMother';
-import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
-
-describe('Folder deleter', () => {
-  let repository: FolderRepositoryMock;
-  let SUT: WebdavFolderDeleter;
-
-  beforeEach(() => {
-    repository = new FolderRepositoryMock();
-    SUT = new WebdavFolderDeleter(repository);
-  });
-
-  it('trashes an existing folder', () => {
-    const folder = FolderMother.exists();
-
-    SUT.run(folder);
-
-    expect(repository.mockTrash).toBeCalledWith(
-      expect.objectContaining({
-        status: FolderStatus.Trashed,
-      })
-    );
-  });
-
-  it('throws an error when trashing a folder already trashed', () => {
-    const folder = FolderMother.trashed();
-
-    SUT.run(folder).catch((err) => {
-      expect(err).toBeDefined();
-    });
-
-    expect(repository.mockTrash).not.toBeCalled();
-  });
-});
diff --git a/src/workers/webdav/modules/folders/test/application/WebdavFolderMover.test.ts b/src/workers/webdav/modules/folders/test/application/WebdavFolderMover.test.ts
deleted file mode 100644
index 71a5e0e97..000000000
--- a/src/workers/webdav/modules/folders/test/application/WebdavFolderMover.test.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { WebdavFolderFinder } from '../../application/WebdavFolderFinder';
-import { WebdavFolderMover } from '../../application/WebdavFolderMover';
-import { WebdavFolderRenamer } from '../../application/WebdavFolderRenamer';
-import { FolderMother } from '../domain/FolderMother';
-import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
-import { WebdavIpcMock } from '../../../shared/test/__mock__/WebdavIPC';
-
-describe('Folder Mover', () => {
-  let repository: FolderRepositoryMock;
-  let folderFinder: WebdavFolderFinder;
-  let folderRenamer: WebdavFolderRenamer;
-  let ipc: WebdavIpcMock;
-  let SUT: WebdavFolderMover;
-
-  beforeEach(() => {
-    repository = new FolderRepositoryMock();
-    folderFinder = new WebdavFolderFinder(repository);
-    ipc = new WebdavIpcMock();
-    folderRenamer = new WebdavFolderRenamer(repository, ipc);
-
-    SUT = new WebdavFolderMover(repository, folderFinder, folderRenamer);
-  });
-
-  it('Folders cannot be ovewrited', async () => {
-    const folder = FolderMother.in(1, '/folderA/folderB');
-    const destination = '/folderC/folderB';
-
-    repository.mockSearch.mockImplementation(() =>
-      FolderMother.in(2, destination)
-    );
-
-    try {
-      const hasBeenOverwritten = await SUT.run(folder, destination);
-      expect(hasBeenOverwritten).not.toBeDefined();
-    } catch (err) {
-      expect(err).toBeDefined();
-    }
-
-    expect(repository.mockUpdateName).not.toBeCalled();
-    expect(repository.mockUpdateParentDir).not.toBeCalled();
-  });
-
-  describe('Move', () => {
-    it('moves a folder when the destination folder does not contain a folder with the same folder', async () => {
-      const folder = FolderMother.in(1, '/folderA/folderB');
-      const destination = '/folderC/folderB';
-      const folderC = FolderMother.in(2, '/folderC');
-
-      repository.mockSearch
-        .mockReturnValueOnce(undefined)
-        .mockReturnValueOnce(folderC);
-
-      await SUT.run(folder, destination);
-
-      expect(repository.mockUpdateParentDir).toHaveBeenCalled();
-      expect(repository.mockUpdateName).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('Rename', () => {
-    it('when a folder is moved to same folder its renamed', async () => {
-      const folderAId = 30010278;
-      const folder = FolderMother.in(folderAId, '/folderA/folderB');
-      const destination = '/folderA/folderC';
-
-      repository.mockSearch
-        .mockReturnValueOnce(undefined)
-        .mockReturnValueOnce(FolderMother.withId(folderAId));
-
-      await SUT.run(folder, destination);
-
-      expect(repository.mockUpdateName).toHaveBeenCalled();
-      expect(repository.mockUpdateParentDir).not.toHaveBeenCalled();
-    });
-  });
-});
diff --git a/src/workers/webdav/modules/folders/test/domain/FolderPath.test.ts b/src/workers/webdav/modules/folders/test/domain/FolderPath.test.ts
deleted file mode 100644
index 70228ebeb..000000000
--- a/src/workers/webdav/modules/folders/test/domain/FolderPath.test.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { FolderPath } from '../../domain/FolderPath';
-
-describe('Path', () => {
-  describe('path instanciation', () => {
-    it('path from parts creates expected result', () => {
-      const parts = ['/', 'Family'];
-
-      const path = FolderPath.fromParts(parts);
-
-      expect(path.value).toBe('/Family');
-    });
-
-    it('works', () => {
-      const folderPath = new FolderPath('/Family');
-
-      const basePath = folderPath.dirname();
-
-      expect(basePath).toBe('/');
-    });
-  });
-});
diff --git a/src/workers/webdav/modules/folders/test/infrastructure/HttpFolderRepository.test.ts b/src/workers/webdav/modules/folders/test/infrastructure/HttpFolderRepository.test.ts
deleted file mode 100644
index bb0fa43d9..000000000
--- a/src/workers/webdav/modules/folders/test/infrastructure/HttpFolderRepository.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import axios from 'axios';
-import { Traverser } from '../../../items/application/Traverser';
-import { FolderPath } from '../../domain/FolderPath';
-import { HttpFolderRepository } from '../../infrastructure/HttpFolderRepository';
-import { fakeDecryptor } from '../../../shared/test/domain/FakeCrypt';
-import { WebdavIpcMock } from '../../../shared/test/__mock__/WebdavIPC';
-import { ServerFolderMother } from '../../../items/test/persistance/ServerFolderMother';
-
-jest.mock('axios');
-
-const rootFolderId = 4206870830;
-
-describe('Http Folder Repository', () => {
-  let ipc: WebdavIpcMock;
-  let SUT: HttpFolderRepository;
-
-  describe('save', () => {
-    beforeEach(() => {
-      const traverser = new Traverser(fakeDecryptor, rootFolderId);
-
-      ipc = new WebdavIpcMock();
-
-      SUT = new HttpFolderRepository(axios, axios, traverser, ipc);
-    });
-
-    it.skip('after a folder is saved it has to have all its properties set', async () => {
-      const serverFolder = ServerFolderMother.any();
-
-      axios.post = jest
-        .fn()
-        .mockResolvedValueOnce({ status: 201, data: serverFolder });
-
-      ipc.onInvokeMock.mockImplementationOnce(() => {
-        //no op
-      });
-
-      await SUT.create(
-        new FolderPath(`/${serverFolder.name}`),
-        serverFolder.parentId as unknown as number
-      );
-
-      const savedFolder = SUT.search(`/${serverFolder.name}`);
-
-      expect(savedFolder).toBeDefined();
-      expect(savedFolder?.updatedAt).toBeDefined();
-      expect(savedFolder?.createdAt).toBeDefined();
-    });
-  });
-});
diff --git a/src/workers/webdav/modules/items/application/Traverser.ts b/src/workers/webdav/modules/items/application/Traverser.ts
deleted file mode 100644
index 76bacafcb..000000000
--- a/src/workers/webdav/modules/items/application/Traverser.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import Logger from 'electron-log';
-import {
-  ServerFile,
-  ServerFileStatus,
-} from '../../../../filesystems/domain/ServerFile';
-import {
-  ServerFolder,
-  ServerFolderStatus,
-} from '../../../../filesystems/domain/ServerFolder';
-import { fileNameIsValid } from '../../../../utils/name-verification';
-import { File } from '../../files/domain/File';
-import { FolderStatus } from '../../folders/domain/FolderStatus';
-import { Folder } from '../../folders/domain/Folder';
-import { ItemsIndexedByPath } from '../domain/ItemsIndexedByPath';
-
-/** @deprecated */
-export class Traverser {
-  private readonly collection: ItemsIndexedByPath = {};
-
-  private rawTree: {
-    files: Array<ServerFile>;
-    folders: Array<ServerFolder>;
-  } | null = null;
-
-  constructor(
-    private readonly decryptor: {
-      decryptName: (
-        name: string,
-        folderId: string,
-        encryptVersion: string
-      ) => string | null;
-    },
-    private readonly baseFolderId: number
-  ) {}
-
-  private traverse(currentId: number, currentName = '') {
-    if (!this.rawTree) return;
-
-    const filesInThisFolder = this.rawTree.files.filter(
-      (file) => file.folderId === currentId
-    );
-
-    const foldersInThisFolder = this.rawTree.folders.filter((folder) => {
-      return folder.parentId === currentId;
-    });
-
-    filesInThisFolder
-      .map((file) => ({
-        name: `${currentName}/${this.decryptor.decryptName(
-          file.name,
-          file.folderId.toString(),
-          file.encrypt_version
-        )}${file.type ? `.${file.type}` : ''}`,
-        file,
-      }))
-      .filter(({ name }) => {
-        const isValid = fileNameIsValid(name);
-
-        if (!isValid) {
-          Logger.warn(
-            `REMOTE file with name ${name} will be ignored due an invalid name`
-          );
-          return false;
-        }
-
-        return true;
-      })
-      .forEach(({ file, name }) => {
-        if (file.status === ServerFileStatus.EXISTS) {
-          this.collection[name] = File.from({
-            folderId: file.folderId,
-            contentsId: file.fileId,
-            modificationTime: file.modificationTime,
-            size: file.size,
-            createdAt: file.createdAt,
-            updatedAt: file.updatedAt,
-            path: name,
-            status: file.status,
-          });
-        }
-      });
-
-    foldersInThisFolder.forEach((folder: ServerFolder) => {
-      const plainName =
-        folder.plain_name ||
-        this.decryptor.decryptName(
-          folder.name,
-          (folder.parentId as number).toString(),
-          '03-aes'
-        ) ||
-        folder.name;
-
-      const name = `${currentName}/${plainName}`;
-
-      if (folder.status !== ServerFolderStatus.EXISTS) return;
-
-      this.collection[name] = Folder.from({
-        id: folder.id,
-        parentId: folder.parentId as number,
-        updatedAt: folder.updatedAt,
-        createdAt: folder.createdAt,
-        path: name,
-        status: folder.status,
-      });
-
-      this.traverse(folder.id, `${name}`);
-    });
-  }
-
-  public reset() {
-    Object.keys(this.collection).forEach(
-      (k: string) => delete this.collection[k]
-    );
-
-    this.collection['/'] = Folder.from({
-      id: this.baseFolderId,
-      parentId: null,
-      updatedAt: new Date().toISOString(),
-      createdAt: new Date().toISOString(),
-      path: '/',
-      status: FolderStatus.Exists.value,
-    });
-  }
-
-  public run(rawTree: {
-    files: Array<ServerFile>;
-    folders: Array<ServerFolder>;
-  }) {
-    this.rawTree = rawTree;
-
-    this.traverse(this.baseFolderId);
-
-    this.collection['/'] = Folder.from({
-      id: this.baseFolderId,
-      parentId: null,
-      updatedAt: new Date().toISOString(),
-      createdAt: new Date().toISOString(),
-      path: '/',
-      status: FolderStatus.Exists.value,
-    });
-
-    return this.collection;
-  }
-}
diff --git a/src/workers/webdav/modules/items/test/application/Traverser.test.ts b/src/workers/webdav/modules/items/test/application/Traverser.test.ts
deleted file mode 100644
index fcf0e965b..000000000
--- a/src/workers/webdav/modules/items/test/application/Traverser.test.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import { ContentsIdMother } from '../../../contents/test/domain/ContentsIdMother';
-import { ServerFile } from '../../../../../filesystems/domain/ServerFile';
-import { ServerFolder } from '../../../../../filesystems/domain/ServerFolder';
-import { Traverser } from '../../../items/application/Traverser';
-
-const fakeDecryptor = {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  decryptName: (name: string, _a: string, _b: string) => name,
-};
-
-describe('Traverser', () => {
-  it('first level files starts with /', () => {
-    const baseFolderId = 6;
-    const rawTree = {
-      files: [
-        {
-          name: 'file A',
-          fileId: ContentsIdMother.raw(),
-          folderId: baseFolderId,
-          size: 67,
-          status: 'EXISTS',
-        } as ServerFile,
-      ],
-      folders: [],
-    };
-    const SUT = new Traverser(fakeDecryptor, baseFolderId);
-
-    const result = SUT.run(rawTree);
-
-    expect(Object.keys(result)).toStrictEqual(['/file A', '/']);
-  });
-
-  it('second level files starts with /', () => {
-    const baseFolderId = 6;
-    const rawTree = {
-      files: [
-        {
-          name: 'file A',
-          fileId: ContentsIdMother.raw(),
-          folderId: 22491,
-          size: 200,
-          status: 'EXISTS',
-        } as ServerFile,
-      ],
-      folders: [
-        {
-          id: 22491,
-          parentId: baseFolderId,
-          plain_name: 'folder A',
-          status: 'EXISTS',
-        } as ServerFolder,
-      ],
-    };
-    const SUT = new Traverser(fakeDecryptor, baseFolderId);
-
-    const result = SUT.run(rawTree);
-
-    expect(Object.keys(result)).toStrictEqual([
-      '/folder A',
-      '/folder A/file A',
-      '/',
-    ]);
-  });
-
-  it('first level folder starts with /', () => {
-    const baseFolderId = 6;
-    const rawTree = {
-      files: [],
-      folders: [
-        {
-          id: 22491,
-          parentId: baseFolderId,
-          plain_name: 'folder A',
-          status: 'EXISTS',
-        } as ServerFolder,
-      ],
-    };
-    const SUT = new Traverser(fakeDecryptor, baseFolderId);
-
-    const result = SUT.run(rawTree);
-
-    expect(Object.keys(result)).toStrictEqual(['/folder A', '/']);
-  });
-
-  it('second level folder starts with /', () => {
-    const baseFolderId = 6;
-    const rawTree = {
-      files: [],
-      folders: [
-        {
-          id: 22491,
-          parentId: baseFolderId,
-          plain_name: 'folder A',
-          status: 'EXISTS',
-        } as ServerFolder,
-        {
-          id: 89181879209463,
-          parentId: 22491,
-          plain_name: 'folder B',
-          status: 'EXISTS',
-        } as ServerFolder,
-      ],
-    };
-    const SUT = new Traverser(fakeDecryptor, baseFolderId);
-
-    const result = SUT.run(rawTree);
-
-    expect(Object.keys(result)).toStrictEqual([
-      '/folder A',
-      '/folder A/folder B',
-      '/',
-    ]);
-  });
-
-  it('root folder should exist', () => {
-    const baseFolderId = 6;
-    const rawTree = {
-      files: [],
-      folders: [
-        {
-          id: 22491,
-          parentId: baseFolderId,
-          plain_name: 'folder A',
-          status: 'EXISTS',
-        } as ServerFolder,
-        {
-          id: 89181879209463,
-          parentId: 22491,
-          plain_name: 'folder B',
-          status: 'EXISTS',
-        } as ServerFolder,
-      ],
-    };
-    const SUT = new Traverser(fakeDecryptor, baseFolderId);
-
-    const result = SUT.run(rawTree);
-
-    expect(Object.keys(result)).toStrictEqual([
-      '/folder A',
-      '/folder A/folder B',
-      '/',
-    ]);
-  });
-});
diff --git a/src/workers/webdav/modules/shared/application/WebdavUnkownItemMetadataDealer.ts b/src/workers/webdav/modules/shared/application/WebdavUnkownItemMetadataDealer.ts
deleted file mode 100644
index 3bad722f1..000000000
--- a/src/workers/webdav/modules/shared/application/WebdavUnkownItemMetadataDealer.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { FileMetadataCollection } from '../../files/domain/FileMetadataCollection';
-import {
-  ItemMetadata,
-  ItemMetadataAtributes,
-} from '../../shared/domain/ItemMetadata';
-import { WebdavUnknownItemTypeSearcher } from './WebdavUnknownItemTypeSearcher';
-
-export class WebdavUnkownItemMetadataDealer {
-  constructor(
-    private readonly unknownItemSearcher: WebdavUnknownItemTypeSearcher,
-    private readonly temporalFileMeatadaCollection: FileMetadataCollection
-  ) {}
-
-  run<T extends keyof ItemMetadataAtributes>(
-    path: string,
-    attribute: T
-  ): ItemMetadataAtributes[T] | undefined {
-    const item = this.unknownItemSearcher.run(path);
-
-    if (!item) {
-      const metadata = this.temporalFileMeatadaCollection.get(path);
-
-      if (!metadata) return;
-
-      return metadata[attribute];
-    }
-
-    if (item.isFile()) {
-      return ItemMetadata.extractFromFile(item)[attribute];
-    }
-
-    if (item.isFolder()) {
-      return ItemMetadata.extractFromFolder(item)[attribute];
-    }
-
-    return undefined;
-  }
-}
diff --git a/src/workers/webdav/modules/shared/domain/ItemMetadata.ts b/src/workers/webdav/modules/shared/domain/ItemMetadata.ts
deleted file mode 100644
index 2c773759b..000000000
--- a/src/workers/webdav/modules/shared/domain/ItemMetadata.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Folder } from '../../folders/domain/Folder';
-import { File } from '../../files/domain/File';
-
-export type ItemMetadataAtributes = {
-  createdAt: number;
-  updatedAt: number;
-  name: string;
-  size: number;
-  extension: string;
-  type: 'FILE' | 'FOLDER';
-};
-
-export class ItemMetadata {
-  private constructor(
-    readonly createdAt: number,
-    readonly updatedAt: number,
-    readonly name: string,
-    readonly size: number,
-    readonly extension: string,
-    readonly type: 'FILE' | 'FOLDER'
-  ) {}
-
-  static from(atributes: ItemMetadataAtributes): ItemMetadata {
-    return new ItemMetadata(
-      atributes.createdAt,
-      atributes.updatedAt,
-      atributes.name,
-      atributes.size,
-      atributes.extension,
-      atributes.type
-    );
-  }
-
-  static extractFromFile(file: File): ItemMetadata {
-    return new ItemMetadata(
-      file.createdAt.getTime(),
-      file.updatedAt.getTime(),
-      file.nameWithExtension,
-      file.size,
-      file.type,
-      'FILE'
-    );
-  }
-
-  static extractFromFolder(folder: Folder): ItemMetadata {
-    return new ItemMetadata(
-      folder.createdAt.getTime(),
-      folder.updatedAt.getTime(),
-      folder.name,
-      folder.size,
-      '',
-      'FOLDER'
-    );
-  }
-}
diff --git a/src/workers/webdav/modules/shared/domain/Path.ts b/src/workers/webdav/modules/shared/domain/Path.ts
deleted file mode 100644
index f4769e1c9..000000000
--- a/src/workers/webdav/modules/shared/domain/Path.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import path from 'path';
-import { ValueObject } from '../../../../shared/domain/ValueObject';
-
-export abstract class Path extends ValueObject<string> {
-  name(): string {
-    const base = path.basename(this.value);
-    const { name } = path.parse(base);
-    return name;
-  }
-
-  dirname(): string {
-    return path.dirname(this.value);
-  }
-
-  hasSameName(other: Path) {
-    const name = this.name();
-    const otherName = other.name();
-
-    return name === otherName;
-  }
-}
diff --git a/src/workers/webdav/modules/shared/domain/WebdavItem.ts b/src/workers/webdav/modules/shared/domain/WebdavItem.ts
deleted file mode 100644
index aa9533d33..000000000
--- a/src/workers/webdav/modules/shared/domain/WebdavItem.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { File } from '../../files/domain/File';
-import { Folder } from '../../folders/domain/Folder';
-import { Path } from './Path';
-
-export abstract class Item {
-  abstract readonly path: Path;
-
-  abstract readonly createdAt: Date;
-
-  abstract readonly updatedAt: Date;
-
-  abstract readonly size: number;
-
-  abstract rename(path: Path): Item;
-  abstract moveTo(folder: Folder): Item;
-
-  abstract isFolder(): this is Folder;
-  abstract isFile(): this is File;
-  abstract hasParent(id: number): boolean;
-  abstract toProps(): Record<string, string | number>;
-}
diff --git a/src/workers/webdav/modules/shared/infrastructure/DomainEventSubscribers.ts b/src/workers/webdav/modules/shared/infrastructure/DomainEventSubscribers.ts
deleted file mode 100644
index 4f4fe4280..000000000
--- a/src/workers/webdav/modules/shared/infrastructure/DomainEventSubscribers.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { DependencyContainerFactory } from 'workers/webdav/dependencyInjection/DependencyContainerFactory';
-import { DependencyContainer } from 'workers/webdav/dependencyInjection/DependencyContainer';
-import { WebdavDomainEventSubscriber } from '../domain/WebdavDomainEventSubscriber';
-import { DomainEvent } from '../domain/DomainEvent';
-
-export class DomainEventSubscribers {
-  constructor(public items: Array<WebdavDomainEventSubscriber<DomainEvent>>) {}
-
-  static from(container: DependencyContainer): DomainEventSubscribers {
-    const subscribers = DependencyContainerFactory.subscriptors.map(
-      (subscriber) => {
-        return container[subscriber];
-      }
-    ) as unknown as Array<WebdavDomainEventSubscriber<DomainEvent>>;
-
-    return new DomainEventSubscribers(subscribers);
-  }
-}
diff --git a/src/workers/webdav/modules/userUsage/application/DecrementDriveUsageOnFileDeleted.ts b/src/workers/webdav/modules/userUsage/application/DecrementDriveUsageOnFileDeleted.ts
deleted file mode 100644
index fd685b4e7..000000000
--- a/src/workers/webdav/modules/userUsage/application/DecrementDriveUsageOnFileDeleted.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { FileCreatedDomainEvent } from '../../files/domain/FileCreatedDomainEvent';
-import { DomainEventClass } from '../../shared/domain/DomainEvent';
-import { WebdavDomainEventSubscriber } from '../../shared/domain/WebdavDomainEventSubscriber';
-import { UserUsageIncrementer } from './UserUsageIncrementer';
-import { FileDeletedDomainEvent } from '../../files/domain/FileDeletedDomainEvent';
-
-export class DecrementDriveUsageOnFileDeleted
-  implements WebdavDomainEventSubscriber<FileCreatedDomainEvent>
-{
-  constructor(private readonly incrementer: UserUsageIncrementer) {}
-
-  subscribedTo(): DomainEventClass[] {
-    return [FileDeletedDomainEvent];
-  }
-
-  on(domainEvent: FileDeletedDomainEvent): Promise<void> {
-    return this.incrementer.run(domainEvent.size);
-  }
-}
diff --git a/src/workers/webdav/worker/InternxtFileSystem/InternxtFileSystem.ts b/src/workers/webdav/worker/InternxtFileSystem/InternxtFileSystem.ts
deleted file mode 100644
index 2976c1ccc..000000000
--- a/src/workers/webdav/worker/InternxtFileSystem/InternxtFileSystem.ts
+++ /dev/null
@@ -1,448 +0,0 @@
-/* eslint-disable no-underscore-dangle */
-import {
-  LocalPropertyManager,
-  LastModifiedDateInfo,
-  OpenWriteStreamInfo,
-  PropertyManagerInfo,
-  OpenReadStreamInfo,
-  IPropertyManager,
-  LocalLockManager,
-  CreationDateInfo,
-  LockManagerInfo,
-  SimpleCallback,
-  ReturnCallback,
-  ResourceType,
-  ILockManager,
-  ReadDirInfo,
-  CreateInfo,
-  DeleteInfo,
-  FileSystem,
-  SizeInfo,
-  TypeInfo,
-  Path,
-  Errors,
-  DisplayNameInfo,
-  MoveInfo,
-  CopyInfo,
-  MimeTypeInfo,
-  RenameInfo,
-} from '@internxt/webdav-server';
-import { Readable, Writable } from 'stream';
-import Logger from 'electron-log';
-import { DebugPhysicalSerializer } from './Serializer';
-import { handleFileSystemError } from '../error-handling';
-import { DependencyContainer } from '../../dependencyInjection/DependencyContainer';
-import { FileActionCannotModifyExtension } from '../../modules/files/domain/errors/FileActionCannotModifyExtension';
-import { FileActionOnlyCanAffectOneLevelError } from '../../modules/files/domain/errors/FileActionOnlyCanAffectOneLevelError';
-import { FileNameShouldDifferFromOriginalError } from '../../modules/files/domain/errors/FileNameShouldDifferFromOriginalError';
-import { FileCannotBeMovedToTheOriginalFolderError } from '../../modules/files/domain/errors/FileCannotBeMovedToTheOriginalFolderError';
-import { Contents } from '../../modules/contents/domain/Contents';
-import { WebdavFileValidator } from 'workers/webdav/modules/files/application/WebdavFileValidator';
-
-export class PhysicalFileSystemResource {
-  props: LocalPropertyManager;
-
-  locks: LocalLockManager;
-
-  constructor(data?: PhysicalFileSystemResource) {
-    if (!data) {
-      this.props = new LocalPropertyManager();
-      this.locks = new LocalLockManager();
-    } else {
-      const rs = data as PhysicalFileSystemResource;
-      this.props = new LocalPropertyManager(rs.props);
-      this.locks = new LocalLockManager();
-    }
-  }
-}
-
-export class InternxtFileSystem extends FileSystem {
-  resources: {
-    [path: string]: PhysicalFileSystemResource;
-  };
-
-  private fileValidator = new WebdavFileValidator();
-  constructor(private readonly container: DependencyContainer) {
-    super(new DebugPhysicalSerializer(container));
-
-    this.resources = {
-      '/': new PhysicalFileSystemResource(),
-    };
-  }
-
-  _copy(
-    pathFrom: Path,
-    pathTo: Path,
-    ctx: CopyInfo,
-    callback: ReturnCallback<boolean>
-  ) {
-    const sourceItem = this.container.itemSearcher.run(
-      pathFrom.toString(false)
-    );
-
-    if (!sourceItem) {
-      return callback(Errors.ResourceNotFound);
-    }
-
-    if (sourceItem.isFile()) {
-      this.container.fileClonner
-        .run(sourceItem, pathTo.toString(false), ctx.overwrite)
-        .then((haveBeenOverwritten: boolean) => {
-          callback(undefined, haveBeenOverwritten);
-        })
-        .catch((error: Error) => {
-          handleFileSystemError(error, 'Upload', 'File', ctx);
-          callback(error);
-        });
-
-      return;
-    }
-
-    return callback(Errors.InvalidOperation);
-  }
-
-  _create(path: Path, ctx: CreateInfo, callback: SimpleCallback): void {
-    if (ctx.type.isDirectory) {
-      this.container.folderCreator
-        .run(path.toString(false))
-        .then(() => {
-          this.resources[path.toString(false)] =
-            new PhysicalFileSystemResource();
-          callback();
-        })
-        .catch((error: Error) => {
-          handleFileSystemError(error, 'Upload', 'Folder', ctx);
-          callback(error);
-        });
-      return;
-    }
-
-    if (ctx.type.isFile) {
-      const isValidName = this.fileValidator.validatePath(path);
-      if (!isValidName) return callback(Errors.UnrecognizedResource);
-
-      this.resources[path.toString(false)] = new PhysicalFileSystemResource();
-
-      return callback();
-    }
-
-    callback(Errors.InvalidOperation);
-  }
-
-  _delete(path: Path, ctx: DeleteInfo, callback: SimpleCallback): void {
-    const item = this.container.itemSearcher.run(path.toString(false));
-
-    if (!item) {
-      return callback(Errors.ResourceNotFound);
-    }
-
-    if (item.isFile()) {
-      const isValidName = this.fileValidator.validatePath(path);
-      if (!isValidName) return callback(Errors.UnrecognizedResource);
-
-      Logger.debug('[Deleting File]: ' + item.name + item.type);
-      this.container.fileDeleter
-        .run(item)
-        .then(() => {
-          delete this.resources[item.path.value];
-          callback(undefined);
-        })
-        .catch((error: Error) => {
-          handleFileSystemError(error, 'Delete', 'File', ctx);
-          callback(error);
-        });
-      return;
-    }
-
-    if (item.isFolder()) {
-      this.container.folderDeleter
-        .run(item)
-        .then(() => callback())
-        .catch((error: Error) => {
-          handleFileSystemError(error, 'Delete', 'Folder', ctx);
-          callback(error);
-        });
-    }
-  }
-
-  _openWriteStream(
-    path: Path,
-    ctx: OpenWriteStreamInfo,
-    callback: ReturnCallback<Writable>
-  ): void {
-    const resource = this.resources[path.toString(false)];
-
-    if (!resource) {
-      this.resources[path.toString(false)] = new PhysicalFileSystemResource();
-    }
-
-    this.container.fileCreator
-      .run(path.toString(false), ctx.estimatedSize)
-      .then(({ stream }: { stream: Writable; upload: Promise<string> }) => {
-        callback(undefined, stream);
-      })
-      .catch((error: Error) => {
-        handleFileSystemError(error, 'Upload', 'File', ctx);
-        callback(error);
-      });
-  }
-
-  _openReadStream(
-    path: Path,
-    ctx: OpenReadStreamInfo,
-    callback: ReturnCallback<Readable>
-  ): void {
-    this.container.fileDownloader
-      .run(path.toString(false))
-      .then((remoteFileContents: Contents) => {
-        callback(undefined, remoteFileContents.stream);
-      })
-      .catch((error: Error) => {
-        handleFileSystemError(error, 'Download', 'File', ctx);
-      });
-  }
-
-  _rename(
-    pathFrom: Path,
-    _newName: string,
-    ctx: RenameInfo,
-    callback: ReturnCallback<boolean>
-  ) {
-    Logger.debug('RENAME');
-    const originalItem = this.container.itemSearcher.run(
-      pathFrom.toString(false)
-    );
-
-    if (!originalItem) {
-      return callback(Errors.ResourceNotFound);
-    }
-
-    if (originalItem.isFile()) {
-      const isValidName = this.fileValidator.validatePath(pathFrom);
-      if (!isValidName) return callback(Errors.UnrecognizedResource);
-      this.container.fileRenamer.run(
-        originalItem,
-        ctx.destinationPath.toString(false)
-      );
-    }
-
-    if (originalItem.isFolder()) {
-      this.container.folderRenamer.run(
-        originalItem,
-        ctx.destinationPath.toString(false)
-      );
-    }
-  }
-
-  _move(
-    pathFrom: Path,
-    pathTo: Path,
-    ctx: MoveInfo,
-    callback: ReturnCallback<boolean>
-  ): void {
-    const originalItem = this.container.itemSearcher.run(
-      pathFrom.toString(false)
-    );
-
-    if (!originalItem) {
-      return callback(Errors.ResourceNotFound);
-    }
-
-    const changeResourceIndex = () => {
-      this.resources[pathTo.toString(false)] =
-        this.resources[originalItem.path.value];
-
-      delete this.resources[originalItem.path.value];
-    };
-
-    if (originalItem.isFile()) {
-      const isValidName = this.fileValidator.validatePath(pathFrom);
-      if (!isValidName) return callback(Errors.UnrecognizedResource);
-      this.container.fileMover
-        .run(originalItem, pathTo.toString(false), ctx.overwrite)
-        .then((hasBeenOverriden: boolean) => {
-          changeResourceIndex();
-          callback(undefined, hasBeenOverriden);
-        })
-        .catch((error: Error) => {
-          handleFileSystemError(error, 'Move', 'File', ctx);
-
-          if (error instanceof FileCannotBeMovedToTheOriginalFolderError) {
-            return callback(Errors.IllegalArguments);
-          }
-
-          if (error instanceof FileActionCannotModifyExtension) {
-            return callback(Errors.InvalidOperation);
-          }
-
-          if (error instanceof FileActionOnlyCanAffectOneLevelError) {
-            return callback(Errors.InvalidOperation);
-          }
-
-          if (error instanceof FileNameShouldDifferFromOriginalError) {
-            return callback(Errors.IllegalArguments);
-          }
-
-          callback(error);
-        });
-
-      return;
-    }
-
-    if (originalItem.isFolder()) {
-      this.container.folderMover
-        .run(originalItem, pathTo.toString(false))
-        .then(() => {
-          changeResourceIndex();
-          callback(undefined, false);
-        })
-        .catch((error: Error) => {
-          handleFileSystemError(error, 'Move', 'Folder', ctx);
-          callback(error);
-        });
-      return;
-    }
-
-    callback(Errors.UnrecognizedResource);
-  }
-
-  private getPropertyFromResource(
-    path: Path,
-    _ctx: any,
-    propertyName: string,
-    callback: ReturnCallback<any>
-  ): void {
-    let resource = this.resources[path.toString(false)];
-    if (!resource) {
-      resource = new PhysicalFileSystemResource();
-      this.resources[path.toString(false)] = resource;
-    }
-
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    const property = resource[propertyName];
-
-    callback(undefined, property);
-  }
-
-  _lockManager(
-    path: Path,
-    ctx: LockManagerInfo,
-    callback: ReturnCallback<ILockManager>
-  ): void {
-    this.getPropertyFromResource(path, ctx, 'locks', callback);
-  }
-
-  _propertyManager(
-    path: Path,
-    ctx: PropertyManagerInfo,
-    callback: ReturnCallback<IPropertyManager>
-  ): void {
-    this.getPropertyFromResource(path, ctx, 'props', callback);
-  }
-
-  _readDir(
-    path: Path,
-    ctx: ReadDirInfo,
-    callback: ReturnCallback<string[] | Path[]>
-  ): void {
-    this.container.allItemsLister
-      .run(path.toString(false))
-      .then((names) => callback(undefined, names))
-      .catch((error: Error) => {
-        handleFileSystemError(error, 'Download', 'Folder', ctx);
-        callback(error);
-      });
-  }
-
-  _displayName(
-    path: Path,
-    _ctx: DisplayNameInfo,
-    callback: ReturnCallback<string>
-  ) {
-    const data = this.container.itemMetadataDealer.run(
-      path.toString(false),
-      'name'
-    );
-    if (!data) {
-      return callback(Errors.ResourceNotFound);
-    }
-    return callback(undefined, data);
-  }
-
-  _creationDate(
-    path: Path,
-    _ctx: CreationDateInfo,
-    callback: ReturnCallback<number>
-  ): void {
-    const data = this.container.itemMetadataDealer.run(
-      path.toString(false),
-      'createdAt'
-    );
-
-    if (!data) {
-      return callback(Errors.ResourceNotFound);
-    }
-
-    return callback(undefined, data);
-  }
-
-  _mimeType(path: Path, _ctx: MimeTypeInfo, callback: ReturnCallback<string>) {
-    const mimeType = this.container.fileMimeTypeResolver.run(path.toString());
-
-    if (!mimeType) {
-      Logger.debug('NO MIME TYPE');
-      return callback(Errors.UnrecognizedResource);
-    }
-
-    callback(undefined, mimeType);
-  }
-
-  _lastModifiedDate(
-    path: Path,
-    _ctx: LastModifiedDateInfo,
-    callback: ReturnCallback<number>
-  ): void {
-    const data = this.container.itemMetadataDealer.run(
-      path.toString(false),
-      'updatedAt'
-    );
-
-    if (!data) {
-      return callback(Errors.ResourceNotFound);
-    }
-
-    return callback(undefined, data);
-  }
-
-  _type(
-    path: Path,
-    _ctx: TypeInfo,
-    callback: ReturnCallback<ResourceType>
-  ): void {
-    const data = this.container.itemMetadataDealer.run(
-      path.toString(false),
-      'type'
-    );
-
-    if (!data) {
-      return callback(Errors.ResourceNotFound);
-    }
-
-    const type = data === 'FILE' ? ResourceType.File : ResourceType.Directory;
-    return callback(undefined, type);
-  }
-
-  _size(path: Path, _ctx: SizeInfo, callback: ReturnCallback<number>): void {
-    const data = this.container.itemMetadataDealer.run(
-      path.toString(false),
-      'size'
-    );
-
-    if (data === undefined) {
-      return callback(Errors.ResourceNotFound);
-    }
-
-    return callback(undefined, data);
-  }
-}
diff --git a/src/workers/webdav/worker/InternxtFileSystem/InternxtFileSystemFactory.ts b/src/workers/webdav/worker/InternxtFileSystem/InternxtFileSystemFactory.ts
deleted file mode 100644
index 33d60cb49..000000000
--- a/src/workers/webdav/worker/InternxtFileSystem/InternxtFileSystemFactory.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { DependencyContainer } from '../../dependencyInjection/DependencyContainer';
-import { InternxtFileSystem } from './InternxtFileSystem';
-
-export class InternxtFileSystemFactory {
-  static async build(
-    container: DependencyContainer
-  ): Promise<InternxtFileSystem> {
-    return new InternxtFileSystem(container);
-  }
-}
diff --git a/src/workers/webdav/worker/InternxtFileSystem/Serializer.ts b/src/workers/webdav/worker/InternxtFileSystem/Serializer.ts
deleted file mode 100644
index c1ec94f54..000000000
--- a/src/workers/webdav/worker/InternxtFileSystem/Serializer.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import {
-  FileSystemSerializer,
-  ReturnCallback,
-  FileSystem,
-} from '@internxt/webdav-server';
-import Logger from 'electron-log';
-import { InternxtFileSystem } from './InternxtFileSystem';
-
-import { DependencyContainer } from '../../dependencyInjection/DependencyContainer';
-
-export class DebugPhysicalSerializer implements FileSystemSerializer {
-  constructor(private readonly dependencyContainer: DependencyContainer) {}
-
-  uid(): string {
-    return 'PhysicalFSSerializer-1.0.0';
-  }
-
-  serialize(fs: InternxtFileSystem, callback: ReturnCallback<any>): void {
-    Logger.debug('SERIALIZER SERIALIZE');
-
-    callback(undefined, {
-      fileSystem: fs,
-    });
-  }
-
-  unserialize(serializedData: any, callback: ReturnCallback<FileSystem>): void {
-    Logger.debug(
-      'SERIALIZER UNSERIALIZE. DATA: ',
-      JSON.stringify(serializedData)
-    );
-    const fs = new InternxtFileSystem(this.dependencyContainer);
-    fs.resources = serializedData.resources;
-    callback(undefined, fs);
-  }
-}
diff --git a/src/workers/webdav/worker/InternxtStorageManager/InternxtSotrageManagerFactory.ts b/src/workers/webdav/worker/InternxtStorageManager/InternxtSotrageManagerFactory.ts
deleted file mode 100644
index b8b58cbb1..000000000
--- a/src/workers/webdav/worker/InternxtStorageManager/InternxtSotrageManagerFactory.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { DependencyContainer } from '../../dependencyInjection/DependencyContainer';
-import { InternxtStorageManager } from './InternxtStorageManager';
-
-export class InternxtStorageManagerFactory {
-  static async build(
-    container: DependencyContainer
-  ): Promise<InternxtStorageManager> {
-    return new InternxtStorageManager(container);
-  }
-}
diff --git a/src/workers/webdav/worker/InternxtStorageManager/InternxtStorageManager.ts b/src/workers/webdav/worker/InternxtStorageManager/InternxtStorageManager.ts
deleted file mode 100644
index 30a435d52..000000000
--- a/src/workers/webdav/worker/InternxtStorageManager/InternxtStorageManager.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import {
-  FileSystem,
-  IStorageManager,
-  IStorageManagerEvaluateCallback,
-  Path,
-  PropertyAttributes,
-  RequestContext,
-  ResourcePropertyValue,
-  ResourceType,
-} from 'webdav-server/lib/index.v2';
-import Logger from 'electron-log';
-import { DependencyContainer } from '../../dependencyInjection/DependencyContainer';
-
-export class InternxtStorageManager implements IStorageManager {
-  constructor(private readonly container: DependencyContainer) {}
-
-  reserve(
-    _ctx: RequestContext,
-    _fs: FileSystem,
-    _size: number,
-    callback: (reserved: boolean) => void
-  ): void {
-    callback(true);
-  }
-
-  evaluateCreate(
-    _ctx: RequestContext,
-    _fs: FileSystem,
-    _path: Path,
-    _type: ResourceType,
-    callback: IStorageManagerEvaluateCallback
-  ): void {
-    callback(0);
-  }
-  evaluateContent(
-    _ctx: RequestContext,
-    _fs: FileSystem,
-    _expectedSize: number,
-    callback: IStorageManagerEvaluateCallback
-  ): void {
-    callback(0);
-  }
-  evaluateProperty(
-    _ctx: RequestContext,
-    _fs: FileSystem,
-    _name: string,
-    _value: ResourcePropertyValue,
-    _attributes: PropertyAttributes,
-    callback: IStorageManagerEvaluateCallback
-  ): void {
-    callback(0);
-  }
-
-  available(
-    _ctx: RequestContext,
-    _fs: FileSystem,
-    callback: (available: number) => void
-  ): void {
-    this.container.freeUsageCalculator
-      .run()
-      .then((space) => {
-        callback(space);
-      })
-      .catch(() => {
-        Logger.error('Error getting avaliable space');
-        callback(0);
-      });
-  }
-  reserved(
-    _ctx: RequestContext,
-    _fs: FileSystem,
-    callback: (reserved: number) => void
-  ): void {
-    this.container.usedSpaceCalculator
-      .run()
-      .then((usage) => {
-        callback(usage);
-      })
-      .catch(() => {
-        Logger.error('Error getting used space');
-        callback(0);
-      });
-  }
-}
diff --git a/src/workers/webdav/worker/error-handling.ts b/src/workers/webdav/worker/error-handling.ts
deleted file mode 100644
index 7cfef94cb..000000000
--- a/src/workers/webdav/worker/error-handling.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { RequestContext } from '@internxt/webdav-server';
-import * as Sentry from '@sentry/electron/renderer';
-import { ipc } from '../ipc';
-import {
-  TrackedWebdavServerEvents,
-  WebdavErrorContext,
-} from '../../../shared/IPC/events/webdav';
-
-function handleError(error: Error, context: WebdavErrorContext): void {
-  ipc.send('WEBDAV_ACTION_ERROR', error, context);
-  Sentry.captureException(error);
-}
-
-export function handleFileSystemError(
-  error: Error,
-  action: TrackedWebdavServerEvents,
-  type: 'File' | 'Folder',
-  { context: requestContext }: { context: RequestContext }
-) {
-  const context = {
-    action,
-    itemType: type,
-    from: requestContext.requested.uri,
-    root: requestContext.rootPath,
-  };
-
-  handleError(error, context);
-}
diff --git a/src/workers/webdav/worker/server.ts b/src/workers/webdav/worker/server.ts
deleted file mode 100644
index efbbe7846..000000000
--- a/src/workers/webdav/worker/server.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import {
-  WebDAVServer,
-  WebDAVServerStartCallback,
-  FileSystem,
-  IStorageManager,
-} from '@internxt/webdav-server';
-
-import Logger from 'electron-log';
-import { DependencyContainer } from '../dependencyInjection/DependencyContainer';
-import { DomainEventSubscribers } from '../modules/shared/infrastructure/DomainEventSubscribers';
-
-export class InternxtWebdavServer {
-  private readonly container: DependencyContainer;
-  readonly server: WebDAVServer;
-
-  constructor(
-    port: number,
-    container: DependencyContainer,
-    storageManager?: IStorageManager
-  ) {
-    this.server = new WebDAVServer({
-      hostname: 'Virtual.Drive.Internxt.com',
-      port,
-      requireAuthentification: false,
-      storageManager: storageManager,
-    });
-    this.container = container;
-  }
-
-  private configureEventBus() {
-    this.container.eventBus.addSubscribers(
-      DomainEventSubscribers.from(this.container)
-    );
-  }
-
-  async start(
-    fileSystems: { path: string; fs: FileSystem }[],
-    options: { debug: boolean }
-  ): Promise<void> {
-    this.configureEventBus();
-
-    const fileSystemsMounted = fileSystems.map(
-      async (params: { path: string; fs: FileSystem }) => {
-        await this.server.setFileSystemAsync(params.path, params.fs, true);
-        Logger.info('Internxt Filesystem mounted');
-      }
-    );
-
-    await Promise.allSettled(fileSystemsMounted);
-
-    if (options.debug) {
-      this.server.afterRequest((arg, next) => {
-        Logger.debug(
-          '>>',
-          arg.request.method,
-          arg.request.url,
-          '>',
-          arg.response.statusCode,
-          arg.response.statusMessage,
-          arg.responseBody
-        );
-        next();
-      });
-    }
-
-    return new Promise((resolve, reject) =>
-      this.server.start((server: Parameters<WebDAVServerStartCallback>[0]) => {
-        if (!server) {
-          reject();
-          return;
-        }
-
-        Logger.info('[WEBDAB SERVER] STARTED');
-        Logger.info('[WEBDAB SERVER] http server: ', server.address());
-        resolve();
-      })
-    );
-  }
-
-  stop() {
-    return this.server.stopAsync();
-  }
-}
diff --git a/src/test/LanguagePicker.e2e.ts b/tests/LanguagePicker.e2e.ts
similarity index 100%
rename from src/test/LanguagePicker.e2e.ts
rename to tests/LanguagePicker.e2e.ts
diff --git a/src/workers/webdav/modules/contents/test/__mocks__/ContentFileDownloaderMock.ts b/tests/context/virtual-drive/contents/__mocks__/ContentFileDownloaderMock.ts
similarity index 80%
rename from src/workers/webdav/modules/contents/test/__mocks__/ContentFileDownloaderMock.ts
rename to tests/context/virtual-drive/contents/__mocks__/ContentFileDownloaderMock.ts
index 714559caf..5fa88c343 100644
--- a/src/workers/webdav/modules/contents/test/__mocks__/ContentFileDownloaderMock.ts
+++ b/tests/context/virtual-drive/contents/__mocks__/ContentFileDownloaderMock.ts
@@ -2,7 +2,7 @@ import { Readable } from 'stream';
 import {
   ContentFileDownloader,
   FileDownloadEvents,
-} from '../../domain/ContentFileDownloader';
+} from '../../../../../src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader';
 
 export class ContentFileDownloaderMock implements ContentFileDownloader {
   mock = jest.fn();
@@ -13,6 +13,10 @@ export class ContentFileDownloaderMock implements ContentFileDownloader {
     return this.mock();
   }
 
+  forceStop(): void {
+    return;
+  }
+
   on(
     event: keyof FileDownloadEvents,
     fn:
diff --git a/src/workers/webdav/modules/contents/test/__mocks__/ContentFileUploaderMock.ts b/tests/context/virtual-drive/contents/__mocks__/ContentFileUploaderMock.ts
similarity index 68%
rename from src/workers/webdav/modules/contents/test/__mocks__/ContentFileUploaderMock.ts
rename to tests/context/virtual-drive/contents/__mocks__/ContentFileUploaderMock.ts
index 79faac6cb..4773b9f26 100644
--- a/src/workers/webdav/modules/contents/test/__mocks__/ContentFileUploaderMock.ts
+++ b/tests/context/virtual-drive/contents/__mocks__/ContentFileUploaderMock.ts
@@ -2,17 +2,17 @@ import { Readable } from 'stream';
 import {
   ContentFileUploader,
   FileUploadEvents,
-} from '../../domain/ContentFileUploader';
+} from '../../../../../src/context/virtual-drive/contents/domain/contentHandlers/ContentFileUploader';
+import { ContentsId } from '../../../../../src/context/virtual-drive/contents/domain/ContentsId';
 
 export class ContentFileUploaderMock implements ContentFileUploader {
   uploadMock = jest.fn();
   onMock = jest.fn();
   elapsedTimeMock = jest.fn();
 
-  upload(contents: Readable, size: number): Promise<string> {
+  upload(contents: Readable, size: number): Promise<ContentsId> {
     return this.uploadMock(contents, size);
   }
-
   on(
     event: keyof FileUploadEvents,
     fn:
diff --git a/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts b/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
new file mode 100644
index 000000000..063fa606a
--- /dev/null
+++ b/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
@@ -0,0 +1,10 @@
+import { LocalFileContents } from '../../../../../src/context/virtual-drive/contents/domain/LocalFileContents';
+import { LocalFileWriter } from '../../../../../src/context/virtual-drive/contents/domain/LocalFileWriter';
+
+export class LocalFileWriterMock implements LocalFileWriter {
+  public writeMock = jest.fn();
+
+  write(contents: LocalFileContents): Promise<string> {
+    return this.writeMock(contents);
+  }
+}
diff --git a/tests/context/virtual-drive/contents/__mocks__/LocationProviderMock.ts b/tests/context/virtual-drive/contents/__mocks__/LocationProviderMock.ts
new file mode 100644
index 000000000..57f78c551
--- /dev/null
+++ b/tests/context/virtual-drive/contents/__mocks__/LocationProviderMock.ts
@@ -0,0 +1,7 @@
+import { LocationProvider } from '../../../../../src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter';
+
+export class LocationProviderMock {
+  public mock = jest.fn();
+
+  provider: LocationProvider = this.mock;
+}
diff --git a/tests/context/virtual-drive/contents/__mocks__/ReadableHelloWorld.ts b/tests/context/virtual-drive/contents/__mocks__/ReadableHelloWorld.ts
new file mode 100644
index 000000000..8ffbc5854
--- /dev/null
+++ b/tests/context/virtual-drive/contents/__mocks__/ReadableHelloWorld.ts
@@ -0,0 +1,19 @@
+import { Readable } from 'stream';
+
+export class ReadableHelloWorld extends Readable {
+  private index = 0;
+  private content = 'Hello World';
+
+  constructor() {
+    super();
+  }
+
+  _read() {
+    if (this.index < this.content.length) {
+      this.push(this.content[this.index]);
+      this.index++;
+    } else {
+      this.push(null);
+    }
+  }
+}
diff --git a/tests/context/virtual-drive/contents/__mocks__/RemoteFileContentsManagersFactoryMock.ts b/tests/context/virtual-drive/contents/__mocks__/RemoteFileContentsManagersFactoryMock.ts
new file mode 100644
index 000000000..e39f4a067
--- /dev/null
+++ b/tests/context/virtual-drive/contents/__mocks__/RemoteFileContentsManagersFactoryMock.ts
@@ -0,0 +1,24 @@
+import { ContentsManagersFactory } from '../../../../../src/context/virtual-drive/contents/domain/ContentsManagersFactory';
+import { LocalFileContents } from '../../../../../src/context/virtual-drive/contents/domain/LocalFileContents';
+import { ContentFileDownloader } from '../../../../../src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader';
+import { ContentFileUploader } from '../../../../../src/context/virtual-drive/contents/domain/contentHandlers/ContentFileUploader';
+import { ContentFileDownloaderMock } from './ContentFileDownloaderMock';
+import { ContentFileUploaderMock } from './ContentFileUploaderMock';
+
+export class RemoteFileContentsManagersFactoryMock
+  implements ContentsManagersFactory
+{
+  public mockDownloader = new ContentFileDownloaderMock();
+  public mockUpload = new ContentFileUploaderMock();
+
+  downloader(): ContentFileDownloader {
+    return this.mockDownloader;
+  }
+
+  uploader(
+    _contents: LocalFileContents,
+    _abortSignal?: AbortSignal | undefined
+  ): ContentFileUploader {
+    return this.mockUpload;
+  }
+}
diff --git a/src/workers/webdav/modules/contents/test/__mocks__/environment/DownloadStratgeyFunctionMock.ts b/tests/context/virtual-drive/contents/__mocks__/environment/DownloadStrategyFunctionMock.ts
similarity index 83%
rename from src/workers/webdav/modules/contents/test/__mocks__/environment/DownloadStratgeyFunctionMock.ts
rename to tests/context/virtual-drive/contents/__mocks__/environment/DownloadStrategyFunctionMock.ts
index 7b43745a1..2800d9cbe 100644
--- a/src/workers/webdav/modules/contents/test/__mocks__/environment/DownloadStratgeyFunctionMock.ts
+++ b/tests/context/virtual-drive/contents/__mocks__/environment/DownloadStrategyFunctionMock.ts
@@ -7,7 +7,7 @@ type DownloadCallbacks = {
 };
 
 export function createDownloadStrategy(fn: (opts: DownloadCallbacks) => void) {
-  return (bucket: string, fileId: string, opts: any, strategyObj: any) => {
+  return (_bucket: string, _fileId: string, opts: any, _strategyObj: any) => {
     fn(opts);
 
     return new ActionState(ActionTypes.Download);
diff --git a/src/workers/webdav/modules/contents/test/__mocks__/environment/UploadStrategyFunciontMock.ts b/tests/context/virtual-drive/contents/__mocks__/environment/UploadStrategyFunctionMock.ts
similarity index 86%
rename from src/workers/webdav/modules/contents/test/__mocks__/environment/UploadStrategyFunciontMock.ts
rename to tests/context/virtual-drive/contents/__mocks__/environment/UploadStrategyFunctionMock.ts
index 312765fbd..880447125 100644
--- a/src/workers/webdav/modules/contents/test/__mocks__/environment/UploadStrategyFunciontMock.ts
+++ b/tests/context/virtual-drive/contents/__mocks__/environment/UploadStrategyFunctionMock.ts
@@ -7,7 +7,7 @@ import {
 export function createUploadStrategy(
   fn: (opts: UploadOptions) => void
 ): UploadStrategyFunction {
-  return (bucketId: string, opts: UploadOptions) => {
+  return (_bucketId: string, opts: UploadOptions) => {
     fn(opts);
 
     return new ActionState(ActionTypes.Upload);
diff --git a/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts b/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
new file mode 100644
index 000000000..10a2333ca
--- /dev/null
+++ b/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
@@ -0,0 +1,72 @@
+import { ContentsDownloader } from '../../../../../src/context/virtual-drive/contents/application/ContentsDownloader';
+import { temporalFolderProvider } from '../../../../../src/context/virtual-drive/contents/application/temporalFolderProvider';
+import { FileDownloadEvents } from '../../../../../src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader';
+import { FileMother } from '../../files/domain/FileMother';
+import { EventBusMock } from '../../shared/__mock__/EventBusMock';
+import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
+import { LocalFileWriterMock } from '../__mocks__/LocalFileWriterMock';
+import { ReadableHelloWorld } from '../__mocks__/ReadableHelloWorld';
+import { RemoteFileContentsManagersFactoryMock } from '../__mocks__/RemoteFileContentsManagersFactoryMock';
+
+describe.skip('Contents Downloader', () => {
+  let localWriter: LocalFileWriterMock;
+  let factory: RemoteFileContentsManagersFactoryMock;
+  let ipc: IpcRendererSyncEngineMock;
+  let eventBus: EventBusMock;
+
+  let SUT: ContentsDownloader;
+
+  beforeEach(() => {
+    factory = new RemoteFileContentsManagersFactoryMock();
+    localWriter = new LocalFileWriterMock();
+    ipc = new IpcRendererSyncEngineMock();
+    eventBus = new EventBusMock();
+
+    SUT = new ContentsDownloader(
+      factory,
+      localWriter,
+      ipc,
+      temporalFolderProvider,
+      eventBus
+    );
+  });
+
+  it.each(['start', 'progress', 'finish', 'error'] satisfies Array<
+    keyof FileDownloadEvents
+  >)(
+    'tracks all the manager events ',
+    async (event: keyof FileDownloadEvents) => {
+      factory.mockDownloader.mock.mockResolvedValueOnce(
+        new ReadableHelloWorld()
+      );
+
+      await SUT.run(FileMother.any(), async () => {
+        /* do nothing */
+        return { finished: true, progress: 100 };
+      });
+
+      expect(factory.mockDownloader.onMock).toBeCalledWith(
+        event,
+        expect.any(Function)
+      );
+    }
+  );
+
+  it('writes the downloaded content a local file', async () => {
+    factory.mockDownloader.mock.mockResolvedValueOnce(new ReadableHelloWorld());
+
+    const file = FileMother.any();
+    await SUT.run(file, async () => {
+      /* do nothing */
+      return { finished: true, progress: 100 };
+    });
+
+    expect(localWriter.writeMock).toBeCalledWith(
+      expect.objectContaining({
+        name: file.name,
+        extension: file.type,
+        size: file.size,
+      })
+    );
+  });
+});
diff --git a/src/workers/webdav/modules/contents/test/domain/ContentsIdMother.ts b/tests/context/virtual-drive/contents/domain/ContentsIdMother.ts
similarity index 76%
rename from src/workers/webdav/modules/contents/test/domain/ContentsIdMother.ts
rename to tests/context/virtual-drive/contents/domain/ContentsIdMother.ts
index 442fd5234..ab72d7330 100644
--- a/src/workers/webdav/modules/contents/test/domain/ContentsIdMother.ts
+++ b/tests/context/virtual-drive/contents/domain/ContentsIdMother.ts
@@ -1,5 +1,6 @@
-import { ContentsId } from '../../domain/ContentsId';
 import Chance from 'chance';
+import { ContentsId } from '../../../../../src/context/virtual-drive/contents/domain/ContentsId';
+
 const chance = new Chance();
 
 export class ContentsIdMother {
diff --git a/tests/context/virtual-drive/contents/domain/ContentsSizeMother.ts b/tests/context/virtual-drive/contents/domain/ContentsSizeMother.ts
new file mode 100644
index 000000000..6c1b17c87
--- /dev/null
+++ b/tests/context/virtual-drive/contents/domain/ContentsSizeMother.ts
@@ -0,0 +1,14 @@
+import Chance from 'chance';
+import { ContentsSize } from '../../../../../src/context/virtual-drive/contents/domain/ContentsSize';
+const chance = new Chance();
+
+export class ContentsSizeMother {
+  static random(): ContentsSize {
+    return new ContentsSize(
+      chance.integer({
+        min: 1,
+        max: ContentsSize.MAX_SIZE,
+      })
+    );
+  }
+}
diff --git a/tests/context/virtual-drive/contents/domain/FileContentsMother.ts b/tests/context/virtual-drive/contents/domain/FileContentsMother.ts
new file mode 100644
index 000000000..564eb8448
--- /dev/null
+++ b/tests/context/virtual-drive/contents/domain/FileContentsMother.ts
@@ -0,0 +1,12 @@
+import { RemoteFileContents } from '../../../../../src/context/virtual-drive/contents/domain/RemoteFileContents';
+import { ContentsIdMother } from './ContentsIdMother';
+import { ContentsSizeMother } from './ContentsSizeMother';
+
+export class FileContentsMother {
+  static random(): RemoteFileContents {
+    return RemoteFileContents.from({
+      id: ContentsIdMother.random().value,
+      size: ContentsSizeMother.random().value,
+    });
+  }
+}
diff --git a/src/workers/webdav/modules/contents/test/infrastructure/download/EnvironmentContentFileDownloader.test.ts b/tests/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.test.ts
similarity index 61%
rename from src/workers/webdav/modules/contents/test/infrastructure/download/EnvironmentContentFileDownloader.test.ts
rename to tests/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.test.ts
index 862c9f9c6..250ab819c 100644
--- a/src/workers/webdav/modules/contents/test/infrastructure/download/EnvironmentContentFileDownloader.test.ts
+++ b/tests/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.test.ts
@@ -1,7 +1,7 @@
 import { Readable } from 'stream';
-import { FileMother } from '../../../../files/test/domain/FileMother';
-import { createDownloadStrategy } from '../../__mocks__/environment/DownloadStratgeyFunctionMock';
-import { EnvironmentContentFileDownloader } from '../../../infrastructure/download/EnvironmentContnetFileDownloader';
+import { FileMother } from '../../../files/domain/FileMother';
+import { createDownloadStrategy } from '../../__mocks__/environment/DownloadStrategyFunctionMock';
+import { EnvironmentContentFileDownloader } from '../../../../../../src/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader';
 
 describe('Environment Content File Downloader', () => {
   const bucket = 'b51fd6af-cdac-51ec-b41c-21958aa4c2ae';
@@ -79,45 +79,4 @@ describe('Environment Content File Downloader', () => {
       });
     });
   });
-
-  describe('time watcher', () => {
-    it('starts the timer when the file is downloaded', async () => {
-      const strategy = createDownloadStrategy((callbacks) => {
-        callbacks.progressCallback(50);
-        callbacks.finishedCallback(null as unknown as Error, Readable.from(''));
-      });
-
-      const downloader = new EnvironmentContentFileDownloader(strategy, bucket);
-
-      downloader.on('progress', () => {
-        expect(downloader.elapsedTime()).toBeGreaterThan(-1);
-      });
-
-      expect(downloader.elapsedTime()).toBe(-1);
-
-      await downloader.download(file);
-    });
-
-    it('stops the timer when the file is not downloaded', async () => {
-      const delay = 100;
-      const strategy = createDownloadStrategy((callbacks) => {
-        callbacks.progressCallback(50);
-        setTimeout(() => {
-          callbacks.finishedCallback(
-            null as unknown as Error,
-            Readable.from('')
-          );
-        }, delay);
-      });
-
-      const downloader = new EnvironmentContentFileDownloader(strategy, bucket);
-
-      await downloader.download(file);
-
-      setTimeout(() => {
-        expect(downloader.elapsedTime()).toBeGreaterThan(delay - 10);
-        expect(downloader.elapsedTime()).toBeLessThan(delay + 10);
-      }, delay);
-    });
-  });
 });
diff --git a/src/workers/webdav/modules/contents/test/infrastructure/upload/EnvironmentContentFileUploader.test.ts b/tests/context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader.test.ts
similarity index 63%
rename from src/workers/webdav/modules/contents/test/infrastructure/upload/EnvironmentContentFileUploader.test.ts
rename to tests/context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader.test.ts
index 2594d83d1..33631bb34 100644
--- a/src/workers/webdav/modules/contents/test/infrastructure/upload/EnvironmentContentFileUploader.test.ts
+++ b/tests/context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader.test.ts
@@ -1,41 +1,42 @@
 import { Readable } from 'stream';
-import { EnvironmentContentFileUpoader } from '../../../infrastructure/upload/EnvironmentContentFileUpoader';
-import { createUploadStrategy } from '../../__mocks__/environment/UploadStrategyFunciontMock';
+import { EnvironmentContentFileUploader } from '../../../../../../src/context/virtual-drive/contents/infrastructure/upload/EnvironmentContentFileUploader';
+import { createUploadStrategy } from '../../__mocks__/environment/UploadStrategyFunctionMock';
+import { ContentsIdMother } from '../../domain/ContentsIdMother';
 
 describe('Environment Content File Uploader', () => {
-  const valildFileSize = 1926506743;
+  const validFileSize = 1926506743;
   const bucket = 'c7d4d5e7-0850-52f4-8cbe-c3f746fb7d3f';
 
   describe('event emitter', () => {
     it('emits an event on start', async () => {
       const strategy = createUploadStrategy((opts) => {
-        opts.finishedCallback(null, '3ebe8efe-c361-5269-b12d-c8a75c4cfcdd');
+        opts.finishedCallback(null, ContentsIdMother.raw());
       });
 
-      const uploader = new EnvironmentContentFileUpoader(strategy, bucket);
+      const uploader = new EnvironmentContentFileUploader(strategy, bucket);
 
       const handler = jest.fn();
 
       uploader.on('start', handler);
 
-      await uploader.upload(Readable.from(''), valildFileSize);
+      await uploader.upload(Readable.from(''), validFileSize);
 
       expect(handler).toBeCalled();
     });
 
     it('emits an event with an id when a file is uploaded', async () => {
-      const uploadedFileId = 'd6f45f38-3316-5823-8182-bbbc31980643';
+      const uploadedFileId = ContentsIdMother.raw();
       const strategy = createUploadStrategy((opts) => {
         opts.finishedCallback(null, uploadedFileId);
       });
 
-      const uploader = new EnvironmentContentFileUpoader(strategy, bucket);
+      const uploader = new EnvironmentContentFileUploader(strategy, bucket);
 
       uploader.on('finish', (fileId: string) => {
         expect(fileId).toBe(uploadedFileId);
       });
 
-      await uploader.upload(Readable.from(''), valildFileSize);
+      await uploader.upload(Readable.from(''), validFileSize);
     });
 
     it('emits an event when there is a progress update', async () => {
@@ -43,16 +44,16 @@ describe('Environment Content File Uploader', () => {
         opts.progressCallback(25, 1, 4);
         opts.progressCallback(50, 2, 4);
         opts.progressCallback(75, 3, 4);
-        opts.finishedCallback(null, 'baff69d3-379b-564f-9b1c-da657376b830');
+        opts.finishedCallback(null, ContentsIdMother.raw());
       });
 
-      const uploader = new EnvironmentContentFileUpoader(strategy, bucket);
+      const uploader = new EnvironmentContentFileUploader(strategy, bucket);
 
       const handler = jest.fn();
 
       uploader.on('progress', handler);
 
-      await uploader.upload(Readable.from(''), valildFileSize);
+      await uploader.upload(Readable.from(''), validFileSize);
 
       expect(handler.mock.calls).toEqual([[25], [50], [75]]);
     });
@@ -60,10 +61,10 @@ describe('Environment Content File Uploader', () => {
     it('emits an event when there is a progress update and finish on the end', async () => {
       const strategy = createUploadStrategy((opts) => {
         opts.progressCallback(50, 2, 4);
-        opts.finishedCallback(null, 'baff69d3-379b-564f-9b1c-da657376b830');
+        opts.finishedCallback(null, ContentsIdMother.raw());
       });
 
-      const uploader = new EnvironmentContentFileUpoader(strategy, bucket);
+      const uploader = new EnvironmentContentFileUploader(strategy, bucket);
 
       const progressHandler = jest.fn();
       const finishHandler = jest.fn();
@@ -72,7 +73,7 @@ describe('Environment Content File Uploader', () => {
 
       uploader.on('finish', finishHandler);
 
-      await uploader.upload(Readable.from(''), valildFileSize);
+      await uploader.upload(Readable.from(''), validFileSize);
 
       expect(progressHandler).toBeCalledWith(50);
       expect(finishHandler).toBeCalled();
@@ -84,13 +85,13 @@ describe('Environment Content File Uploader', () => {
         opts.finishedCallback({ message: errorMsg } as unknown as Error, null);
       });
 
-      const uploader = new EnvironmentContentFileUpoader(strategy, bucket);
+      const uploader = new EnvironmentContentFileUploader(strategy, bucket);
 
       uploader.on('error', (error: Error) => {
         expect(error.message).toBe(errorMsg);
       });
 
-      await uploader.upload(Readable.from(''), valildFileSize).catch(() => {
+      await uploader.upload(Readable.from(''), validFileSize).catch(() => {
         // no-op
       });
     });
@@ -101,13 +102,12 @@ describe('Environment Content File Uploader', () => {
       const strategy = createUploadStrategy((opts) => {
         setTimeout(() => opts.progressCallback(50, 1, 4), 20);
         setTimeout(
-          () =>
-            opts.finishedCallback(null, '3ebe8efe-c361-5269-b12d-c8a75c4cfcdd'),
+          () => opts.finishedCallback(null, ContentsIdMother.raw()),
           100
         );
       });
 
-      const uploader = new EnvironmentContentFileUpoader(strategy, bucket);
+      const uploader = new EnvironmentContentFileUploader(strategy, bucket);
 
       uploader.on('progress', () => {
         expect(uploader.elapsedTime()).toBeGreaterThan(-1);
@@ -115,22 +115,21 @@ describe('Environment Content File Uploader', () => {
 
       expect(uploader.elapsedTime()).toBe(-1);
 
-      await uploader.upload(Readable.from(''), valildFileSize);
+      await uploader.upload(Readable.from(''), validFileSize);
     });
 
     it('stops the timer when the file is uploaded', async () => {
-      const delay = 100;
+      const delay = 1000;
       const strategy = createUploadStrategy((opts) => {
         setTimeout(
-          () =>
-            opts.finishedCallback(null, '3ebe8efe-c361-5269-b12d-c8a75c4cfcdd'),
+          () => opts.finishedCallback(null, ContentsIdMother.raw()),
           delay
         );
       });
 
-      const uploader = new EnvironmentContentFileUpoader(strategy, bucket);
+      const uploader = new EnvironmentContentFileUploader(strategy, bucket);
 
-      await uploader.upload(Readable.from(''), valildFileSize);
+      await uploader.upload(Readable.from(''), validFileSize);
 
       setTimeout(() => {
         expect(uploader.elapsedTime()).toBeGreaterThan(delay - 10);
diff --git a/tests/context/virtual-drive/files/__mocks__/FileDeleterFactory.ts b/tests/context/virtual-drive/files/__mocks__/FileDeleterFactory.ts
new file mode 100644
index 000000000..3a5504d5c
--- /dev/null
+++ b/tests/context/virtual-drive/files/__mocks__/FileDeleterFactory.ts
@@ -0,0 +1,12 @@
+import { FileDeleter } from '../../../../../src/context/virtual-drive/files/application/FileDeleter';
+
+export class FileDeleterFactory {
+  static deletionSucces(): FileDeleter {
+    return {
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      run: (_id: string) => {
+        //no-op
+      },
+    } as unknown as FileDeleter;
+  }
+}
diff --git a/tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts b/tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts
new file mode 100644
index 000000000..dfcb8359a
--- /dev/null
+++ b/tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts
@@ -0,0 +1,30 @@
+import { Nullable } from '../../../../../src/apps/shared/types/Nullable';
+import {
+  File,
+  FileAttributes,
+} from '../../../../../src/context/virtual-drive/files/domain/File';
+import { FileRepository } from '../../../../../src/context/virtual-drive/files/domain/FileRepository';
+
+export class FileRepositoryMock implements FileRepository {
+  public readonly allMock = jest.fn();
+  public readonly searchByPartialMock = jest.fn();
+  public readonly deleteMock = jest.fn();
+  public readonly addMock = jest.fn();
+  public readonly updateMock = jest.fn();
+
+  all(): Promise<File[]> {
+    return this.allMock();
+  }
+  searchByPartial(partial: Partial<FileAttributes>): Nullable<File> {
+    return this.searchByPartialMock(partial);
+  }
+  delete(id: string): Promise<void> {
+    return this.deleteMock(id);
+  }
+  add(file: File): Promise<void> {
+    return this.addMock(file);
+  }
+  update(file: File): Promise<void> {
+    return this.updateMock(file);
+  }
+}
diff --git a/tests/context/virtual-drive/files/__mocks__/LocalFileSystemMock.ts b/tests/context/virtual-drive/files/__mocks__/LocalFileSystemMock.ts
new file mode 100644
index 000000000..6495b0307
--- /dev/null
+++ b/tests/context/virtual-drive/files/__mocks__/LocalFileSystemMock.ts
@@ -0,0 +1,15 @@
+import { LocalFileSystem } from '../../../../../src/context/virtual-drive/files/domain/file-systems/LocalFileSystem';
+import { File } from '../../../../../src/context/virtual-drive/files/domain/File';
+
+export class LocalFileSystemMock implements LocalFileSystem {
+  public readonly createPlaceHolderMock = jest.fn();
+  public readonly getLocalFileIdMock = jest.fn();
+
+  createPlaceHolder(file: File): Promise<void> {
+    return this.createPlaceHolder(file);
+  }
+
+  getLocalFileId(file: File): Promise<`${string}-${string}`> {
+    return this.getLocalFileIdMock(file);
+  }
+}
diff --git a/tests/context/virtual-drive/files/__mocks__/RemoteFileSystemMock.ts b/tests/context/virtual-drive/files/__mocks__/RemoteFileSystemMock.ts
new file mode 100644
index 000000000..76473803f
--- /dev/null
+++ b/tests/context/virtual-drive/files/__mocks__/RemoteFileSystemMock.ts
@@ -0,0 +1,29 @@
+import {
+  File,
+  FileAttributes,
+} from '../../../../../src/context/virtual-drive/files/domain/File';
+import { OfflineFile } from '../../../../../src/context/virtual-drive/files/domain/OfflineFile';
+import { RemoteFileSystem } from '../../../../../src/context/virtual-drive/files/domain/file-systems/RemoteFileSystem';
+
+export class RemoteFileSystemMock implements RemoteFileSystem {
+  public readonly persistMock = jest.fn();
+  public readonly trashMock = jest.fn();
+  public readonly moveMock = jest.fn();
+  public readonly renameMock = jest.fn();
+
+  persist(offline: OfflineFile): Promise<FileAttributes> {
+    return this.persistMock(offline);
+  }
+
+  trash(contentsId: string): Promise<void> {
+    return this.trashMock(contentsId);
+  }
+
+  move(file: File): Promise<void> {
+    return this.moveMock(file);
+  }
+
+  rename(file: File): Promise<void> {
+    return this.renameMock(file);
+  }
+}
diff --git a/tests/context/virtual-drive/files/application/FileCreator.test.ts b/tests/context/virtual-drive/files/application/FileCreator.test.ts
new file mode 100644
index 000000000..303f19bf8
--- /dev/null
+++ b/tests/context/virtual-drive/files/application/FileCreator.test.ts
@@ -0,0 +1,123 @@
+import { FileCreator } from '../../../../../src/context/virtual-drive/files/application/FileCreator';
+import { FileDeleter } from '../../../../../src/context/virtual-drive/files/application/FileDeleter';
+import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/FilePath';
+import { File } from '../../../../../src/context/virtual-drive/files/domain/File';
+import { FileContentsMother } from '../../contents/domain/FileContentsMother';
+import { EventBusMock } from '../../shared/__mock__/EventBusMock';
+import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
+import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
+import { RemoteFileSystemMock } from '../__mocks__/RemoteFileSystemMock';
+import { FileMother } from '../domain/FileMother';
+import { FolderFinderFactory } from '../../folders/__mocks__/FolderFinderFactory';
+import { FileDeleterFactory } from '../__mocks__/FileDeleterFactory';
+
+describe('File Creator', () => {
+  let remoteFileSystemMock: RemoteFileSystemMock;
+  let fileRepository: FileRepositoryMock;
+  let fileDeleter: FileDeleter;
+  let eventBus: EventBusMock;
+
+  let SUT: FileCreator;
+
+  const ipc = new IpcRendererSyncEngineMock();
+
+  beforeEach(() => {
+    remoteFileSystemMock = new RemoteFileSystemMock();
+    fileRepository = new FileRepositoryMock();
+    fileDeleter = FileDeleterFactory.deletionSucces();
+    const folderFinder = FolderFinderFactory.existingFolder();
+    eventBus = new EventBusMock();
+
+    SUT = new FileCreator(
+      remoteFileSystemMock,
+      fileRepository,
+      folderFinder,
+      fileDeleter,
+      eventBus,
+      ipc
+    );
+  });
+
+  it('creates the file on the drive server', async () => {
+    const path = new FilePath('/cat.png');
+    const contents = FileContentsMother.random();
+
+    const fileAttributes = FileMother.fromPartial({
+      path: path.value,
+      contentsId: contents.id,
+    }).attributes();
+
+    fileRepository.addMock.mockImplementationOnce(() => {
+      // returns Promise<void>
+    });
+
+    remoteFileSystemMock.persistMock.mockResolvedValueOnce(fileAttributes);
+
+    await SUT.run(path, contents);
+
+    expect(fileRepository.addMock).toBeCalledWith(
+      expect.objectContaining(File.from(fileAttributes))
+    );
+  });
+
+  it('once the file entry is created the creation event should have been emitted', async () => {
+    const path = new FilePath('/cat.png');
+    const contents = FileContentsMother.random();
+    const fileAttributes = FileMother.fromPartial({
+      path: path.value,
+      contentsId: contents.id,
+    }).attributes();
+
+    fileRepository.addMock.mockImplementationOnce(() => {
+      // returns Promise<void>
+    });
+
+    remoteFileSystemMock.persistMock.mockResolvedValueOnce(fileAttributes);
+
+    await SUT.run(path, contents);
+
+    expect(eventBus.publishMock.mock.calls[0][0][0].eventName).toBe(
+      'file.created'
+    );
+    expect(eventBus.publishMock.mock.calls[0][0][0].aggregateId).toBe(
+      contents.id
+    );
+  });
+
+  it('deletes the file on remote if it already exists on the path', async () => {
+    const path = new FilePath('/cat.png');
+    const existingFile = FileMother.fromPath(path.value);
+    const contents = FileContentsMother.random();
+    const fileAttributes = FileMother.fromPartial({
+      path: path.value,
+      contentsId: contents.id,
+    }).attributes();
+
+    fileRepository.searchByPartialMock
+      .mockReturnValueOnce(existingFile)
+      .mockReturnValueOnce(existingFile);
+
+    const deleterSpy = jest
+      .spyOn(fileDeleter, 'run')
+      .mockResolvedValueOnce(Promise.resolve());
+
+    remoteFileSystemMock.persistMock.mockResolvedValueOnce(fileAttributes);
+
+    fileRepository.addMock.mockImplementationOnce(() => {
+      // returns Promise<void>
+    });
+
+    await SUT.run(path, contents);
+
+    expect(deleterSpy).toBeCalledWith(existingFile.contentsId);
+
+    expect(remoteFileSystemMock.persistMock).toBeCalledWith(
+      expect.objectContaining({
+        contentsId: contents.id,
+      })
+    );
+    expect(fileRepository.addMock).toBeCalledWith(
+      expect.objectContaining(File.from(fileAttributes))
+    );
+  });
+});
diff --git a/tests/context/virtual-drive/files/application/FileDeleter.test.ts b/tests/context/virtual-drive/files/application/FileDeleter.test.ts
new file mode 100644
index 000000000..f0119a682
--- /dev/null
+++ b/tests/context/virtual-drive/files/application/FileDeleter.test.ts
@@ -0,0 +1,87 @@
+import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
+import { FileMother } from '../domain/FileMother';
+import { RemoteFileSystemMock } from '../__mocks__/RemoteFileSystemMock';
+import { LocalFileSystemMock } from '../__mocks__/LocalFileSystemMock';
+import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
+import { FileDeleter } from '../../../../../src/context/virtual-drive/files/application/FileDeleter';
+import { FolderRepositoryMock } from '../../folders/__mocks__/FolderRepositoryMock';
+import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
+import { AllParentFoldersStatusIsExists } from '../../../../../src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
+
+describe('File Deleter', () => {
+  let repository: FileRepositoryMock;
+  let allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
+  let remoteFileSystemMock: RemoteFileSystemMock;
+  let localFilseSystemMock: LocalFileSystemMock;
+  let ipc: IpcRendererSyncEngineMock;
+
+  let SUT: FileDeleter;
+
+  beforeEach(() => {
+    repository = new FileRepositoryMock();
+    const folderRepository = new FolderRepositoryMock();
+    allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
+      folderRepository
+    );
+    localFilseSystemMock = new LocalFileSystemMock();
+    remoteFileSystemMock = new RemoteFileSystemMock();
+    ipc = new IpcRendererSyncEngineMock();
+
+    SUT = new FileDeleter(
+      remoteFileSystemMock,
+      localFilseSystemMock,
+      repository,
+      allParentFoldersStatusIsExists,
+      ipc
+    );
+  });
+
+  it('does not nothing if the file its not found', async () => {
+    const contentsId = ContentsIdMother.raw();
+
+    repository.searchByPartialMock.mockReturnValueOnce(undefined);
+    jest
+      .spyOn(allParentFoldersStatusIsExists, 'run')
+      .mockReturnValueOnce(false);
+
+    await SUT.run(contentsId);
+
+    expect(repository.deleteMock).not.toBeCalled();
+  });
+
+  it('does not delete a file if it has a parent already trashed', async () => {
+    const file = FileMother.any();
+
+    repository.searchByPartialMock.mockReturnValueOnce(file);
+    jest
+      .spyOn(allParentFoldersStatusIsExists, 'run')
+      .mockReturnValueOnce(false);
+
+    await SUT.run(file.contentsId);
+
+    expect(repository.deleteMock).not.toBeCalled();
+  });
+
+  it('trashes the file if it exists and does not have any parent trashed', async () => {
+    const file = FileMother.any();
+
+    repository.searchByPartialMock.mockReturnValueOnce(file);
+    jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
+
+    await SUT.run(file.contentsId);
+
+    expect(repository.deleteMock).toBeCalled();
+  });
+
+  it('trashes the file with the status trashed', async () => {
+    const file = FileMother.any();
+
+    repository.searchByPartialMock.mockReturnValueOnce(file);
+    jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
+
+    await SUT.run(file.contentsId);
+
+    expect(remoteFileSystemMock.trashMock).toBeCalledWith(file.contentsId);
+    expect(repository.deleteMock).toBeCalledWith(file.contentsId);
+  });
+});
diff --git a/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts b/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
new file mode 100644
index 000000000..8074fd60a
--- /dev/null
+++ b/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
@@ -0,0 +1,120 @@
+import { FileFinderByContentsId } from '../../../../../src/context/virtual-drive/files/application/FileFinderByContentsId';
+import { FilePathUpdater } from '../../../../../src/context/virtual-drive/files/application/FilePathUpdater';
+import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/FilePath';
+import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
+import { FolderFinderMock } from '../../folders/__mocks__/FolderFinderMock';
+import { FolderMother } from '../../folders/domain/FolderMother';
+import { EventBusMock } from '../../shared/__mock__/EventBusMock';
+import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
+import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
+import { LocalFileSystemMock } from '../__mocks__/LocalFileSystemMock';
+import { RemoteFileSystemMock } from '../__mocks__/RemoteFileSystemMock';
+import { FileMother } from '../domain/FileMother';
+
+describe('File path updater', () => {
+  let repository: FileRepositoryMock;
+  let fileFinderByContentsId: FileFinderByContentsId;
+  let folderFinder: FolderFinderMock;
+  let ipcRendererMock: IpcRendererSyncEngineMock;
+  let localFileSystem: LocalFileSystemMock;
+  let eventBus: EventBusMock;
+  let remoteFileSystemMock: RemoteFileSystemMock;
+  let SUT: FilePathUpdater;
+
+  beforeEach(() => {
+    repository = new FileRepositoryMock();
+    folderFinder = new FolderFinderMock();
+    fileFinderByContentsId = new FileFinderByContentsId(repository);
+    ipcRendererMock = new IpcRendererSyncEngineMock();
+    eventBus = new EventBusMock();
+    remoteFileSystemMock = new RemoteFileSystemMock();
+    localFileSystem = new LocalFileSystemMock();
+
+    SUT = new FilePathUpdater(
+      remoteFileSystemMock,
+      localFileSystem,
+      repository,
+      fileFinderByContentsId,
+      folderFinder as unknown as FolderFinder,
+      ipcRendererMock,
+      eventBus
+    );
+  });
+
+  it('renames a file when the extension and folder does not change', async () => {
+    const fileToRename = FileMother.any();
+    const fileWithDestinationPath = undefined;
+
+    repository.searchByPartialMock
+      .mockReturnValueOnce(fileToRename)
+      .mockReturnValueOnce(fileWithDestinationPath);
+
+    const destination = new FilePath(
+      `${fileToRename.dirname}/_${fileToRename.nameWithExtension}`
+    );
+
+    await SUT.run(fileToRename.contentsId, destination.value);
+
+    expect(repository.updateMock).toBeCalledWith(
+      expect.objectContaining({ path: destination.value })
+    );
+    expect(remoteFileSystemMock.renameMock).toBeCalledWith(
+      expect.objectContaining({ path: destination.value })
+    );
+  });
+
+  it('does not rename or moves a file when the extension changes', async () => {
+    const fileToRename = FileMother.any();
+    const fileWithDestinationPath = undefined;
+
+    repository.searchByPartialMock
+      .mockReturnValueOnce(fileToRename)
+      .mockReturnValueOnce(fileWithDestinationPath);
+
+    const destination = new FilePath(
+      `${fileToRename.dirname}/_${fileToRename.nameWithExtension}n`
+    );
+
+    expect(async () => {
+      await SUT.run(fileToRename.contentsId, destination.value);
+    }).rejects.toThrow();
+  });
+
+  it('moves a file when the folder changes', async () => {
+    const fileToMove = FileMother.any();
+    const fileInDestination = undefined;
+    const localFileId = '1-2';
+
+    repository.searchByPartialMock
+      .mockReturnValueOnce(fileToMove)
+      .mockReturnValueOnce(fileInDestination);
+
+    localFileSystem.getLocalFileIdMock.mockResolvedValueOnce(localFileId);
+
+    const destination = new FilePath(
+      `${fileToMove.dirname}_/${fileToMove.nameWithExtension}`
+    );
+
+    const destinationFolder = FolderMother.fromPartial({
+      id: fileToMove.folderId + 1,
+      path: destination.dirname(),
+    });
+
+    folderFinder.mock.mockReturnValueOnce(destinationFolder);
+
+    await SUT.run(fileToMove.contentsId, destination.value);
+
+    expect(repository.updateMock).toBeCalledWith(
+      expect.objectContaining({
+        folderId: destinationFolder.id,
+        path: destination.value,
+      })
+    );
+    expect(remoteFileSystemMock.moveMock).toBeCalledWith(
+      expect.objectContaining({
+        folderId: destinationFolder.id,
+        path: destination.value,
+      })
+    );
+  });
+});
diff --git a/src/workers/webdav/modules/files/test/domain/FileMother.ts b/tests/context/virtual-drive/files/domain/FileMother.ts
similarity index 72%
rename from src/workers/webdav/modules/files/test/domain/FileMother.ts
rename to tests/context/virtual-drive/files/domain/FileMother.ts
index abfa42dba..fc60a91ac 100644
--- a/src/workers/webdav/modules/files/test/domain/FileMother.ts
+++ b/tests/context/virtual-drive/files/domain/FileMother.ts
@@ -1,6 +1,8 @@
-import { FileStatuses } from '../../domain/FileStatus';
-import { File, FileAtributes } from '../../domain/File';
-import { ContentsIdMother } from '../../../contents/test/domain/ContentsIdMother';
+import { FileAttributes } from '../../../../../src/context/virtual-drive/files/domain/File';
+import { FileStatuses } from '../../../../../src/context/virtual-drive/files/domain/FileStatus';
+import { File } from '../../../../../src/context/virtual-drive/files/domain/File';
+import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
+import { FilePathMother } from './FilePathMother';
 
 export class FileMother {
   static onFolderName(path: string) {
@@ -35,20 +37,20 @@ export class FileMother {
       folderId: 3972960,
       createdAt: new Date().toISOString(),
       modificationTime: new Date().toISOString(),
-      path: '/Vakwogfud/Dilbusege.png',
+      path: FilePathMother.random(2).value,
       size: 893924973,
       updatedAt: new Date().toISOString(),
       status: FileStatuses.EXISTS,
     });
   }
 
-  static fromPartial(partial: Partial<FileAtributes>) {
+  static fromPartial(partial: Partial<FileAttributes>) {
     return File.from({
       contentsId: ContentsIdMother.random().value,
       folderId: 3972960,
       createdAt: new Date().toISOString(),
       modificationTime: new Date().toISOString(),
-      path: '/Vakwogfud/Dilbusege.png',
+      path: FilePathMother.random().value,
       size: 893924973,
       updatedAt: new Date().toISOString(),
       status: FileStatuses.EXISTS,
diff --git a/src/workers/webdav/modules/files/test/domain/FilePath.test.ts b/tests/context/virtual-drive/files/domain/FilePath.test.ts
similarity index 64%
rename from src/workers/webdav/modules/files/test/domain/FilePath.test.ts
rename to tests/context/virtual-drive/files/domain/FilePath.test.ts
index a6ebb51ba..a77b02014 100644
--- a/src/workers/webdav/modules/files/test/domain/FilePath.test.ts
+++ b/tests/context/virtual-drive/files/domain/FilePath.test.ts
@@ -1,25 +1,7 @@
-import { FilePath } from '../../domain/FilePath';
+import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/FilePath';
 
 describe('Path', () => {
-  describe('path instanciation', () => {
-    it('path from parts creates expected result', () => {
-      const parts = ['/', 'Family'];
-
-      const path = FilePath.fromParts(parts);
-
-      expect(path.value).toBe('/Family');
-    });
-
-    it('works', () => {
-      const folderPath = new FilePath('/Family');
-
-      const basePath = folderPath.dirname();
-
-      expect(basePath).toBe('/');
-    });
-  });
-
-  describe('extension handeling', () => {
+  describe('extension handling', () => {
     describe('files without extension', () => {
       it('when a file has no extension hasExtension returns false', () => {
         const path = new FilePath('/folder/file');
diff --git a/tests/context/virtual-drive/files/domain/FilePathMother.ts b/tests/context/virtual-drive/files/domain/FilePathMother.ts
new file mode 100644
index 000000000..a3296150f
--- /dev/null
+++ b/tests/context/virtual-drive/files/domain/FilePathMother.ts
@@ -0,0 +1,22 @@
+import Chance from 'chance';
+import path from 'path';
+import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/FilePath';
+const chance = new Chance();
+
+export class FilePathMother {
+  static random(level = 0): FilePath {
+    if (level < 0) {
+      throw new Error('Nested level of a file must be greater or equal to 0');
+    }
+
+    const name = `/${chance.word()}.${chance.word({ length: 3 })}`;
+
+    if (level === 0) {
+      return new FilePath(path.posix.join(name));
+    }
+
+    const folders = chance.sentence({ words: level });
+
+    return new FilePath(path.posix.join(...folders, name));
+  }
+}
diff --git a/src/workers/webdav/modules/files/test/domain/FileSize.test.ts b/tests/context/virtual-drive/files/domain/FileSize.test.ts
similarity index 88%
rename from src/workers/webdav/modules/files/test/domain/FileSize.test.ts
rename to tests/context/virtual-drive/files/domain/FileSize.test.ts
index 0e30b2a6d..7d99f67c5 100644
--- a/src/workers/webdav/modules/files/test/domain/FileSize.test.ts
+++ b/tests/context/virtual-drive/files/domain/FileSize.test.ts
@@ -1,4 +1,4 @@
-import { FileSize } from '../../domain/FileSize';
+import { FileSize } from '../../../../../src/context/virtual-drive/files/domain/FileSize';
 
 describe('File Size', () => {
   const twentyGB = 20 * 1024 * 1024 * 1024;
diff --git a/src/workers/webdav/modules/files/test/infrastructure/persistance/ServerFileMother.ts b/tests/context/virtual-drive/files/infrastructure/ServerFileMother.ts
similarity index 81%
rename from src/workers/webdav/modules/files/test/infrastructure/persistance/ServerFileMother.ts
rename to tests/context/virtual-drive/files/infrastructure/ServerFileMother.ts
index 608d88b86..7f3a89caa 100644
--- a/src/workers/webdav/modules/files/test/infrastructure/persistance/ServerFileMother.ts
+++ b/tests/context/virtual-drive/files/infrastructure/ServerFileMother.ts
@@ -1,8 +1,8 @@
 import {
   ServerFile,
   ServerFileStatus,
-} from '../../../../../../filesystems/domain/ServerFile';
-import { ContentsIdMother } from '../../../../contents/test/domain/ContentsIdMother';
+} from '../../../../../src/context/shared/domain/ServerFile';
+import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
 
 export class ServerFileMother {
   static fromPartial(partial: Partial<ServerFile>): ServerFile {
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderFinderFactory.ts b/tests/context/virtual-drive/folders/__mocks__/FolderFinderFactory.ts
new file mode 100644
index 000000000..d7fd12d79
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderFinderFactory.ts
@@ -0,0 +1,16 @@
+import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
+import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { FolderMother } from '../domain/FolderMother';
+import { FolderRepositoryMock } from './FolderRepositoryMock';
+
+export class FolderFinderFactory {
+  static existingFolder(folder?: Folder): FolderFinder {
+    const repository = new FolderRepositoryMock();
+
+    const resolved = folder || FolderMother.any();
+
+    repository.searchByPartialMock.mockResolvedValueOnce(resolved);
+
+    return new FolderFinder(repository);
+  }
+}
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts
new file mode 100644
index 000000000..b0dcdc679
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts
@@ -0,0 +1,6 @@
+export class FolderFinderMock {
+  public mock = jest.fn();
+  run(path: string) {
+    return this.mock(path);
+  }
+}
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderLocalFileSystemMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderLocalFileSystemMock.ts
new file mode 100644
index 000000000..eccabee32
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderLocalFileSystemMock.ts
@@ -0,0 +1,10 @@
+import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { LocalFileSystem } from '../../../../../src/context/virtual-drive/folders/domain/file-systems/LocalFileSystem';
+
+export class FolderLocalFileSystemMock implements LocalFileSystem {
+  public readonly createPlaceHolderMock = jest.fn();
+
+  createPlaceHolder(folder: Folder): Promise<void> {
+    return this.createPlaceHolderMock(folder);
+  }
+}
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderRemoteFileSystemMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderRemoteFileSystemMock.ts
new file mode 100644
index 000000000..4a43211c3
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderRemoteFileSystemMock.ts
@@ -0,0 +1,26 @@
+import {
+  Folder,
+  FolderAttributes,
+} from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { OfflineFolder } from '../../../../../src/context/virtual-drive/folders/domain/OfflineFolder';
+import { RemoteFileSystem } from '../../../../../src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem';
+
+export class FolderRemoteFileSystemMock implements RemoteFileSystem {
+  public readonly persistMock = jest.fn();
+  public readonly trashMock = jest.fn();
+  public readonly moveMock = jest.fn();
+  public readonly renameMock = jest.fn();
+
+  persist(offline: OfflineFolder): Promise<FolderAttributes> {
+    return this.persistMock(offline);
+  }
+  trash(id: number): Promise<void> {
+    return this.trashMock(id);
+  }
+  move(folder: Folder): Promise<void> {
+    return this.moveMock(folder);
+  }
+  rename(folder: Folder): Promise<void> {
+    return this.renameMock(folder);
+  }
+}
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts
new file mode 100644
index 000000000..68827b525
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts
@@ -0,0 +1,33 @@
+import {
+  Folder,
+  FolderAttributes,
+} from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { FolderRepository } from '../../../../../src/context/virtual-drive/folders/domain/FolderRepository';
+
+export class FolderRepositoryMock implements FolderRepository {
+  public readonly allMock = jest.fn();
+  public readonly searchByPartialMock = jest.fn();
+  public readonly addMock = jest.fn();
+  public readonly deleteMock = jest.fn();
+  public readonly updateMock = jest.fn();
+
+  all(): Promise<Folder[]> {
+    return this.allMock();
+  }
+
+  searchByPartial(partial: Partial<FolderAttributes>): Folder | undefined {
+    return this.searchByPartialMock(partial);
+  }
+
+  add(folder: Folder): Promise<void> {
+    return this.addMock(folder);
+  }
+
+  delete(id: number): Promise<void> {
+    return this.deleteMock(id);
+  }
+
+  update(folder: Folder): Promise<void> {
+    return this.updateMock(folder);
+  }
+}
diff --git a/tests/context/virtual-drive/folders/application/FolderCreator.test.ts b/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
new file mode 100644
index 000000000..d216e8f6e
--- /dev/null
+++ b/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
@@ -0,0 +1,82 @@
+import { FolderCreator } from '../../../../../src/context/virtual-drive/folders/application/FolderCreator';
+import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { EventBusMock } from '../../shared/__mock__/EventBusMock';
+import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
+import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
+import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
+import { FolderMother } from '../domain/FolderMother';
+import { OfflineFolderMother } from '../domain/OfflineFolderMother';
+
+describe('Folder Creator', () => {
+  let SUT: FolderCreator;
+
+  let repository: FolderRepositoryMock;
+  let remote: FolderRemoteFileSystemMock;
+  let syncEngineIpc: IpcRendererSyncEngineMock;
+  let eventBus: EventBusMock;
+
+  beforeEach(() => {
+    repository = new FolderRepositoryMock();
+    syncEngineIpc = new IpcRendererSyncEngineMock();
+    remote = new FolderRemoteFileSystemMock();
+
+    eventBus = new EventBusMock();
+
+    SUT = new FolderCreator(repository, remote, syncEngineIpc, eventBus);
+  });
+
+  it('creates on a folder from a offline folder', async () => {
+    const offlineFolder = OfflineFolderMother.random();
+    const folder = FolderMother.fromPartial(offlineFolder.attributes());
+
+    remote.persistMock.mockResolvedValueOnce(folder.attributes());
+
+    repository.addMock.mockResolvedValueOnce(Promise.resolve());
+
+    await SUT.run(offlineFolder);
+
+    expect(repository.addMock).toBeCalledWith(folder);
+  });
+
+  describe('Synchronization messages', () => {
+    it('sends the message FOLDER_CREATING', async () => {
+      const offlineFolder = OfflineFolderMother.random();
+
+      const resultFolderAttributes = FolderMother.fromPartial(
+        offlineFolder.attributes()
+      ).attributes();
+
+      remote.persistMock.mockResolvedValueOnce(resultFolderAttributes);
+
+      repository.addMock.mockResolvedValueOnce(
+        Folder.create(resultFolderAttributes)
+      );
+
+      await SUT.run(offlineFolder);
+
+      expect(syncEngineIpc.sendMock).toBeCalledWith('FOLDER_CREATING', {
+        name: offlineFolder.name,
+      });
+    });
+
+    it('sends the message FOLDER_CREATED', async () => {
+      const offlineFolder = OfflineFolderMother.random();
+
+      const resultFolderAttributes = FolderMother.fromPartial(
+        offlineFolder.attributes()
+      ).attributes();
+
+      repository.addMock.mockResolvedValueOnce(
+        Folder.create(resultFolderAttributes)
+      );
+
+      remote.persistMock.mockResolvedValueOnce(resultFolderAttributes);
+
+      await SUT.run(offlineFolder);
+
+      expect(syncEngineIpc.sendMock).toBeCalledWith('FOLDER_CREATED', {
+        name: offlineFolder.name,
+      });
+    });
+  });
+});
diff --git a/tests/context/virtual-drive/folders/application/FolderDeleter.test.ts b/tests/context/virtual-drive/folders/application/FolderDeleter.test.ts
new file mode 100644
index 000000000..42917c90f
--- /dev/null
+++ b/tests/context/virtual-drive/folders/application/FolderDeleter.test.ts
@@ -0,0 +1,83 @@
+import { AllParentFoldersStatusIsExists } from '../../../../../src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
+import { FolderDeleter } from '../../../../../src/context/virtual-drive/folders/application/FolderDeleter';
+import { FolderLocalFileSystemMock } from '../__mocks__/FolderLocalFileSystemMock';
+import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
+import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
+import { FolderMother } from '../domain/FolderMother';
+
+describe('Folder deleter', () => {
+  let repository: FolderRepositoryMock;
+  let allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
+  let remote: FolderRemoteFileSystemMock;
+  let local: FolderLocalFileSystemMock;
+  let SUT: FolderDeleter;
+
+  beforeEach(() => {
+    repository = new FolderRepositoryMock();
+    allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
+      repository
+    );
+    remote = new FolderRemoteFileSystemMock();
+    local = new FolderLocalFileSystemMock();
+
+    SUT = new FolderDeleter(
+      repository,
+      remote,
+      local,
+      allParentFoldersStatusIsExists
+    );
+  });
+
+  it('trashes an existing folder', async () => {
+    const folder = FolderMother.exists();
+
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
+    jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
+
+    await SUT.run(folder.uuid);
+
+    expect(repository.deleteMock).toBeCalledWith(folder.id);
+  });
+
+  it('throws an error when trashing a folder already trashed', async () => {
+    const folder = FolderMother.trashed();
+
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
+    jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
+
+    await SUT.run(folder.uuid).catch((err) => {
+      expect(err).toBeDefined();
+    });
+
+    expect(repository.deleteMock).not.toBeCalled();
+  });
+
+  it('does not delete the folder if a higher folder is already deleted ', async () => {
+    const folder = FolderMother.exists();
+
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
+    jest
+      .spyOn(allParentFoldersStatusIsExists, 'run')
+      .mockReturnValueOnce(false);
+
+    await SUT.run(folder.uuid).catch((err) => {
+      expect(err).toBeDefined();
+    });
+
+    expect(repository.deleteMock).not.toBeCalled();
+  });
+
+  it('recreates the placeholder if the deletion fails', async () => {
+    const folder = FolderMother.exists();
+
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
+    jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
+    repository.deleteMock.mockRejectedValue(
+      new Error('Error during the deletion')
+    );
+
+    await SUT.run(folder.uuid);
+
+    expect(local.createPlaceHolderMock).toBeCalledWith(folder);
+  });
+});
diff --git a/tests/context/virtual-drive/folders/application/FolderMover.test.ts b/tests/context/virtual-drive/folders/application/FolderMover.test.ts
new file mode 100644
index 000000000..93ae06223
--- /dev/null
+++ b/tests/context/virtual-drive/folders/application/FolderMover.test.ts
@@ -0,0 +1,55 @@
+import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
+import { FolderMover } from '../../../../../src/context/virtual-drive/folders/application/FolderMover';
+import { FolderPath } from '../../../../../src/context/virtual-drive/folders/domain/FolderPath';
+import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
+import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
+import { FolderMother } from '../domain/FolderMother';
+
+describe('Folder Mover', () => {
+  let repository: FolderRepositoryMock;
+  let folderFinder: FolderFinder;
+  let remoteFileSystem: FolderRemoteFileSystemMock;
+  let SUT: FolderMover;
+
+  beforeEach(() => {
+    repository = new FolderRepositoryMock();
+    folderFinder = new FolderFinder(repository);
+    remoteFileSystem = new FolderRemoteFileSystemMock();
+
+    SUT = new FolderMover(repository, remoteFileSystem, folderFinder);
+  });
+
+  it('Folders cannot be overwrite', async () => {
+    const folder = FolderMother.in(1, '/folderA/folderB');
+    const destination = new FolderPath('/folderC/folderB');
+
+    repository.searchByPartialMock.mockImplementation(() =>
+      FolderMother.in(2, destination.value)
+    );
+
+    try {
+      const hasBeenOverwritten = await SUT.run(folder, destination);
+      expect(hasBeenOverwritten).not.toBeDefined();
+    } catch (err) {
+      expect(err).toBeDefined();
+    }
+
+    expect(repository.updateMock).not.toBeCalled();
+  });
+
+  describe('Move', () => {
+    it('moves a folder when the destination folder does not contain a folder with the same folder', async () => {
+      const folder = FolderMother.in(1, '/folderA/folderB');
+      const destination = new FolderPath('/folderC/folderB');
+      const folderC = FolderMother.in(2, '/folderC');
+
+      repository.searchByPartialMock
+        .mockReturnValueOnce(undefined)
+        .mockReturnValueOnce(folderC);
+
+      await SUT.run(folder, destination);
+
+      expect(repository.updateMock).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts b/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
new file mode 100644
index 000000000..1a5c20b3f
--- /dev/null
+++ b/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
@@ -0,0 +1,160 @@
+import { FolderRenamer } from '../../../../../src/context/virtual-drive/folders/application/FolderRenamer';
+import { SynchronizeOfflineModifications } from '../../../../../src/context/virtual-drive/folders/application/SynchronizeOfflineModifications';
+import { FolderPath } from '../../../../../src/context/virtual-drive/folders/domain/FolderPath';
+import { FolderUuid } from '../../../../../src/context/virtual-drive/folders/domain/FolderUuid';
+import { FolderRenamedDomainEvent } from '../../../../../src/context/virtual-drive/folders/domain/events/FolderRenamedDomainEvent';
+import { InMemoryOfflineFolderRepository } from '../../../../../src/context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository';
+import { EventRepositoryMock } from '../../shared/__mock__/EventRepositoryMock';
+import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
+import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
+import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
+import { FolderMother } from '../domain/FolderMother';
+import { OfflineFolderMother } from '../domain/OfflineFolderMother';
+
+describe('Synchronize Offline Modifications', () => {
+  let offlineRepository: InMemoryOfflineFolderRepository;
+  let repository: FolderRepositoryMock;
+  let folderRemoteFileSystemMock: FolderRemoteFileSystemMock;
+  let renamer: FolderRenamer;
+  let eventRepositoryMock: EventRepositoryMock;
+
+  let SUT: SynchronizeOfflineModifications;
+
+  beforeEach(() => {
+    offlineRepository = new InMemoryOfflineFolderRepository();
+    folderRemoteFileSystemMock = new FolderRemoteFileSystemMock();
+    repository = new FolderRepositoryMock();
+    renamer = new FolderRenamer(
+      repository,
+      folderRemoteFileSystemMock,
+      new IpcRendererSyncEngineMock()
+    );
+    eventRepositoryMock = new EventRepositoryMock();
+
+    SUT = new SynchronizeOfflineModifications(
+      offlineRepository,
+      repository,
+      renamer,
+      eventRepositoryMock
+    );
+  });
+
+  it('does nothing if there is no offline folder with the given uuid', async () => {
+    jest
+      .spyOn(offlineRepository, 'searchByPartial')
+      .mockReturnValueOnce(undefined);
+
+    await SUT.run(FolderUuid.random().value);
+
+    expect(repository.searchByPartialMock).not.toBeCalled();
+  });
+
+  it('throws an error if there is no folder with the given uuid', async () => {
+    jest
+      .spyOn(offlineRepository, 'searchByPartial')
+      .mockReturnValueOnce(OfflineFolderMother.random());
+
+    repository.searchByPartialMock.mockReturnValueOnce(undefined);
+
+    try {
+      await SUT.run(FolderUuid.random().value);
+      fail('Expected SUT.run to throw an error, but it did not.');
+    } catch (error) {
+      expect(error).toBeInstanceOf(Error);
+    }
+  });
+
+  it('does nothing if the name of the online folder is not the previous one on the event', async () => {
+    const offlineFolder = OfflineFolderMother.random();
+
+    offlineFolder.rename(
+      FolderPath.fromParts(offlineFolder.dirname, offlineFolder.name + '!')
+    );
+
+    const folder = FolderMother.fromPartial({
+      ...offlineFolder.attributes(),
+      path: offlineFolder.dirname + offlineFolder.name.repeat(1),
+    });
+
+    const offlineRepositorySyp = jest
+      .spyOn(offlineRepository, 'searchByPartial')
+      .mockReturnValueOnce(offlineFolder);
+
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
+
+    const renamerSpy = jest.spyOn(renamer, 'run');
+
+    eventRepositoryMock.searchMock.mockResolvedValueOnce([]);
+
+    await SUT.run(offlineFolder.uuid);
+
+    expect(offlineRepositorySyp).toBeCalledWith({ uuid: offlineFolder.uuid });
+    expect(eventRepositoryMock.searchMock).toBeCalledWith(offlineFolder.uuid);
+    expect(renamerSpy).not.toBeCalled();
+  });
+
+  it('renames the online folder if the folder name is the previous one on the event', async () => {
+    const offlineFolder = OfflineFolderMother.random();
+    const folder = FolderMother.fromPartial(offlineFolder.attributes());
+
+    offlineFolder.rename(
+      FolderPath.fromParts(offlineFolder.dirname, offlineFolder.name + '!')
+    );
+
+    jest
+      .spyOn(offlineRepository, 'searchByPartial')
+      .mockReturnValueOnce(offlineFolder);
+
+    const renamerSpy = jest.spyOn(renamer, 'run');
+
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
+
+    const event = new FolderRenamedDomainEvent({
+      aggregateId: offlineFolder.uuid,
+      previousPath: folder.path,
+      nextPath: offlineFolder.path.value,
+    });
+
+    eventRepositoryMock.searchMock.mockResolvedValueOnce([event]);
+
+    await SUT.run(offlineFolder.uuid);
+
+    expect(renamerSpy).toBeCalledWith(folder, offlineFolder.path);
+  });
+
+  it('makes all the name changes recoded on the events', async () => {
+    const offlineFolder = OfflineFolderMother.random();
+    const afterCreation = FolderMother.fromPartial(offlineFolder.attributes());
+
+    offlineFolder.rename(
+      FolderPath.fromParts(offlineFolder.dirname, offlineFolder.name + '!')
+    );
+    const afterFirstRename = FolderMother.fromPartial(
+      offlineFolder.attributes()
+    );
+
+    const event = new FolderRenamedDomainEvent({
+      aggregateId: offlineFolder.uuid,
+      previousPath: afterCreation.path,
+      nextPath: afterFirstRename.path,
+    });
+
+    eventRepositoryMock.searchMock.mockResolvedValueOnce([event]);
+
+    jest
+      .spyOn(offlineRepository, 'searchByPartial')
+      .mockReturnValueOnce(offlineFolder);
+
+    const renamerSpy = jest.spyOn(renamer, 'run');
+
+    repository.searchByPartialMock
+      .mockReturnValueOnce(afterCreation)
+      .mockReturnValueOnce(afterFirstRename);
+
+    const uuid = offlineFolder.uuid;
+
+    await SUT.run(uuid);
+
+    expect(renamerSpy).toBeCalledTimes(1);
+  });
+});
diff --git a/src/workers/webdav/modules/folders/test/domain/FolderMother.ts b/tests/context/virtual-drive/folders/domain/FolderMother.ts
similarity index 57%
rename from src/workers/webdav/modules/folders/test/domain/FolderMother.ts
rename to tests/context/virtual-drive/folders/domain/FolderMother.ts
index c0f5c7957..51f0f35ba 100644
--- a/src/workers/webdav/modules/folders/test/domain/FolderMother.ts
+++ b/tests/context/virtual-drive/folders/domain/FolderMother.ts
@@ -1,11 +1,18 @@
-import { File } from '../../../files/domain/File';
-import { FolderStatuses } from '../../domain/FolderStatus';
-import { Folder } from '../../domain/Folder';
+import { File } from '../../../../../src/context/virtual-drive/files/domain/File';
+import { FolderStatuses } from '../../../../../src/context/virtual-drive/folders/domain/FolderStatus';
+import {
+  Folder,
+  FolderAttributes,
+} from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { FolderUuid } from '../../../../../src/context/virtual-drive/folders/domain/FolderUuid';
+import Chance from 'chance';
+const chance = new Chance();
 
 export class FolderMother {
   static containing(file: File) {
     return Folder.from({
       id: file.folderId,
+      uuid: FolderUuid.random().value,
       path: file.dirname,
       parentId: 58601041,
       updatedAt: new Date().toISOString(),
@@ -17,6 +24,7 @@ export class FolderMother {
   static any() {
     return Folder.from({
       id: 2048,
+      uuid: FolderUuid.random().value,
       path: '/Zodseve',
       parentId: null,
       updatedAt: new Date().toISOString(),
@@ -28,6 +36,7 @@ export class FolderMother {
   static in(folderId: number, path: string) {
     return Folder.from({
       id: 20445,
+      uuid: FolderUuid.random().value,
       path,
       parentId: folderId,
       updatedAt: new Date().toISOString(),
@@ -39,6 +48,7 @@ export class FolderMother {
   static withId(folderId: number) {
     return Folder.from({
       id: folderId,
+      uuid: FolderUuid.random().value,
       path: '/Zodseve',
       parentId: 437296692845,
       updatedAt: new Date().toISOString(),
@@ -50,8 +60,9 @@ export class FolderMother {
   static exists() {
     return Folder.from({
       id: 2048,
+      uuid: FolderUuid.random().value,
       path: '/Zodseve',
-      parentId: null,
+      parentId: chance.integer({ min: 1 }),
       updatedAt: new Date().toISOString(),
       createdAt: new Date().toISOString(),
       status: FolderStatuses.EXISTS,
@@ -61,6 +72,7 @@ export class FolderMother {
   static trashed() {
     return Folder.from({
       id: 2048,
+      uuid: FolderUuid.random().value,
       path: '/Zodseve',
       parentId: null,
       updatedAt: new Date().toISOString(),
@@ -68,4 +80,21 @@ export class FolderMother {
       status: FolderStatuses.TRASHED,
     });
   }
+
+  static root() {
+    return Folder.from({
+      id: 2048,
+      uuid: FolderUuid.random().value,
+      path: '/',
+      parentId: null,
+      updatedAt: new Date().toISOString(),
+      createdAt: new Date().toISOString(),
+      status: FolderStatuses.EXISTS,
+    });
+  }
+
+  static fromPartial(partial: Partial<FolderAttributes>) {
+    const any = FolderMother.any();
+    return Folder.from({ ...any.attributes(), ...partial });
+  }
 }
diff --git a/tests/context/virtual-drive/folders/domain/FolderPath.test.ts b/tests/context/virtual-drive/folders/domain/FolderPath.test.ts
new file mode 100644
index 000000000..a6799f377
--- /dev/null
+++ b/tests/context/virtual-drive/folders/domain/FolderPath.test.ts
@@ -0,0 +1,14 @@
+import path from 'path';
+import { FolderPath } from '../../../../../src/context/virtual-drive/folders/domain/FolderPath';
+
+describe('Path', () => {
+  describe('path instantiation', () => {
+    it('extracts the parent folder path', () => {
+      const folderPath = new FolderPath('/Family');
+
+      const basePath = folderPath.dirname();
+
+      expect(basePath).toBe(path.posix.sep);
+    });
+  });
+});
diff --git a/tests/context/virtual-drive/folders/domain/OfflineFolderMother.ts b/tests/context/virtual-drive/folders/domain/OfflineFolderMother.ts
new file mode 100644
index 000000000..0555d9974
--- /dev/null
+++ b/tests/context/virtual-drive/folders/domain/OfflineFolderMother.ts
@@ -0,0 +1,30 @@
+import { FolderStatuses } from '../../../../../src/context/virtual-drive/folders/domain/FolderStatus';
+import { FolderUuid } from '../../../../../src/context/virtual-drive/folders/domain/FolderUuid';
+import {
+  OfflineFolder,
+  OfflineFolderAttributes,
+} from '../../../../../src/context/virtual-drive/folders/domain/OfflineFolder';
+
+import Chance from 'chance';
+const chance = new Chance();
+
+export class OfflineFolderMother {
+  static random(): OfflineFolder {
+    return OfflineFolder.from({
+      uuid: FolderUuid.random().value,
+      parentId: chance.integer({ min: 1 }),
+      path: `/${chance.name()}`,
+      updatedAt: new Date().toISOString(),
+      createdAt: new Date().toISOString(),
+      status: FolderStatuses.EXISTS,
+    });
+  }
+
+  static fromPartial(partial: Partial<OfflineFolderAttributes>): OfflineFolder {
+    const random = OfflineFolderMother.random();
+    return OfflineFolder.from({
+      ...random.attributes(),
+      ...partial,
+    });
+  }
+}
diff --git a/tests/context/virtual-drive/items/application/Traverser.test.ts b/tests/context/virtual-drive/items/application/Traverser.test.ts
new file mode 100644
index 000000000..62adf56d4
--- /dev/null
+++ b/tests/context/virtual-drive/items/application/Traverser.test.ts
@@ -0,0 +1,307 @@
+import {
+  ServerFile,
+  ServerFileStatus,
+} from '../../../../../src/context/shared/domain/ServerFile';
+import {
+  ServerFolderStatus,
+  ServerFolder,
+} from '../../../../../src/context/shared/domain/ServerFolder';
+import { Traverser } from '../../../../../src/context/virtual-drive/items/application/Traverser';
+import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
+import { FakeNameDecrypt } from '../infrastructure/FakeNameDecrypt';
+
+describe('Traverser', () => {
+  const nameDecrypt = new FakeNameDecrypt();
+
+  it('first level files starts with /', () => {
+    const baseFolderId = 6;
+    const rawTree = {
+      files: [
+        {
+          name: 'file A',
+          fileId: ContentsIdMother.raw(),
+          folderId: baseFolderId,
+          size: 67,
+          status: 'EXISTS',
+        } as ServerFile,
+      ],
+      folders: [],
+    };
+    const SUT = new Traverser(
+      nameDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
+
+    const tree = SUT.run(rawTree);
+
+    expect(tree.filePaths).toEqual(['/file A']);
+    expect(tree.folderPaths).toEqual(['/']);
+  });
+
+  it('second level files starts with /', () => {
+    const baseFolderId = 6;
+    const rawTree = {
+      files: [
+        {
+          name: 'file A',
+          fileId: ContentsIdMother.raw(),
+          folderId: 22491,
+          size: 200,
+          status: 'EXISTS',
+        } as ServerFile,
+      ],
+      folders: [
+        {
+          id: 22491,
+          parentId: baseFolderId,
+          plain_name: 'folder A',
+          status: 'EXISTS',
+          uuid: '87c76c58-717d-5fee-ab8d-0ab4b94bb708',
+        } as ServerFolder,
+      ],
+    };
+    const SUT = new Traverser(
+      nameDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
+
+    const tree = SUT.run(rawTree);
+
+    expect(tree.filePaths).toEqual(['/folder A/file A']);
+    expect(tree.folderPaths).toEqual(['/', '/folder A']);
+  });
+
+  it('first level folder starts with /', () => {
+    const baseFolderId = 6;
+    const rawTree = {
+      files: [],
+      folders: [
+        {
+          id: 22491,
+          parentId: baseFolderId,
+          plain_name: 'folder A',
+          status: 'EXISTS',
+          uuid: '35d8c70c-36eb-5761-8340-cf632a86334b',
+        } as ServerFolder,
+      ],
+    };
+    const SUT = new Traverser(
+      nameDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
+
+    const tree = SUT.run(rawTree);
+
+    expect(tree.folderPaths).toEqual(['/', '/folder A']);
+  });
+
+  it('second level folder starts with /', () => {
+    const baseFolderId = 6;
+    const rawTree = {
+      files: [],
+      folders: [
+        {
+          id: 22491,
+          parentId: baseFolderId,
+          plain_name: 'folder A',
+          status: 'EXISTS',
+          uuid: 'fc790269-92ac-5990-b9e0-a08d6552bf0b',
+        } as ServerFolder,
+        {
+          id: 89181879209463,
+          parentId: 22491,
+          plain_name: 'folder B',
+          status: 'EXISTS',
+          uuid: '56fdacd4-384e-558c-9442-bb032f4b9123',
+        } as ServerFolder,
+      ],
+    };
+    const SUT = new Traverser(
+      nameDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
+
+    const tree = SUT.run(rawTree);
+
+    expect(tree.folderPaths).toEqual(['/', '/folder A', '/folder A/folder B']);
+  });
+
+  it('root folder should exist', () => {
+    const baseFolderId = 6;
+    const rawTree = {
+      files: [],
+      folders: [
+        {
+          id: 22491,
+          parentId: baseFolderId,
+          plain_name: 'folder A',
+          status: 'EXISTS',
+          uuid: '6a17069e-5473-5101-b3ab-66f710043f3e',
+        } as ServerFolder,
+        {
+          id: 89181879209463,
+          parentId: 22491,
+          plain_name: 'folder B',
+          status: 'EXISTS',
+          uuid: 'd600cb02-ad9c-570f-8977-eb87b7e95ef5',
+        } as ServerFolder,
+      ],
+    };
+    const SUT = new Traverser(
+      nameDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
+
+    const tree = SUT.run(rawTree);
+
+    expect(tree.folderPaths).toEqual(['/', '/folder A', '/folder A/folder B']);
+  });
+
+  it('when a file data is invalid ignore it and continue', () => {
+    const baseFolderId = 6;
+    const rawTree = {
+      files: [
+        {
+          name: 'invalid file',
+          fileId: 'Some response',
+          folderId: baseFolderId,
+          size: 67,
+          status: 'EXISTS',
+        } as ServerFile,
+        {
+          name: 'valid_name',
+          fileId: ContentsIdMother.raw(),
+          folderId: baseFolderId,
+          size: 67,
+          status: 'EXISTS',
+        } as ServerFile,
+        {
+          name: 'valid_name_2',
+          fileId: ContentsIdMother.raw(),
+          folderId: baseFolderId,
+          size: 67,
+          status: 'INVALID_STATUS',
+        } as unknown as ServerFile,
+      ],
+      folders: [],
+    };
+    const SUT = new Traverser(
+      nameDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
+
+    const tree = SUT.run(rawTree);
+
+    expect(tree.filePaths).toEqual(['/valid_name']);
+  });
+
+  it('when a folder data is invalid ignore it and continue', () => {
+    const baseFolderId = 6;
+    const rawTree = {
+      files: [],
+      folders: [
+        {
+          id: 22491,
+          parentId: baseFolderId,
+          plain_name: 'folder A',
+          status: 'EXISTS',
+          uuid: 'fc790269-92ac-5990-b9e0-a08d6552bf0b',
+        } as ServerFolder,
+        {} as ServerFolder,
+      ],
+    };
+    const SUT = new Traverser(
+      nameDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
+
+    const tree = SUT.run(rawTree);
+
+    expect(tree.filePaths).toEqual([]);
+    expect(tree.folderPaths).toEqual(['/', '/folder A']);
+  });
+
+  it('filters the files and folders depending on the filters set', () => {
+    const baseFolderId = 6;
+    const rawTree = {
+      files: [
+        {
+          name: 'file A',
+          fileId: ContentsIdMother.raw(),
+          folderId: baseFolderId,
+          size: 67,
+          status: 'TRASHED',
+        } as ServerFile,
+      ],
+      folders: [
+        {
+          id: 22491,
+          parentId: baseFolderId,
+          plain_name: 'folder A',
+          status: 'TRASHED',
+          uuid: 'fc790269-92ac-5990-b9e0-a08d6552bf0b',
+        } as ServerFolder,
+      ],
+    };
+    const SUT = new Traverser(
+      nameDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
+
+    const tree = SUT.run(rawTree);
+
+    expect(tree.filePaths).toEqual(['/file A']);
+    expect(tree.folderPaths).toEqual(['/']);
+  });
+
+  it('filters the files and folders depending on the filters set', () => {
+    const baseFolderId = 6;
+    const rawTree = {
+      files: [
+        {
+          name: 'file A',
+          fileId: ContentsIdMother.raw(),
+          folderId: baseFolderId,
+          size: 67,
+          status: 'TRASHED',
+        } as ServerFile,
+      ],
+      folders: [
+        {
+          id: 22491,
+          parentId: baseFolderId,
+          plain_name: 'folder A',
+          status: 'TRASHED',
+          uuid: 'fc790269-92ac-5990-b9e0-a08d6552bf0b',
+        } as ServerFolder,
+      ],
+    };
+    const SUT = new Traverser(
+      nameDecrypt,
+      baseFolderId,
+      [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
+      [ServerFolderStatus.EXISTS]
+    );
+
+    const tree = SUT.run(rawTree);
+
+    expect(tree.filePaths).toEqual(['/file A']);
+    expect(tree.folderPaths).toEqual(['/']);
+  });
+});
diff --git a/tests/context/virtual-drive/items/infrastructure/FakeNameDecrypt.ts b/tests/context/virtual-drive/items/infrastructure/FakeNameDecrypt.ts
new file mode 100644
index 000000000..f45d9dc52
--- /dev/null
+++ b/tests/context/virtual-drive/items/infrastructure/FakeNameDecrypt.ts
@@ -0,0 +1,13 @@
+import { NameDecrypt } from '../../../../../src/context/virtual-drive/items/domain/NameDecrypt';
+
+export class FakeNameDecrypt implements NameDecrypt {
+  decryptName(
+    name: string,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _folderId: string,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _encryptVersion: string
+  ): string | null {
+    return name;
+  }
+}
diff --git a/src/workers/webdav/modules/items/test/persistance/ServerFolderMother.ts b/tests/context/virtual-drive/items/persistance/ServerFolderMother.ts
similarity index 77%
rename from src/workers/webdav/modules/items/test/persistance/ServerFolderMother.ts
rename to tests/context/virtual-drive/items/persistance/ServerFolderMother.ts
index d198bee71..b52de12a0 100644
--- a/src/workers/webdav/modules/items/test/persistance/ServerFolderMother.ts
+++ b/tests/context/virtual-drive/items/persistance/ServerFolderMother.ts
@@ -1,12 +1,14 @@
 import {
   ServerFolder,
   ServerFolderStatus,
-} from '../../../../../filesystems/domain/ServerFolder';
+} from '../../../../../src/context/shared/domain/ServerFolder';
+import { FolderUuid } from '../../../../../src/context/virtual-drive/folders/domain/FolderUuid';
 
 export class ServerFolderMother {
   static any(): ServerFolder {
     return {
       bucket: 'acd8aa2f-8af9-5b61-b298-d52ea69588b9',
+      uuid: FolderUuid.random().value,
       createdAt: new Date().toISOString(),
       id: 1762214292,
       name: 'Kiosefu',
@@ -20,6 +22,7 @@ export class ServerFolderMother {
   static fromPartial(partial: Partial<ServerFolder>): ServerFolder {
     return {
       bucket: 'acd8aa2f-8af9-5b61-b298-d52ea69588b9',
+      uuid: FolderUuid.random().value,
       createdAt: new Date().toISOString(),
       id: 1762214292,
       name: 'Kiosefu',
diff --git a/src/workers/webdav/modules/shared/test/__mock__/EventBusMock.ts b/tests/context/virtual-drive/shared/__mock__/EventBusMock.ts
similarity index 64%
rename from src/workers/webdav/modules/shared/test/__mock__/EventBusMock.ts
rename to tests/context/virtual-drive/shared/__mock__/EventBusMock.ts
index 0af449639..f7fcbeb68 100644
--- a/src/workers/webdav/modules/shared/test/__mock__/EventBusMock.ts
+++ b/tests/context/virtual-drive/shared/__mock__/EventBusMock.ts
@@ -1,15 +1,15 @@
-import { DomainEvent } from '../../domain/DomainEvent';
-import { WebdavServerEventBus } from '../../domain/WebdavServerEventBus';
-import { DomainEventSubscribers } from '../../infrastructure/DomainEventSubscribers';
+import { DomainEvent } from '../../../../../src/context/shared/domain/DomainEvent';
+import { EventBus } from '../../../../../src/context/virtual-drive/shared/domain/EventBus';
+import { DomainEventSubscribers } from '../../../../../src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers';
 
-export class EventBusMock implements WebdavServerEventBus {
+export class EventBusMock implements EventBus {
   public publishMock = jest.fn();
 
   async publish(events: DomainEvent[]) {
     this.publishMock(events);
   }
 
-  addSubscribers(subscribers: DomainEventSubscribers): void {
+  addSubscribers(_subscribers: DomainEventSubscribers): void {
     //
   }
 
diff --git a/tests/context/virtual-drive/shared/__mock__/EventRepositoryMock.ts b/tests/context/virtual-drive/shared/__mock__/EventRepositoryMock.ts
new file mode 100644
index 000000000..9484794c2
--- /dev/null
+++ b/tests/context/virtual-drive/shared/__mock__/EventRepositoryMock.ts
@@ -0,0 +1,14 @@
+import { DomainEvent } from '../../../../../src/context/shared/domain/DomainEvent';
+import { EventRepository } from '../../../../../src/context/virtual-drive/shared/domain/EventRepository';
+
+export class EventRepositoryMock implements EventRepository {
+  public readonly storeMock = jest.fn();
+  public readonly searchMock = jest.fn();
+
+  store(event: DomainEvent): Promise<void> {
+    return this.storeMock(event);
+  }
+  search(aggregateId: string): Promise<DomainEvent[]> {
+    return this.searchMock(aggregateId);
+  }
+}
diff --git a/src/workers/webdav/modules/shared/test/__mock__/WebdavIPC.ts b/tests/context/virtual-drive/shared/__mock__/IpcRendererSyncEngineMock.ts
similarity index 54%
rename from src/workers/webdav/modules/shared/test/__mock__/WebdavIPC.ts
rename to tests/context/virtual-drive/shared/__mock__/IpcRendererSyncEngineMock.ts
index 27ac8a1f2..c1f6bcf38 100644
--- a/src/workers/webdav/modules/shared/test/__mock__/WebdavIPC.ts
+++ b/tests/context/virtual-drive/shared/__mock__/IpcRendererSyncEngineMock.ts
@@ -1,10 +1,10 @@
 import {
-  WebdavMainEvents,
-  WebDavProcessEvents,
-} from 'shared/IPC/events/webdav';
-import { WebdavIpc } from '../../../../ipc';
+  FromMain,
+  FromProcess,
+} from '../../../../../src/apps/shared/IPC/events/sync-engine';
+import { SyncEngineIpc } from '../../../../../src/apps/sync-engine/ipcRendererSyncEngine';
 
-export class WebdavIpcMock implements WebdavIpc {
+export class IpcRendererSyncEngineMock implements SyncEngineIpc {
   sendMock = jest.fn();
   emitMock = jest.fn();
   onMock = jest.fn();
@@ -16,20 +16,20 @@ export class WebdavIpcMock implements WebdavIpc {
     return this.sendMock(event, ...args);
   }
 
-  emit(event: keyof WebDavProcessEvents): void {
+  emit(event: keyof FromProcess): void {
     return this.emitMock(event);
   }
-  on<Event extends keyof WebdavMainEvents>(event: Event): void {
+  on(event: string | number): void {
     this.onMock(event);
   }
-  once<Event extends keyof WebdavMainEvents>(event: Event): void {
+  once(event: string | number): void {
     this.onceMock(event);
   }
 
   invoke<Event extends never>(
     event: Event,
     ...args: never
-  ): Promise<ReturnType<WebDavProcessEvents[Event]>> {
+  ): Promise<ReturnType<FromProcess[Event]>> {
     return this.onInvokeMock(event, args);
   }
 
@@ -37,9 +37,9 @@ export class WebdavIpcMock implements WebdavIpc {
     event: Event,
     listener: (
       event: Electron.IpcMainEvent,
-      ...args: Parameters<WebDavProcessEvents[Event]>
+      ...args: Parameters<FromProcess[Event]>
     ) => void
-  ): Promise<ReturnType<WebdavMainEvents[Event]>> {
+  ): Promise<ReturnType<FromMain[Event]>> {
     return this.handleMock(event, listener);
   }
 }
diff --git a/tests/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.test.ts b/tests/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.test.ts
new file mode 100644
index 000000000..73cfda30e
--- /dev/null
+++ b/tests/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.test.ts
@@ -0,0 +1,15 @@
+import { AbsolutePathToRelativeConverter } from '../../../../../src/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
+
+describe('AbsolutePathToRelativeConverter', () => {
+  it('works', () => {
+    const absolute = 'C\\:Users\\JWcer\\InternxtDrive\\\\New folder (4)\\';
+
+    const sut = new AbsolutePathToRelativeConverter(
+      'C\\:Users\\JWcer\\InternxtDrive'
+    );
+
+    const relative = sut.run(absolute);
+
+    expect(relative).toBe('\\New folder (4)');
+  });
+});
diff --git a/tests/context/virtual-drive/shared/application/PlatformPathConverter.test.ts b/tests/context/virtual-drive/shared/application/PlatformPathConverter.test.ts
new file mode 100644
index 000000000..772d88a15
--- /dev/null
+++ b/tests/context/virtual-drive/shared/application/PlatformPathConverter.test.ts
@@ -0,0 +1,18 @@
+import { PlatformPathConverter } from '../../../../../src/context/virtual-drive/shared/application/PlatformPathConverter';
+
+describe('PlatformPathConverter', () => {
+  describe('winToPosix', () => {
+    it('works with a single level', () => {
+      const win = '\\New Folder (4)';
+      const posix = PlatformPathConverter.winToPosix(win);
+
+      expect(posix).toBe('/New Folder (4)');
+    });
+    it('works with two levels', () => {
+      const win = '\\New Folder (4)\\Subfolder';
+      const posix = PlatformPathConverter.winToPosix(win);
+
+      expect(posix).toBe('/New Folder (4)/Subfolder');
+    });
+  });
+});
diff --git a/src/workers/webdav/modules/shared/test/domain/FakeCrypt.ts b/tests/context/virtual-drive/shared/domain/FakeCrypt.ts
similarity index 80%
rename from src/workers/webdav/modules/shared/test/domain/FakeCrypt.ts
rename to tests/context/virtual-drive/shared/domain/FakeCrypt.ts
index 9003787a4..3c65cafe3 100644
--- a/src/workers/webdav/modules/shared/test/domain/FakeCrypt.ts
+++ b/tests/context/virtual-drive/shared/domain/FakeCrypt.ts
@@ -1,4 +1,4 @@
-import { Crypt } from '../../domain/Crypt';
+import { Crypt } from '../../../../../src/context/virtual-drive/shared/domain/Crypt';
 
 export const fakeDecryptor: Crypt = {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/tests/context/virtual-drive/shared/domain/Path.test.ts b/tests/context/virtual-drive/shared/domain/Path.test.ts
new file mode 100644
index 000000000..443624cf9
--- /dev/null
+++ b/tests/context/virtual-drive/shared/domain/Path.test.ts
@@ -0,0 +1,29 @@
+import { Path } from '../../../../../src/context/virtual-drive/shared/domain/Path';
+
+class PathTestClass extends Path {
+  constructor(value: string) {
+    super(value);
+  }
+}
+
+describe('Path', () => {
+  describe('Path must always be posix', () => {
+    it('root folder path / is valid', () => {
+      const path = '/';
+
+      expect(() => new PathTestClass(path)).not.toThrowError();
+    });
+
+    it('throws an error when the path is win32', () => {
+      const win32Path = '\\C:\\usersInternxt';
+
+      expect(() => new PathTestClass(win32Path)).toThrowError();
+    });
+  });
+  it.each(['/folder/file.........something', '/f..a.txt', '/f...text'])(
+    'path with dots after the first position are valid',
+    (path) => {
+      expect(() => new PathTestClass(path)).not.toThrowError();
+    }
+  );
+});
diff --git a/src/workers/webdav/modules/userUsage/test/application/BytesInBinaryToInternacionalSystem.test.ts b/tests/context/virtual-drive/user-usage/application/BytesInBinaryToInternacionalSystem.test.ts
similarity index 89%
rename from src/workers/webdav/modules/userUsage/test/application/BytesInBinaryToInternacionalSystem.test.ts
rename to tests/context/virtual-drive/user-usage/application/BytesInBinaryToInternacionalSystem.test.ts
index 0c2c00906..fd86cf3b1 100644
--- a/src/workers/webdav/modules/userUsage/test/application/BytesInBinaryToInternacionalSystem.test.ts
+++ b/tests/context/virtual-drive/user-usage/application/BytesInBinaryToInternacionalSystem.test.ts
@@ -1,4 +1,4 @@
-import { BytesInBinaryToInternacionalSystem } from '../../application/BytesInBinaryToInternacionalSystem';
+import { BytesInBinaryToInternacionalSystem } from '../../../../../src/context/virtual-drive/userUsage/application/BytesInBinaryToInternacionalSystem';
 
 describe('Bytes in binary to internacional system conversion', () => {
   it('when the bytes are 0 returns 0', () => {
diff --git a/src/test/fixtures/AccessResponse.json b/tests/fixtures/AccessResponse.json
similarity index 100%
rename from src/test/fixtures/AccessResponse.json
rename to tests/fixtures/AccessResponse.json
diff --git a/src/test/fixtures/errors.ts b/tests/fixtures/errors.ts
similarity index 65%
rename from src/test/fixtures/errors.ts
rename to tests/fixtures/errors.ts
index 37fa78d35..6bf7aa417 100644
--- a/src/test/fixtures/errors.ts
+++ b/tests/fixtures/errors.ts
@@ -1,15 +1,12 @@
-import { BackupFatalError } from '../../main/background-processes/types/BackupFatalError';
 import {
-  GeneralErrorName,
-  GeneralIssue,
-  ProcessErrorName,
   ProcessFatalErrorName,
+  ProcessErrorName,
   ProcessIssue,
-} from '../../workers/types';
+  GeneralErrorName,
+  GeneralIssue,
+} from '../../src/apps/shared/types';
 
-export const createBackupFatalError = (
-  errorName: ProcessFatalErrorName
-): BackupFatalError => ({
+export const createBackupFatalError = (errorName: ProcessFatalErrorName) => ({
   path: `folder/file${Date.now()}.txt`,
   folderId: 24816,
   errorName,
@@ -20,14 +17,8 @@ export const createSyncError = (
 ): ProcessIssue => ({
   kind: 'LOCAL',
   name: 'name',
-  action: 'PULL_ERROR',
+  action: 'DELETE_ERROR',
   errorName: processErrorName,
-  errorDetails: {
-    action: 'a',
-    message: 'b',
-    code: 'lkañjsdlfk',
-    stack: 'dsasdf',
-  },
   process: 'SYNC',
 });
 
diff --git a/src/test/issues.e2e.ts b/tests/issues.e2e.ts
similarity index 92%
rename from src/test/issues.e2e.ts
rename to tests/issues.e2e.ts
index 959f17da3..a7f05dac1 100644
--- a/src/test/issues.e2e.ts
+++ b/tests/issues.e2e.ts
@@ -4,17 +4,7 @@ import {
   ipcMainEmit,
 } from 'electron-playwright-helpers';
 import { _electron as electron } from 'playwright';
-import { DEFAULT_LANGUAGE } from '../shared/Locale/Language';
 
-import {
-  longMessages,
-  shortMessages,
-} from '../renderer/messages/process-error';
-import {
-  GeneralIssue,
-  ProcessErrorName,
-  ProcessFatalErrorName,
-} from '../workers/types';
 import AccessResponseFixtures from './fixtures/AccessResponse.json';
 import {
   createBackupFatalError,
@@ -23,22 +13,17 @@ import {
 } from './fixtures/errors';
 import { getWindowTopBarTitle } from './selectors';
 import { wait } from './utils';
+import { DEFAULT_LANGUAGE } from '../src/apps/shared/Locale/Language';
+import {
+  ProcessErrorName,
+  ProcessFatalErrorName,
+  GeneralIssue,
+} from '../src/apps/shared/types';
 
 const activeTabSelector = 'button.text-neutral-500';
 const tabSelector = (name: 'Sync' | 'Backups' | 'General') =>
   `button.text-m-neutral-80:has-text("${name}")`;
 const emptyIssuesListSelector = 'p.text-xs.font-medium.text-m-neutral-60';
-const infoCircleSelector = '.inline.h-4.w-4.text-blue-60';
-
-const allProcessErrorsName: Array<ProcessErrorName> = [
-  'NOT_EXISTS',
-  'NO_PERMISSION',
-  'NO_INTERNET',
-  'NO_REMOTE_CONNECTION',
-  'BAD_RESPONSE',
-  'EMPTY_FILE',
-  'UNKNOWN',
-];
 
 test.describe('process issues', () => {
   let electronApp: ElectronApplication;
diff --git a/tests/main/thumbnails/fixtures/1000x1000.jpg b/tests/main/thumbnails/fixtures/1000x1000.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..98333c2bffb9f389388b59bc3898becc706f2dce
GIT binary patch
literal 105501
zcmb5UbzB@h7e6{Iix!H*qQ%{v1=_`(;uJ0JQnYA`ySo?n;$EOoTo-p*e6bqR7HW5R
zp69*4dq4NDo6RI=l9O|CzB!Z3PV#r{?=J9O!OzhS08~^s0c-#OFacsTbN~&c?k*}c
zjDK<ikf#2RHV0|;|9BuEO#=Bp{EpGkfA~Rx{{&?)y_565918$aumC7n!Y?SmkCyr`
zjRs1HO2Y!k!14j`0*e3R5#Z-XEB;sd-@gC=DgIabF**RC|3B!vCNjEmDk@;E<!J5Y
z<4Uh052qL42mWpXasW0aCKe_JHWn5Z4h}Xh9w|QFy?c0+#3Tfyv{Vo1XsKvu=$U!h
z=oz`0XlU5QIJo%*goTA4ut`XZ3rg_{2@Bo{LBqkp!MleC!^ejSGSDyx{{Iet-vLC}
z=*Qp>jS+wlp`jC@{T&9VKts^LaA(1P0R#hzfeF@8-c^9%e-&W<Pu<@Q01q7vfDob+
zf+cwm-tJ7!F;-`(;c(Q$aoAa!Z98$aTGpzIQ(IJV*a_D%p&7(ljA8nvYBHj+?99bk
zgQUb-Dl(k&EMSEWkqibjgBc{4OXyq1jhWNJ^r7VSnWe1WD!I0^Zo{$5lv&JN2Fk+-
zdH^VO3IWj2ASE`XX$}B<GpJ8T_ldVGthzXBTn?)3(jg0rDX}R|3%yeyJ7p1teHSw!
z)Xe1!VeHH<X(@5CForN#tQJR8T9~T*onFE6;?yub<_tpJYIYSKLah{I6=OzR?#NPQ
zcJ&#u6kYX1vXnLzj5=mZCL(+Qg5^X>TR{_C?W(oTf*Xg!9?MQRq5#bR72!0=LHX|@
z87VQC3lJePp&6lCYE~06EX?4&)*zldSY89NGG{~xrWL29F+_lN%k!tjv)tjapdy1&
zo)(779X8LopxQFM5@zFIdenv&PdPnrlxw*qHnq*|IpxM&EXSij!~*TWE>4R{3o~)P
zgHcNb)Yd_)rDg#ty)&7extv7?WWoU@voPQh4yVO|7UOW-ai$ZI5?3>qmKSHrs;H*Q
zaE7U>fHDZRZ8{>V=}TCQnM)@)nCpniV<JminPlLjp4XM*avXSCHVh#E9^qO#R8&P7
zlam891c10gETSgZ2_ft(A!v}&^8Z0zs>pZ;G((sks8IP14P`kT7-+8%6O=zKOc6&b
zO|ZNiyl1Y(5UtO8rw`4DWp7br)0%w|V#Cm$7K%qWh(`j;gy`XbHbvny>y)EIt6A<K
zRt+<`!&wkI`5)fIivJAr-AF?-BETwsIU-ga81sN$Dkz0h7N(*?IH?+@Dyzo~Dq+#q
z0bLCQT-JwE;yZ{5l%EWm!F@M^6QFZ~d^j$I>nsd+E`&(8xq}wO@h(%AL*z3T-=PTd
z-DRL{X?ILeQPtvq;AO-mR^?P>#KmE+(ZjY<kzoQkK~*wN<#!5|)8bChX=RFWnJv%>
zC$vW7Y&t>!7-I_PMJ!FJA;Nc$89Lz{9-#n$j>!23y?-z)2Fp3{2se}m@o_>}vCA1+
z6eC2_^g`zDI_x0F4Fb!Uk`5IPvxus}BQB4z@=ie7@XOKPp^wuHx*g#=6Pt_>80a9_
zmOOWZau@GBrQ?6Vg^&R1AmDd#4qXMNW(kgxI=ea{kTd!3jT|&5R*N2rml_6BerLj|
zD&N5f^F}Kw9#?<>u)B`q3vhy|oD~&-rbSN*z_1-iY%;I`jWjKKG*Nn}jy#?Mv=+xT
zt(p*G!O#qlAV8G>P~%FU&k_<9$`23<DuRe9tJ~Ca;1Rq2gH|ZOn5H7rC3U4ygRlZD
z000j$tV1{eV<?8<fF`ua)KXyz-~)GP0eH-y=eeZD{QJa5VOz356F_T-i_=m<V`yUl
z1!7@fxCR@1)ImE*V=WltQcF#UNMpf~Of5lg#uIg!oqMmM1v)tT9S8$}9CT1Im)lA&
z1op2;RsdoFfN<e}D1a^|Kscax=W2I={Ojit{3OD6-kHV<f#DRZ15kdIFc^z!3fPHq
zhL{jAiAKOSKr7awLZ~JXp<ylvoHhVhXMzp@V3dPyfOx3ifdU=mC!Av)23T=I0Gybd
zyEPF&19jcyKu+2Q5u!3B2c%RK=-D;s0T4Yos4zf})-`>l0rn;&7bgJ$jK~pz!%0fK
z2KJ5~`0ufd!nP`j2|+6cb&SY4GC}dRhC#6mF}5HR3nG)@9|sr&l}2Hs-O(U?ncy>;
zicSdOz_w&U2oCeF+4+Ky<3;dea{gm@2&nuns{fPzOM@u_oEESxa<DB}v90I<2NI|t
z2m~Q;H~HN~a4rSCQt^&-0J*cUL3lwt5jvF0mR+z-fW!(wtIop&09M4E(dZh00JsPX
zqu*hGFN`k$;Ix<^Fz%`V02{3`1zcl6=ld5S2n!+vx)#C`3E&iC-r2DLU>AplnIM1=
z0DlmrY>_kJLO3D^o#O}FVBU2B04<>ctiT%wOl$!2pYa4i1BXM71Vlle9|5BMFAE81
zCI>!P$50F|$^3E%fEC*!gmCh1atnjyqZNjLZw7!C;23jfC`f`{12zVI0?dFYa76#f
z!8Vw8BGEuMxkC#q1m#3w+cJX#@}D{wJ?Ld~QP@r)U`Z5O>tjiEv`Tu+e~knoz{ec`
z{Q}@e11Ap96mTg9691V)?)3i?LZItBpeKTM0Lq}l0IVTkLI_}hSvp98{>e}xngXoh
zG}(Yn(Aeh^5X1PeN@RX%PC;=FPz*o-b})jh{|nd%01_=xS-ubg5TYR%a=V(rp<xKM
z5QbpJvg^fQ-1#yvPgy4-uwsyhRtrFvpw{(Qsh+Wk;3EJXmc!SiYFG>xT99)66wG#*
zcI)r2TOUxc71i8PkTkn?MCCbpFWTK8=#%ito>F6DwExM+N7U->OD}921NToyj|r#k
zX2T0K!;>YY(L)Qzijw8`lst~+kLj$W6;Sr}B~z%Unt>lkx~@HUb&b{Y2J&qKXavMQ
zy`^~b>c#q{L_@I2*UYiE$U|#*04<%i|4)-&DD~CW<n+SA`SDKVlQfh=%JY03C*nGR
zqC)YgHX(dI%)I(=m&@51_4loY%&YECBkZ5bJ(X%+JpM4d)&HF>!%^$iV~I{lY2LTw
z{@1r8qXMhz<|d8mmvELdiG(vG`r85$#gK9qpL{i)4Hi+`39p(oQGpt7mbA6vd67aR
zXZrWu1>V+ToWk;?dWnLpuQ8)yRawf2c{pn89XSr`Ytjvk^x9Oj74u@0-@AH~Y1qD!
zM>&f0>sl+OInDYaWkf{ZKj&c?t1><?OqPi<lujmkJ?&+lIm7MU@VuruQl+8y_3J&o
zV#(BE<u#NfOM}z#jDX2I`Gqc>_pP~(%nC@ON$XCpDrCP`i~9SpBL~VnMm6X7CFMf7
zqE4UC7C{jv&PqE6RyBKf5jUFau7aak)1t6J%lxJpCrX}hvaXyyIWb4Cq_AnP6ZOmY
z(_u?naBObD=PG&2T!hV!X}t6IPiIs6r6t<yR@uD|XPj_Kb$OO^HFqN&&WG0|K5HF`
z8A@%qz)s}5sba&9^YJ<;vN~P99v)K_1%Hz)3i_$;9PL`r(ynot|Ju6Xm;~pzV!vpj
z>j)lU&y{y#y1URlRN>XWeHlCFRaTC2p7Sa{mKZ8V-H)DKwV$QE2W(p`+K0GVP{YcK
z2gD@So6|)3@u#)B<20rz>xM-I6puug>mxQw?M?Xkc&4G-HoTRxPG9WhW%oZ11lR`H
z`Cc05^j`b%?EA#z!-NdOG$TVza$;M+mL%3hK1StB<Dy1P)<hzLTyp%&c8YP3aqf2Z
z7RXX$3aKg&q63kU@_Jl1q@BAwRURy&x5C`vQRCGTKqrKUl!tcNGN%<payV_psxXc_
z%9k#X7sTCq2)x$`++UrUPv%qS{p9L3c^PonCPWuoDA=1rec0C9`%1?*6TUR_?Q4bh
zVmMI)o@!2LH$yBBc5^HbF{!eSatQ`8UX}o31h`h-MP-YUnD!W0Xbdcd3Nr*cSnL2G
z1^`TD(a<pJEC?p}{s92=;9O^Afo*|@xE?dT3OKCd({n}67scK8+3=G5p^NXysp3fG
zc{Q73AbDj!G(WXm{@zSHPWbF-6<+A6lE0IV7=S^0@>3-v7Ktt9jB_9sU<6o!9C|cR
z-QB!=_wI{HOb-B#A$Ri-xQ+rj;JOWl0Vo3e!zFh&ZwvsuzO%P%`BlizL%a#b3-%gb
zF|D0RxW)$^v4tZ3tB+(vq90gBQ<Ne5&7|HZbzL~Jz2wm_e99a$fWc5xCx_H-@g57h
z>iy#MeH8qE2q5m{1AqWdbxw@Kzf+<dp{{($LJ0jLj^h(yaHax;2l+Ml!37s&<A;Ld
z0#3%F5!NhuG7Vb|-e*E@#d>;+{sLmJULr309u~B&7-~|a_4nJCk3G;+3p`krN%{*&
zf8fflBg>pR>3aJZi4z>;BAPdNb*Uln{(0f-k1Hlq|8Ld3onzARD-uP&ejZ5F&B{A-
zgUHi6-jgk1-r(d_A#RDaR<2|;2(e;+wl{!Oyk}~H$it+kvH%1v!^;7I83s{#(qSNH
zE1XbRoJ3C;PaT1WR-)3d)d#!s`etwR;pqbdDe0_Bs^kaD7ZTTJ$Ec+DFGhM+C1x~l
zWY3XPpM*{)mm5?2-ArF}=6VMdJvZ;ZMv57h4Hb?l{!r3b&HwO<!a!Pl^v8+KCu`I<
zAFEbpQ|~MvRP7n6W<|tMvhU`?>STmKjyxZN3xq#em2RGY4@Vi>KjAdFET6GqN2>Vv
zujoIMdHb-*^nA{nCfHO?GU$t%s%nNhkuphl1ss(}Wou2cLcT8b`9*LGQZI6Gb}eE6
zimvXs#G!8G%@F1Qi8!>o);Zq&IN>Vwn+lbOTJimQe${=wn_X4t>ASzWo^Z8m|7tsF
zgQ$`2Orp;|&91dqjzsgl+iUw*wLh&N=Ja{ZcB8W0`owc9;rquI-nR9q@;5`T^b5Hn
z--;=`v2xIiH689bL2`E6XXf2X`AI`3&Wx6v+73@@{4PI{e~;fk-5Ck+^!-drR74|9
zTZc2-v6?kgh0E1CGcSo09@9F0s&uf^F=o2hO}x!*HoSCh_;8KtMC{cgHwuaT%j*j=
zNexr+{d4UK-wPD2xRYvEZ@P;dGjW|hhax9VaZO%cptaHa#Z{W%Tz8VG4$5!-IVUGY
zIvv3;f)2*QtCF@iR{h=!CR%rzzVULue=c!_3~!aRo;f|>qe2>VjwmS^W@~T1E!@uS
zR3cMY68VH$<Pctkt@w`Au5yj}7bTFJaY<LUl(%QY-<?P}ddgHxIkR@g&GNCYIKwBs
z`rB#N^&FJ=?BFc3!ITDS1t*0!iJO;auScD8OR54W%oT%S-iNxcDMtq~xjz-%OEz<u
z@yWUt>}lxj{_OHeVtp*BD8kDJWU1lRZf>wMVHq=Ha3Wvd`f@Ao{z~|>bZ<+0uk*tw
zuPcouuaEPTk6-owkZP&v<uT39s@&T6>Nr1D8PL)9=pm|+<N7*@;PHKzr*g0Go9m8`
z#wgMs7)EQduBwUT*9Gc1&W|;)HoA!~_$=W6noSSb?>R>eSwAryQ|z8S3jSj-->?Or
zYS1ie%wsjPMA<7zReT&CBySd|dSq_nV3XM^?`>_QBxjUrJRvbOw<_JT$=y<XPX0OF
zS=eajx$DrpTlac>MN(HKoWlvbtW0XZtSqT*RibuGG~GOj_w~VIp8w}Eb&;k;8r$P~
z;fdMg267WmjT135Ke?VPGD~EmCIzg^$2Q8|UDWCWp8-|Reo{|Ck7b2zQEJD}XMx&7
zAKG?)TwS`na-Ke!S-c+;IX`g5Rl6YG_NjAvv5FH}{&@<gf+?tzHfa5mW7HSR)tM!$
ztLnqrmFC%Rk-j^l{&n_A0gjbsXoO`-)D$!Q&)Sp9@Py0b;}UP$WE-9vqrBBova9J%
zZX$3^U5-uZ#8O`U`Pp|j*HwN_B<b)fe29ThtHf;HkzIN+BH?*xZk}sYapm|5BfMqQ
z`Azu43!eky{v<Z3xC-0F%&Rflek(mxM=oa0w&$v$m?jaWbF#v>uiiFGfTJj~d17(&
z+3wj*o?^kK-uIi?_ern#tY0*;C-s|Lb4^}#`6i1ryq?y8Gr}dl4=H-t9;+RdQ8QLt
zoSZynZI0H#ikoepdYHFKT~KBU=Mt3=HZpx91NBDP`DA8K*QUl-80a1zFLbw0P~{Sx
zptwjBI!WIs*jCBob{KivW?0S}COW9r-&@RAjYBN0FD8*ucP-H6oNAOZ-J9)PByQcB
z;_(@B>da8Q@lGvpqM4tcsPySQ8GZ9Zc(JHc;(?sR<;T4_?M>75bqWuG(*o(ONe0^9
z0=o^{Wu()Uf1gzID)rR#De{$<+uKL_5$*DC_$SMK^k?K4nJT-(8zp?AS{IG?8w$48
zQY$*n;1&&N?<K12jws*k>N&>jTGrN^k632iEH2We@z2h9O*-qSUU7-dIu|)A_#3QK
z!LBdO9P?0c^?Co35a-m=@-ow_t|@gm);zMn+nm%zGncytGuJyBo|jZ)Yo5&CvZ?My
zXJ%SkH!CLTh3c8D^Fjva>cq}AN=_LB@Y{7?%jfoaCveqqR~V3;@JI;GN)yNg70m`c
zRzhC&hEt?(1s8ajsCooHmTHMB6xqxj&GDi1%4#Qz4Y0?*SUOq}n5yGpKPpojf-g*S
ze4bk1O=v`?<SI^#KceB7ryNmi$g^U4w-0{#V3y{3cT-8T+*MZfN>sZ0sK<Z6SYc)B
z_R>~pex_o`;4^`8{EW&%l^k8YaI}{MoW*zYQe{YO5ntl!wODr6hLWN-<-KgNvZAWI
zpW;^=t#M~VFM@;?GmfbYW=!*jCgErCwd7P>tiEMc+?|usNp!tuZ$>vmg@-iSP*duT
za>AYQ$%fG?Q*OM8v#tS6)dKTks6|-q1l5Y3t4M)sj!vS*Z1Mag*78(2Z;~UtiZh#K
zQLnDZ=9oS%7HL>Ty>z4rbuCKa|6s~TqK0ZQg{NH!cE=o}HmL$VkG*YG*`!-K%r%qx
z;ao4w%6*u5Dm8l#m6Rk$g{K;cu}$>2;9{s%mfo*Z%X2qnW<MA;y4`8pMjR`9gC#}<
z7U7Dno4vz%`~B!^XVVnyj*Cb?%eRjdi{5JfdBnAyo!gN<6}NSK(6v~W$))RX9KZ75
zC2yB?v_^q68Anl|t#0;HX{XkOtaTKX6nY)esG7@Fmva3!aA2$Y(eLUo^w^@HkY>?%
zXeLlVP*`1J%>ghw)N#*n#;+vNYq4kl<n>yJ!^l_>L8Pmnr`jkpGLvH276ug^ol$oZ
z8mr5esdC%2pO1K~nCtnem5r{xJ|})IKMh68sbh)zadwwB_t3Gk1l8|0d;d)mZJ?+4
z*$Zh&(MxIW_x|lQlUGLzDAQ`=1JjY(b??K?2y^Y#v?LevKw6?i>PrWfN`!MxfrI9+
zC2y;pHxV53%*N^ZqOBfX?|rhRH8&)*Ow*k6<WI6P8FA$^TRaM7#ah{qQIM}6^4cR#
zZ~1$hBia@&u;-m@-@=p9Y3Yr~=EPV7=!s%04Mhl4I^7yXqV04S3aadxokdv9OaoT*
zNzB&07LFD<rsr}Tdr-+wcE3wJeAzx){^c{An|=8W$}UeqC0<uKe|hl*e8OnW^Oisg
zj+(`+tL(kXLcVxT>YAF4+ofYVCEOptvlPN0WF%C0!Fsu{+3f*Ioo9AB@MvHSusd<G
zQy#36t0LrBtEn$DZBI$`tbQ%{+Q}<+Q8R$VcC<x7Dv{Bsex1-&P%+hNv?#UG&7|IF
ze*NfUuJLQjLvAh!(W9mWIm-!GDr@LTj>JaWl*we@gGX-)g0`gLUV(H<8k(MllE<^}
z`>o1Hu3Tvrtq!B>4v%jo<XW8B?Yb7vF9XWBz2i7EyjR8Ky}B($gz0IIsCsYlcp*I!
zr*fhh_*`Y8wppzep7@Ix1db`ArJ-68q;1ojMCEwUnM+Q*t588_mpo2HXNoHh)!w{r
zrJi$Es)@aSAx)C%IcnDICM$EwVc}c4kV;p4pM=`U&f4)Vk?A&39sKe{JuyK)DxS9*
zxweZWS-NPXnrhAGF=naQI?0v|PP?JJy|&Mkrd+1kZeHHM@-mJq6q``#m7{RS@{cl;
znwPY4G~1Gv(4;jzvba)B5hlOra&yrjQc-zrS7-j}QI7=t##^G+%%OFyx_A22C9={R
zTQsg~zyYeiqA50Q%QaxrvKZokOTPjkysAwsGIg&N4wUi`o*?r{OLUSX;0?G~Rt!**
zKk>AD<))4F_i?zn?P?)6Y)Nc3Nvm@Su;+n`C8+zsy%uTB1DZPHP7Z4)z5CPCJJbC>
zq<K7+m73u^<Lu}T@Sln}$<Fnhr#1cN7;R6~hti_-RTBPKXb(rpx2xB{4q%9*C^b%m
zWLMyRT6bq1YL!G)EMxyVsGQS`wNUw8S&1TPZKDXkWayQxje>FxPE(4tv3B?>Q}w}>
z;A-^Bg<x%VO#|U+`)J9*QB`HFknoJhDn9qA(DC33O!23OK~%7SX|}E^OLd{{$-(JV
zRatan!PxQ_uZDyf5$C*PRI+T_?l(Vj{mPtSFYikSB~1>@mHt=RC;r-|zhTFmlZjqi
z?@9_+8(@-C{`@(GPihys_f_f#O3*w7=-Ca_M3bJ$ogIEm!f#%v<4Qfr<SRS64a&{Y
zIIDu!pH48olRebBkBhDnVd|{NuE3C>Lq?sQzR3+|)wm&FPShMPtFevHJE5L|ofs=A
zi766aZW~mIm5qJKn2n<Gm`|3SD$6S<(@z|BmK=5@qgFC}F0p&`vq$RJHPW#3W)Cin
zEYkjT`QhOc?MzKKUp`iE*_^YZ&6K6Eq5uURFKv%<rJCfbk*GlD@d9_THv!6&apkxO
zJXkv9@P0|G4#i6XUsGkDe(FmC1+`=A4x<7WeG=VLO40>hCsm}DcA3EQ67KgBJcr8a
z0Pk0OJzGKd(zEf)9)<vaJNDHVfo#0-66PuGZ$(r(yzA~Ql+m3_T3)XF=nwLKJuzfH
zG>t67Uk?~DXfCq*`DM%d+ZXQ6!`Qie<E9>qsm7F~-WD`z2RlS2ww|}AYX&RX{50qN
zoG^DG5EiA8`J}3Q&YA^Z$jVRn%h4*mLo0DY-#$EoFnmU?^;SDBPA$iZI#W4{54#IL
zn-Wz>bEalFa^UIDG5sweZ;)z{uwq+F#StFiZBMp2GM~FRb^IgO=@MDtTHDuMkV!ST
zawBBkK2z#GCnW%vP(Hi-nebD*RBU9wELNDl&c5uGTp4%Uw0^R;C2has`eb`2DGy!O
zysk?QrDiL(1y0=cKzHw6jNaUd&!xGUGcD7~{-@oeBD(2za<Zg%Ud~h)x(IYC@B_BU
zlrB-Vq~9Bgw9>_@>{dp&;K%91qZ3rSkLR{c+q%SKMA8%0O@D!7bCbhWBu!86H6LaT
zmvhcCbzjTD@hOtm;X{Y=Vf`6~S8c&I)dbsPQI~4t&7wZ9OmiyRGY_vz+iXMD-;5tG
zx7?A`1_FzPmgQ!xo>LnE0<2;uLsMgG7oAqr8)xLIPPN8SGwKM;RI>`(WVVtKz2}|<
zC$$!J8cnNA>OJ?T4gB&hPex2GwcFzLr`2U%+tjLhqP2}$S$gz&g%Z@I*Z6xQ<xlsn
z#G`wR;;}?Zin2DR)5`~@FsX|%f16UUE}Hp!JvO8a^C`<F?{1?-V}0XkpQb4ytJ+nA
z?|IL^C6npJ^vxI4ytm_-=kE5z(eCEhTpypLzeIq<_3Q48Wc9ZC`ikTIkGqj`0mN3H
z(|J5{=hB2TrJbjP2_o#MR&varMI7VbFG}K5$`74gPV$!)o`4%GR^|!{uF_vgF!{~I
z)p5ol@RaBEVM&fL4-{#0y=+%UC8JBJ@I7m6OJ{pqH+k@C1d|d%Th@#h5HVV(TQlL0
z<kAkVZrXPb#-3AKwNEJ;WF3ks1%C<XeJ^$G^+^_AFGri6wI%~$5M?|ZIi~kme>XNr
z4Bq`QtW~~45JOE?zbNU4Klxr#k!Mdp(8=&BkH?}!&9eDlAbd01J#lkbvpG<AdeYFr
z1O2sR(4TYh&s>ZAdELIY4KBxnOR8=o{ha2#LTjVE9GUtQ>4|vt+Lj#aMVp$IGpk6K
zL`Nnq=ggX-b)z+oDRny%RY-GMT#7AbfXx!?43Un@&8?vSmH&QTfU4X3ehuvSjr~|(
zFFn?3;Z!-m!KLLnDy<z^$IMecohO#$*D3avHD6*wC_b;PfNMgg!OXj|r|BZ#`|hHt
z*mwj=<8vKysx{7gAwVEKs2v6Oj7cPObD!EivMuCVi=P|(n94KX7699`oH_F_AknTB
zCcSJ5U>`mio{co9lEtd^cAkLwT%L`&Bs$>4mOLNojOCoMR;Z-Rt3QZ6nNsHq`iMhB
z%p<t3!Ecl|Is4jq^7Yibj%`CsB!5!pC`G<rJvLcN00A#<eBCN{qNI3VP*-aAR4`5E
zYBXE5ziyiz8R^voIkUsX954NGflrJv;^bJ-*v_3qk!1wh1VG=_B#}l}9e$=QFdjA8
ze@o_j!2xd_DbyB^IH6*DZNQpIsn^^*G>lp6bba(*sekmz*XI|T1-gr3TBPAs*;UM2
z0SB@%taK41&efPep3nN?;R-Fy73;6xe>@hGes#nwrA8HO3~=fD)34iM<`O+@%xw>R
z$X0XYWpk#P_~QzdC@Eo8w|Wswb00(aI8KPSq>?e0SG%Eix9te;gYqIvf&xnK*8dy$
zem={7CGJG!ZQdpGtfqWtk-zcr<f+hTvA0ay5RsOSdf=}1eE16g$yf;!T?3bmQ-}{k
z{o|5o16FH~WY!<2L(Z~}5g&8Q&DqTTPM8*%rLNZw%(fUyueFG%Q6IAD%+?I}N(qx@
z8IHId5N$*q&mv1Vz_%_TliJ8i*0gZ-l~hPA{!OBlY)|(o+`sKg@KO!6aM>GGlqpi4
zvjlOMlhg_5zUhxJeCWiN|70FMeX^J(Q>nHn<dQ~3%PK&|e|sY>;eWa6g5*CxSSMqm
z$(G!q$6XLhwa=HPqrI_Z4j{u@G!IOg8gfyJ_ipX#ED{-0WPMV8j5<NFIm`(iztgPU
zUtwZx13IS1`?`-mPT{6kaT_%}?vYxZpQ+s{Ng8B!tl}+q&MGOaVf5CAP{??X2Fs8g
z`COnsR`85oo+$VAy3+GdLq1lxStY~`SLVGrCR2uQNF*K7WG+Uf7TpkI2ndxGc7*`A
z-YFp>x9<734bP9>@Fl4Yc|8_irDcbhKnDUZHy962_D>Ho@sFcIjFk-Sd0|D#eD35=
zsuwFpVHh*$;Xdh!KJUsjgIi?3E~+2K;Vb}cG0QScd~i3|ef@OV8vH#@9&u)Ujd$rX
zlgQ@}<_<5-v)S~YV)pK^w6hKhqIuKOAoI|q0c~ZwUnrI7MH1C&RS`xF6sts2`obkZ
z%ay^3P7EV#bQJk`c_v2Juc7Ov*&r9hB~68f2XMqB76qyVd2@%BRd2HN&Du!cB%XTG
z7y9_`Sgnfb=eG**JB8}V<J)whkq+P*kFqI=W3zi`lwxs{U@anhHO-_BPEr+f=ha*o
zoM|&rw^CH{qg~7NW$JUL)pf|?sfR_?mt#~C7E$rN1&rl1JqVmom5Jr)CC5AfJlO%T
zGj-Axlx66bFOj`v5*f|qA<bhvo}1)VsB}5)H_Wc^^HeH1@bNKBFX!R)>1I<oo+`Ab
zGE@@nKnYV6BBD<4(bG5w!sX>pm{)#|2{h9rIjaDKT7tOw6pBWQmw6%)VQIxcja_O9
z8LpEt$BaA8HG_x<f@rC`hlz|gL~j86Tug*7f&h2QKxz&^CyCliD#&=3*Rx7{;x|l>
z0pJP8_O5BB>6nb-^E`No<z_l7Bs^Q%81%*q58iD}^L@<LkPC<sK`?aV6WdglEY&W}
zC~kPUGZAIDkGr*TV&a5+L(x0Mx?<*j%e@SE|Kf?LL$2&<QL#fghS|ul{c41*Ofj|v
zf=#A84Zw!cV`5|Gq45I_&;iU4G{Jqb1_j4V!<XzA{NH-pQ2|`^-t6-v%CI~Pmc&aB
z7JbR1^XdBq3_{9<MOaUBtSjUSNwB#LEFVTo%(lgAVKD20yY9d#ju>;o+_ly^54eL!
zq?m$T+T%}Zp5tKPQhylYkO&tKxNjGlM$H{ssa1m$(l(6=?p{WPID)&cF=(b;9_0(d
zt)%Pp!vJ{vz`5SQyfgp!i``dbNn}df){fYas?T!nxVIzhaC5vXqoc%;%26!0XsQZ(
zOp{i`UxBjKp@d^|Vv$XJ-l$t7T6EGPN>`sg58TB}NOjC9)(1~fR3qO+&rd~}X&aT9
z`MU|vKr{3w6rUGj*H5amv|)R*h5!x#X5RgnZ_h4o0=qad!5wrt07FZnIh@f<r)GuU
zDWW#ihtlG?y5;F1GP-2{w%^sO+Kg;@d<6V(+0{FnTfnf>Bj$fSo7SPIZ4`jzF7`l4
z;uY)qmDRlf4gQ5Qj<rwId*EAAeU;iWN@O-2eCqAxOBS-CpkxdsK+f>HG>Z_l>b6h;
z{L+YVVRc>qusIxclf6VQGz`5M@GKQ3fYu=bEe7{a!9d@Ii>ad8ak`h#9#YfS%4x+E
zd;`BYxeV|}>cUY&>Ad}J;{a!%wfX%97142HX(5)ns6vSY#lBzflf@F>!Z%;|*5|nE
zn=G(iZE}pMm+bnVn|rs%RC|s-)qB<eekrVl#EO345EI<9Y*W^m12<>!(8lqB0epz?
z^u1{a;0vWEBn7CV6cK;}|K0xZUC6;kJ4OR{VcrP?5fBTX0GW|++}&w73GP@iUim$Q
zD0&Jp`qH?>cu4Iqm$Yn0$`tQTeGB#xx@A}~2fy$!Uehq?5@!pfn)w8s06ZfmKnOq}
z5Hxfs1Ooa9#@%r-2tb5R%s|K}KteAl1LbFuB^5$gU@!~IX@xv%0?&?NgD1++Fd%17
z{{lR#e}P?*zrZU))l9Cx0P6HF@aL$C6I-aH=;f~>w(4}-N7e0`N}rm!U%WeJt4^_z
zllqf3@c1c>p}}7udH9-`W|GO?TH2tfRptg$)K_rg6jpz|K~rzxOZY;bQfnsrPiv~Y
z%jJsyS+D84d=CDZnCxYtILzBL==B0#jBV^`+_he^nU8whP?@b>^o8ZGtZ1&84ZKEC
zAuG1}F9+7VE*9hRltnb>mR5G>^y7=m{-@pfZQGTjrrm9(^-V7fANGq2a^&+pC2C#r
zYOe92kc@f6%2oFw`GV~R@-l^CcGPY0S60y*<db*9e}UnKDQWv~$;TIX4^rqEdWfOd
z!~tul*GU0uyT2k|9X`I0{|m6#-)Oy12XlsBsgEYYFRE^M9*sNx(Q}_*RwHqsnfc`P
z*}(SI0lubhMEc5j(uc9RXNrcU!#``a^JeVQ%`<P+yPGo9i@^{51+k}H(M-8WvuKn2
zmSiJPKRfaQb@S|nqL8%r@8{SjUY25n;@Ka&?TiYFIz_X^7-^DhU)|K|edVk86BnT=
zv%1FGQUQ+3rsvVSC)ppH@8LA%YqG?84zpEw*C=YA^sWW+dT~z)P9GT^w}0w>aT^(6
z+U<F}1zx88oqU^P8n)gwI(?nIuHX+ZM6Lf#?lYoKU39M0vwJR;X5Re~GYM-m4G+*u
zzC4*?YurvMm<<kr$zO6+c!-kRMX@Kew)N*3tun$waw2EeHODMhM^8<%d0o*WD`qOL
zYRVh3`AW_dLEpJ`nYEXe`2LmCnacSYUr)*2Q*GVY;g5jmmtPwEw>{Zdsz(*~I~P?N
zW#P`8dNqv*xEIDKzi^kryH<1T%(;7cOG{Hl8mTyrNY%W_%<V=EH;=_wS*-$1Hj-Fb
zkQ~!wqvflj^(zSUJM%o8Isvcj&;147{n@-v)xLRft7Y?gh!>a}9R2h$LD#kN5YOf{
zZRXa9Xy$bV)3twMvv`5#`X-pLxqK{a?eLvt!I9O<02S0u8jYzEN0hLul8kA{*MPF~
zL3tpQppySj=H=++_)mrFzg7Ql)}366=AeD%0qp-8-gPuzEnlN@(Xp+&ZNpVGTlC)>
zko><}3Qo8FPt6^=cVlP@8utI_z)Zz|U25C7t99jlD$8z)srP?+xFkWQjhnWW-1uL+
zpJ3~ke|)BXQ~XcN(~jSreBVs1o#*H#9}ce6tw~lyO%fKori^`L-T4<_g&fL#EwcQm
zo!S^ipkH(3VP@c5Cmk(QmyCs6{iAY_l|@BHq8}&ksZMr}^2O#s7>23L*1pkcy_MOJ
zNE#X*o+|&%UtmHcRGEijFNo6Y{f>2eBm>UG;B&wULY3$ns2q>_d}TI@`U_CsYlej5
zMruYZ`~@sDhXZ8?B;)EKWiCuD{1Z9pk%?LSnJ;>OB4g{Nu$A2Z@b^o;zR|}Q#dzB}
zOk!_jrjm{B?bZ8eB$Z@IuW`&>OG?<T?COjwo>Ani-aP{H7x?N7a4m6p4M26#k~x=H
zcZ5<Yv+6>a*wn&v;>!cC@9P-a<;T=DeZ7?_V(5#_)Sf{ja2j0b`VE4Bd-3wu?)29=
zS@vYfyg&7H5BXom#sV8bmR9x@CS(p?_gJ*<2M}?)XRf@hHqlbfK8MBQ<qT-r$|(BT
zeA(lBRx3fZCR<4dWKQgVBiMfWr?kkVOWi_4(WqwAnlf2^<tFSSrpg|gy|SASTyd#^
z`Pw?2f`=n`kwKD96K<z4*HmMwKp}GIGChs6f$kY;p0o5t>6w|Og<Z3P?95wH%*wjr
z=%mcshY6PNLb1l)D|kN~ASZkJ<I~gMan|?34~(;>=)bVaSq4%rzhcF3*BjcrmvT=6
zmY30cEu5Tc>Z(hXl570cpB;_o6|2x$7TYj{_aUnRo}%DFT+^plo3iP{YoCkRsBzaj
zO2kXH>fHoBLj0u$zka6*AD}rPyg$>xk9z$KV=_bCjYT7nZ3F-P+nu*oOFMr)H!g8P
z4WfyZi{DY(IKMizo5ZeO8(t26`SuA!jk0~ey9c(mzV|)?;;H451p9RSV9&gYOAtS8
zJM0l{o1{n7PF`}!WE`GtKK7WAO_8+B-gyYUg>7sQ9sSt0Y*CG#v+f@COrR6}AO1Ge
zFYkdBXX+e3c<#v8RyvuDC;jNe+-ID77<JmW4%gb)8McNUrN06$ZxsT0&Hh9PBo_Gd
zdYv-GY=j(HT{D@9TCpnpp{mGcZ)I1l*|QEvsy?5zHN`S~#2x(gZG<&@X}XzjUSVQQ
zU&h7(o|=%yPS^RU1dXk2PKdx(9e-pu<~|W$7C-)>%;B3z&w&{~$gXN=pwkh&WcVS5
z6XJOKNtPtmPC~@-!1slP^da|mRM|E}=wy=f4{ZYzR<j8Gj`UR%QRZ+oFHIO4hN7r{
zM)05D<vFrUJ095-9(l+wns{&vimZBjZGeg8*$pnru7l#_)_Wv&DrA!mmtYsbknqV)
za=G|Es##y*D<yo*i`SRm5G|?jt8{DyJRCHsR2P}}P2UY`;?uV!{k=t_3(mY5PTbBP
zac=o~Y(9Hk^N0{5k%#n&c?3*t{aX99g6YNAk}V=V7x$Y|PqcJgSyMgYT87fesGL1y
z-<67ChUUFPJJG_a$(%9$Ns_xeaB#^<7KQeV+rB1nND+Xt#hN)CY9BN7ccPv0!ctr;
zk5?%t?3l@>)qn82mfDg(%H~<36j7?;N*Jgo5DlT+K;z=Op?QunBghRdr~Zonm=+>@
z6`7`N{^Z%lCSIUix{>-R`b<uU0p^OX>qeycDDT`bX0xfL{x$zO{g)>=S5FKSmj&+6
zbbokD?IOVd(~nBDIrUMpsH=9~J5SZM(V{ITMK@6NH0vIhR2-h}n}SMBMi0=k53qd@
z8+yz(*)Twm{LK<0_DD$GLYw1-?Ghu;`#w}sq#Lh<8bKC$J6AC+5TR89Q8?frA0@}6
zV>~CQO2A8s!Yj8%_eu|cs9KfTmNb&YJ$sMevgLGuB*7~st%@=)$FCswC>Wg0B%2P&
zKiQ4w8{T+9U}>#HhY{)pLfPW$SI|>`?mpB5W?YeER^2BJg|U%uR?~+W9o1C~xupe%
z77=CCGMA$gmNje60m#-vh!u;1*z7qbCEEnjxo<ibs-wPWxJQa<v(t$M>yN)En|Fd?
zljK<`UnA^kcfMhBBZ+#Q7LCzLJR@BOu{hs3_!htjKk7@#kSXvVRjVG{cOnAT5!EKz
zfdf>(<UcWEaPPzm+2+PHY0lk@DWPd#PwJ&6Gy7Z%WQY$;SW1T9Umn-~>Fsk^C4yD>
zoJ$S282glzR}?eU*4H*EPf*P55SXcrT29SW6}Y~Eic~dPmf5((71x(Zi*hvMn)50;
z^qq3-I_n*zE3cliuHbxNIEOdwl+?;>$w1p%o8!p&Ca(J${H!}_HpIG(-$t#{HKquD
zn#5xM3ot9KnUNidMP3wSk`!Lj=@F=<U?NJX3c@@JlYI?`r^xhem$Vq1O*%<g+xl7e
z)=VK)@5@6cB30nX&L1Uz__x~6cCtST?c*GU+0;gGBK5*T4FsT_2@<LawZRY6TX{u?
zgYa_mc-k}<Q(tB-)hmXI<uYQBuu92iGBj|MD$uB{4K1pRWc~$yvabc|?z_#2nB$FR
z#(Y<V(rK%<3w;SH6C!B}J)<0l@OGT`7j2Qq`7|7>lef~!nOAZ}Kk)zI<b!V?8S;{F
zM@oX6%3&b$PXT)Mns8s`8#0V7Pq7V52kIxyFWel*|41p6Fc-cdm?#WJI0^aIro{w4
zS-T{=S#38rHFSs|E<blOj$|_mKA`M;Xb+_vuw^W+x$@5`rX9`wpj8Zep$2@KKqNM%
zQQ|~eUd(Ki9tp4Gvs1D@o@f~zbR*SRFLSx{Br-|XTsE*ONne_y!PFaW-im&1^*)h3
z7%_pY8TS={vFgaCen|anTLKHm=Q`l&$xuG+VRL(g`GX9{LW%I)6b;LzgJ;-MdG48v
zQO6B7HR*!nIfk(Ah6_8ZS%|2DZlKmPJwBq?xQzitc2VB@kpzy^mO2bOzl!S&1t@cQ
z(VbxYTDU(<KIzuza<wZH_D}Vf`@adfc$sF9wi$SslRKzxHd;(#L2zxu|4mUuge0mU
z%I4rcng70vgAd0<Q#oAV2%Ts=Bs6)DacxP*PQ>qE^z&$GjK|47R<Oc>VP6|HzOKqy
z|BskWb-(;yg?3UisYKrmCz`HtVn%XJ+URh)ucvpAMf5L|8Cx}JiWoEPMu&^;KU|2D
zksysAB8_;~zF{O4N%j|59p@OfJCq9b7d6X;ap5moo7UhpM)>aC$J2qhwh^cWNpx?^
zu&qb_R<!%H5h?pwRbE)7+f=+l2iJ)-Yc8(Eb@?0M@jH}@VEVaI3C^JdI<*z%{FJa8
znMxh^C;Qvg7sISMYNBsWpEN_3srbA9OuR9Epebm&vBS+I+_|2o73rgq_!nq0eI$BO
zxif+IE^mSMxhR%M&wzEG9g_xLV(xKLY1&^t@_uGk-OuRAg)b@~o84s3!0b8>_@&b5
z#$myd7VLx8g8gbDt&i0uwDO@RDe9?Kd;NCI=SeNz759KhAE}XG+waMdH2zZZOy1+I
zJDxVdY1eZ(T{G5e?}W!|P8mLmmN(AiT}b!d|F+2`;yCi1{0n3f{<X|E!f1TlH_qy2
zQp6a0Q=@wB-nL}MCd4qYSeO=@Q%!B|d^ds3b7}I0JU`Yz8O>s)V&)oT)8-F<ambai
z@8b&DMXGgs?(KMiWbKXl#H8?pVaF6NTV;5<;-ickJ<z%FqMq#zI^2VHPVUa(A>&PR
zuJl>#Sa?$3$W~6id?1haoYE-!<IOMAczNo?Hdz^iDj(QZrbCSU2P^Zqj{0uyh83ij
z1!LG`HMZ^5+TIhxu11cUS9-8TVnxJ(xQRa1r*&$VicpJj&zIy9K{lTixM%t}n@Zd2
z-K<48eAkaJ$nMR~wW&r{@Q4>#{P^-@T?*3FJRYwVv#E`ymyN4AOd|Hg<T-wwz<MO-
z2T_FB!?os^rY1e9;l7q4j|vvwkSR>#qL!LHa=bU^d`Wm8adWPdIv)yrupR5H)Ys10
zs(EeWbB#SboRak}536_@j}Gz?JLY$P%c&<O>&7D@dC`Gi9vkxSl&=XY>-FA_m+P~v
z>7?<|Jv`DlOzFrMZ&_DtyRV?=I0!+PQsj`9sL}GNYi%Mq_aNmRJT-g~e|n&~pEd9Q
z0+Vns-^!B7EJO5Iu=Qgqno9wszC`BZZmxe$wnDx}Z1w<a(DHM1FHQ-TW&G~F2p}yp
z0RyFjDXM5`Mdb0(^59$U_yfN`0j&>(bPq~PEYK>s4yri|*S<zZ8hdI!WC%{uT*B29
z8I`Fdp<o*{G<NZPpSi-`+H-D1dtq}ei08vukuGfq99mPy1ij+gzAyS}l^P@Gh6Pu!
zx|XWZnP7Ci#h0I__LS0-#vkkOynws)^^zQNqys;hkNBGolJcWuvC?w8kj=JnNsSdy
zF7mEtjEQ;pu;R6Gfg20$q^GeF<3l)E`HvZwC;>mKod--*tunu&a}u6oMNia|?}ilL
zMopZCaRy%!s3TGX#yl<7sOlrDW?kh?;5Dtk6e644E+{YjMvZp@6y1#0D{^W_UFy(2
zug%misfqjkQPUMTKzMc(KdpM})XQd+-bccoob9VfKA5_6*_05dmKmYTAn8&`WZ8Vs
z#;GzaI<Iz6x?Jx@I!J0lkti)0<aab!@-eAr-%Nk?LZGa5e_Ip2`c?7K1VXT`VRj>A
zaF_Po^(9}&597_|?W@GJ%>YF)Ec}MaDqGvKfl#&ha(o%nuwFtSft%QvoE6>1v;{4Y
zn({d|oFJT^lJow3x780Y`ipn@lpj3^Qt;tq_D$$t^$7%bF1jU=>DiGND8J#;H%>Ab
zGOc=CGAN72pep*JphyY~oFJw!na<+4GQaZoyNJ^2lI8ltb@ih$l0$&|@W*Bp2~{1r
zYR*(9uDAF};JAnVtV#`$-^04t(>jD=y=;6(VAO7Z_^hUCGnP~SLO=$0`n3Tt=0-#-
zm|4`gx2He;fSTj_-uWvQ;o{t2DS6@bbPI<<Z@EL>ORFFw{WeZ5Jh$S4$l`=RIeF?d
z))^evC&d^(Nt~|8`@?ah+vv9zZ_u44399Y4bFevil+CPh(PO@O+O}udZ`B@4y`D8n
zlEjL6%kQs<Ce!TFnn!;&TSr7tBe%?~rj<gKmlNGdMMhuP@PVFlsk$ms?w6x%kSe+{
zZCgiE35I%d?*YA5>yj|ewu6wMz|=0Rc{-a6P^7>jN>AibB*)%QlG(WZcFel15Mb-X
zAOF>|hDKBH@aj3`TdIwuZgk=gN#98H*h>lB&*`L)y{@yVo<wA52Ir>h(lY6&NZ){~
zo!U!ot*>4_j(VEqUm`cwM`XT!;S44IgpIao%)Y(6y@A{4lTJE&gq~_Kh>>{|v$Hab
zfj<0aYh}cQ<*9ABR_@L_Uwk|8Bkug4fen0R5BXVRFT<J-i96)Vo!oFfr!R$~z4q2P
z;ZrawOlA_-n0PWGp0Mv;-h&>?sYC2bKy&@z)NM+7r?k{-b-zA@e?(fChk(ERCv_*o
z1<obP57EE0s99agh<6^0?%!8`mBL44JC<w-kZL?0qqq6lAD@E3V@c#gZTWzm|4m+R
zE`N&<n+Ltz<nn;;t0lj_%^{q2fumqmvOTfK=;!x?WZkLW)H4)QO^Ipa7@Cy*c>`@G
z^n@GAZS!KT1b;__4C4-LC$anmD8GIq@DgnE-OWRO=U*wF|Jfk1@Dr=>&Cu6N&#liR
z7u&;?#a|GF?}&;=WfQWbJz2N7Bu00?S-16BivdeVYdZTBxSpd!and+Dnj1f1Ka*&%
zlQ^<=_V5aCMP6_@7Pig3iE`PXNm$W9Hn|ba`CxPD>s?KD$gT_0!!Cq~%ZPJs!?SYR
zMQQ}9F+S3fr8m(k#4#f?zCQd5G#~t4rh26vbcS4AF5k=|q`vq3cPw2_%ae~}8Db`}
z!#eD-CvAJ4_kzl_i)`t`I{N(zr<FNyjwMUT7Bln76I&vP2aQWjx;j0MSa=oOj6PAH
zTw@84@8c_02ISTC^4-_`)p&|L(Z>;@(<JnSTG?(~8MiM*mB7}A*RH0rnw^#ey7fmd
zHkb-WH9XsGMhT}2x^BF?O$pcrbmoFwkQdVO*HjLqFJyFMTW%x14WewH5b*s;VO!fH
z@tS7#en7XK03H2eaSRAXthRl{Vx#<Qu^A@6_Aw>bGMdU%^RVUd5?z27S#_2`zn=2#
zP1{3)SM9MTorM$h?u*A)6(!}Q6@j^j&y$SC9+H1^?jE)@6VIId*7Z{RBkvshjR_EB
zgJAPP^D_Vbi8}#ks<WUHI``tLnxhE_j!kUAtFG=!idy?~&kp^opzr=>1d7#n#kOyi
zcFZ~KDaA9-2oI8jo@u{t$%#7FyZ3umzXtndkIWrC2%T_ZAI+Z6w<Q_w57U2463Tgt
zuJn`W-F`$0ZLB+y&r%$h=g?!!p8<YyM}Eg?J>0;X)6(Fkidz~aA?#gt<kPyyD9!lc
z9R%6X6WWd!24%&q0CTt^im2E7=w54v^QkpwkeN&%x;=fe2Px;d-r3|gYnv4uvw?<p
zJuX&gCuLSlJ^~k_rj%qIOWb&C=zcEQNn8#GZFZ=oKlBVcrrq5*Plu*;<kf9w1wJIA
zzcSVKeCoPxit&ZA1NbufAo&BuFr(?upHOlUyW-35-<%>Ix+igkz2<z*d1^T-f8h`o
zZ(S5!sYzWMSw&n|0&(3u@_Mir@Dxp<>zKhcamJsk230x<2_Cs;9LjE1UDz~)M6iYN
zde&3L2n?tw0xo$pt+vA9U4H@BuKV&EMz5VK9={dmWoT~>V{e@H{yZC)f3I|2Afvv4
zm$O6WL{R!W<uxZdy3>z>R=1LTE@2&VjO>2>5&Ho<9x3l#lH;pC{ev*%xj%)@%{>o;
z{dQ!F3!j5~(eQv1*BN*7s%g?{%7cA!isPJi>m2(nW=hla2`<hMNJkOQC(K&{QCVq#
z$<R2;Q=cmLxc64@93sDgWTb<eHb|*KTuSkBwrm=855=DR1sFC2BKe(ZlC`MG#)+J@
zQ87WwJ~TD{KhC>avME~%hC2+C@DDsvxKcj<dD{`r{&Z|DbE&CxV4t%;CrQMC(O=7|
z)46DSJno))&<mvxYuQr|FO3KAqz3FisD|MdnN+9|;KzQ4Vns6(4QMJUh&~q3wPE{l
zP5sh(X+Ye3y|*r};UiASQqM#3Q*t~g{i%eMgDR43=sr53?6O|9R4Y1Wx@sg8Qs&+5
zc_TISn!V#MV1n0IA8VY7PQ<PB7ckOkUe(<VMg1h;Cex`33mV9mF^+)Zi3v4ui+3ED
z?2fM-Z;5JLFwJ{E)nf4VsRYojx-B8>9hRNDKTd*p&GbA~?D96IgY4b2*CnMW0y-;>
z=va_%?KeX^pF(e>y!X-%Q(bQKT2A|3F=Bb#5L_3*353pG4^Ffam=sxG{VYH@{MN7}
zbx)tL+rw=&qzE^VS#e{Zk91?)N33N@a(P!L*8?Q=7Q=PW<P52+4yLa&)K3n`S8fT=
z?iUfRpVqQ3ji^r6#!ZrtzwnGR#FDq;<E>gP*L#6**PWj%k5+_cv+m%r4YMT3r~d^i
zy}KTN<@ki}pZofAg6YA_Z>tc|Jaj0NPS8)KSDiQ4mr~Lub3{tmOE=D50)$Gd3)H+^
zj2t%O?hJ7i8*h4?M^^hwpDPjGi(Y>*D5X&qW2pBtv=%SS_nr8GJpDauEWAk;?dqD*
zTFl?IGi2fo-?YkYEMg8RV|iM&fN-&jqs$828V}4drl_0(>!1d~Y1anB;Fc^_hb4)`
z2OJZR$WGq!@eT?IDZ(P`KTYghVuhVQqN59Vs&EnX`;Qn>%*}dFuS|gC&2z>558v^A
z@|)d%9Pas}JNtK%|KOj`t@C^5#NSR5z>lttJR%Qwd<xnqY$)4heX~d8_N#KQFyc?X
z8;_a=RI_S9m-AyM+WXk?o@3<~RZ+w8HNs|!jIdlQi+QD<!=C@rT!m?8+2_P>PKeKl
z4z{e;KPI_db=)s&CAXA^TqZtisiXBIoBfe-u(sz+$x%hvynMD$;1slK50RGJvv8Wq
zesh6yAi_T`XXET5yJ?J7^`YZ;abYi2b-;ss&$XBDFVBD64y%k^Q^fd(1)p2EeQ+oA
z|LM-wm~89Qpj^ZNP1Q)jh~9J8ZIQKo=Z0B2%_^jl*JmbkVuxjoCOp&9<4g)GZWHJ+
zBS%$7kR)N5dM#h$KqYI8nywmhZ{VhAq0(a%`0>OfwF0XONb{oYlo3vbIvXFdr69bu
zv)_y_Tluew7@LcVYB5OnC?YjZ#*Ft~{$FJM1ymbf&<2e2YYP;2C|=y%DN@|st+c^|
zyF;<!PzbKY2_8I9B*oo=hvF^;iU#S&`@a8k{@*#@WY6BsX748FZf5q*JoC(2y2hw?
zR}3xi+=@&cqHq@Z{3<HixI%WnH#>S?yz_V3ODfc0K>w|OE|3cBRm2XrK5d$Q&FZ8j
z(7W_gM<<%~U0<{IC%)+>t01d)w!_`2g#D0%W=K|+gclKE3B_Qx2RGDxhTOv{h)K_=
z-(5-n-N-5O@Y~gd%^V9kcvt_`l!$qORoEd>b+_b~uQ!EnWHuD;LuCKl8|w>Dkbi0+
z4WMCOOnB)28Q9&i=feE*D<7m_@qwR9(`|8o&QcGC`=tSqTwbjD=F&XDM=EE<O7dq;
z%RHnBUkvn`d0*kAsy|4%Z?6R4*qBhC25`MTn%xTdB}$d*FQ#E-(>)RQQ8Kf4XLB?9
zf&XVaWs~dnH4kBaaZzHlx#hM<`BF9sKdqj?b~Jx86Aj5L7nEvYQYMUoNal-IUx?Rf
z3IK_atH+A@i;Q8FXSwe+o;pbf`X~|bPaDA{D}LcT|4^td7B6wv@E6nzPxyk?)IUnF
z8IKRP7FzsQ67(xD<i}UVym#{<b5cKc{y2{SghaEzL#gqX-djjd&P6o}1ojqHiFvfA
z)YnEKWmh@{cz}})YvH>uj)WbF_ElfQB6nmn#(xbLycv+W+!Lc#S)|?l^7fvf@FPEe
zcTG-yq@+Z~T`ei|*V<%!3iPU=EWPm^*CtMOMJ;)`T@A$@@M&n_k+I+Vo9l_^y6n4g
z3B1hLEZet`ecEd(fF#iG#v~mk;1YWofO9JO>MP1uc=uz*I0FjHY=y7WmjNOnUW(ic
z*jom{H?Jr*;hJyyH1E+Gnxd2zFdZ_A&@1_2>G*OI>grgwkHKVeu5uTb{+X*YG63FJ
zP;Z@MUTmM}k?mTy9{RQ!=;2d9aL>4TWtlG{nw?Z0TCtGQ#(KNIRH$0$MS$Hu6zhk8
z^$XLcNWn4f$KV#XIFf;nJS(@}w8_9eZGxuMA)9I6zOVFbXB$6k(Z*Z3HKrt4C*DT0
zymm^Bk+#mrnd&!mN{nD$8`u9@`{RSQ@Q`uPBmj=hJRKLaLU`hiY&;U0r?uP8r*1qc
zI<8oz0I3hwmAybrQg(dpno#<n+%`1+F!vl>c<K*>ioa(vO@(#{`Bhr8e<-WTEU|@C
z(@D*twEIuYs{c?(pW0CJrrJsMuO@)<Hux7j$*#X=&xE;*F5<0x14L)AgKD<6x8G)d
z(cO32xZ30TblT)$F9R&d{f+LVWJ}K1!_+CsS5akU+^1w&B*U5Yn!uab92!R|@DL1X
zFaPnm_)i(kI{Q{}(6Hz-bA<&pr~V|6#C^t~kduCl|2MX1myqh`U6N4kzi<zAK1%&#
z%LkR~-0#JBLPtszlw0lNEfGJ2a5RDDP|uHaT~Q#i7@sFr;<0{P{rO<supH}=BkPAu
zofxmBMZsiMl=qEU?O~YZAl!?OcI>*O%+jIT2f3oZXyM9dz73NILd2sM=+}0uK9(Dg
zuYK4_A#41>-H}91HBh*`16NJ8=mahN@7z!uMXJg4u55d`h*$#|qVem>tq9PFwzJ<5
z#hdn#?HZIvG_DAjo1+U=tKu%ZBs*S3`G^;>PZ0t7`hYJv?@r=e*%lMixqmilB{gz;
z?TyYUgM-mz&Bh25vM*_y8UJ%YDplT|VZ(8l5Ur<!Z|3<fjJ#Ig1PD<C((&$`Acvyw
zX7~pG2Ibtmegh4P!7E3JoC0sqo5~Eet3eMNBHsC`2aMD2^^ReQNli&@2;Wv43e1Pz
z*#=XHqAGa+D2(1;@0S0}`>dr!0T!7%Ep&<Nq~U97DX_~53Jfc>A*^h+%y7zR?(k|y
zmmevywgCX|zSV8zCxPuQsR7Sww(2GL7CyoRHKxbeI*R4vMZqY|L=kK;Sk1$4lT&^Z
zp@;Q9D1kv*-VZ_j{V2bYtjzqt;5cqHEb_5dj;#4CFkI5gJj|8uN$xjy$M!!IrJ0S~
ze<=7wD9l81ztlF=M1uR;A4s@SX8205tHP?_APZH|v;Zpu-koboilTA+9Uu`0vj}%B
zzo?Ic`9~m^8QW^bN{RKCyC35A@9?Qgu%jl$%6<SjH353Yq6L})h^eWo%mLYS{9}TF
z4AYTVGE(WG*Z-l{FW&-7Xqzso*1yI>9~R{|uBB|uInbIYk^Zmq{96s3B5j1mFXlAa
zJML&;u?gO+YdXV2i)6@skbDRxPJXw>MYnkH>0F3p%+Jo)@2OL;`6Q~ZMsg%MG~&+g
z#@w9TFk0c_!(?WpCAG*&#|KL-0UG+<<nkM5Q!5Qc%b`ky+Ov3Jq%4P2zg5fCv>@0>
zl;EvlUt*JRslsKPD+O>O4|2V{S(EZ-_6_)OyMFb(p{vxd4fez$U<_p4zQv}#YJj*^
zORJ?MGA;x7!F>T~MEhwh#)Y`<$IZ3oH|KvSEuTnO@w(How><Ij?6>p;pErFde{dOo
zPVc>(e?=si(0KLrQtU>j-aaDs>kvS*jg|Ad&??bA?<+qt+}}K>ihbbJBJosrZ-e!`
z`JGJ$08>ANV=l4ZQ}1ZA)>Z;{Q<@B?<6w?<qzf!-ET&RErn;S=Xi5DtQO#PDIurWc
z;Ev;bD#dzyLPT&iX~^=sJ7j-BU;-qjSC2mR-k%|Yn-}H!)gI%u(vKz?yb-@c&j<-3
z3D{$NCT4(v_Sj8uV0Cd0VN&~KQf5m2labGIRE)9gEw_b2C5~E#Jp9+&XiIhdM$C9r
zzQa{W)4O%8=E=%s0sYQ{LY@?LJNgu*s)dsUsuSO5X&|eui+Buz%1KhT&%<w_t0P7^
z9%Fwg)2<*d(ETq6mPH0=_md_X!5P_%xFNU2%E|H%^XFju@(Dh2SYkbQ(fTvMc<HTb
zo5Gf9c3smp){PK1{{v_&BncaA@WId=x=O;yOrRAD7o!)YQ{pdgpwF{*<eZiym_fg&
z6P}NEGx$}>|En<VYWNe~#ubkJ;00`t_SHt8U%n3IS-Zh<6Cnl3$&mzZxCoI8j&|fn
z+eecFR?tW9TAQo@;}-UTNHTeShLu8z;wE)TC>G(|A621{)x+j?7J--($Y4X`4l%~@
z)+^li*c<A}(1(X(ZCvrEzj*03SI-BALKYrq#!!sh#@3}ik-xOHTj#`beZf3mMQJ&c
zo8*BUiOuHZwC~QpWmndl`>k^J|1OXL!)^(Bvxz^_3n%qM+2``5slClJ0xYSeI#ATj
z75PzvS^eKXsK2BnDC-VU;J2!lh<EF?YT5tId}^TiNJ@&jKx7+E$a#10{^m7Gm<y*j
zkhO5z^G#JIJMOE;d@{?6%0{cJD`o->9LJzQ*;A<>_c{XaT=k?U`-c_2sy?QKE|QJ7
zYD$0qPuk2Jyy2gagDsz(E3Bm~{*svmiFrLp>{?NWzU}@IPBn?H@vSE$08N0BZzTJG
zZ}kTiuI<-o4O4fc(Mpe_IFtJSOi4~(E!CIXzpL!dMhR466pr__B3=;KU%O|xr{|tK
zRd->Q2Ia2<=;9RGQs!cHi|Iz*esoXTcRMpkF*Z`GODA=M(3(I2P+2RyZlyEeVZW8#
z@sG={8vU<OS4^E;9~52gWy%CGNsaB@Z5nczv>R-vlG<pZZhsfTXY902i|_Y3U7YB#
z&d9{!(A~14-)F^5oSj>6S+>*pE%qyP33~D_!bQG%ZusC+q4xbNzr<bHL-UzT9w_@f
zu8LYrvGd#Ll+#J4iDB&@qohCqc`6V>tNk6f1s*;c|3SlNj+LsaaWa6C&PwlJk1`{9
z#o^~vfa@?O1!i}!l=|z=i_4cmOZ>eRKhRc{%~!{ZQ5gID%z%nNa~o+zPLB7{N@@p-
z^*R0oib+i;4ERdk)nh^8LP678Gg7NW!q@egijtY8v+%R*7t{1t=JXvLI>VbeuP3hm
ziy5k7u!qnpj{H4PYGOh5Hu51{WQs5j-EwbnZAJPaj`Z6Ge$Vck!}_%ZZ55Zce^K(@
z{=BLxu-!J>Cw$2>$#uba7Q2gRyA0u6^?LAZZvRO=`H`Vjr11L#hab!L0po%x=P|-9
zTkEJ;#<#$?!^Ck|#Bf^S!S8L9=2FvQ4_mRv&FzT?&!kG%I9I$?$WVrp2ZL7vw?VmC
zKkKA(am)~?1OMsxqAKIyNv#N+{X>bH2uKSjWD1ucx9}FSAU1yut?Tm`+_JS)%drhr
z1*&6dw@hLFB)IHklq2>Go~^?-)QRzb1TAYrI8^Bz35@JHKQ4mkQA}!R1v!p_-$^_j
zf9iFt<J3s|hf?zX&*=XB`xx(_Q-1^EsR7xEwEE&c!^3#;5u}G_%#|TSrI5sf3kn?^
zv*~+m6z;_3&4Dd}vstebwrxayhyMZUFSd_FpC%)||H>gxCLU3j(BjM4JWMz`8w%XJ
z@Alrz&T>(PZqaDT>|9K{3o^g8Ls+@F{Wu!m9hbzpdc!Tn5*t3LDDypxRc8123*60g
z<N@V-0KUAo@JK!p4e>LT9J!@3@29~du05*fxOGk+m)P%>QtLhVZ-*-@WXo^@(|v^C
zur(>pAv^WBc+fr^*59L@G;jHBxOgJUyh;gu`MO^trV!8{oR!Qj;xlq2YhMs>p$ZJp
z0MQnuEY4N(4Qi-X0|UFd=?<?@TRTZc>ZH5{t+eA!AEc2Rmm7hk36iyug?g9N?{)_c
zzxumqOcC&PLgsM<lEQTc$5(0M)?$z!gr>k2|J8pnxjozPvdrAGa`LZM2d*S6RRt$Y
z2NTjtq7XP5V`It&2Xdwas4Egx+Go%On+?+kUm>$-)eApgR@l1o5*d_A1w;8W^a`jV
zGn|vN6kxWVVgf@A{u@xKl8&&s{tX)!v$89yvGT!!5_&5EairG%viFRY-U}h`wGG7t
zyihx#@bmORA!pu0kk^ikk%83Hx8{eNC$E9$^{0<S_pal_yjB6`RYi{vuJzg9V{bVV
zXs+k!9gFsv^@J(im4+I!BagFtuSu||WfkwU8c%55gd~1_+4u;2MMkuT2o&Y@>!z3b
zX6fu<H-~ux7&ubTI&8eibksXDWaB&P`%A91YkYu1`#vdx^1Ff;$y<gWWFPFs15Omp
z+b;sf-LvMc5WhneX>UV9Y12w5Y%F&@j^jw=bvv#fZV(1bcZn<AyZGNLJyH!mMnKg|
z>NQ#DX#vd;;f;G}8_jtaUUtZZFN{pRNZAEXtB0WM+?J=`ZUD`4^Re~JceyJ(xS%j<
zYIhGEej6}x_!s^_d~1Q~QKSBFOXP^;Yd44fJ<ZDhCX7YSh5<baeOKGw<0sg|mS6i6
zJz5H^4IHiG=V7$nSZhhP-TN6>nY`#dowRy{gXb33;saPiIbPL%Nv%yuSEK^gXC`F7
zIIT}(+v7+%_ZI`j$5?1HcHnNv)8io3D;%+#i>`xIl%kA{sRx5%{`<jYGFE(F7phEz
zN#?n)t3n*$pU{y6k9z3V*4@IxytNh<51X5U0BLNz7$W~7wGK&|-Zy0Qdtz+8^*h`X
zT2pr+W55jk48%9misx&~$=)a^$87wEQmffsQ8}F}U4i=oe~n*YcMCs%IK6={#!(w>
zt)mWaS@-hGTMs4kcbgL{sci%7IOPrYA3k8+^KEz;hbl>Ju#^JnFOh%XxldI65<A{#
z^%Zb}(SkT0mYw5goy!Q@k-twE(G1ZPY`@wYob1+{lIQj)sik_12*`YW&RB|rlE=U|
zKbBh7ya{(NqWQm#*>W^)Guj^UMF<lYuc{0mbxq$NUY{8*poQ1KvFuLWNi%<}x-J@e
z8zlY?(x|3EOi`<EvAyz-txQ_A{yO6-DG}%nM6W?E^N;*PX?+NR@Tu(4WVs`=&4IuF
zp;Uug`u2F3+F8cWHESi9AKS8h<VJ12di)Nckv2+p9(>=shneez0^(RT^v^B$x_G3}
z8W54HB+1Uq>mIn!#q$75nB51}Jo+w*?2@<+-$n_X_%m-Mg<K}vZKoWGwMPFKR99Cm
zsu}#CXkvtl@;h`B)7YLF5fH{Zw!OsMXK8Pi7#k5Nb!K@HA%D5XlVprP|B|Hra_up5
zgi8}B$#f~n#_!W-OX#R&B9|Z1=Nt)(t+<3xS}9@^bbr{dOZEZ=COhRSnR|BkUZKl8
zgn*o)rF4#h$~>oy8sa25Wp~Tf3n1)9S2}UI6tADlC>2$YwR_&(uw2MKEA8yjPQI&Y
z(mQmT>TVM{?Z`7)-e>{|i*K9s=K6Ye*LehRBn4UVeX}$bsWiDhqN6f8n|?-a)3_?&
zC1BzjolQKsF2&SJ^Zs}LaZ%g82(!ky>mlDR`HnS)xb2um++HPQ`5#JY=-<%yp<=o(
zb=3HN2;rr+P()(dMoy^@4$4yrBEKvV?uu8U+sv2$P;cXlQHcc2{V6tO$S)|4y$T9h
z5n1TE9;0a!i%eBG^6)Swm|m5ACnNBJJ%@z7z&o4B<B`l7dXC1vRHV_NQ6=BFUlQxi
zskvAf^jg^G-8gS(J+2T+evWgE3kxaBcYgy^(4syH<)X^>Urr40CcCM1GhXnw{iIC1
z*1IP<mBWye(4=K|&lw{JJ4S2PaXnr1hW`{Xt|W4L?%X$h6Yr1{c&EG(2K|=OpC;7j
zfAsGK*m6_G<istju%9ewy{E|5z}orC_tw~SOOhP=cMf@<XuODg&&B1=5I)C3Saj@p
z5|<z(nlY&GW83i6(7IU`FLqd_<utpS<Tw8#9Iw86bX*=@9uYVp)Ab^#ceT}A;w6JU
zzFFzY){dOw{wc$D$fTLN0gD=lSsk9x(n8%y9yMYfp);R&WmJkdTzT(71TSwNa<YpN
zHJADFCxHu+tQ?TsWLd8A{`}_yUnP@&0I6mLha2udpvqZ7d3SU;yS4z*>n}3)_Kr5>
zf$OxoP)Ak~PGt08$zUy|^vK#em71}6sOXpL^pO&6_YcJy?ZC-M{%zvvt5y0KF>e2e
z5#B7+N$+*Y8~Wb+b~+Pd@THbTpkCDAW%wW?O#56N&Ez;(j30?Bxdb6|owx1!Wspui
zu~%F-kohUPHmTyq@{!g;1ne0DL^X)2BU;2&K<6GGNq`cBnWU&ojRSuOs|0_{L@A(i
z{APucxlotofn^F>o#r&HV`i)r8!gT3vgrKrjTQiQh<?YF@lDIs$?_FugmFN6(L+e~
zZRDz@wDr<q?UmH-;2&C|7iT&TF0~arjQzt(<Z_n*zDE&WR5C|Smz;&y;9bJUo_a#Q
zK5Q1}o#Zs(S819?6Ri0NWxBcU0Ya6rqS&>}jVH}3NQ6EDooqP@UuYQY1pi0Fc;R8Z
zRObC(`R~>L(lChL^U7$yq38QZ{9WgZ+t>f)U%XWOmHw|dj`d}!|NVb0{6*>wU*1!&
z)?;#9vDP)~SlHL4=_nBE$SIbW#Dc*J{yLUK3M32v(@jW7h)Ux{a8&P*7sYYsFXt$#
zPyL@h|8vgbpB$S9#c>?_2gMyamJF5`an~=quN@a&_C4oX-rYQ5Db&L^nk`FgGB@ov
zHkzzWFP2Gvrfo^2e1LpN`A{<KG9&;3`M7Xac$pYMn@y}zg<}!_|5waqGFSZjOG^G_
za_z=s*2b6Z{F%Lwz7Yn8Oo2aAmwRl(txgl!ox)D7oQ<TOKP47~C$bu6ek%pgj}WzY
zQOBP*PE6Dk|2%;hnQ>GZ@^`p7b<pdTboipuji2S_D(i-9+oATGHoc%WBh^B|_L@<t
z9Xg+g|7R=|D00#d+_bk6b;%O5M*4#tylv=HluLn0;^)BVHv`E}Nm!3524^NP<x<fS
zeP7&7#D{3NGwMFi|BtwT;OzMDZSO@;VVPVwOLtV0|9kLSZj+D8#B!&I?f7!8fUVP*
zP2;jttC^VCQ?1$iJRObU39^2b&7$B^hity%xkEcxDj#q;lhKBP>UkX$&&Mss@NPN9
zLyHA5c%nYUp+AFH5x+CT0~78VsZ>h!+TOOLMm@927>$nYOPNa5X$?UIW2ev!r=((J
z&nj<TEFz}U?6tScf;6yFRLW&eB4Y;(a3RI;anTY+Yh<t`8f&vfs#Mukf_bd04ygbc
z72%NLClV~YB~=o-!JnzD)faVXj9pBWv@~_%LHq<d>4bw_F;x_TdnY4F_ttLUkhd~2
zR2bYKLz@V`U*mrE$jIfWzv>A(@+A~Zu92dDt>=@t2omoUuxMY!DFZv~2V!&hwe1ru
z3WsPDtgJWX!esfGYLWWdJ<Jk7)sZhM#swv03=!s_i4J&QvVj%h(Gc;lm2%NcCUx+z
z-lLbhE}?ueYY|NObXKUTbs$dOJ=GkG8U(Yu@Fx|FQ>=7T*Oq09OvAxl+OX>Pf%0!R
zy4i{n4pC4U%t!#4h$mHTyv@H`x-ZK!$ejn}(CHGjr+<o%1(PTc3(ZC+7*B{1UhPsc
zy_BxpQlgF%G-60h9c0x`Q5}jgj+Fzo$OE!-@j3*p-IuZTm1ybJMsnh^Pc4gk6cZJO
z5{VsV<K%X9igh;fM2S_es$ro@Y7YXI)0r>Y%tV0l`bD4rk52V}>ii$UD}2KDyszo_
zK57%me0KZ(zl!|oe-!y2N>opY+CP;4RCQl0wC)q-RvDYBZsxIt<pa{P_kXtUTm%21
zWa!@WyfnS6TCiKmTa0$41)8V!cmkx|Ur{P$jX?Z}-e<f2wkzF5cie}!Q(n+ArN6_*
zSg*e}(4ohilcN8nd380l7s>~4r<Y6yFvJoN;4&&ToJ*%XMunZoOW?hHw4Fj5=M#xk
z@5)N)j}*;QmZb{Ny|&-nEIU-SBw-8O0a)VLu$ib;G3(ycl+wMG#gF`duYz7W;9rw}
zdnKzx6x+Y$F8V#15dWn)!jF6;yA1utxffK3CgwOlgwXhh@{KJvq}-CBoKwx8fk%5+
zUBS3VBRddFAf|aJHUnf!R>G$E4@IbS@W)gCR0@N{W-?fPWmc)|v`%(3nSsvQ>QZ8x
zwa`|l=k)_Q&W!bVf{D5Z|5(iBZaJMOU_3jsGQjB?|B{n$455IZPnl0iW5W%lN*Q_A
zJl-gKO=e3c$tTV253?%`!nh>GpW@@|;_~DlFS8~0kS93T;oCj)h!)pN86Km<6Xnqk
zX=`|r%N2tJB;vts0ORUA9;AvUc~1%aMCF=PaUO>Odd!~u!&*j`=*)o$-KgIiNfp)0
zxGTHlkW`}{Vh-IPKWom-aT9Vo^mOSyGSrmOWb;Yc;XM&-0oF?ztMQS%sAgu}CN8T?
zpvLT3a(|&Jvu<8O0a#TxZ%lr4AbT{Pfoi-_43A5*HskxSoM{;)+u$AFg)9)e(BQ^2
zaEcu;^ruoLkTApH+Ohg#g5Hl#y!${2CNJ3{n2}2)<tr~#DSLM2Wx=9yMR?q=95QgI
z^gVx8Vb)S65g5G0BK(sprWnCpB;1{Fq45hy<YYh8X)Qey6K?TttPHx@qjD8_@)KL3
z_?Du;|7xKy{LrB;^H)ZpQavbnr%OZg4?-ERHp{%f%_U8wKR{H$Rafo!>p7P!3ft5S
zV8dNdgmG1{^z&p$%}H+d<XS{4#Tnw8^9lW$@Li!oP1IUrOvGUPs+wc%?CiNT$1z&}
zh<MQHZDeUaOQL_F&nGy5@KErkzmr*uVdbxm%W1rtt7Frw1?jT<BTj6*tG1;gk+V*B
zOa;v;o^r5GiZFt2^w9YUbr*1qx?wjQJNqZ5C5Mlut}xt>EXUian`r^N_?$2B%8ns3
z{Lnl2Y*AU`5#uz|@u1O#$f%1frP#0WmT#3`_OjyYcV+-rs|RagoWEsid<TLi6BIi%
zywt&c(#`zHQ9`y<!e?QWbW_5zQCDMOGz~bP;DY#pLnWWSvE0(eW;(cJ{xuoybSe&h
z*TLssIOC6T_vxP4B`XM|Zhee88-HoLG5x*UWvN5v5SZ|Z<0?COcKDMm_gIPai}4VB
zVPyXI`W5Q`EN@;+$jfBl#dy&1y_gSr8J#b@{O+&Ah(5}u6zKvW4BDSPU;^RAGv~ek
zKVl}D^h?0-Zb;yH5rhcrVl}Z7sRc<@wBM3n)s1I_rcGu*^7+bsw=Rr#@Z0_MwMjVi
z7&Iw(TiM!XtDeoSM<f5+t7(x5JckI(K9d|&&lV{69sx0{XY<>f8}BKq7wp)nWo(Ri
znN7pO$JCEO(y5Sq-p{R>cI_h|ri6FArl|)<CNy&^pMOb~%2SWOyK*z`_UgL3_pqKS
zD>Pj(Z`>R?;~vl6x+UigRGYQMe#u!j9x1%B|8tLhSa|nRhpX_0D&rqY^hOHVV}U5&
zeJ9x>n&|oG!S+SkvmQWPcOhau-|aIj`DQHi*XN|+rIWy(eZy?ZpRoOB!**WFaD=wJ
zJg%TcL80{J>iOLkqO7q`3-W@jrOD3jOqI1~i8ypJW~j%gWKKPnFoFmJKQ|GRU40<Z
zI`PoM$yIFKaoo`=S_>WRRxxGQ1o*jDc>HpFs~HcMm$5<{a&|pfHTj2<ILj&lDs|uJ
zt<1f)(JzJ?DTrh%oPXfVnte|AhcaZFPgUgXW0Q|0o3bDZu#8Rj9Y)9(!Jo0LDz|>;
zBy!RV{(S-ZpgZ4U6`e+EynfbDXU9r71d+;FV1sJSG7;tJVTdf!#pxcrd>)uxxJs}J
zot?TP?fE|x@tg4RD4e*MdydfZ6vmxX0~V&EBdtS!rRdrW`I0v+Hq%uLvXCs&9RX)+
z8?UWw*v%|f28o`t<N}$83a51p6Y^N;*pu`hiU*XhY;s$_lX!l~U|S^=^&5*uEHbSM
zEaptVW{9myWvs=ob|9=r&g;p#F+vRChLmFJVCE79cSSAVP$W0p>}k1Rn`to~OQpy1
z)yPn}*IX~$F<iDjPK=QS^!=iqQ{26kwFAVx_ngW743=)F5LcztkR{pCh&^jOV6|k8
z;8$g<{B4G|G}A6Z$U-&!A$K@@KtRtLHkK-W%U%!-Q}>=77^CMa_b#9nS6@|g;7k>a
z;nYm7ODUZ!lun!4=bEmX9{hq>r+t-FnzXl=j!cC2fV|c^u{K(Ucu=`aAg3eoy|;u7
znpj=r%|@B?^cBbejDeLDXQd%o8)qkndH;s<jdRo8j=W{2crkVZUxqf_qqR|>rh26j
z%_?y_kz54DcANrWib<uIdBsuzPhkm>A1`JzF(nygi1kUM|IjG)<u3&t_2>4;y5czq
z^mE}KV=%E6FD-~P&VxDev+RJscVO-<Hwve;?id#on|YY8DYuy<0<+*=Y!wg<T?JwK
znpr(TEayMrztpQ?95*z_lJ7nJtqwe17%a9L^Gt7;cvXFl;z_Ohm|~`MwJ6xtp!|}P
zeJ8Sa(AH8#WmQ~9dibdHoIGx9ZwXjSShc{E;X?pfZ%5s)RijZFM3E{eE5I!Lkq8Yf
zTT&>hx5&IZl+8Jaj5D6dJ}JV1l9KIYSaogaiAj?|Ub{2hmrQn$0k)G=J};j(7r}VL
zAaAA?@9@DtCIQPfMCmS`l=Bo((6_9z*0@z(fBva2?<dZ@KAi!)Rzv_E;d;o~yc-G?
z!h(z@qhV1tiOb_KI<I=Pd=kfZiHUGq71kp_INr0|5!d->7|1Cfd%RgIyq7W={qg6G
zFCCvA{BOyDT`bm*-QLzFrV%>Q$#%xUtnHp^U(~Z$*jRds9tMsOl=7)mZ(5DedHAOD
zFaaa3D*wkC!BUqnQC_a+j^&Pluo;8hB&c_6DId`_9y{B5PvtGv)s5%dpX{Sieakid
z4@DQProRGJWJ;$k&4P|UgE2|p#p*;TeB3NQ=|Gcv^2BY!%`}Ke<Vej^JvX?G=t(j=
z6R+XG6OEj}pIJ<$jB1h~w4vmdY=jL9+zI8WtSmtcNxyRahcdiIdccp~4j|^gXGC<+
zth>8>laJQ=;tQCyQz923BAa(e6>QBGQ`rDfsDxt%;-5^9m856>;%wZ_Ef$vnAlW@Q
zFm4W9d`sy4xJ5*7>UQ82Lsrf?p_Ra%1|)<=vtu~{(PQOgvZI>$M*VlcGy-fC>D`Uf
zQw_DiJXqO!(lp`>%A{;X8!>{s`WcrVkz)z4%7SSz7V(wVG-R#A58<ofqy+3UDd1b`
z6HQAQaC_cUoTjOp$vR}E#Ph&4k0F>}3E*f*qU`Vwg+bfmDQUud_m-b|pIgPt5)AmW
z;le39dZhGeD17jwR7<u42-8!F6us4ty7N1-5b)&nG=5(2WB)XB<22s*-X=<n-mB?D
z23K`OYpS*UB$}-7PTGmbL!mC0yLhNoHaR4u%q$be(@a^d(Cl?9Aj0N8f{59%_6nBI
zP@>sBJncM^4~}ni_W(nz<vVZaqp?@XI8_8d*?enLvIS2{grYW2!|Upmz7$J<ev<jf
z!ZWU(hSM8bWis}>*g1`kIL>5hw7Hy)j2ZEB7U;+XFUuoNnJ1u+(D7A4DG#DQy)lcu
zZ2keGBu7a^zBKk93QWm5#z?*l-!=E$a8dT~+<^*5(KbX7%;MB!CsPS=_qA2}(hLQx
z_&gBz^#B6mxQwi(QkJ^RXXPZ<zqCppxy*{ysyy{+uhNYtYQ*X73Or<rRMThiYT_}S
zYiaH_81IdQOW?DEV~;d)&nG&av-!^DMmkZCv=!AXzSrx76qhT@lZwSuyr{oSYZMgg
zF&-Fh%g+70t;g#e0n8XYpMa!!(%-fpefmX0XrNYR9ECq55^r7y4wJK!y*prMxgoR5
zrl`AZ;_OIQYD~2dA>+tNY?2(iIZ!uvRi#J$j2hUxD7!Bt{l%eGKcS)GRn(U+<Z@x^
z#vV}PG=%<XGJ{7g0IVpD<gWRa&Qz<3u3&t?f3+jWbj>6@Y6F=ok%viQ83SG6;Z+)a
zuIQ262_AJF84tO(>Ub*U16Lua2D8*^^v^}1;fs|W!}T}9H*<k@?JYYNMpk{ZpS#~=
z2Vom<P)&w5zd+=tBKpH2b8D=<XU>;mM<WNuo~hVNBWzRd8Yy?djA=1ITr1#_d8QGJ
z?T&Ou|5&qvA<j@tNzKg}>67f<hK-QCy{9P9=x||#WYuDMjfw%%mn@<uxai5$Agy)I
zM@T~d)JkJ9cX-tJ1J$s`wLjTavV&RoKa@Am)Qg6yU>ACq<bqOWStzBG%Mpk15(LrF
z3$Dtlbhw4xxjd_;A(m&+qJ*q|q&~&aYB*RVOr;nXMDcpk^)q(RuEMoXJW>%}!aJ*J
z!?mFc7~u<lOFJ>i5JCN%huB);1F{uhd22tGtK#>&Q@Y|f^De*TH_{(4=ELiTOlY>)
zs-E7gx|BHfWA(VtBNfx|z@qm=)vw#@tQ4r<a+LxP>QM!6dO>IUnR3o1m;NFe50sx&
z>PsLo31s)|)>^P}NcaL<+Qdu?rwo4XWw2=`v|S-ST{RuGDJ}A-Tq$kzOYpZsB`fc^
z4vDz#^6OFdEp)j;2(?zSJG2LxuC{Bte(C(I%w^@Xw`fAspPSc6qqy}H*Jd4Bs(G=q
z=Mx-rQ<9!IKL3oFd&l+ISb0lulS==-{a!`wl>#zuQG7B}`%@X<?Hb_}wsUoA@!mYX
z^V-{fy%>gjl3kcs=tes3A}H-!#R#b_Me6X{%oQKwK%qNZBUgC!h>!(l&qhB#JEU#+
zux#XMc#Z5CL?qoiSB0Gstdg4{7V6ISkPO_j_M@s8wR;j6o;OgkDhSz|>fnJZhsnHS
zW-K7(PUu!Z0$=WmHwWyUS9JaK9kolV3iMT;)2@mjlLHMsENG8&N=M;R(6qX7MeU?H
z^`w~>uN})bGelgyAIQP;MC;sSzo^Y+J=IeO+TQi}z2P59m|k${<W^2&vxhHrPGwHE
z=LH?r@;Q5MqlNtZ#C0_m`>y$IA#_1A3hHP%JU2XV3GL#L+FeblU}09$Q0{~V$(&`P
zK26IHDEF1C>QW&*>Zebb1Qh6>Q<_hA;xUL%4pV6uRm?BdMyO*e5b79<US_M)mu3uV
zXTFX_d|TK{Y4=Hv-BEZyR)*oU%r?b<->Og@9)?x8yLxZF^sAi2>dc22go5DG<!3d-
z&t!bz2M1N|#33u-R@j|zOMEflX+W4xQu<upjBzd^T@B!poZ?&kO7kYeKY)peqjC<G
zMcrEVnB>8=pzUhlQ6#P}$Q@{)-l*HiZyn3xMdo}<%W&>l3O?6+VqP@j(G~2FxM6UL
zdznfZA$IHC4!zd3&eciuC1cgjn25BY??VKwI#)DqlF;9->xS*U$qwfB<m(BwA|pGK
z7FW`_wsv94C2JoSN@1Ui?C~(jOqnzZYihE<E%us9Nta<$(W~lrt~~DY6*Ks)Ilk6`
zRq+pHX;<hSdlm6xeCZ+iJyn0tMlM+u1^Y4qnMm2W{&R&M(85DazWk;@>oF;~Ovs1l
zTn*OY=Hiq<Ak3Uo+MU8{rKn^WL|HzRLNr~KPNI)YDkw{XOHTVxtEe6@5tJa5b8UEF
z)NgVdx<SCo<MOj;K&FPksF}OuTe&mKA_XsKN%e_K+4}G;i|&b#?(TsBDWAKkyuUoz
zi04j<SU8Da12ja9lzHLO<tVPE+5JQ0hu9i#{Kk~l5TpfgA3v~xJKs94E`E)NX;(%6
z^RAATM^zdb9a}Y&+#>SO_^?C;(McBJg_wMs2V(Ev-$>hNJM(znvm6<7Og$ftQP>}t
zXlrly(H%hE!Bp?g%LYp|FnYQDuAcgd)j0cfWo0O4eu^5VhzBj@r|iTsJ@?CObQBCM
zfYtq}I_q~-Y+_~fp7hhX%h+Rl+JDBjiorS$_D8hf@$>enX}=ezHLDaf*vFUBU~NY{
z(F{LJV1$f}GcMaXm?l;Z1Re#BFsL-hrUIFj6V0Rt+D9APr!ZTQODt1)inmCc&Ck?j
zdGk5SpKN&1Sx<!BmHD~BpNPp+T6tB|B%~N>^$=5*f>>Q;q$l4Fn?ysBbug~M_Y`+F
z337~de=nv~y<7isO|<&uw2wj#0_uHm7>{nwYqZ5RoN0YlYLSV*6{fEWHM(QCXZDYC
zsxi>PLz@rZO*)7r3|35Ry(jQ~TW#sxNz=D_E`4Of>s*<r!)pzC$R^Ha(W+1|qDYQ7
ztn1rxDGF8vOA`un?+`I{oO_bN?qZj(=%|mZG4c06*-1LYH@s>js&!TlzHjfCGd&go
zI{Jl7{SOYYAMj20wgNJJc}=yLGMCoUXK=*}X5&uVz5NBwW|ca_?}V$%l>pMIxaZ!|
z=YpSqTT+j!AiPSPd3JU!J=henje&TOaPeFlynrd$rO@7tLqcDGyXP1;3$M5BUTJ<T
zy~aeQ+81^FKS9ZN4A`pG-1}@n#h)R$1uCv5{tI5&JuZ~i72PSN5HD@6C3O|6%7ai{
zseIvr?a6sW`sw?<>bScTb;9lejXFR)+eDmMo%Jg7?_K@f;fIt6Cu36%8EM$t3Wtuo
zlv}>iL$n21`!lc9lNR~m-{fPU=d%5s{_d#JVL&w$Vf5hW<6?n#$zADB%hi13FZ^BZ
zNQG@J`JPJ8We*`saupROP=QE#(lozi-WLwC2i>RK_^}0J8Fxdt(M5?5sfSHcx7Wtd
zUT|+l@oq-H2o_I#^#KO8)BZ<NhKNwWpKQ>QUP;+C38hW!BCz;iS@ka}d%GG0<1&M}
zT2YHdx)uGev(G7X*Nemq+EePe2<=F?p{figa3T#%Afn(jUfYQfrXJN8&v!97X0c$@
z-z`|>tBWy^3!5!n$&YvFuqqm_lUc4KX}&bhf^ZMJN5R+hq<AeW!J#bq+-!a$Sg)cl
z%_#hNja!xJC_kS%r4$VAr>r0u(%qIpwh5&keIJ^9w(P+1x6<u<vs%pDW(pL)W)}n4
z8p{5XX2kM~mz2_5>d<JUO4dE8hLqeX>xv3@vw0h@KM<Fe-4lXkZRR@*_3S)71A~b5
ztFrxQli{X^x%Qz<9keXrIqCaa^s}FT$#c2bg`>?Um$#WD@sP`|Yw>6Zlnry0i!0%7
zRpU2G4ZKV>eZ{bz`#01_Qm&;(HX_m$GZu836LQ<+aUWOiX18a}7Q9vtp{F9+3JPiE
zfd06lR6%=Z$3*KB<1z?*0aw4c2)DE*adan>dl$DY^+_xI69~o>&BWD-J7Tn!T(eBq
zQI)#_%3LJ?<XF9p!kdiakH`3jLJ=76@Ws(Z0=8`#v9rwIQr;ZR+N#5(|1^j^UsW&y
zJdIe-6>L@CGXhSl`P#E!l4xrwfTac7r)VaTMk#Sp%V6GbnptxYXSX09dRj!3rssx_
zfe&+S^)Ir5oQ|xt1dVFy<d*_mx0~4%WyU2rS~*TkvSWMFIKqYQOw%FqH3L_=By4vt
z^P#b@_8?p(BP(xBpp{l}Hrwxv=O|!YnYG2$$~dV2e8tl^G7Z?0#5PN>Y^oLEpaFC*
zh0CY<a4T?}`OMm#*2aqEk@^xIxE{z2wn||gTBX~uq-p75%K!qtJ6A}l%@$$w`$@c;
zx#1q8-3b?hAfi;0N_BJWM^e>tlNk_5hg3;;<D_8$cEKqyRak~ggX7h*O_=uCq}}+C
z+F)8OZHi{@hx3y>M0X-5j#Yb^bYJNj2h2<@+Zcf)!PSR2ya|x#n|&mMZOiX%hZiDK
zkcq>2#h>1MGuk9HHg!IA!CFCm#yjJ=C9?|`cR>AHLp-Q5MV0d6#6yA{eJmU~zV+kc
z%(F7*czESArKB|Gm~1*wk?|E%4s0uEX<f1dD?}}#^&UtJ^e+9_>dG(*2!bRWM@v_A
zw~``@>Ewj_b3@X>>;+}{Q61b;w~*V7j;qW>mQRkj0dG_LdkX<tXo{D*Qql7v=;GW=
z)ToB|lLq7L<w1m3**w`B9S`x&&AST$1k>k{FAs)MzN&TSYNOk@SW0M|L+5iZfhC&n
z$cyx+VYa6)Im2~iRZr@qD>XJVI*LB~v?!1FHtWv;6VJevh!kt{@_ULyar0zU!(;{v
zRQvaBGLo0y9#_>eq&p#<^~L+jbdq8nMB>dKt{4<M4n1?8nrkzuy10Hl@C%yvXU`55
z;Q8`c^$wI{K$19$?b3E<Bm=RG58)Gub=jn&^~(pP;I?zt=6G-$Bk1+4UU$4%<1d>J
zN(xe!Q*Ug`&((BhF$<VMp0+E8X&!+3jYy}`=zIqITPc_DXGFSDQV3d4WjMu6v7J`=
z^s}E)nWNt#8n*dMyv(1QPx<)VC54fViob2CG*#(HMF1vb9k2vVWKhf4^eiQ?_>kQl
zUpK@)5A(etehJ$XpVo>!<IFR)?WEOsTMx7#wB8hK)%~i|lSLF)^@J0IUAdxODyDUG
zT(MTT_T!ZtslDiugLSa#x0TkDbKT+t`FmOosmu}GzqL)}h@~Fg=Lk;;{-C`6F7{G+
z`zQwL6UDeR#m3Vi=l5A$2fmvITB{Lg-aZ+|fht46OoS>Ocpwb>Me~fC#PUIUr1OCc
z6=r_;QhX8=rdH_${oo~A5ZTe=;m~4p@k*75PVu{vGTB^cTZw`Ia<rtqxjEGgLKC0#
zc1~P|zPd}C(NZf+-*5rrxY!Fck2K_#rIsMQst<NylRZYHsyzhcl^sD^c-;1t-*;n~
z7nG~31*@&yh@Hf!_DgY1$ro?CE;V>0X}vj!Lz9(A?7X9eX9@2T>D~#b-vDw*XkXhK
zvi+&Jb&!%*T_{YgoMkAYg>2FS0-m)FL*b!J44=F}uxqj~2gc)_o*yOA5{C1XU}KSB
zMd2tW4lsqKic-PepCvbW2WxpE;zxp3yw~A@-b_*$8)-9XoFVVQD}puN!v62?Bxv6>
z@fzrPelaCzv@Hxz({23XFr^-Ecd2{)^JXJiTt-~)(qP>L9|1$3!bbL}*1->zUWUIo
zk3@RbfOOa9?z9elHGDoGRl}dS`ikLJiL*-4j7hT^e*PI6pSj4W*mFm(_42%-qm^Mq
z6jbzFq5JI|G{|lJjeJ>#O9=u=^>nFUyf&U@Ai$t|+eHIr%ye%#RrpZ<R0g`+fG!hD
z!3PqI5%rq6MjnERY{A(^`hosBokb4ZVsoR!&kDL74q796e@oxiT@EVW314xaea>3g
zjgnN@2uU2G?QTxI*2InJOdTq~m}9E@lv<Z~=z)JrSx-L)ylMQ0f~xWqyB&hwVoC2;
zSyk|DmH=|aQbS1{OJZ3)qW44}{W`}*PZHg8jZxt$i_Bf`sZn-3Mc8(k!D8LnA>M=<
zOh+62_&qPalRE{oKfoh~V?h;oL7{gkop1abqo9<eyKgIYj^gg>j0vescW9x*Sp{Z<
zc$q~|XvrFPoO73dvEMLC!Rh8G5)0QD?o1^maQ3}Y+_j?5gx-@~bw`DU&s{9#fPs7a
zUZUpse2R)!nW^6ALdE_rAfQCzVm?jEK0La_oL1w0KBa85JNMAbOtBMb!eF-1Ry3}T
zxky>J9U?d}7Vney^Bn};>r)IfEgGY{kzU8$tQ(K4boj60?h2$TlHICyd0V6UPr0%Q
zwWaQ=A*ybZ*A>0pPPgVG`3!XE$5k<5ep}^k4;<84=~?@Ssdg}Wb++Vr%HX2(>PVCg
zyjAwPXQ;@T)52}(ft=oNx0-0K;ajDNfY8S><0=OO?g9+?iGC#62K1ePwb~qELN3^N
zRGjDa#k7YvGf#~Jujl8W9@M{xPA0pe54q=@QW5Rh5fp!dc?FU43<2f_UQ%B9MmD{v
zL!VH09j=b(bNOao;LY}6D{~~iG?l^pvYYes*1K&~+N;G^Cn5`4On5a&kvS^zE2ocj
zxxrW)V3rIaWAHDF=JL8^m4oIiKGd<|r8(5}ft~u!J`uyc;*R;M7x!1*pSg7(LaAe0
zmb4zsQkT_+`aA$(*ytML=ER?GNwl$QBRQg?(WCQb^=27$MaD5!7YlPBJ%>zV3oxEf
zLtfHnRT!HxnFNbeIMC;U*HPP>>bx=+X9DAV^l0G&!p|u@(9RlAq800|_6$1gY4B(`
z7q0+k4QH}Ul|Ezkx!fXE59y%AVuZ-~#OeGL8({W^rAm#{%iEv(IvO5=Sq(n7jKd<^
zv~~bIk_9S)4SlTq!Jjkkdtg&KV+QLQoIMN{O}#Hsp!(SWW`j0*=i{q+<Bb=z!42k3
zqiOf0F2;Rvde28pJJSPa{)?4@y3!khQXU5<^48S;4uZ$RZ-=2@W)?imi&NL>{qiz;
z0B>by4s%Iica9VxEbz9u6Y=u3mix^BNm>s-bEIUfgA5VKb<XG0R@Dbehw}HZ&e@<)
z9YsHm`-SX-5#<Qf<`f4Icmv9z!o86PgFX**(NbvMS)$gzNh90JJ9HwLZWWA&`C2(k
z&DluQRzu1t4RQ5ynLkILS!k>l-);IX^n3H*N2&di^5gMvXsbM`T&)iXJVzL0(#-P)
zTPy@BsrkFH2gGNE|4!_Zu4<OMpH;uG?rg(Vdec!0H{(@zn^0Xjt6pIzRG~CTHL|MZ
z;NH@o=dSR`(Y>h#?G2<iuhou|EjqKC9Vo%;j*IkjKPQ7nC9|!sh`q!d#A0(ZKV+B=
zrdsdmiV*2=&l|+4Rw1DZ>FrW}Wkyn>z`7dUC?+kJ?`wnQ2%QLeM=W}<)s%$@r`6)h
zom3g$nK`Y|wp!ss^HPHnuIQPwK8zYeM59#u0+uQmDSc#x)W06CECcixn|wK!Ny3Qt
zW>;N{Z`;>^gX`)y)(rwXGm6Q46w?<O0D&oi8LcUriZ1r9KOXJZMC^aB^9cn;bLOwA
zI^VLyp{`)L^{$!t(gkX)2{}dt4pwGp#w0N-k*=Is8n)9wpA=##wtH~Z_z(V}7@@6C
z3u%!>WZsI)INdU%-Lb^cB(ndg)Mb`E(mkp=E;54Gm4kk<RXEA;>w-r-Mt9>6cW#v1
zNKXB^HIn;^ETO(q*lYwg?%XR=a=E;UZJYVh*8G0uMJg_DxwQa(B}u<?dCD%e&=|9~
z$C=>ym+`@7J~Q(J?z&L>3dDc`(chu%>4yH&MiF>v^^yKP>5CSZgM5}QO0Q>?cDl0|
zFBRnFQnwV2nJYX(RXC{L?Z%Ka!BVTr$G(}hh)}!oU}^j`@}Yl;^V-zOyI*E+2j9(7
z9ZbxN3WP-cEgQCJcdd=aZUqV#XU2}4wl<Yb?v1*QzOWND({0uYV~tK!ug*-7=1taZ
z0QRauMC|8p%@7Y?ON)v-vHPlsf^0iB^tLRh)yPEZBdyL;9MLaxUKdwv$D3I-JC&CL
z8ykPi63#8vGOqY4TKl=hLsT>KgF<9DV~d=dOkUy#WxbEU_y7;{RRif@5kc{)2kspM
zhr`l|<+h{RHM@qRC#*Ne@i-bS*+g_-?02fV^M_2$yC%zbx-p)D{lvVyL!b*3I*8rD
zyu}I#qKh-e#vm1m<TwAF$(_6y`T3jcsN9w%lPLlKejXaZZhPalvcvGo`vc{zWgCg9
zYNh_9%OjpsM`uPBgTi`Zt@gUSHu$H2r|;1iak?zYXv<2oO-nxakLXjQi1YJ8S+LP8
zGxlUcd5*qRy|M)9tk9*k5rm?B_6&ca(m>r$E}BUYupN?k#5F(*P7#@5S)8`KHXU&(
zrF|1icf(hDzQ;!YZKu0XLZ@^vDVhEdEBw)OrZCEK=~B8vfnSpxV}k3NicJxD*+Cnv
zQ0nrNx+45!vJDmvV2sNvb$yEUx0WRHFwHO}a9{aTS$uOXaX9(3hQ*plXz9@&ipH&_
z!+64{{6tA;DfxDzswzp(NsXcEiY;`dIg*K#@XS0?tK?Ep<sV8uQGM*0n49cIck0NT
zGy6U=@Aum>2M@D0z>;t=xIBQ=#}4RzsW@&TkkK^<8X@5~jrA8`YTtGsVV&*2VfyY;
zQIzDAv^e9#bMSj0?_5*6&4e)S0U}dq2D72idcy>u8}963+_>LHYI^N)*{F!k{!SL+
z7e8td1Q~Hjq9qLv7pm~oTyeP{2Gem7vda^cRC~#>S0ihyARUBC5fI3sY+wAHY<Z4P
zu%Nl(j&2t=sm)Pgz66=xlIxLZbusmQ^Q9*T&O|2$0hP9t5bjwGP7`dSk=b>y^rBon
zDIjGCB*Hzok~!^36W#Y-&G^cLQEsr1NwsE^0A3{GY?EvFR!c>>ldHBRx>x}Vj5d2_
z5=>6-7Fy=L2m_%Pa0Ez-P(GI_XnLz>jeOdwfXD756zgY@A*cfqK6B>_Y$5@8u(Mux
zYGQZ9!oXD+{5;;lgTR^ZhB9Vh3xHr+jq~HI2p<^SNtuMaph->PA(?Ar0UX}!ZErvW
z6Jf#9We<f$M=iYKRl_+|lvLmawT)U|#{4e<f^GUmk`1w{2=~SCp`@L}TZVhe&5W3r
z@RsV2r5^WF=5!LC{UprPmoHsIDyuRiU${*?5d>2JR90Bx{47r5GCdU5z6;)2)n$tL
zar;_Kn)#Cu&t?Y12P^2}U&lFskk$WC(DrL&NH`9I+4L~%hL=}_rfQuHgnWdr`8uIc
z3n{iNbHc$6M*}YZt%&sD&UCi@$|b*97An8du&h}uN}a!h;Db1}CqeK-Vs|M>2UuhJ
z=*JTQBVN}!mB33n!>nN87Ii)41ZWPfahIyb>2fW3_WAbxkJss$oo^M(-E^q)4+W4k
zLc7M;_#qW?$k-ASdwlR|yGkr(_1vr|fDzC`g0rPss6y+^wWz}0@<hy3w_nh&M8u$U
zQEWPe<)>U+x9iw@ccP$Hr&WzP=Yn<o!JKUKL^p9>kE2-RCwbI#H}(aO+TjhtKLKOG
zfK+MoNz}Ey&44S3?@*G}+~b@>?Y%b~X&hX5Y3di`K3L0Rw4LPZ>BB1}Qc~OgK1Qk#
zs3ZAALDcn<41aX@4+Y1-s)yz+G1+7C%|DcIhiWfCalo}TyG?Gb6#CAJ<?AbQR4Fp_
ze6gA+wBI!olP=*a-Pr5VP9eH}Qo-0{v&j1y%{Q4c>|OOtW;k74B${*S8_r0|3aR|a
zOOF@g3>1)V$hbOVrA8ST07_=@YUCe|cEJeQR8*pF2LFs#pgmFEq4yplmdY_}*pE7A
z7CA6qotrB_sz{~HC-F%5Zl>_G=X0Z9J3QpFzNoRG#$-C%6?e%u>Ys-}r0*mDp|D54
zyEfn+0}}@tePYZ=t7p<4`+taf51=N#FKn3JJA~d5r1!2!4M+kAp?5-+PAGy%?_EJk
zLXi#$y%UPm00IF415%<=Bq|C&P^1Xx$NzobnQwP?W_Rzsd+xnEvpe^k=R6NpTuxnl
zRC6TiRQu$TD%uD|3Z}Jx99MKWL-L)}cW2vwaLrMOpHXxD`DkODgb<BWbQEiFWO9)&
z^HTvp_SbX3>PkeVeuQoO%AJ;yTNT(Zg$xuQBQ{mG*0!1i{t>mQ;GEbS2nQo?O4Bcm
zMQgeBu3Kjx>N_zsevLKzNAyEdT|6$x>Q)ToKB(;)U`BBfY0`bdnJIG#=0N&JsG3)w
zpNc&98?E_7-q975{Xo0YC0;Z_6emZr<+_nqu5%R!?)1yd$F1fozk53VLplqpr(Zt;
zQGUB0e972oszrJF?d<moW&MTFsZ5hI#YcAuBb7>5eN^G7+RGX87WI(9uEK)G+xWQf
zNQtx-6lT^8&R_a?{N@Ju@s;V^>($#-3_F5!N}p5M<v0FS?4N>9YS5sNtV+Q5B;<6|
zonQD@uVbmMixyoS2$(N#{t+F-J}US+uIXs@M~PzN&PcylJO0=RzuAWUz<&?Xi65nV
zE$aik{KO4@^XVCj3<P*u(HVTk<Lm8#1EU5@uuI=wmex#wj~w!>?l(AfsyL6NKpZJ3
zpK+|(h5nu1^zDZ<E;-+hrcHE3IXCFh{z22L(ivR{5ZFB_raZ9s^I5^Z_HV$E16}k8
z^)k$DP^(ez$I)D)f=5|W(fL|*1c!Hq%>j1fg<*%xfSTz>uMh;aEUX@6|BBKQz$Z{`
zdF|lqUway4AL5bp$EM_fBlL(iTA@w*&YVO>z0a((<v$`<7nS_eoq5fY;Bz4enD>5>
z@b~{PIOG0W34Q0;yC^^CckFhTY7P6t1MqCv?0uRbwWTD}`46?Rw|)%7Xl?L<S^12e
zbnC&^U6sR26%mW6t%r@Rxi7<n{}kO5usq*2j?g~HuH>ac@R>$&yAIq-*-Sha#X(L_
zT8gai@IQ>!l|p^am1+6&K=TjmtKRmHTQ2|JhBx2F1uTO89!>svDfQ3<70E$|>whr4
zaeAL!8`t^7!?Z4>*)zYhb5w8s^On_H-D&kpTZM(t&qgG_^VKWt`70&!gY2(=9%7n2
zyWn-tw{zt^Oip+6_@9_Kc4`{YQByx*1!+ksoltUoZ&jA=Y@OTuY;+5MlVKwM9~A!o
zNfO*j4G<9%F$*c^S};Ljf{FR^I@O)#<8I44$0z>}41X&|pe@7*P(6VR<JxgvPuoAP
z#uddifr?1Kp&<29UZ5gL8&OdDf0DL2prYSa?EtBTSnJ*Tr=n5qZS`@t3!Fcawg<M$
zuE5)hRwx%1D`Y_p=%yERb7(r3zV`Qv;z-ubFM!n4EtCFPuhgv6Z%M0mmEBROYrVyd
z!%clud(G|9Ru9U&Z4IdfNZ#g-ymPrdcdd4{j%$sZt_R&z{LjXFSK!n3+v2SMnSuO|
zn160qV&{LI{?-4NI{mBm|GD{p%A!z^QJYbiYj^vyS6l_?M&z{lyBFw&`?jUAYppA~
zUF8qp^wvUm`}+G;>pv>DBLWbH-!D~~#(j-{8SgS01{u~q_BjKnNS&$tDZ6E(<wCjc
z`JYN%d+A@7X!qaZ?k<3Ft?`BJ$Ny_RWpqw?&8U5ne%*XkdLy#%KTA>zx3D={*Wvc%
zTQd)8ulp5leBNqrYy2a+#TQOjZs6LtaP99<u3d4ZMOT|ee^&ph|062FY5T?J#shC6
ze}7uXwQpLrZ`gjrwKoipZu@_0Z>o<=yy`v=zOMgAq<RYhzJL2J{xoJ4Nu8?@>f_c%
zZUckkl^1WB{t?~(dprG-C$4+Vzg=(bo8ETiMaRvk!fh_o=mpPT$<d&HL@DuOw%=~&
z;CS!1>&MZ*jjp@?=XKhD3D7^4WcVvE@<E%O_rw#bwCyzP1?u|m_6_gFTP6O+2_RR!
zAtZ_V<PX;}4QgDj*YeZy1!Cmxm+7m_6K&>^1}P=ns}v<1%96K!;y+K>YunJlM*^Wx
zyC&t0$)n2n_CxibqIX^71mf3G-H_Hr#6U-s;AJwN+)!jVYBY1Cqc$_!F1OAxaagoe
zX-^yYw<y-&>hjt&>NwmjMrak_o)cQZ+#iq^DzQ1qjo=|b0))zJzkr$9l?&vkqZD*P
zL)wSeym;iY&rH`KpUy$b#2mfaS1*7La=r9E>UTr7^DNgFSkefLIi@d5NfRSa)&)be
z1801Gf@0=UfCjV*$7veNh<`*&Ntyx(3thj4hS%8cfJOs>+Jorfz0AJnTz~$~K1H<E
z`1COpIL|CsjEISeiOv;9G6_Ax#h9!SmTs<zgH-pZu-f68A1-(d{!6JUSxsNry;F2(
zVB^iGp~X7y3Lg=a>KQWnj}-ra3j#XqpVSiM1xKlU&W@vTC?|tCWNkv*8o4uw97A*?
zCjJpA_Wu`}<|Qe=l4b?@9j_F}WxMmW_+(g|K$+@sYE0Kn!CJk|>;IpTM2ow(?W13m
z`Df5-+7s;S`_li7iC~(9UP+(R0gw2W8QmQyqp3_s*`mX=jZayF>6s~$mo-`CYIZN~
z1Hc8fl+!Qd4K1I^3CDO$?(SCtFGi7AlmQPCDUR|DlZZDIeI+L&LNsron^$|l0~0T;
zln4?<*zHNsz$C-iL>mz4gRaU))RJM`N0$4#=n*C<*ymzD%N@w_;jz@LxO-JOShEm}
zYN$Vk#~fZHb=WHYH}lcYwO}86z5`SHY;6#=M++|b+-?zLGKZVb=(;8)gIX)#Ap2+V
zr$2GSJ)N?y?F>Q!oEbJT!cfJ_i=G9r8rA2F=*0h~=D9LVS(*R<hJw4c@tNK22;c!@
z>J(knm7usTG72|JpZO6%(1a@&?ef>GJnQ-oUeF1^cx0Lt+~~Z@jOb#4P+}pT6&pT~
zb_KWGrK|ieqM0rxkCGg`?~d}lO?ex-e>uJv0B$;w*@@)Q{~`{PR{u#Y;qvV6qCY&e
z3{)9R`rzjt!gwa>nyXR+JSnBP%?IKaV-R`FWgkSvNpDq!gTk<F`<llbc+3}bON&RW
zviUu|QZ>ga3cYPHInp&TdYOd=ZBR$W^8jh-1_c<mhf)+GjEKR@-OkUPJJ}H$A@fdg
zSH-=vonA<B_e)I;yhz33G^g5cn0UvUJp>95q9ai8pnc7(wxq-M?DYmqtPqA(Jw<ee
zE|8j<nqiU@d)$1cc~{JR4rb{}Y9C8}0cxKd6L7X@!T+{dvwAO4QPF}~&n|oELeYXh
zU{NtaYI}Rny4&j#KFDpA9e+S$vach+0u-VE76m`3$`3``Na5O-jcRO>&jo6t9~APG
zm1Sp_l?~gqliUD9yi9H5h%`!rgz()6+Xs4kIPUl2$)f<$gY(6h>wiQVKTA$7L7=yV
zmzRIT?Blf;J-&=CpWNhf-u!LKudBO^%lzI+*p_V0W#)dogkc8$^=6cwo(i7ae_;9L
zfeZM!u08C_m9lx#CrGf2-2XPMcOSG?KFmM)zx$2rKp3NnM`giv|IQ=&2Z_c%2kc#C
z+`UA-yhLMM0Up~IPbK6gx;lbXa;k|dc5huYu|meiCCRraI4<W+4*8cm>aHK{>-_9b
zX)ZZO_6x2Hj|bxF3$}}-i@~B7qbvWv^v5N->)L4`pwHWBRCK;XZfgDy`ACPH?DeOW
z{)7LCfBem6xs<*3|Hac+y5cCyu<IcXpUtTD9?1o((6iku%l91f?ZH>O7>BoJKC*bY
zXIb%&sAyE}&$-;f?bE&v+%8M>_Af`P)eR`zo8m-qGJa%3<q0!_1lx8}@<6Y|KB<aW
zFrS)wQIwjdx?8Zcx2)o%L7e^Okrjb;H|?|Z%=iDRV?x-!{i(QSm;6!tYa(wNQbp&+
zDOR<njHl$z%5^9HC1bMt<;`-Y$pT-bG8R7;;>AArYG*^iCjw_z1=HdL7yd~OlL?(S
znUFg*y^$-q&b_g{lDuJ+#`H;uh1OEFP|TXBhY_3mZefPvDiPocR=;=XyYm0_G%G7(
zI{FwTa*7=it=dAo9mD5Wt6{}`_hNmqLOzMOmiTFh3>)nXHgn|fJ8#q@6f7emxq`cF
z-nr_Qu=bv%DP;6siSe0kDLCVs6$Jwhd=oN7TZYd`pwC4pYPQno8VRnz`E67@7^Oq7
zwjKDM&iG5C)I03z-i_4%W-sI>_i1~>Xt0YK3U*FUOTAu^oK=)|_!8OIH*Atvi#JQ@
zvETL+S@a<<bkfkZoig-z=C%s18w^>{dKu8cf%D&X3|$Ub{w+CeBKo{;hWii64!Zxo
zQL?<N0h~O@@sQl@7bD-NANm5r?G#_M9e;lS-=Mfj*f(>O8FnjrwW6L!(LmV)y(Csq
zJVe55oJpb5dXNSaX4X%st<vJp66+RpM5-W68}D0a{4@jw*<C9wnW8*03KBUvxY2OV
zVMB8z@kj}c7qV3nA{p5p!$tvnzZC$CVT|8gSLC14`X7we!vDSo6<ra1HF$FJ(n4NR
zq?;mKc-u}*N?9{Hr6p(qdxzYVokt>#LF33hO8=$#SF+w+5oGvKv9rB14#bAsYD$)g
zWFzf8XOpgu60Na0s1gu5uvZ@CP)~iyN+KxXkeZ#XIxp{8(eV3#37wBNEl~*xD*hTF
zIRLui#n=QQNXuK5Qc5=Bf?QWF-{hU}2H8YPowo1?Jxd0DDr-Dwe;-$VWBtdZK_iil
z(w4jwopi8lLxz*LTC$^POFqq%S0E~W;vqZufGc4nBkN-WjS8O%l*an096F%2Mt+LL
zKFmK(*_%lH$XOu6IKdtNQ0jnE@+Xx8E+j!x`h=CNS%4>VEpT4Z2`#kV%qq>EDvKM;
zWB%;7Z`p&9cJlp!d82qFs39Ec=ZRy_S@}n#j~e(&@I<^AEbP28Ita|T^@Wis-VlZ6
zNN=bv#@pUEIXUIg{mp$tvVSQ!3cTUffAgFFo+OQeUU-^3zFPNDXu9$dg%JDrn{1|q
zECRDF#qPR|+gdH9(<K$qN5*B_fh|(VfGi?1Za3&L9cuv@FZrg82s2f*{>9oxhQ*|W
z&5>7b4R@P@lku1pS6WR`800mXFVP|QRr?p&3yMTD)Npv=)GNq!eN&JGf(>l%6}E(^
zaFa-)YgUwkNjTCEpkQIUUs&Z2%@3YG@^#abP@K!~oFt^~dzIh}WQ^Rdf!2p^o&euO
zdu(3@fu8A4@Ynl1xwhF4A<okjk@q|}q+{Nlx-Jic)uZ;N<FYXV92)LQ#)9vY>@k~$
z180vWN{dHsxD#|%Trpm^6l?Bx4?9of*FUG(ew@}!f8sGVILGBp@<C^u{0Np(nGxk8
zA;!W@ELnS>wI+YZURB2tW=*m4PMqT@)$+0?X8p4}5etG$($kemfMXgnPb=gy*@Pfw
zlTBfi_rX;I#kY&bY39&ZIt~*%7}9@4@5o?1{ZPMHeHkm9+b~#ag;4a8hJ67i{$6~|
zHV`=B(1F3D%yA)7j~N_ALWTLQ^Y&k~m_4zvip~J6RtnK(E8v^j*LITA<)sWXk*dF?
z4^Gqtq6~SGUn`K2I3@p*y?>l}TBTm3c279Uj5>|oge&Jhc}WB}2d9gu2I1Z@t-%+$
zud<G%Cp8cWqv`t;Dw5vTx{&ApNfYsAY^}n}>iUADBumWkD!q|RIve3H|J+5+s9e`H
zmQnLl^XzzA7<s;%bE;xfVG23u&$N=AOnH_k%ko|u5e&pi3~k_)B(oCKwvvd92M1qR
zK6wJ?Up}Eq30;3%=gkX7nrG`eizMUUuzY|q^6KAm#-vb*I3WzW&vXMw>dXXBL%IPw
zJ)7heyBti?ri$r|O2=FLlo;0H@~KUQw`5gJXuxYuDR(Pv<l2!4?}7Ocwr1B(>8R+P
zd#y_u{DY_;k-^k>v}Ts46PaL@h}0l_uFX8kG{~wCUk<kEw)kS?DTcyUmu;{H=IzTI
zC_~PXFlz@9on3E-cQ9gW^^|7(Z06JFckYRq>RwFGn+bU<@n{~~_s-8GzbF-_fRUV4
zQBqrBqQ&;32GS=<T?prttcMb`NINEYiV{U)<{8SfV-Q2nl#OwumsTKZ`*UEq<l<8Q
zCCXNl7wATVrmOIY^B69iLE9bn%N?nzGZ1LJv;MAJ%!eI_UddW+)ajnvqwzRheb!(y
z++-O+a}fr?HZn_aT9xVH3U>0lViGeG+nyteh=YWQb?kBvvJ<4Zuw+i26=PKIp6CUH
z*F~wDiOzr!0ZW_AHYAQc=e+yHRTF^UEaayV;=@wMhN4JqbQ@Spuf<aZKfxBkWP6zm
zE2HYIQ5@G{K2RDM7g5u&<*yzQN%9s*0^tk2=G=&##-tUCB6tZ>gFG4~Pf7yRMT+5I
z`CJ`T+Y8iOGVizIkB#fVdn??QI!z+P;mirt8yKuyxbBOm=aj?j&(ikpv>i$KS;p0d
zu?pd<KVubzr3{+rx=7Y0gE$~bph|4LEme6A9&C=UjN+*gBl8IG=s2gjptiJ6`P^H&
zxR)2?h&m8p>S|JFmWosDqjfgi@1$m9`SQ`KLC!v1jpQJ*Gs&`Y*k~lyyUEFB{jAuF
zKdVHIrnu>E0G8<;wW=;WI6LCV;)-Scv(S>tXc(IB8n|WCS@OhoWOt3HW{cn>uMuss
z{VC1kjxK8Yo<bIK$PK!9A~EQZ1Q~*tAf73*ye(`bML@mtX;fW=g#ybMzNXc$`{8(4
zY2*~>vT4us7XSE!as70Wq~V+&HRp&v@UJgRfG&^cc`=&m(cDpR9_zHFoA^sXwx8;p
z_r*^uNHxR<(wxfYZgZ7|lt8o7=lyt+P(L>l;$)9VVN?kUEO%w%zv<}zxd*pW!*A~t
z63h{%+g}^%zn3<LIC-Cz8$9;!3!>WB>v}b)VEQfn=$!p|#(_PiZfao)?!`k7Cb#`r
z%=S}loF;baD5k{Z(T%rovOT_D;ZbN-0CMbY2(7fJgHu(knD?2<;5?6PH+8-5Yn_1I
z9kBea`vMmN>fjBqOaXNiQU9FSu3I76+R-5|OP=wk*B2-MhSSOn@&gzKObaqlh2~4*
zy6=*83lU`rxo-fZXLu3{x@GWAEW1|jo(EAvhN4wQ82M^x4o^W4I_sVsq{Qr;CIaY0
zw*E6-Nk9j)kX;T676L1b%SP`Fc*<sW=}Rk`FRAAVzn9B=mC&kD=ti54#xUzrEN-8+
z3A#pSJt?!Kk&>XJEx6HtM}_%dZ$-ZZ#+zQkKOa3B2ynO_+vel~)<2J{#wC7fL{h;l
z{6gl7Xe|yL<9Yow*`64Mgz3AV&V}d?CMT2@yE&;9l>lDU!rDxMzCB9ttp@0DNfw+g
zcPidbx;GWb)n#Dy!^EH$a=vQ+tjK5i6PlBm>v4lEQ@VCOKbv=3hqoL~2Nflp24It^
z!o21(xeFPqqH%FoR$|Tp@XUOmJ_Ae1B<?aC0d;ZBnjvCj9~67gkAI|2#T36u+ScQM
zdQnV#nWUB&8W`M9SsK!-Focp$yhj!GPOfrth!Y2FVm@uB1IlZD>Bxe;0M^z_9agIm
zlKcI!27LWo$0Drg3TPtJvSfDiId?!kR%ptb8=W<2)3uOiOW(bBCjvmHg`b(?<0wsp
z{w&s366L`7mvbJdBU#pWC3_dfL&V5MgZ6bzU_2N+uVH+b0b?u)H)!gRPg>uqUvYQ~
zw|+Io%TO^#J$XmQ-ym)&sg@>B-@L6A6==kmWx?#EMIpo>OKSJJ;5EVWF&~h*H#>ZO
zfff?aEw>a8N$t>i4G0exs}R0QdRRlXzUhZ&w(=fA>9KF`Lau0Wq|#@l@DO#nD4*bg
z;sIf)hGxYLPPLH7TDN}8k^!^TfCC8^3fq~-2;aZ1kk^mn*AcZhtnYF@!O8-Y9IZDb
z>5A|e<!>~)-y-<Z?!{s$j^NYyFa<@aV9Wk~1?Qh>?DkStLo_D>in%BS2wa*z8#}20
z6oWDvuq>rkjkpEU>~awI<kq*Tc3Tg)C)K$ks$FCSKj<g(F{6G|A6cQd_-e$G{ZzR7
zF{)1*O(^Jc{#2@Y;E`LGt4fB$HmAV*Osvcn{l^cF(vpWt@&<#fRq@c`4?X=X3071#
z+bN%J8uqGf)hyn?@tMWX%}JmusEbs&-9+h8CgNMb8Eaq(dWBv=RVdBdt6s0+9b*D3
zO9Gs^ibtc&^a0D?No{#oM~nXc6H7BDEH}wy;cI(C(-UqD`+f3gUcICn!3#@0z+?Z1
zVzy(ya1EW3sz}v_*bJ9y)}k$>@P6&SIP$$?fx=UZUV^}9XC0Criz2Cn9Xj<c2`=(m
zl3SzXeAV{X6s*~*P07DLhQUaz5|o}DNd(8}na8hK47zAm7IT@Gn}_-OH#r}hU76sy
zLvZqJgWJwsyM|AXT%f;_U+dPQ`_xHB)l;oGUM<azj|ZAkI8ikZwVThEP1VzxzSJI^
zvWbil%q>4TasXI{=71H518jfM3s=D8MJq&00M{UInH<MKAlux3wzgrk$YAw=c_|Dp
z(|&Y9s$YYU6q2TEAyU=h9%2eP?Ve2%I_E}tob%-KT?OI{p`EE+-i7*6T(6zoEH2io
zEZ62^K~}m$d81YsxBJ>sa`b;3i=0IiI`1KerU92(N<3Yzx%Y&@N>l0#^6&X;*skAN
zCUGjZ{xVqqXqUys?Jbe!ZvhNk&i6QE7t}~{7;m&x|D+~IHUi_|$IZ&TvFL<7AD)$>
z4DhB>;I`bCShvD)bkRXZ_Z9m@Iwq~<#QYU>X@@anl5iu>BsJ+grf*O1PP*~SvY%|3
zTLvo7&t<wX^U7rk9fNdCL8>~6nxhktb4U3PIPQ}67g;Ew&`ARsnKq+L^TX5#;&tRt
zdV@CR2UJ`t-_d<$we%x|5Z-zDd*`H=g+mnNFQS+_jvn%47`}gN5qAMJm+xV>acb*S
z?x4;6=7igma%Yr0F9$8y=}rsxE4e8y&%13X2z?qbcjTS^{a{vSJxotU_$DcGi9JJq
zc0JuUmNFn-q~OBb^1#&{;4NNL!SLeI8$X-A{)79~@O2U-)|XdS>V7WYgiNu;Qm&B~
zKFahH-Q3DYQ9m9ha9f>Z)mFT`SsreDz~?s~yzDL73H%=0MAXQXJ;pd-SJX>sqLJR%
zL8qF`y(lu|egT!G6cd%=nJ1Dd#jfAECH99QpG{J!QPP2`ZV1QCP_fbpKosnNM*g0e
zXhj~VB&~s{2`gxGg3u){?{)2nhTC>-(R&U|(qbfxn<Po8?6bM~_huoueqzqmmBLZ<
zkPl3@3oE{d9rc(0;fqE6xYO&Gj}07h7L_M8Xh0OtnHGBQP*H#`;M+(YMYPwC$_cx{
z5Z^>IXJ=4Kn~D~PMxwK4u65T-BoUFG?*|K(`RTmfoa(4b^`P1MKokD@>?Ij~_d{~|
zWM4t&-=62p$8;$VNf1_{t<%gRH}g4VV*)Ueg(FX<olcImmF_n|jyrc~XsP5Db-ZYi
zLLDt8;q=AZ8`k<okB5HhhdkWBg~q!ZCurunPj4ntRANc}z69Cz@`ImxERWPD%*mRz
z`gt@mhw?X4Nh5sVTo)<flY)0!B6!0+9@UM>Wx_2u>win@{dh9B|Jq>Z&8J5&37N&%
zF|iyrEb|auPqRY=@vSSoUTXWk7MRqLPMm()G5atBWC)kt`#B4q)@GtrycD<%w11<v
zW;zN=oaYtM@g}J))<<qLN{8qg$<~ipeLd&43k{>NeZvcUN};LG)gahX9+FuljOzq&
z4KC%7j%FCUkE>PeS-^oKwd@u>3J#Ri(7-J=a}yB`;?7b|20spI?Qn3o^m3}a@gx)9
ztA`XRa|2MTDH*%ubbZBhP-TILoBl8>+t|LD@Xo{$O(}Id?1u80DFi=Xp(v@HWbM{;
ztzT}ApS2hskBEC0!99-Tw(Xr7ODmtO+VJ~sUT?#o#`pW1a4^{m&;FYQ;*h+JTq7Z)
zO(?0B9+0@kT2uWwbQvEorI=^zL-ZVJhb@w~3%h}IFHhWMg}w6jbu0Bt_whB<`$vQ*
z98z+WQll@qYhOf4ZkGC4m*!IskXcm=EBPK><)lFwM*lZoRWdDPjn08P3e>Xe+T%Oq
zi+LknDqQiVl`tln%#1FMy)xthcGId3H!yOL@&x#rhH>2Eh>T=zQ($z^sxOBO+W1SP
zDUNtZ3)-bw1RFt8I7D>-A`SG`+3k>n3r6#<)*p!ah6-I=rnMA(+8R^?=By<DM-uQ3
zBsg*$^qL6^3<w2FL+gT&;f4LpSi7NRnc~;p90??ulpSLWN6^5?<q36h$R3M$YY;(J
zwqZawyBQ}Rujw7^fP@q)ccea5M)veb%g)1f-U@y_;-O9$$CA$ewNRF@Rq`Y?Lh~t@
zSYb$}F)FE(whYH+kGgz6_8jcC*$v+!^Wci(LT<`L^X3~g1?4RJ4g22?n8VxQea~nS
zj_cY3Pa~tYCz3Q->XY6`c!qqV9e?7V1fbZd3lJ&zDAXK-hJIM|hDOJJ_RHeuf@vyD
zsIskt*2(w&BTKC?;dvT&qd((eNYl>&dk@ydZ|l_0bL4s*@N&f$FuY=Oq<lCO>WqIQ
zndjbHlOj_<ku`yGxTm|Gunig_62KUI5R$r8BoUW!s<T-~3m6i_u;1(II)gM1GGnaE
z7QV#lwVYh0I=tHkwlvXHQ-eJmTJTm%EsBNn{9o>;HHr`FMoc2<p5cQczoasgLVt7j
z)x6q0@ipNq<%`~Bk^B`}M@zsl120)Mzr@Tt5zj%X2n42<9R6L>+6<F379xql3Nwr(
zz=Yt&S{x_lV}{WE%F3kD<z{bsvtK|QsrcI)(lpBKLcp4b!_n80B}-A-DV8rrsofvU
zMs%3guHphd7$857%_QuYiGqo}bccVL(_eW7LRQDKIGx9Xo2uDD0I2UtWK}8=XfF2)
z4r+809&}t8W=!fV%Ha7|)Y88WR9w9Yq2P6g09gPsAqVvv+zcGd??^>4BLVZcNNZ^5
zVas!b8>PY#JGC*JPR~E0&AhpER}%KN#I))TMI}WuTUJqF_B>)tXZ04`Hg>b>YhF}Z
zV8&B(HBYx?ujYGB+mi34i*@N%*K6cyIjDMq#BWIg&09J#;p%sq7DX(oB>yDhI9)ty
ziPK)wYBP!6f=~<WWV+^O!tpe8X|?W+;(yswX^ofZK6NSd+ItzmQuv}xjU<Y(>;R*<
zeX;4axz4CHkMnZrIQf(xAJ>sw*Mi@O(<NsZU20ZTq$je67Y(Le!<h8x@lt-f+-2N3
z<5)WSJ%wLNq9tBf+e*VwV}2cLCX+8{oAr$QCSA|UxaBbHR2t{(Rr5Z`)6In=Z)EaG
z=5(Us8auvK2L7$7J+471|D~QxOazh6t{E}l7yV6+=_%=FMB|e^j~D`>N1ryy0*!{#
zH(#1|%Z<4~kKPS96ZsO|nPo?{1fv=S{}CzODmkWk%Y4eHqkn&*@|&-h<1woaABeat
zD_N4@?>*d5!vcEEWK!DQDW1*aVbhN=+!J4Rj4E^-@zPqC3i;6*!?Z(;=imv!Htnz<
zDf@9ctQIuYA$N`>gxe>M_7k8V#nO^?V$^PGCWOQ2QBHG_=13x1&|Apq#ybj{aNaR)
zP7gecESpz0=`8O<G1Y?eUkYblxr@B6Uo@zWklY_JP3Goo>*X(VfOqK$_KOjenl1ym
z)z!N@L{Cueg3hBYLIw*t2X5ryL3Eq};%WhKGmEU=eCd`PR$0^C?+Q$R?TA<#*aOxY
zm`I)HGDDbZ1J9;Ret<KFvWRsY*urq(wb{aHn@L_x@l;h748pV|WA2)024ePa?vB-S
zTFVVPO?lgAv0+?~JZ<WcuNR8wVG(C@P2UEZz#J+WZSAyDsXe<AS(YOn&4z_T8DITb
zGS?!D<@p`T`Si`L+cP1qk*J4enuYbj+#NT9ggZr{tGWFp_{DqtP~^=nMTCXJgoN?K
z&iq0jb3-~*4mQ=Fo6Fhs7h-0NAfd;_zwhSu1e9I$IH|3^V^5l%f#Z5ieCNEr`+K8Q
zo-5DSaZ)Xl2@niTLw~P)j%FRC>XVJ*8TQ4DxE28HpmiBkG7DogfJS<QuF}!rD)GD1
z?#%1vmuUltn*AJl9~s*+B}yH>qu}QlS`1Se=co7syKJ%8d7?PbbD3#xo$Jz+T)qei
z(prRHAE{PNZ&<V#1GT$MeUNrJ@=*qtk(=Nf&jz*0F=32_RPJ!41o*2YP8F#nL)R9B
zH*nc7T<>04N;J`EtNDD-d9Ea|h;(?n#Z!2onhSN14gHyfBlxNK{g+|=_@i5p=dgOF
zRae)-ep4W`&h}-lV$#t*?K16+>t>+b*1gmZNEM1iBPm%xpQv~yw04JNq6s%aYFqt)
zf<()NJ4hts1<9krnj0-|70)F1?<h+md8B_1$@qtAnW8epFW$&BJ^J^SiPg#~eAVOm
zSZX_Tr1X#W4W%skoMaLjsnl4)GesR$weOI+$J<Fcvdc@wXD5=}-D(X?L*H8Tn_gkU
zGDEYo{}Hj|;+o;QrUSS($LR2EGcuYYi*^GFA4No==Uu1Tq%7H?%mmvSt8`|pLkkoA
zvtk|b4&79B1>xTDg&JVdov$6ejtF2q-36YaCS9BLy`(=}PDc@MU52&h-@%d5Jb2UE
zy6M;REJG6x5?m{yR(-Vudb23@Jmb4$d2~uE?@DLr%02BA*}=`6iS60>BPUvNCjClR
z3(Lf3#o5J5cvm@$nuTwT%dohJfWc!r@5j9{i?N3iFS<5&UAIlll5RgE`r8K2P25U|
zrZPk7O_oG#asGkg!Wk5Scn;YR)La}>gz*H3u;!OhmA1{ckAE7p=%Rs12%_1-hvHee
zf_zfIVho~bX`PZpV|BPSqK_gv?oXbZ|04?18Cka5@Z0_@b;x6w?dUXTpKMX4VPxGi
z_4wj$P#BDRd09L$=T!~Yrp5hpw&$k$nY4^p{Z!FvBPoMHo9&S^v#^&%wtckR!0H#t
z4^}OtOu;0?&1q%XN!!uX(K*(0za*zVzR~paaN7_IBpJg5AO;YnBBkJ-YwU~rGcDze
z%;GH9^{w5#M*@5pkJPlL@O07GFTiObO41O`ePegD=-1O`R8n8;BJYB34#_)Sc>t<^
z6GOt8olG}l->M=p&EW0>UYM|?=33Zj;mOJCWeq^5hFJ>Hkk4s+>9QEAvl_$z1qz62
z%|yEO$gdp}4$*d`n@(PwS6~Txkus<0t9IY;+D#H@hoGZJ!qi<=RFIG9OOXAvr)URy
z*ODpBiL==JvpqZIKo$(f)&c<ZOoS7kSiF30IuBWII(@Ftbj#ahP!qj-_Z+A@j#H(z
z)c69RajDtiw$FcmgPrEM3t2mC8AL6rWb{8UdzYAcw9^y>mYK7gcd5^9-jOZ%IG9@H
zJ)YT&8w5zvhPIk$DsV-67+7f`4kQ+Nj)VdiXlulG&7B;ONbmjEb8}O-IU0!}AaVuq
z^9!M~q%<!<=yzn^={1whr?c|Z4ZNDKx>?*sVx@aM4i`JtI10-d5$04mPB{Ec5-4k{
z_}=-PN55_;5bE^?x$sqN$hF7*9K#;FCP|d#IejU386*=3zFUYHd)5pWI_6X(59~r=
zMwWdyXxdMh;p{6W0}r5iE^u9J_2%x5olhr4`?bDwA+QPU62_$KEc+Vhel?vlHu|vG
zKg^oKN|Y-D{4@7YZi9s1veBEej0X+g247HlllM)=I-1U99Aj3*Qe8a_$cJaD-+Evu
zTs_lnDlh?m#W*CAX3a?-?5j%<2nD^81GcS(>OEQA!Rom@-SaXd+Y#8=a3vsXIuh;g
zj~u;}h&<#oq)*3pihdLQ3Pah_dZ4`IRvgrIGL)y<G0U^7CTm6{4ad!b!S@uDy1J@3
zTENo&SryDd(nttbW5#=_+8Ce(N1c-lK<>nVj+1m>eQ9RyUIFHg7&#1GMcno*wZMbo
zGGn90^yBj5@5^%7L|B2c+A4+@t>e4}^0OqOt7#cn&!S=Hf;WE@(U(I!Jo54KbHKLH
znwZiZF!6;+|99?Zk%n<r1>>G+>G?n=8)Pd_jeCOF7-ub#B~x5)wIA~KGoJ{qtuViE
z^a>?d+ly~m)*;dKcy-In1d^&FaW6HT53ydRXJ4R*qYhD5KlMvpbzggV!NBBF#(e(X
z$n@cKQeQdlBMRv?Z6(ID^_{2g52~`j+$!`8`(a#CvhMc2*_+ycfU)%_B0$~63H(g{
z6@rH{qvFifoa1SIovaeIj=7O|5s5F_$BGlpCXtzi$JZ=1I)T%NIGo1hRPluGiYXI?
zV)kd(;~46~C5~2*vr&FYLO=}@BA#r~44gg4lf06O9cQmq0FW;$%MYMCo9VP($biu~
zP0mcue_&fbbO@jGT_uw&7_e#VD;3cRMPLIMXJGk-3_T%+l6~Uc6DaLWG3TmbR{2ym
zUV%w@hq9<V?<Qo`j9coEMqvUcm5j7djK$0({*dzJ0H%hZ9)L2GS7v~$fVj2vEQ#q%
zt-2g3m8g+TIlOusFugW+nts-VS246;846Vzm5~O{5B(ut4AI4*4mA3J+aM*pK@4D+
zp_tZ(=ruDT$PkFi%aUO!WvS|~>J{E@Zc`Yj7%Cy5Jna#@MvoXRzQ!6k&T9xiC^X4q
zug|taf!Y3Jf|}XQbjDe}hLQ*&51=@a)W#E2lYr-GF%2B#N)|6)47g1<sH?%gQT(R3
z6f_ig@a}=;Ypp4y6SJ&=E{<mlmBh1pE}p6*GWDAdyiA-h&t|kQU9?tHQ$FLVV$G4m
zek_ORbigQ5?MxUID)IQ$({*CjdCmON7Wc~246R!1p0J!d3_Q*()tV=nfN^zvL3ukN
zvd%M<0FbfYX$~sO3f%*sBhN49z%_z@FzSdQI?>P?+e(^vnQR{H+0>v)VWm^GEAe{o
zZjG>`Et`2e`Yd*((2As5>dG+HeU(47&CPxL$&pHy1fC<DG>k`$ZUCdonMi(_t!OvJ
zvdIqh9WYV-?6VDnky^{vayI=HeYxgnncXE*53gh$bjxMcnrt9Q|A#wNHRPhwdfC((
z1W@P8=YG?tSloOzF=lPl(HO>Q!>nI0R3b42<j?0b^>z;C7<l0;WWJ|>yU1{IQ2}K2
znEKJu)@E!M^G(ydLN$Fih&kI&Bn|C7P-d7GcjG9oZa)98D4<Dj9;0`!mc7|^ezWFy
zAre(L>4EU?Wnap3*lmPeR-P7=>#PO|T3b6dId~Kr@gJ!cOL#e9xM-h<Rc#M|a=9)|
zigs_@h2I37bJ_qG1v_khF;pIT&8_luAF^aiu2NXM2BU!+UN?lml^)EOw!4;0+}{6)
zGPqkW+?C*v=2t5lHV?c?hhb_aK<+?W2EG|%rkc%ZuS6XzX%Zn+?|9*UGtPCPWXvV!
zHwpayj^nOHQOhrGKSWY1j3o*F%xq;nQxfmgg*X+;>bd8HnZSQ^5Ux#7+Z8ePtPhg=
zA?(<}3j(kM4iF>IjJ;lY+S1#V718I!z9F1xu=BKYxH$Q$eFB$=GiED^fWXO~*{#no
zk6WP{c=+#5Xkq3j*zXe4MC!fKn4uBziuzvoRAP>aLLr@bRB<;lh~ghn07KfR1G}*d
z1qBOdZx1$@#KC12Dp|RdV4+W*o>ns$M-5H;ML`lGi@=$&g-$66FtLBsJ>m-Y(v2in
z0G7md=y<4Gq&T3mfcr?BCZ^&?9;7)ocZc1!l`?o~#e1UMhWgJ^`@Ip>AL|;n1$SN1
zcD^09aj|n0sF?;gJyx|oM@w82{p&HRu@1C`DJU6kJ{HN2;yq_O5qH|d6E8vf@qGGH
z!30Q4_5pde`E!icD$5x<cRfuPGxa4*z8bL}oKXgKR~|_8h}6n?;gr`M;#NO731uCF
z$=dtHz;hCgD1J>|mVjBBOeQ+%g5moizI|@8-^FUdv;1=#MF1_m2Y#FTxXgNY>nG1W
z6m&hL-_b#P8L5Vsw%Ls&po(RlcqELuWujh749MjjU>OjqT&<CvFzY;BLy)2Ph4D2I
zPSlmntq)wZL)&$hWP*{gvl;cG^~rqu{0agr1a{40&bP=H8t&G;c#v&`(tG13Va&qn
z8axNqGUqV+7J1{(-#Ezu=ZNuI9h((i?$YF)cU#q2v*;~;W&T?{E!C;p$eBzEPNN0n
z{wRRRB4}Fx9MdL!LV)K-4~*_erii3xG!;7*cOKBv@p?fe*EJBByQr?`-&hqHL<GfG
zFLLR(o+V2LXXkEtWmzpzLt3oeEh_XHABzO|z+4JluHZuQFqTx1^DZw}X1BN*Jeg{0
zSDG|*14^`_4jHQpKhtmYhm#iA(~PpbyCU>{kd(?}>OkNotbg1qE!-j2DGb!tAF2l1
zV|IJ;%9TwAQ$%XFZv~~fv;Gl%)eWhSPzJ55!$VKrWkA~_adWMFc$!}!hP|w5#0VdG
zP~Uc-nHoRC@qjnuqs+F~nCBR*Z*FJQ0Vi$qU%~wlcEtk!kiNrzM80OO;nmF(8l`US
z1=eiAiLaLVv}O`tx%YEE&sXsFI>@7bLh~Q)wQ}J;tLYpsF;LHMa@MVhI*4PJuaa-7
zZ~q!}P>wMz8Y+`_-l@*?pT*6t(kYuLt=XG5MiuGe-?3Bvg`6%Mol{f>+|u{cevD=c
z{^T{+QlaUUpze5Bu3|OVyFQ*3+O{)0B3d3M#s67e0xU-3qf|Li{WYulxeZi1Ez5Sy
z&&l_YGa~otKO$so@wWpzDN8ky)khD>Wo%9bq4LLYhWbPEk*8@9^LU<!dOTOHl4f-3
zuIXWV7y|o@KSJi3aRACb^_zie7h?r~;;OVaFIvNWpZqbE)e=H93(lF_>;s>jq&s6k
zr_wQocw9{n)oIe(Nm3|NN9`)+i9Q8O_nmVf6ZM@;obEJz29b>rw94)krM<Gn+B__K
zeU4nFY0hoo%X;NUXQqTSntCa`?t@<+2o*~bRVC~_Vj6&4b}erBSqd09OBTaxXEBlb
z51D3(kj)egkp16Itwj<Qz=e4wVV7M_`K2Nm@goW1Z-7U~M{Jt1`7&UQgU3Xt2rgzG
zTlp=l;Zw368mGWB6M65d?FiMS0btTpaM&;Q4n)rBT2%u*P?;#Q0-TKGw08agXMO5r
z4C!Ea522mR;;;IAAk{PV){~XjK_0wl=&huI_PchHFZY^QW`zSy7`E9<m7f&>$Mi$&
zujk*oC}DRVx9{F{FMp3D?c92p7+)TQ@5<ezleX#?5ui%!GixxJ^Br&)MHpH>CmqV`
zcA5|9#zeelZML%cs_Wtml4*ixJY}h^4+<N&tlNa<5KK(Jz|(hnH*&0+WXBIeMJL40
zJX2_!iY<cJ)~N!c3(>rWUUI#Q#unDj9XM{y!T_>vXcG?9Enz+oZgWu#^$jA{DfTSu
z17%O~42#|`%XzFbZihG(v3!}KtAbGTj2))n!s$l}+`pH={ZdJW$(yzoxn#GY(lleq
zAfk+5w_|Y6e|twqZ^^nDaUnAsn3+dCk*<hMxij#X>1W;(4gM-L7lG>skS&jD)3RHN
zThvv4MTfhI2Nfad9aJr!7#Z4n2$~mqBU~NH|MI!|78vC0DXP!AsO*TFIwiCtdA2|G
zPrQcknFvnQDE@Z=Bm`2N*~e~}LAKEbR4X;N{<ZH4q1&U|!e5LP#W=gKCfPFpa#UOc
zg=C|+7Gi&SOZ;M*GZfV>*x7W;v}A*ir}`vn=H<BJ;!dA1i!`8kb1wqJ#C2sDz=g6d
zZV0H#cO8c;a-hlQ1nH)_k2Ai90p}lBs6Y<QV|aRokk(fH8k!ZGnJO@s{c7|uB4JCy
z3ZubvQM?D|a+>;dM=sbOmE`HQB<hGWPwEpg?xljMhKCzqtb|ckrnyiV*!4VKK?(^K
z^Ab*Tv+8%*FTYEQl#1@VNR9syHHkOW0C(buI!w+185P5(%cH=tvI#5bO@5^D=R%T?
z1V1;KG7NpvrBZQ~bl3K(DXm7b!2$;}VsapJJIqqBw@|T!TRHSM3pJ;#(m^cl2@lLX
zi045*z^I31Co~D3G}i`HD8vaZB~0$hSa-^%eK6rkw%8R20N^{^Jj_=1yxp1_6b$fJ
z6yCe|d&=s?lj!658vVvasJGjkA-GW36{8CI=4(CwaO<Z6JM1}NXR2_)2j)av+-4bF
z{8D*QaCuGQMWXQp`DWE-F}+nopMIDwDmx5+$SpoOuTi?58u!kog|2(Y+OpoWEW@ji
zuB>FcajV)r^;5Yss2tb8%b3AL_P`rVmRFL(b-ZfChOMQ<JAN1+Iu1$R%1mXSavnJF
zesCYG!o@Wg*+#PJ4rxz3u%|!6gGx&Zv?PL<sH1mf(IVao_zo_&(jG+Mr=Etl?sm6Q
z6jgMn;!fk1u8c!lW_`*U85{AY3|_8OCNQwaAxft=LbjK%o3`<8MEEns8Wk1eQP9Y*
z=HePa1g(0i6`7h;3(F=TlK!s{!0(pECACa2{h_K&*ao8j>}gt-nNFLrn@f-~$^H|M
z_5f>zNNr{)OML;{RL(LUZBfFErc1ws50{yQIxo5vU;w%wvGR_QBlWF5ADv56V%(Xg
zE%1ubhA!9YSt*5a#w|Dd%?^HQN=5j&*(_2Mn-MV*DP-aFzOZs(1f7i^Q_K2zTj899
zn0-&O;-^ThX&(mTmr4%|x%@PNh;nvG^U!`IkK?|eJRR76&wN#;#6F=Mge=C_Rm)TC
zs^E~;AjD9Qq5as&0~N*aF4$z6at$r#MS3X(R{dG-L2p$hu3#jR;&CumA{nwUm{x1>
z=Dq!sTm3QnZ0FY|GjqEg33?n>E~A;!)<T*Ng|?0}DT0=T_kQ5Mf*X5gm<G5X!Ma+0
z<9chpvy?ZnXL5mC&_%T=$TS%LhJkeYT7&ziP3Kr$=0OfR_xerfe`GwR^uvvv)aDW~
zOhgKN)0pglF$UfwbJ~F>);r%MCY;0)56p9AB#1ENhFPLNxx)%(bHi{$X^Le(gFG8T
z&rcmQ-QLc!w~408Z8|l!_<wXypXUe3rmXdc&VO1A;d^_?OEw%`CcvF{Q)Q^eCI!$!
zM1J{`-k|QUHErP(p%C%c9TfPqn81UhE~DU=b)I-BLcVXlt;BKwu)ZEM9x+#dt8h#m
zNN=iNBwCw35HhI$Rk6T^`zn)ba-d}sL9Jf|pzk{<e+1VjHbO5EsL1aylpya>ofZ<&
zz7H9hZgS{CII#9O@o2U9TYZN&r;$mI%jNh57Ekkty;!X7&^h97CAF?m)wNEz+rGfc
z^{@r=@RPXw`Zj{yvQy4s{n{jXPgSFUl)+m>xmvOD$u2TfmiSG-6rX9H7incdw*tvg
z!&gRALx-Jfu{v7eN#8UFh3U*ffw5xWw!Ov;$#@QlClZ*JdV=_#ip7Eqw#vUxGmWGd
z{n%D(?j)N!BqwseEx2dbi!2t#$^_eOgS0spQww8D4}7G8Wn;wn#C6V!#ZvTgBk=v2
zqAvSixzir~=6x~Mz%e|Je&5PdWM`|!6oB^qCQCHIeF9t*Q?K80p1v%{PQ&(g*)h;G
zw^7f5ii|CZ_`-=NvLKf@J*P9F?CLIu<unGd7{F5>&6`@mrrzkp1Cx)?luN6iz$3XK
z$uO>{v=GkiBnBN1A>DCtlss?XoErE;s<`$VETcUB0kMPbHwx3Iu_b&S>cZ8*zh&2J
zwLE}_HDhjM&-;T22$hTm-9m2Xd9O1sSKc7ihW!l+b`W(W(CQ1`q=xcG-fW>4)veq^
zdW}HFhvN}5FX4@`&t<1`GONs4#X~wo`vkY<q{{j!to14<a+7gdB;}k7ZT*|&mN`gw
zLFaQ7W}zjLXrr%7v|r+F`FoTnfS9j2^n{Tt&fU3wzNEO(FlRA1110n&j6o3xIxF`<
zHuXg~0fjHqDBy{KA?g(qC9U%mOLG6wq>Cx%=d!b!g0otc=<qT$A~z3b#<5dVDRr1H
z^3~=}%nwyAKr>fIYLXRoNQuPZgs!4cH3b~o20QJ*m=*u_>dSjJ+n?7Q6X&}ark$LV
zkwzk)m1ssp=Wv`!lYYe$wO!PETd`Q7;rx0VXpt!yac~PTITO>SLJnM%@=xwi2zo|0
zsULv%4=EJXea6&!#`5bBUrn@SODW4^-D)DOZ?e!z^drwinY0!7_)WcDs<GJt$qz}g
z#Xnfq3Z`tLmB-(@Y(Aqi0y!pDHiVnVv(Un{fReMKtLDqf2UFuR#%z%rCEQ0vJOGIU
zD0;xL#Yy+$-#jtQ(YeHzDIHQXglT=HK4s!tMXe)f$0@iL167zhCnnN6S0r!#MHH!=
zQ}s3Ro8@J7J2zF!z-}P+p~8fB8-2g!OZ!a7Q8`#&*#reII(n8F<}~%RsB8X~VEKew
zUq53nFT|)CS(-zso(J79vCTTN8+0!PQThzT$ZratEn0II(p2*fwC($@1OQzzKF%Y8
zP~Yy1cZnorHSSIMir*d=OL^^uzNwFyQHk(JMNaR!0C$C)`n*&!Q6AP;lj*w&sxu+0
zmXbM1Cm7_K)uoqL$*X>)NGuZA+FehBbpA&aB|Md$c$UgIjj0}*P)-}*c0{C`B^JK(
zjI=BNFeYv1kfn=X)GYb_U|Ea{YCD*29MZnOzbYqf^|{K2#@%i`MAVITO~dWay+)I6
zxa^;lu}S<u>TiIIzT!<jg=P^plCVvXU1PW(1Ck@_<;e=+JUm%Ar<jpDh@^P8Mg1;J
zF-=3igTf;xRn!y!4o%zi2vQTHxc<B_EbG-!YeTTfVSBX!AD;6|PQbKC4-^Mrr@&Ub
z^{=mWSBPsW8h*uz7F~e1|B6LW%kHlC)EYF4_R9)#HHs*nhY30!^AEujgU3m-fkqT;
zGC+F^p}t!3Pu!yz+<JiUKr_M4!7+2@gD&|()GXVx^vC2IYW4E=>(SoX!naAwZ#RXk
zKJHUKl*l~J;|eAG;=Vdi_pNIreb*J=@j3%Qobawvg$Ui&D-C(W@R7nRREeUSM%?$D
zg}f;14+SGu<v%w&)j49&6BtR}5bCk>Z*}A0RzGXg3~E6(NPdvlVq6wsm0(dLyMr!L
z#apL*O1Ie3{=<roZ^6EvDnzKsBbatI)3cmA@mszhy_8gc(J)lm#2l7HrTI;hi$#v-
za?c8oBlq~}$0Q}T6mI<?H}rGPMs5)d^4#}IUa5z}X$USGPP@u4)Wt4y0cnSvIlTr8
zf%(Qk`M)NSE@ZIukXo)X=HzJbk9Ea2jT1+ncOFxp8J&^FpXzS@Sm?KCB3BntpF3fG
z(R?!pU}8_2lypNgM35|Iyo~oiOR~96b5S@|DP4FBEqtJ~&v#$o7t2edesQmubGYrB
z`J$K0Hc&}(@3Pap%4(jHfmKr;|2StdWJcm=qM4m<X%mS$MymlbrxkGQA#X)|MI9O<
zeD`VD!(YqflwCz1oj|#wD&8~CoB^l&Y9Ui5Qk(n_L0OKc4<CtBLc9}J{zUofq8q}o
zA6s}0$9@`qy{bNo3EWfoj(F(Ac?Y<UP(G1AL=$_&)e6T!j=>(gDv~a8k|;1GL9^og
zG*|xfJh{gq!Tl)^33?+)+<M?J^$zvWf|8kuv?|eJiVJBBiloaEqP-F&)9ZwV@@TCC
zd0%FHatOIw=hzW$QX8<_q^ZH3Xl>g&SJdLng1#QW4Q!>fz0hW(pF89YFXy@E!S^vE
z!DVj`5&ybZ+7gxOzJ&_~Yutv*kl2H=2r9^<&zW`^?GuigG${X)|F~?hCV7OOFG!#{
zWc=~_&3l4VFIKVUD;zNH2fxILUvqgmeT)^(q4g8<la;h+u3=cy(nG+PV)k&n-;G^B
zHL=?&W?U&|PGmww^CZVXs!$=%-cL(UeGS~EQft_5b-BfOUV~4tw3`|>*VvYG?i|^I
zoj@y~HrvxS`-|d6d-Sesn55%)Mze><LLyS3&z<g?3U{f8oe0bJrqT>;0u;S9pMYU!
zl7h##KmSIqCD0mYrgqNhm;8TheFs=mP1APhEkFpp*HA(Wy+{j1AoSk56a}P-f&$V>
zsDhMGln$W?Qba&hO6ZZISP(>tR2x;P`XBUp-tYas>(9k?vS)X8=APNv*>l1<JCqk6
zx-u?z=jD#xEkUM#UglQ8o3<tqo@i1{Jr%geN>sMV5}U~vZpXC8G%+-v-K=*3&3`kE
zSNFuMi-;gJTU)19{$YS<nbZsVWUw>6%D2l&j+<l66)%~Q6L^Sv8(ZK!N<Ap6jl=1e
znd)-D<~ko!nU1zO#hb457TCh)=7%2i<xj|{q)!%xHp{5Qd0mzS_E~<#q-#I0;!tNL
z;IrTzvCG|ea|At7gKd?#VTB=eTIB&}$@FJ5>VBLazR$n!D8dj_e1D34T4O<_bfj-a
zS~^T~1#&GUL>?iVD!WD=By4+q{AjDD$=5Y9q0iSyIa4sa7)JvkzN*CEGcSp9*3*R4
zdD0jpe<}!lmhHrO@9MIma<v0r{u2*Y9gCt}BncBg3%+)Y`U1iDIi$S(w7)7HJ}2|#
z7#4xKQe&O^1p82PlX^zw8ha{sbwREE%~GSQgutsdo`vlLjuY7|o+sO6)aG-GDq!Xg
z_9?vtIzp{P&SuJ5k3&$W(oF2*kt`CW#zPC-uqX}N`^-h_SlX`m3GW5_S%xumT+OV7
z&+@9b*EqJGo~Bk}2z2S0JD+}TJDSE!_E?efv|oL&puOCd7HMKM;Zqv~R@vPuVK4BG
zwv$}23KBTe!#d3e%gL_&xUy<oPtuc`%Qq7uOPQ88^NbZj=A)G6cX-zN9$XQiTaGlh
zDF2bwh_EiXhVp(i<NBeZzP~ZADKupHRl3RH@@>mIve)a<tkMXLu?`WB!!0Mq<ro(_
z90J%~C9O?$TdBgDq}ph)8hitZ9<Oqr{04bYyO9d|&SNZM&IZ0k!;JdEvoqVQ*Eky0
zE-udEMR_*;JQ`YNYF<3l`x?FadVSf-s843W`?Eh*$^6ja4yz?5ZeqFI+_QRL<`Mqd
z>#&l{<#E=~X=ll6TYfBag8S(FrqczOJc-0)sta_L4Q73PfU6CmsP{(r-8WuD;7!f0
zR2l>WN$v;cJ2xPftPOenisERn2BGhJ7)Tz~DQ@gPfW1oA+9UK-I;6gt>x@0GGPGfk
zaOQPVz|!gIlPaZK!jO{g$=j;nCLR(d+Vd7y%u`-0F`H<Gk?j1KaDzmcIj3(PX%HwG
zm{adVb1U~}XHVE7tKLAcCm~rts&jtHV>sZOnC^_jEf`eraSf?jk?`A;?H6Q>a%5o=
z`)24qZq!*3HjH-Sg3)ja#}&9e`-^<PBnekOJrz5g$G9(El1e|+ISOCzJ~M2PDRObK
zkO^i&ow^lRw1Txb(Mjr6iI8ywo))g*?&PUx`xQyL6-%*bhV>?>1na$RkI8y;j3##*
z-k4!_>OCsF<$wpHFyT5SC|WYSxSJV4_wsCKz&0tPw0Y2U7-}@9$J|FeXj-zVX~(>g
zjFRRj=M8df#zKwx9F@Zd)TgXWnAd!Oc<8<LffWHZa+RQ-Bi8NbU3f<_{8gUaJK+SK
za(W97!s5qFgK~Rs^xTX%YC$9O3aw%xgi?jswtR~^q)1#6A&J8c)cK^*!E*Po)1>=7
zh+dv=<y?<y(ISxy{cNNG>Jg0|nX{3}m*DKCIS=~KOth%lFx9~>UCF0%TD+QLkZA>z
zhh(q%2c5SnwocG;9`P{4g2FrE%l3u!V%b(W`}z|+Hwl)V&ONRZ&yhq!sIw)&a9o6=
zMWc#JP3RC;mIZ3i;X+z6In`qdokH`Z*ZSZ!rIdvr1y>qf(goWR$7pU&f|sMO@pk>`
zV{nH@g=B+^R$5;ddTR|{?Mxn6_dbKc<goh?_GS)mL=3uI?6<Z&2RxxIEjt?odQulu
zH(68^&)KosF}}Ga8~DJilrEacZcfe${&Y}&u|?x6S$5$=|B%mhgvZc!?P4Ft_@5=w
zG#MUuy~xJXjtbLx?#dS50zbA?Qtay_o#}i0Bjb%vZ7|L2j@A+hC2E_>-CWq$Z(_ai
z9j0nw<T{p5wj&O61LWp)UDBT1!zz0=T3;Z*Dc6O9uHdngKc|Yxl8R6CKuoW`QQ!uV
zsfF114YrvP>TPx)gOf9X7_s~ACq5#<wdMuWFvHl!0p$L>27<9SVUsai({Pt!`{HA^
zEt~Y7T919thdm2x7jm<0>va6D6+CXs0`)i9yY<_KsqEr{fY<1M@TvaX)?)L>=vcQp
zx`8PFnWEdwL_B~N?3LMJ>R;4jH=5ypyO<=Ccv`R~pCb2tpEKWIt}E<{%^C5TF&XoF
z;FanXjy>Gbqs$T2<1{QMAL|Hp(aj0<F^l+R-U~P`{=4?^$nb26ZUyW@=P~ONPy7YH
z3Lm9?#RR85kUFz!v6tnxv#PiAYkaS1IGIn%$oMt&$~1;$Ch_NVYBWjxd7n4B4Z6D8
zCC2JpLe+*HAQ#Jx&GGWa2O_^gkeArtkR3$5%eBnOLU+fD*FJ}?EHF2DFgHUJve1Zb
z2?tXTysvWK0jS^g8%4FoQD*EgXMt%gG{?lgcnKtVkzeK~@R(6;L}rHmH`ph?RNKc(
zc5|XUi~;(wbq>iUZ#;g32o!19%8g8(+56>Irov7;j`fhBDndKq(+gfZ*&#S@>=yip
z?Lp5LgTR|5;=;lpjcN`(!ph*vj5UCdUr4C)<CJ=?PCmyrOLqvjf^9$7kK~1in8^s(
ztCx&K@a1%^?T9Y|y~;%oO28)Z5XU{)l_w!j+O4a5qV5ezo6lb~{3#J}r~ez_+N02m
z>%T#fE2<POFa?I=LVLm@Uy1QMdV(oMv*qr+cssE@*3>IYa-#Uf53}Y?7x{0d`~)?l
zXIH7ck#jGMW<KTK)b&q(S6ywz27k{}!xE;%_F1o2`U8tirDl5<?V!ziIoF+oEn)JP
z*eG92W+3%Nev`rnHhqaBT_knJ#Ff=B2jawHJGX)Uua2GZ+|~3I4tbrmB+W{in5E#k
zi|b%jIEOQPK6h=Kg(hT-p;aZ8q{5kcl65`;_fD{DP~uK(TB@Y^4##(fxWrW-_*E;D
zu`Mg{f#zT}rUnf4$*|t?_`pp}QW!@Hxv%vNa_3p|a2F%*uGIScXG;MtCRrupWlQ+(
zz?}AN)AAu3T5+u{I&ba#8vaSY)LWP!+#_eQC|!<pj@0V~g?UBIF)YHr;u;{8yM>ja
z$4-mJoOr2jK|9Bg(A?-G<wCl4U1TKb%>u~VJAFj{v3+FLwqene*(?*tuvN;&9l3|L
z$r342s~qZ<Wo;K`!ij5czvSZx#n(7-7O*oPT}-QYr;o^rVG?^VK3(<V{+iA#SAEJJ
z^E0QKO3ssPmZoxLCKcqP><pyRA>_p=C7MGet!3=0s+8yERw%MBX?+NyDdWyN<U!-|
zbxTPC>>R)X5i0pG?*1tiWn)Ugkn#58;LVc34reby>lpL51I{NxZ%a@G`DqcE>W7cV
zYBsd;11D4H{LjV<NN{3=27az5Zw(XVss`AL7#XuOoY%b3DaMDLc$sTP->5&tg|RHY
z#ywt}icIDDrCP|$_?^=)!Ml4C&N*XAc&eXma`z7D<|ru3QvSR8_?pHYVZM#7{>Pj&
zhJ?bkOOV^;bk`p^Uz+o8qz@zgpl233{$RJlg*?GGUU)V%Eoo5E*}W@gyT~~*St{^H
zQW;I|*Tg>AyDhVM?|f|S1~71`ZDw_%Cz#$FkS%Gd93M7{)y~wCH3zR%t|y3^6w_7f
z0>=XT!Tz5ruf8B6B!4DMu+2Ej4mN?!&}m>~YHvn+1B&)m5xWDw`$O=WGyUR(mr9Ab
z$5okd4qhGj#JUXH56JtS?yb<(d4g$1JJRAqTC2C}NgjqVGq>erYTRF_Hk`Z7!|g_D
zWlAaErEI;bL`?B?d_>#iYdTkxD0;9QT}dJP1SQ2L{<L45KJ?8@yiff&L-jHP&vhN`
zjyIn3^1x0QdyHmmz?K^qFafUK+K<|yH~2@d57HSdbA-mB>r?esu9+rtmh%jlddGUS
zl8~!t(PBLpn+4jqTN1=(ek3Uy(WQ|nu50ma&g;5)WiIbCyu6&c>PkB0$UfhM-A}R`
zffdDWGCEFm`E??)NNq5e#Cu=pZBwFYO?JqrDxqU0@;l{^(!RpWX2PU5mLX&O#PC?{
zrYrAmVXnn1JKn;QS$7XA9Vm;v?KGO!OFD}f#dCT(47odWI4FI(pmQr@Rq_R)VTtTi
zX7o2`GX6&x@1U|tfboMX?6=hLHUS?kTrN=M?C+6^PZG47ZtW5s-MdqWb`OjmdU!HK
zkPD;G<re{7g=qcdA<Zb{%S!5HlbX`VZRCgO8LyI9o9a~@qKqJ#VI}y*A8@S~I?VT|
zIY_6gL=1kO`EXL4V%gxmC4Q6NJ;9eR)2VPM_Q&UJ{2<1j(2dG}^!6mpmVzX%?8Nj_
zk8a?jM?2g$PC=OVt&$Th3%1vNdo+(#6(}vX9UL!JtUKm*P;H|vb}yz>z0xpzq5EKL
zi*25g>Zy^tKI8Y&!a$u}l{J`8I9tksh}e5YS{7qYH{FkjZfDp!vF-N!@NNAdo{Ieo
z!1mXrGLaddF=^aNGj0ZJ#0tn>u-%q;F@tJ{LyAV(x?FKWl+n1$_&0|zL|#$yW?t9D
z1J<MgUTE@>kH4j>h63v>fhX`u9%d^rThXhIB(^Uvm1b!&#4^TmsZeLRNi_j$AvkLl
zZW~UNJ(cz_e9PTBqdLa&-OX*~ZBLgiPs&gCu2SRQ!Pe}23u{J<@;=~OX{^VHzNGM-
zXhEDHBdNWTV!+!HTP|2&^EgnCKtty*J71#0urOv9aNCSAkAKLxuS7*6-K_($Sk|g{
zCE6KxgRgA)v0pR3pUqdu;aTJ@SUq@8iv(7pT2ItLey<g>KwUaP$(}#<6jhhHgBSY-
z8CH?0N&XGOJVyi1e~>-?Di&QNf(VG)Cj82_j+#jH8x6Q);43rXXc@2k$zMM`Vyy;_
zwpJD(azf_?*Vh+(V}hsSEpO)c-gx<LbLNpvulycmWd)FqJ@>VhYF+5Ywhx=jT6Wc=
zyU;J$KX8e%2*I|M!MHkt55FDHK~-nAk{_GEBS)u#cZE{JgM)c8Zjh^DMxUtc!enX3
z1s0?%4`bnhR1rQ7%No_P;~^Ym5fAfIN7AOybm?RHU!C7?SwI|;@P`7%BxxSiVlJEf
z!N!+EVM$E_KsLbiZ=Rso+02nANAWgnck&r5zA?lMtr$=ZE#7Xyk5BT{652Z{ah!tQ
ztX<e`XQn1-e~D*X#wMDG>xelZiO<`|)~iu=0CUZG#JLxtd$BPDy-{17rQ=H<_Vz-q
zUddMnY_f$#-%|1(ag&u+&*v3%tq%5GWs#59{%??SnroeTVaZs2czj^cV6l>z^~pd?
zxSYBXg$0^xaOE(GOFPEn!Ir%azF{(>x8gFP2L^AS@83>u*SQ<gP6+Q*!>$pHN^)s;
zpznMzTK;C8KhTgc^UT4ITg*P+nYPGHc4g__Sn4ZBOsxjB4+e>A$htr2N3g<-bgo^X
zHBO<%vb8p?kvR~oA2nL`AL*t%B`j{SU41O!Vut&*3H<I6M%Kh8`LiaFJQ6D(A-zO!
z+!ZLV1Rf__)_L-_&V9kb&a#*33-(hdh}r2$MsYt))FkSGt0#xV>0QN|Exuak;f#*C
z`78BKhxr*mj$YMFtPA)^m)=T%_7TCnEi_><Ij?6zRxT|M_W&}s)PF@r_25F?jPok?
z%g3r<TE7F?J}j<lC**=hYDt*%#Ld|DOoxK$sNtEU8M~3oT}N0<`a}rvs`exsZ~JBM
z^=4IXYP#YKk|#$6`r-w&FK74_^Ou@AirCN}kn`!NsasD6btRpTQ#}fNnI-(EOLW0=
z0`)y%zp6#^BqMk3RhzHQs{}X1h~PK7l291%%oCgosn(#<vl^qlD)3JRPu44J0)?S|
z6CdQ7WfRC?MxP;^Mc&TS;*`#Ww{mBd`5|I7<~Qyf#}f6;mvN1#pu9OZdf5kCtMh9P
z@89dUOKiydDTZ^go-w9-dLZt;{gR2v?y&_;TfLPoBz~!rALkt<yQJbw*MZ|2-I3|e
z{gLyAwuSKt+jCO6_Qoq^H}MHoZShi$NE2z<Haja>xKvgtI#-GMnDj})ZH86nN8>CB
zsDYdhRGqWKbrv=kslI!mJ>RD@vaQ5Oxj0JMMBO{=Ugn^j8B@HB7iV#yM77OrjG<`h
zmQ7z8Q{L#X?qbV*v;rVprF&U%hqhLZb<;on!T_$<F7<lh3KsRD!_h%pHCD8mXZ4-(
zFYpKx^6JoJ#nN|U@Ft#wR9nAY)t8ZY7UN}dKsM8eL@5xd>!?KH8x~f5WmgG&PE2z0
zl2l0SYG%mHQu@*kgSzPFA;tj38scHy4zZl>84DVLK33n2hl-or>z2=^^7W~1U2S51
zoFmsJ<(~goVxF0mb7USRyi^xDfc@H%AFh%<JcrHF8u}cR3wq{Q{3QgVdxk#bp&c+8
zRVbLL(a;<G?)5Y4f^<Atz?L+hW3l;qEe{pp#!{CJIG*Wafq8*g9$h7;O4chKXPu{2
zIyWM>RO=?ZcT<@)5ixheq(l=1Ex$`lLO-YXI%`iQFRRd?iYN;5e{y=eBlSX!WoK~?
zNbAoNB8)^Ipz$=BUZ4-RWlKi}Y$CSg-oC%`^r1@TNGYT>>X0L@i(u#@@Gx|&`hn4F
zmzOR)M}_u-TNVz*R1m&yADf`Tavy_^hfVAB&K2fc)Uq{SyV`MV^L5#H<KfreeDtc*
zB|*|QqHokBpU?Erd>8$x@iOhFXZH~Od(K<MqaD6;i4O%$nuCpIxs8sQru-5U=Clfo
ze};}x5!3iemtrFKuY!5lzE8@zT^v-FvvN`OAdD$(Zh<?#wywSI;(Nzh7ZSMUN+}nd
zdzIO8ZT5lj^qPZI1^-k1#}9kX==a1GG+@KMZ{^7Oi{T6W#+YRCZ?aM4Qn7}%LyyEh
zn>P?lUlyF``S7yhzRy&0>6YlE{mgu|<i!wD5)Ew1wp?)_^}gU*9&^*mH6<Tt_pwTz
zy#n;tXe@l#-MI$ieJFj|2b#g4-^YGq%N)<bDA_2)|6a8-^A?kLOwMu2)K%u%^jSly
zmWv_#j>Ft%HQTUA84D0*$VVl^ufQTrku8b*ic|xMIp^48iw0q;?^{)>DG3bTALE%P
z%5Co!oS+V9yCwq8M#F+%v?RyBrP0aNxs*$(%F%gM<rs{w0r7cu7ibO2#j|<NfnOs}
zsxvw@NaVSPX6ByEu(rco$oXDbR7=<+;NL2@tcTXdDa~ir2M-l2D!C>!TGCk{AKoS-
z_M(u@7+?<$m%h4UzkATt-C&G20%>#-bvwj5o^E8Q6eS>I2vP)j^0&#@aUUYQ^5(ng
zDsMP!jHk32$=yIH_%F?@jOAgO36+JOE6Yn>k~=sjZu29|1yo5M$4q?$?V<IHhW(KB
zG))L-B{HvE;<FxB=J}$YQv5CBXXP%XnD6N#keT_0HJb=0&stJ=`N$99q_ypEMCP*^
zYP-0a5l7Zb4ERTK3jV<l`9F1)EV&mbA)pT)_Tr}P6ngptwlAa{?A~CrnZKUDY=e@7
zh|KtJils{jZ+52PtF{^7*3Xs6w*+SMutIei{SfT}M4|Kg*;w?{sABz0RFL7*>)&im
zTm(t{=bzJj9=w@8<X+-Q?WMj1?>_B&K%VL0An@2`k-!F5bP>4Zn;v@D+~8n%BOE=(
zwFEDt%|DQ(9XrmlGK*atJRP^)b{D{yQv@x;)>P5ZA}i{>dB+0u;en`5M-6vxQSM`@
zT6Su(P0M8v+g%DLu+|Q9<VE!8PSQ6xbN5WMCwTVP=oPMT>E#gC1a9r2m)+|!J1B!T
zl|lvO#JXth;|xl|!};}oRTdB71rd%yvcWZ<+RNc}Va0Vx>#`rqm=nns@J<D!Ajw`S
zmcv_}d8}xo1QLoEa&y}mQ_=?mw;jIRf5oWNqf`4`(A6-MWjzIY6e-HfRMXyDu{8g9
zlZ>c?X}$C`^`*wIh~tJG4%7nqDt50x@rpSsLkHzoc#12cFabM?Um5aT8oSuZ0G$wo
zcXSsne@S5?O>BMU&1pHnrH|B_!;(yWh}L&`@d(_1Ky=!1OT|(C*rb0C+m-*}>*D>_
z^dbIM*S9@Y3X605xofVE<^>1)2*3mw0=3kmdt0vjoWXZo*lAW;49n<S8l!E|Q;@c7
zzKg*3<<lN=nz~W1xEF7&dD7#TZHq4o`=y>T2LvB$z&fNUF561z6z5n>l$IG~y=g`q
zmsTmlU1CR7Lq>V8d4m&|*UnPAelQ<%9O;0AM7lieh)BFux}L1j`F94lMdS~9wvo#G
z2re-7NW7WfLZ~WFm;bnWzxNp{VqBNCAVxZ?<_!h7r~1elHHD&b@2LJ6=}m^K&We8(
z4tMe~yfK`xEZ=9Y#jc!7-!-V3S$V_1kbwKX@uvK0ji7-t)E&knav=EwOI%Z{ob}?&
zI-%N%m-V>h%=c}K3R-zhu+Q0uS58%=4Rdje^M$5qPkH$z<0enGj8USBneG8}DUF4+
z?09$n(l2kX)L*+v-#o3!q7-^>gvn*}iM>j|D&9(UNlj4Vg-OhAS=U*VM6$__d^)DW
zZ@IpP;@qtRJRWl!MG4xZY;@fXtsXtL&#Nrz8lbvuNFs}9Q|TPKH@qaBDcB@$M3ks<
z?X|p1wAx^gPP35H8S6ePkI7jOp{(~Q((VEGfMA6SGee=4wX)Au;8j-W46khUF!$T|
zC1^fNVg6y8oDKOngP&>iHxM1zCX@U$dxrO$puHx8?r6?+_U`;sa+g4*hywIDvvEJi
zHXi>r8-Jp|xg3H(EZcNl^pN|s(|ln@oe;7DUn8lvdCq_~Pp!wwLwheZytJ*PF&=*m
zneV|zV@*C6{=mwb8Y!UJ4P!m}dXIncokmq}V#XzUeiblgy*ZG!(l#H6A(EWA$qw`9
zzKaVae1n51s4`Z;1KiN&e$EC6>`EBg>6U`T`#o8HhFf>Q6Kv1bB$m|49?jPzz$nZa
zuD%T(uV7(1)m0pLuV`?}5Lx+=k@`UPDsf$=!ZHE!KDvgqpu%3LY0dRh<7>0hnPq3%
z`$3;YcA$?J39=$q%OWp1J~~|{YE^83xi2OdTqks9O6DbSrbuY5Wj>wo1zGE3ZgAW`
zViNoO@~SQ2e$?K67;T!>)i4V9*#&%K<eY9eLq~zry#<)Mk;=z64Vf^-D9#FI3&-2-
z#+3CuBYB#UL{m2y8U=>1e14T7XY&M&&|a*JFek3X?m})8n0V+7>5?*S?>PLc1yO)D
z(Hj{y;rmnsXkg3xW{Y2<xOl7l6BMhN!MqFAuWGr_Zv8<A_N$d22dG(t%;y~2@@|lX
zzhdY)Bc=1SdyVF!INCLVMLV43^uh*IGRgw3MSzFt(3x=UYK!OOp1lfWVno;1?wP`;
zb`KYXi+Ahpm$pvkQ_Q<$^wsRYpdl<uw>QkK4C$TO7tJW$BNR`-;zlDx*;_K+;}hhm
z8x2k@FUTW4e__5Jf@Ug|1OD-|*r~Kd+sAk96{Jnvyn2!?A&8L;*6WD1$P}Atbn5(e
zgH_yjm8<UsioZK9{Xu3eEn!fJGgfjizF?FgyQxMTuxO7pWo9Dkx#1(Y%kbu4AIrV4
zMI(6aaE{qM<AW?R?)Qb--+ctx)mg>WE#lpoQ4b%Y$Uo92D|D8~ct6Q_SOb<IuWWu7
z6}{NRTIk0G_sBr!gv&j6Zs6_Abj4DP+{vzPNQP|mse&?Ijnr>8gY3~v%oxv-Rp`;1
zaO!PxrN_#5y9GwEN=kHs#9!KNU~Mwr)WZW21AM={T3?p67X_c7D~r}#WC>4u29o->
zJJX7kXjlRm2({RE6q*rAMx7GF&==cX9(5IA%)#}JyaJ20HJ%T(VFwDOa%}6IX>QQs
zo8O1)u9HslAtZn3UyR$byB`zVk#>f^>Th>cg1;)Uzq4iDSZ)0IBC*rzHwQ+VcEu3R
zp88>RqnvMo_zp0Vr0ZVF!j)TV0*|z<mqp~(mL@`!=<9#oL4ImTE%3j5%Uo97$U9Q-
z$uYRpz|?~S9%bB(o4a(K0iE9%WO<(wT62=Or{UxDcp->$MoF?YRVSTPsx8903D`T|
zD$qMq7|XZi^cZtPLSuwgkK^YXpJG*YeLhE~sG-SAvi)K6v^;C}YruW@v*$jGy$v$(
zP?Y4|8(az3@iqAOid4w2*fdE!ya+?X7cJ|3oEYueOV4(ic;=ipyy%SA#yZ+E$*&{O
zePZc#malKXl}u2OQf(HaxPDE2=z|C4rKD7@F;T9tOSo=n$n;WzZd6cVEJFqU?UV$4
zq1~a^H@QoP2{{S<`U(oiUQfxdLS5(>uAh~c{3=CUaVyFtz>=j}WbqcygtZS4JCde3
zW#jS^jb)1&LvKa7b^GQwb`o2R>IK&s7jqm*tfSZ0$~@I!KgBr3Ek|63EjOZ&CKL?G
zGd{HC`dy*v3qjJj!9y(UO~q?H+cntGdLuehQ%>V??x_{^j2R=gf~Ol*WYi!scFPRY
zkBD&DV{{MUEfX<bJ781kPLis>koW00EylsH-L5MqoItgmA<>0?${%LyzZ|HbB)WW6
z^V<de{rW4OcAq~W5g2kx>lXx`yJXqveMM51=|=GmWC4wwC3+nx`9AjQy$<PD!E<lS
zZw(@yhn!a=2nkL1m%ZoCjGa-I%(%2I%e^}HrW$@6*fP!y*ZppTf533K)A{C=OA?<f
z{9Vkj6sq@<VdzIx_9ckCL~|1}$IddiU3=<V2J1l^3#a`HhF=*e==-5hjaN1Xb!Zxa
zL`xFm)t7>2x)OtSb?2i5czhu{U6Yw`&f{ogvyOy3@NWz|Mtz(OCd_dgDcqemZ#!NR
zP51c*J9F^y&$Z{~7?5X0S7?v(yfsncWf_cR54-ErF!2NmM&sJpWvi%#vH3Ob_flV=
zrC~~9Pt#GQ0XZEd5hN1Qx>}Ez^FoxjIGR~1;=;R1HeZ)%DY*@>PorOW%oDakfOJwa
z4r?yvkFj5de@(1TAiMK8!lVe}aVd;~o9y@tKj9ZX?no;udLPafTd-4jE}m&d`kK?I
zphOiSZEyd64+4__o5O=hKp+rArZBtQO!vV!Vr7!e?qkSXo9G|&A;WG_d-MwZW@W<#
zdPqAMvYJZ$J`-Ycw@=Gs`8TNaH|RGg=KK)R_Obb3F8Vj<`EStodtpC62JTL3e*Sp;
z8+0u5^6N{Fm9vH*j6nIMhzRz^q{jB38ln#@Z)H4%p*@&(X&W~|41hg#D6x1+xdG#H
zBNtp~Ug2k+FAtYTi*FH}e?I5h8&}(Vp}bf6^f%}%`eY(z@8kEMlPV`KqCWnl@E)9t
z9xgOl|9*)Ksd4i+DC+0i-=I$m-d1kWkL?^*7os&wqkm2!e!e;f`snA$(aFtk(d}8>
zZIj(cmJ4$UFJO~q>Z%{3Pkw`*hJ5S+_9A|^XJ))Vsk}F-wl^8QH>un{2OOimPF}MM
zJQ!E^+HW1*-yWDyD^C~NGe-2K1K<%;7nKLVY6Bu|AAcVEgJs9Tt$kY^zd?<2AAhX(
zogMAp2cA~<Pj-^1n7e%r<81Hy*>BLVpXcSJXD1&e72RAuK0SFGvo}}bLOSTk_(Bsx
zo)|Vu2^mB1(?D9{z+p68tt61xeo^xguvTAG<s_eWqIb%x5Zci1@5H~n?-{XU43vLm
zsQW6CX~sm+!U6v_8ph~xgDEn+C=vz@q@;4FvNM5A%Gaf`R~Unfe}jIAeohr#%A^c=
zE76*ayZY??Vk)|9kCHDwO(1?$;@NuZTYvZNlZ~c+|6zJD47u$`HTePQ;Jwt&ldJN>
zFAyvAs&A!L+UBEve%qVll^@ofcS&Kkp|A_F8fU_1&`AL}(j6|%ntWnFUMuxxVhSXE
z>A`&0rHbNmyOqi9-C?!u^%u7$rR8iCZK9c8Z6|=Bw1)}c;1#gafEi-NO!OmH`%7?Z
zo3TJ_ESQB#G+vx9m6|UH#Fu(2poa8<H><k&GzLKeM)ZTv%|8H!+y(RXfeo3}Lh$z-
zhPjYF<{m*RCp_%~^SciCUWiPb5RfPwG05dkB##(i5*QK&`hZYOa{Zv~0Wcqv$)yi2
z9Xaky&LJhT{St^h@Pz?=2$Iws$pl3*0R;#kWVjhI5THE3)%prdgd`2yBV2fiE(75t
zdM!ajEG6D}2r?03kpi)xU<2qw@K_675MqEB5(k#;10!@u5eexYL*^k&)PcfNdh#zX
z%l9J5r}Px=Ams;a<fnAx0V$jgDR+=~0}x0DMBEP|iUo!B!N8<_qzr>horc$9<3JE%
zV5)*ZB+7ddAV?omSOV9yiTfRDwon>Lccd}I98`r2Xk2y|E$Ylqsc7nEo&I<)YR~YR
z$J~yWUS49<t@=&H=T1%Pi3<U_&gfxz8ibbCqP0*kmCH>|DF0ZiA>)k2hfqT1G)!<#
zb*A;&@LlkrH#ODQFL%_)Udg|#xwP`8*Z|gXq^x{cj(W%WOQB?!AQN|X602RzNB!^}
zjwJgEE<jPo=ymWsqOq>Z>mj(R?N;p=x6*Op@=to@&t_-q&FYgX3G}F2Gu)2pdl<s&
zj6+{xkrv1{2oh#|<N3-s*lGaLKSbF_1*x=$Bx#$No0#|6N4g2U)4O;uq#3^VF?#5J
z_>gl*fy)=f05XZ!Lw`O*(fl$Qmljc+8vh7rt0;>?yg1b~q_4UHEVvaw35f%V>ZC%*
zxq=5M5d*29UNVFy35Y08xfjewgjD#h&tYrO>Ji5-N>$y~dKpBA7$D^r1oG&m^AY!v
zRhno8UxbtqtL?_AwU~fYx7^&C?H{~Pje2kKwVA~~$*k;tcxb*rws6b`n!VhjK%v<_
zXzPqjai9UE=pOC&>SDWz*Jk9RO8jk4htBxk`SSF?_D2egU;4hq{CyIZ6sglE&1d5g
zpT!W6?|}DS^Mfy#Yj<2LyQ2KILe}szQkOaY{w_)8gwO1)FgeLWhL5${6XFHL+u<Pz
zrQiYc;E1NhEd?;c01HKIJwg72dG?#3Sa3GZ|JCKG-FXum?Pn5+lP<ijk9R1w^%y71
zut(PVxlJ`O;IHXAUC6;}q|4^MN1I>Upp?z0rKO?~_nRV6@A_V9x3k3cW}S>BG(HgD
z9e;6yc>MirJ>}9RE|T<)WsYmR!vZLsqf`+#elrOVv;0{JVY*EyRS=h<H2e(NGzXVz
z30J0}5!M!B^DGm3QlUXSTIMCzJ4@Y;S<WYt%Gp|{ZOrlx9%(vIGBeXx<{(Z&RB>4b
zW*|jsh{{e|E8}ThYbZEc>&BnWV)8}3J7@&J26qv==#*B8MU<ebsxc|NPX6e6s7z{Z
zY-Xl=K+%iu2|2z+ag9)3gX-?}jTTVnC1PUjz^lt^2wBRf9^yROL0ke?Szc~1iRVAO
z-lX;f#6pa9zNr2(F3stl1wK*16U3*SCL62#jt;GmwPpZ~6MN;B?fu>5CfK<2#bt>E
z8e9!k^+S9oBN!xcN&KN!)wCG&*#NDwcRjT#Wx+U8VQ)o37ThUSY>7@(ORB72hnR8@
zq<Rri#xLG>X@SP6g1tNwDkijRTQomT2dM#7z}YGin5I%kdPn3rb?NvoHN7WMgODQ%
zH+Ctmq(~ZykfrC#RUg&d<;K=U;e2zJC-eO(C1yT>6H+VUzBFc=mK2&O3-sUFl&7S6
z(TT1IUD4+&9jx12vu8RM9!P2AmxgGO$RCnWi;;5O>66k~6lxh~s?$QdOe9q-`H*bo
zcWaS!p+JYPWN~1{cj%fO3d&I7&N$&7CpOZ71ae%w{BD9k{C79Qq+{lvIi!2fuGG94
zAyLbg$)pS@k-GrtC1YzLDmqzb`wb$JgV44^Nt7)HbLFy{EL*BBuPO+nC5qc7&-rzJ
zPM{9;e>yk<ildhIAX25#tG<~|AR?<c@k*xdJ#BC%mdvOWAHj#%HknjPoungfHh@R_
z-=!||k;HQ$)@VsClds4M5#dpV#>to4K!N&HdbeJ^f`FyJAK&tbpN{LM>KC9Pr^Bv8
z1Sy$PFB*$b3l2^y>YzeBuhQ96b0QO(-W4{!jZdIyN=JI|Ic0I(L1G0a)GqgniY`)X
zF_6>iYs7xH|J(&m8bI&yfrx~vOfS+v%SWb4!HxnIpZn5}uRfa=Xw){MQ=uehmeSM#
z<L0boO{kh)PY5px$)9vIf6V51h5SjZ{V)}jLo_UFFjc~#(|Kibdur((&G@VKH)^*{
z+60JWN!BuDdu!PrWXg%*+QjRp==kpPkwWOXwLofq(v-di`C<mAX%E!)7t`ccAOmqs
zEBe$+<npT3HEo6nDh!0PE)%H(wf`#h5{$(Ll7xJ#xyvH@tuOuM5W&+YUM_=fib~j>
zKwKe|d6HCxqoT}~AWl<yHa8^uIRx4^bn(3}I-VW2t`q<AR3c0iez_OY5T~5BDC`+u
zlcQB~$5(=gT2-*SJKK;qlE3vOt43rwUmQhItRQ$NUOtwD6j59=z1j4x5%)?*fO<tX
zJEa~9zJN^<*b=fgBvQMvsK`i1ZeF0gz52CjIT^*z+8Ow)kP@s#)VfVXybJ?tQ*zCX
z^=t%o>+r2DH-3&3>>2f|=0k$!CKJ2MYqAYu1;j)xal&_L;T97@+Y&esi73Li!x9e-
z9figXVyE>G{GTDAja3nJv4?dPR1`T-QBf-LMi7yJRxA@An5ka3Xz_%!Ee-sNGIwd5
z?Hv)9`v%La<=h;q?k%Hw%7%0h4ut9xg-|m+Ok|4Hl1()OD_v=4Nl0$weJ7vWXNHRf
zfhm52GDH`H?yxs2_GaYVBISDp5-RVN7w`w`q;hSK-n}__=}CWmWM)Cjmej))E)a+|
z#~9JQu6jj>GMlQ?Jc)@xm=DxT9eb6sD^|9ZQnrDG?O=l<iIPwD31TXP3uDZ;L?_?i
zuIOaOBeMtsk&@y>fi=87jr<O>KR*@Js==NXBq8_FLicuck)gSv7N1%yJ!q$whiEZ2
zt(Pldgex8dBBtjHn*@<8@}cR=j)u8HzVn?dmhO%4(R>%60g^lkG5{CxK$0gCBH#ls
z2R=j$5Pm*{j26<u!#u=24!GE-Bm$Z>A@*;jXCR6El-mDwNYLf`T(F?Z$z(pusi+;|
z%t96qN#xPxm;DcstadP@P?(<olXbkT=+#!eWubqX4E~2zg6=uj1P8Xn#gAs7FP<r+
zf2EM3|HB4o_xsy{ZyJ%vuS|(-Y)<j`i$&Vz&VP7$Q1zO|LgMZJyCcwutoRE$!8z`K
z%DO<kz<(+8A13E@ro@*L`N`2hNB<lV>;Gt-u!Q(8G7e#wFaUz_4->}eM1I*b5wrr@
zY*iy4fc{6Ve=wT<%i*7MZN|U48EZ2l?xnqq+1qq`4>11MIRBC1^MCPSO^xPm?*zU2
z55@l__}>k;2b+dZ(QtV`ziGQ!^Vhq=%+YzCxws1dPq_2XEBT8^`4_ZjS?^L7KT58W
z(pCxI*VH~s`@tc&FSZ+y^(lU*rMyq>lcD_Wnhf5>sXK+3WKCjnO%e|^(hUro5EaAT
zG{}+xG-h4aci*#!CAElBHUzwA+?O1uuED5gDB`KZo1-h0d=Hw^?qyaIn4v+5PRxcB
z*2pI=ezLY2W#Py*x94k}6X(oUREZB0wCc@9)+b~O>Fz3YrpoqS9ojF4Vn3AT%dX0r
zpCl&6_?@l<%yFiBh_Um|x_Jh*YPN`_o^YRH>~dnZe}nXoHD`G*Mc@5l_A(}$fq{Wa
zf&=WQr#q6tdxC~|8)FT3MNgM-LHoM+mi9CHcj%m=6As(ymzq{<i8XAzT(?_lk9g;$
zA9{T{SqQ)1GV8s~;^3YC_fMTuvQyDwPNFgJz7AxQe!gtRLML=v?anUAs*O<wk=|EV
z3G5|)O1u&&AD{W%PU|7bdPcVDjAxdttKir74Ya8s|K;!hHAGvXuenW3wwPX@fdjlr
z-X@E^rWG~FqC9-~quekNsWBRIi(h@cgHg2CUgZU??Xa0Zk<LZ5WV&B>;yjlrKUD<h
z;W6Yv3}cP@vm9%zi?sB#*QGj>%HibqP>T%uLQYP_o^MVv)XX7J+V)6fmY=@aZY0_l
zDj2ky?#RLSdhv~L5?Y&45}PwiGgv`S#CcHxtsSP@Y~eZ^h`cG}H{DWoobe_xpE8Pp
z{~0|)bK7|3ryNKHN9~szzHL^$wv}p-yIunpcMP+qS%WAewSA`ESM($VkxY}n5HVo~
zrf-6IT-j8lwUOc7M1HEfCRqgC-l}x7yIQf;XpM5egHJ|01`aJvl)sE1e#oa5544Z9
z*_pj)X`KZxhtSD_U2#|ViTph6@xZc3AJ2F#Ii*HH7C++eC7QHAOft8Cq=bvH$ZN{9
z?jrqacz(b)o|<F*j7Xz05}8ya%G>aFKA^t{Y5N2!qL=#i;Txwksq;F#e6dN1`5j7l
zMx|C)6VhxdM-6bR)(q|=KN%`98+wyxxA5UFV-p05Vu)oJ9U<j6HPx=3DU)-^ga2vt
zBr$n>Yzgj{j3{3dM%F#4Kp{n^Kk14>`XP=`W&z9s!hg{Mzk4!u%v$w?6~!C+Q_5FV
zr!VqlRt9uk#mqa@A^MBUq<FRWYN&I8(SE+0H9>?;r!S1^MR1SktkKw?x$F^qk4C(D
z^;+XIGx4Xl=*6X5ypN6EMHKe<!gczBw>va8zdXwuU0wb38<e@*dTb~1Mf2jeeUC5m
zMA%K%TL*Tq(Hk;1dYT3c3i9#_^5#$6T-I6-wRvcg3NQ;FzD9Iaf9jF|SW7QNI^VZ-
z^BNl;`>|jrlGlH2zCR@K+f${qB?IH0rr|Fd1*7}VH#E$|@BZT2=y6ji9{der*o`WE
z__UcW=<cSo2i3%_%M+OX{mJ9nv!DIj)lwcP*Wl9O$Y}B7NonbvUsVKxm{HOYr1YJO
z8?e^!18dEnW#)Xf`LDG`27%Nvw+Qk0v(gZsuQb)1Vkpau+-l(XzYe-%|DJQ6-WUjD
z9T3xNtY)oo_7+1~T-iG(ma>rDL|J|X&U>oGjM}TEUIGk43to%;+ZB^r;VoKvr&{dd
zZpP<dng6gCEd)B74T@d+kH`Y1^J2kvtlN3P;)-;tNLt#d{^`~q1R|S2;;ESMBL<Yq
z|HTL}dLB!5UfT(Dbhgax{tfDKd(%AfocaGldM+fl`W)oH9o)XZ{V~2>arn38e|0(j
zTep1<w)$6LO!%qYDeR1T=loQ9=YL40>w$`M?SDPG?f$&nL3e^GJ3AXwsCy|Aa_GhY
zl(X**zLW(DtM4uE{RRPVxAtppmoAnrW}ONGyN`;d8@4D<AFE20uo`igy%E)xYf$J<
zw5%|M8bJ*$({xyby(2+2OngYFA!JzCjvM7cT0sdxdMZ{K2+@*iCU|1b1eo+<Skj=Z
zU(T1kLMeV(Mp|=B8i9jff3*y!tKqL|M|}+`%)QKgp_);&2r`uZM>Ttk=ln8H0qD)A
z_oPeX-s*~l3s!qaSa?x0GM8@Ot`|AgTnv0ZJuRF%w%xq`=LfMJ{nD?Hp*rY&Vr?1G
zbQE74KdFu}l2o6LOF8Vw1YJbO&u{@6H+@y6&xN0v^bDHReEdU`A&X+mGbSy;@QkVG
zat2EK8UD8U*kbdKD6xyc=)Hcx{IGUN)Kd?mUjn6x;vOaaCO<hVLjU%_CW=dYvbypu
zIlq;VB}`RbsA%e;U%uJPAvXhMRkhsfsW-1?a!h-R8Id=?zu_d^uzBt3jJk5n9!G=e
z`sqDSj#3Jxe$8pK9~boE?c1|nlSwz$TCs2I4r@y{qK1Jd@kK4J1;i##ZJ_W+hU0mf
zSNNL5S1Z_R9(;{#Ve&lLuBv3U*6-U-b7oG6@VqqC)*`;NPu|j2BgEORnvPVi(Y=#g
z{fp@Xp9m)7u<BL<sl2sUITcNUb~aKJ?wKeA=hUZy-<Hh~MWeKN%;H<%uw&k3`H!YN
zb|Dq?Z2M(1;Y_7;lZ}o;=taJ9Df0f{4y5ume$V#8>>V(3Cw?bEzrRaQ;Q714{qG6G
zpD!UP+ZNXlwS7qj!O7BH*N&Apf5l%*2tH1-AK37V_rbR<zW4I|MIK;E=@(!e9L+Z`
zs;h|a(!FGUkJ2U=$u!8lzpCBMi3s(IWBBUX>d1E|kze$AoSeqc8N){5NFGL8SF<+J
zGDAjLoAIMQ8_uwA%kq-2w%2=w5E<DF3>6iXwGiYfG%1OKD3ROij4t;!QCqpFvHllM
z$h0cInl=?LO=ikKIg(NcNySJH&ecX<NUvtn3BDq%%C>Q=W^Q?gd41Q3SHG{@3R0Hh
z8MkeU0ZUhIZY#ZHH0<l<CzZL_CqM-$Bu~cVFOj2-hZ9H}SD<W_NVr!qrxbmIP%>IL
zCCya;z@ZXvf0v&WjciODMB5)^L4_bwhc^mUWemyg_@V1WrI?s3YDBqcDv^}(!jcKP
zLzvA*m;wYv!vXwcK`(TCJy=nwaDW4!#!6p3nBvw_!<t~BNM%O0QTCvODH_j8liN8D
zF}UxGHgUx`D|;Sg@RH+l@A4}h6kMj+%+qlrTWWcNf!w!@^ot)gT%{lQJfJ(Yq^m6U
z?$AQ{ng9*^F~?=hJk;I+Qo7_Ry68N7Xjk39zkP{CAxePOmpbJo<*bZonGrjArgUu#
zgQ)(m40O;h=5!fSL^pEVg`aB4D~w+;!T|eJ;uddtHw=(gN*c3N-eRp)6a(?^J5sm5
z$HBS{O$d(3$gl`b=>xaWNgQ7AJW7_^$bnol%_84uR!g(h)nH|<E!8>I`*9qanKJFZ
zLta4}Y$5#<(isgowu1UO^G9<?2w(H!&Q0lSZEdkz(%FcZDq$@+6g}25jJM+@h?qjo
z@QE#*ihBK)I>Id!^ix9o<VnIZr!Q)Um!s)<q{VV8X$Ew47T1ACcH<41t|SdP8t}K&
zYkh&yh}>nFe#S}}Z?y}paCM|^flGSKew;R_oJo+8A4;sEui)Stiei+m=HGrok8`D8
zo4zghKr!WcsSa&c1=8ycN9EM98M!>W`G>a+OC+%i^i*VNJAGmqJ@5)vNKys^_}ce^
zTwemm<x+ub1_nib*MtO!a3(!Muyp%e&WhosV>QP&mg{7J``W|XK`1AgW%HnSlWd1l
z;80<C?A+P#m$Eu8ns{-XDJEzdC!~QE$r63{ZcbPIzC-ULQ9i>oSBqyE#{4U)P+oll
z{S6l(NqnaH!BW{$T7N+VM>CDBnC@wC(&n3uL5j?cl$R0eex@-L7+t(@T0+GqVR@B(
zPi@CHG9~=BF!C{^z@@Lsl(LX91=1u&F|(?nHRLKq{}&CKD&c22Or~jET&Sf8KW8r5
z>ug4(p1R{SOZv%aGFSEu;>{nA`%>8du=Mcq;CuKKHLA|5N$f2lwtc;2i#GCd_2C8D
zY0tNxX5X`RKB}N%#E(os5_y5R3A;F&88f7KUkw?2X@?T6q|Q04Q!c<u^PpTenlmB5
zjkH`562JJddUX?HAtbH)cH>MtG6rLy?ezxtF5L%ht)%-reSM}1n)F8E7Wwn|*NoUl
zpBa7#=_-oorESY=N2K&;&@d%vN6dx*IcbS$s5%4+@Qhp=jhA#aE=SAWjNC{0zcX8b
zY;=KNIaLk;?r31_T3TBENu>HK+W$vOw^EHWkKz7kV#O=YPZ~*Yly0X*Jqq;_Cb%vO
z94Nf$J0@+ei1${$z)y+T$=P4L;;{zYGIolDxBNoAZl-vCTkiF?&wX1BjG3gZM8H{U
z5^qYfMdb!?tpoojc`|To{pa5Lzmq4&@nx5{Ao`}acb2rw|6KH(XHJGxki#nOjMc+#
z#VWw91HnLEVqzg20}K_1<u@pRo6l4ODa&A5`2Qp)F7p)jKF^d4M&*g4f#k-2Tg1fc
z?14&vN|#V)IXqyfHI~OHBLn2MG_Pvl8(8#E+_r@@dJ$KQWoq_+-wOwFDAS$V4D?NW
zvltZ%QI8^C1^V_->u!rd?P9IHu+VB+l*`b4q9TkdD$%-G%(6T(5x@uV*J{?BSN{d%
zQC@^Rm2Ci;>ny~_oa-!L#&$^&M%$?52#iHLTz^<QNCR4zFT#+Uag}PZKoV{pPUDp&
z77FOM_MA0_o*U59`drVysQ>*U7+M*{(eibf%Me@FImBDn3%34E*8E5IKUBKytv<@$
zsJaqd;dyThIpA=vy#f1q4(Rh!<1tL3-gxm264E^I2&fGHrN9-#715B#h=A!(>Y?yF
z%>OVHmytW9j#JEAI?o9GPaWJYN$U?|nD!kXYw(})c{4!c381O)IX|4&HlmUl<Pe@d
z*3AIdLJYCBp{u^wo$atpM8D6Ggog~Tm29;x9>;@RoKX{p)Gh*6*R-se*5oR)TVy>-
zI<ju=FSAR<Sd~(Rws9SSVRoqp;-?CXyqRwCm6sEn`>Q<zLnQOW``|W*wrZRNm~o|D
zOqAfI?a(3}HcP%`g)Nm~dS=R^3{UHZ3|JumG45Xttn1>>p#q=*J6e``lAf1=*7_aG
z>Ob&(Y`xF*#j#=FmRJ8$!fk-O*VU*$IkJINBj>DIfP=Xw?HF)kJcg$PENf7h#|S7z
z0OJewd091CoY!{ldGRkA83H}GS<m~FMf}6=@7EFx;Cf!?a4rt|*UIKFul|2ZP7;4`
z{257umq7CG^Lk-Ez?eW0aArdn;M^__yF{(q1$ZC9&>kasc#zO{X}(!O!(4pCxz1et
zMU2gPUhm}|cy)vgDs!#Jx&cVHsvlpO#SF;w8U#2f7i>BAAfHq08s!~Y&C{LMBHHU*
zEq4~fNY0&CZpje&2@sQ{+o|Vim*j(x$o(^N?=_}?nfQ-U&n;Q4g$Fc^_@gKQ^iQ&K
zz@FwZ0F6VQ!g9sAGUryzg9`!XBZ+~pp4TuP{;jj+yLxUx`7T@8a}r@S8(^BAn-gdT
z#>+lWoFTqAFM$0|%5)6o51;>7(-k^vpGPvNmA3>t=cxuXl%clA01!ZL-GAkZ_ntF5
zCjgujK<KS%4D%#4JTC*b$N^dw&kui4Y9*%w6BmUkJojl_VcsFoAih&)d8Q*<twY*O
zCEk|_JI*746o8Km-I7d<0O`XT{*ZAXcDx?@4cb-AFW6Gq+4UXNVc7jXs1NS?GZg`5
zun5P3Lu=H|4%{v=Z%N87@i~bk3K%|A9(M4r>;^!Oe=TL*sD=N>Gn$!0|AMpV3XMH%
z$ot19^Zu79Y+?VX=QZfu3``yP--u{na;^!`9kA#*K_j3Hv>H_iQ92(B!2QMh|Ir)x
z5_Uf?Q=OBa!|3@#k%tE8fpgq_%X6FlZK_87$t(}JH{g$di2u_7NNW4b8>lzHp7%Vb
zQ5yc_H9Te$qqOB#7t>=aMF!lq;PKBbD={(8;dvyx%VaS(wqRp<#CC^pyR5o{CF$*R
zaVACwOY?PRmQQ2oo=a&mby=S2%T}84T2@Ei5P#uHa_%Po*GiVSQ=32V0dD`X=D*1Q
zOktblzi4fiYp5`PoXjmrm(U2rN6U))-hVCh$J>DZfWhFhO?IiB*d06Zf#*Q5K6lI>
zp=K(;Qm(*+1ZHv%53$|y9ax0nU-RH{dSrWS-QE8Nn13<+GXMY(U|_My)aNtE6>1%J
zUY`kgmQkMg2%*km&$0&?Il#JRz;cq9w_H1BgUTZr#e|j(rxu<^kup@Ag;Z4Scz-1}
z0uF?*=bQ(?d;+*p7LY(2UI6GP6}XHJ*0)rE*xX~?+$);Qk!B&;`K<c5V9TwUnK*>F
z^0}D!VE(Fw^i0%DGi@n#9vmhEcMaz<*;zi*?XXMX(g&o(uL4WMqVu`o{)v%*v-GVs
zS=XJLZ^!PBX@LN9uEzO<cD=HS!e|Eo1t6lIdu%f^8DbuHr|7Ti9X>g|@;8>&4KG;?
zsHDTjMxmtV)&-(y9=wMvlFAZ@`*FV*fXU{T>PfL2qX4%9R+kuNdS<S3BMSioB;LDh
z8wDHN!#67&cISx?qE7v{8w7xP3iz2_T%kiAR|GCw?%enHfN7^eqYXIib1MK0AO=`E
z080*!$;XBMjs04A8m`Q1f7$@{Rn5e+mS>Si+T#7^!SB<KWzRF|ncG5nOXp<LGr%QB
zAJn-khNWhG45lGHV??NrlI_v31O^Gds;!xUY6h~cHE(Ar{3C6s$!-NO5|E>W?A&7-
zUYv9N*B{S=9N<sTYQTWN@qBvr0PYH{Y#Veo2J8+PC5FQTSSAcDt5F5u!zvJ<f!&fh
zEP^I)F%M3Wn!t1AJc__jdCL`ccYlNM-%kZ)%W)C7!g=r^5GvUK_}1s0w*i^WfY)l_
zZ!;7Ev9#ZbxCdITb?TR8My(n*1I)#lI#((@&eILJq(Y@fosSz3Pj}4Ks_J4Y+>*4K
z0Y6O5gL|(6A>JA%cQ^x72=iIMd!GG85OHJqEV7xjE~aMHEO+L)<(W}l*eVC0(V*^R
z93c1H@)PHJx@CWIZl+kZ6F+?f@3Ch3r2y|K+OcdH#eLZ>`0GTGD?se}>pEPTcb_xE
zdv@3@8-TS45Pf6yV{VsaL%)yz2<p_*E@4n-P-_?Zyl*lO7}VWH{M$qNq4HH&i~=x8
zx2x*@A5HHa*VOa04Tn&r_udgCA@mM{p(D+N-aAMyp-S%^1f+_E76`owCKPF*BMJr;
z2nwMo3R2{YAmST;_w)Xfb8^l}KC{=(UNgIAX9hm?OW!NnkSp)5OAgT%IXhiM?T8vZ
zB<zi2Fy_@A0^&=S7e@cH6~#oFgAu7Iu5p&Aw-U0_qtYKTCyY+?Fhm5KEOx-idnLaA
zSW;25*5>i!@^52A8HrYrm^D$#^MWXv(G{37Q=X{xP4L_GMCv7y-3D=_p~{GAZB6VT
zqKUNHIsHFXxN%`Mdqo6<4KZj%yls<%amjb=U?74bD@YtuECT699b$Do<HP^7sAIB$
zVRMT3Nbd0X!^!r4{{>b_q`xy~K0K0`E}Ho3UkChpWsm@-+?;y+7r--oG;l>+!^(X)
zR_jd!eDiZrrE_$)Gg$ONlX*=rHBt5nqhoU-queX`C-*-+BKFSzo&G<v-EiNUAW{e$
zkf@GCZa3i9G)HB45g#SCZYn2L^Zy>tA58gJx+P6r`j1F?iOe-|f#L^?C4x({$|c4L
zNSjAQZ8vY3FzQf5eESPn{=bHus6Y9&M6A6|ig}ZUaUnFJK9+(T`N2C0pnqs!o2)MW
z4T0xu;6{N`qmu`BxUX7#qjrwr;|y5Q#N-pAx!sLYJt7`*96OHlX0IgX&<jFDmA{C(
z_-CmeMEtVsm^ebQ5vu>mI}9hfbw<%%Mnvs$WFP4mtH~x}O2j-3<IGGX%>QQt%!jE{
zHO+U79v@pgF1StmKYI+e4E;qM70i|a*ivA26M{&JmLZexb~ND<6VN9K|LDkNBZ@BJ
z)|NRk@v8kcjc7E{gIb<FVjsO$P9$s{8<$pEQ1E0|l<r8`JiEh@;J2f5RVr~cwSAGu
zUHTWW(*(mN-b&oO>&*8Tkp6j_i1SHHDUl(cUh_gbgb>5>H;ImnGuUPiCPDPgh`z#R
zD6ugK_a7766-ua%Hcqo4{2Mdobq_^280YW)uQQ1aBOZ_BcBUXiH13tiaxfFW5+4iQ
zk+KX`{`Gug2|?uG#4E)iqmCK;-pSTg&|d&+Q`E)rMJQ43Oo80tiHt#hFu%)*z;@zT
zViD1sc|{y*@Xs4;vT$NXu+KYFzlahiXa19Tf|#uV^AE}dwttcke`nd0_}KA(EDIdw
z{--hja3=arEv45A#6kC9(CCVHoQznJ=agu*h^D;m;e?b`f}*07BVzXGoOZV3*2SAi
zqz!Qc<U=fO>*^{o|MM?2QC)^-K5zdxS@QV{D0I=a@?e9=bX1Nw)(jL}=KrK#@HR;|
z8^@xBzI(l|EV^E?dhtu{(hqz<+(aqOQog&Vo)OkT8z)QQf|dMwD$}d8OXJEj-vfPB
zo79r+{^{ZFzH8)Rp!O#cx*TT75t~PJA67|vNpV&?@r=;fhqe_P)w~R7)$!k2eTiW-
zu-_>m@nh{iO}*#b9wtLhds(+BXKBj>WJEjgdMUKjhXh{S{@&a8d27Ez0xLOIuXx@o
za#yl5TL0D<+xo&Cj#$l&gYYbiXq2jTY!W#AX(3%!!GmF`zW{o%Gtw2FJHJL%d-g$N
zcMyN>G~FM@wPbFkmxvrI69{#-nPzVBjb{|gm+7!B^W`+pIC+ZZ8xo{jvO*kll=|~b
zwHi9H63EncsTqXM*K`^V$#6;!;2ecZgH@R_sO1ezeJaUW*hU62Ao`?xVNY%l^ySYy
zos_$cti&+RXJRBuJngRY8+_yNs<^xh#uacz3+6wxRgO3Fx#uiq@bRHs(xsouw`lZ0
zfb&KlC7xPOQn8WovSf!w4;_<{5R=}<fPu}e>jY@-hPMo4jYcpCpNVtYI=7)oy3E@S
zt=*$5iJ^3KLMLO~&(el0`Nko8k8#%}UG#qeA;lj{F~fIg{l5Kn6=gGFy9W!1&%5*c
z-EYKHAm|-$)|g15R<ewM-0Mf#mV8DX@LZ{j=O3uv8L`iP#s?JsuAtU5Tz3qX?Wf;J
zHE7PXWeBVLDfr*JO-b9v&4<|d`GuS0%`VZ|>>>&;N5@1gV{X1duFqa5TXxR5%tQAV
z2)g&OkBhxR+!fqUX@307RHgNZ8~yqmle5fIlME_zPXQ}Y1lz}ry?lwc$$&Ujk2yir
z{jsaFCc3gsh#wOab6y;Zxiy6`p$C$)47$;PCnL}r#;|uIR4ict7xQvjzlLX-^XL4v
zD})6&Yf3ZF%|(2&lV|t?sl60SiRt6CEdH8YyXCpWvurZ{yZwD7Joq|S)0?N_UacMb
z_C3t3x;GdM&&tsxuF5b!XfmMRd%^5j&Qn)GXWzeLZdbV3df4&KAwY)Q_8eXfqMHrR
zW2F?47P##$c^|JNX%YeaD6fia;Yro20^6OjN<Cs;b#3xR(3JdA(s$CD_XSzqht(D3
zD~?g{%A%CW#bQipnD0}p%u^q<`##I#avj#SWz^{Iy3gg|Bg8af=H=~1YxVo7ZFVOl
zGx;Zyk<weTmD>AyCZl~E?q<wjojkov9sHbwb_!;R_al)BCC`UClyZ5sDvPMF0j&=5
zI*rezZpwK()MuJ(b7h#i2QitiXv4ndN>RZ~Er8b*nX(5Z-Tfx?H;zOt8#T#O?aSo^
z-;S>m=crgk_6!MAWon)<a>uL@a03i2r&r~I1C0NE4nlj(ER#f_lsqWuUJKP)(yIST
zp4_&qE&Q0FZ@yq6Y&rtL9fpx5=Y;Y-6*`chZ$QpF;F^-D_YPniBI6$D&y{7NELvco
zr%t6>NE`NZ82hRKiWHjA$e4oY^JEH#m(eZHE5HF3KIQ``vG?NL6*S)VmS=42$o1#w
zx{-as9+?R~+__PXHwhh<y&`|L;!r`cq^G2n6brD@e>)fECL$7><GgE4Fx?gYn0!n+
zWC}5&zk|l}EnvfN)efX))j$GU<YWEX)%PSu!)WCFlY%lE>}HUMc7&J>Ke3MPHz352
zxEnjW{u=pInccWM>uiMU9^N;t!SMlu+)xpzdh!z}g=KXqY5rvTYW3W}Q)C3hcFIC{
zQ*__Chsts{vsMh$7y|r)1;0mv&X|H~a@xHpIHN`XOlk86Np_duA9yO33?hf`Lf6-5
z9U>~;el(eabZ=u<kumA12*u9J{Nz58V*ZVx1i}pS27dyVor4Wr58el!Z91c7UAhS}
z^|PC&PtoJbe|l$D<-qGj(x70S52ub56R`%R6>v1W8_yH~qzRzzIh7xX)9c|TuWvC6
z_N1)RlWWOsP6)DOW4A{dYKdovBw}2Hrh7|qjQboOc3p;j{bv;AH~d{-$$CXv0sQIE
zPg{oO=72sSS?s`u-ib|CMFksmo8ZK?vyd`lWmcA9c6PZ#Uas*Nc@OWpv2uk0j#>>>
zIt<|Kx=3B(?u0kzx(lT`zQFe8U~&R#h08<^Z%fb$fczOxvu&7+sU-<Q`YKuI$?Emq
zc^N_X^+_~VKMmUzT5aU$OHx8_j_sPF%BwC}aPS&afkB$Xlk+cUjFgvlyp=&&Q9P1f
zkWt?TId&)Ak3Vz=p%D+dHw8rpg%^um!W6rV^njwjQ+UN>7Va~v!Y%!T&}@fTGMJe~
z^or@Iph{`3WzY{6R2dJp-n`F>taM`>15;(}tOhb79ACoi;OBheKoyx;rE>Hismrot
zn&PdfikB*MXwmQ>jyaTsN7koE)RVVT!mn%XxJr{0H%N5(bQ)sz+GDP~HjZ;%I$NO5
z1e*LMH!4UpsOsv@q(_>LHD&bc-a!r->R&bP$21!17YOn)8W`+r5aaI8SO{0aDU!Hf
zw{0ReByb$rNB2@<n1UF9Lu4?NMFe0`ld94Dd-s!jjsq5Cs)iIKmpL4|V1fh2--@gR
z*K+1&rp(|(r|<+zH;eosyIktZnIkulY0Ahy$g*$t^;=~ZwFJv@@{wr4t!B~=k}pqn
zd)PSF@E3{TtJja-ktuGIRCskT{Sa-KwjPT$9E5B?0n^v8Oj^G8hd;Y`7*gE>iqodH
z8>>Ai{av1HfLH4{bm?=hzKGKlx9!)GaT-PgW(%S%KI(n4jcx3Q&$k^gPpG50f(j$2
z=bp~SJZq9%x}De35QzDnyEg%mD)myiQ{jOgGX9;JMSE7B+BT|+@jWewA3f8+F1<G=
ztP?ofe&x;s+94a|U!_i^@fOrv_z=ACHd7U@&h8RyN4?#Z%i`WUjJP(;`6C$IXJMYK
zL{}&@|EA>P)(j(YUO_NFB-xDwor{P1qz{w-@)|hupTE!@G(zHkT>~)cj=`F68}{Rk
zmzaj<c#F@6v>;5v%6IpxPNq4H*8lEcz9)vZ(ELt99LwqrB$_|9I+gnT{i#5A;ukIE
zlhc)w!?=xdTFV`oH6Yf!NTrYBrDo_Yxu<WQ)V#^*d<{c%ceRAb)OkgBFa~izwS+9s
zqsfkDvZD>@qMfCejen7L!>00e7|WDK7!6~yC=oSml|A<~rR^U0n#J8P`bx~dzph==
z`u<pHJ6RY2+hnB-KDeV(2`A_o&8lLw%sbW4Vsvl9Rk+M{1i>=(3^o!QA{gIa0BT}6
zx*AAXsFWiHu`71FKwuLPQZ9W&zOaEVJ2k4w*mMy~P&#<5bu=|G$kmiPaw17PNHbF|
z#dd^2Tp8_+?GR`$<hS2E(loh{+uh?yp*XAjMqnS7+y6R0uD4{T%BLGenf+1!EnnAs
zcLSe{oRM4n7*E2^D5}qDd4$Pgl}AW<rQCeCAi1o=W-2F}xH+*v(9}aB?!QoSgJ&)k
zw$1+p+nFnuavbLP|4$+RyCOY7yy}u%E`24Pwy@KHY>2Hqw0}v-RK9f>|7%c(pJT+*
zdC(X4IVS>y`(<oQ6jzg<L&^cqzf(*YA5qr4lFXd9S7z>|42@{vDUs&*4dq^&7nCfk
zW@7agQxw;J$3{uzIH*f0_x?8^`XQrI32k`UBhDc+n)EG{Vz+q9?W0*zWB}@|bv@kX
zP{2~H&`M>;VOMF=rkq71{R8Sm^Uq`^KRfal2C-S8)M&mj_ZI-5Dc|@fwc{|&|2_(w
zZOs3*%_aSFZh6AL=Kc8J?f)HzZ*3uVu9eNNoQ%t*uJVnK1dXg!!%G2+mD3Wa@zFQM
zEjuKg1KRDjRe7gOHoEikS)RmT-(CR);}>4g(Z7Ha<Elhk5}p({HEBjY`U4o*8JSv;
zhb=SmEo05D>!PiCnOc@G7jj)TH@6b8gWsEY$L=hJ{AD@%Cf#J1gD4jf@GHlG<A3NU
zNJ;)eV~8>nk-rYw{8isEfpKOK8a~mqM!F=~q{6Noptx%0Lu%n53*n&(0DF(wt`DUF
zYTOhT)%?S(E=1NPUAwm)&?uB8ynemNrkh<ArT*o8LL&M)=q;+rhCI)i<5!Z@hQ$;U
zBbvAP=x*QUzJvD1DaO0T@-q*zof$C(`O1vKRc-(u_bxp$HbY2d)aGA+;x(-sDlui{
z^cN97DMvh)OVZqxc!lWfxuTRio915tx7|Hwu%vM|g1EYdc(%DQy1Q994-Dd#kCJFR
zF7e@nMNl0bWIo8Yto5qGxbaHG#pHGKrW|vHfe@!~Fhwg;FkMC{iCwDU&+t85t-Y5z
z9URD;Xa1vBl3h*Ek1qHLQiuMjWW+|na+|j!W1W8hiBd{N=e{^;(>PCD6rsS2Nqit9
z{l2`pG#nq0EVZx$l;<*liId?v>wO+>_x_(kAIa@aI{o6l{SVx!r8rUKT&~5YCKH?~
zk!50T_{iQW`bF~zjpVO#?3+}0<^>o`6=d5Cd1;FEX>Q*q7165%<XG%g<tHR0705x@
zKq>qzUL_gP#P_kISY%2CpI<;KWV=8B6k8-2^55)M^&%qY99R$}xxd38>NI;lFg7s5
z(>5wskNL-qjATy(SR)%R<!RRQ#XZkhJ_Ad4f*-hhj3>IrdCRc-rQ!(Jk?`5%7INQp
zq3hxfAp-K^_A+*A%SPgj><Po2{Lx|B7B@B(vGNR$8Rdel@)J4Hx#%)H`jx&T`jwQk
z;DzEQ9+=v|+^n8dX9bGL?@u!Nl5Ml_!HQ%<(TNvJ!N_yhyvCV~(-wtM7$`8~8!ZYO
zt}GDpv)-+alR!JY)qwKK)CNrG?iJ}%t*H}})#59rM<F`0O-N9Rdc2uj_fAvW#m3&m
zN}%=_9W*3Pu9t60M*)YVwsueIW&1rprr4K6Yal|ND`7k4DPdmE<v5wN%AuvvnfDbe
zN3}K%v)N=1`p1Q#VN#A3l`cLIORcBK?R_HS5dMwRqzNqMK}lbWp9^AVxmgs1>o1E?
zgdE;#8j>-$Q;`?jnU`m-jxBdIkk4Y{)eO2}kGYS#nB$#|EhXhC5PdzH?KoPR#lgZT
z58^Z7aktE6t-A+bPP58yGg|tYHod_{Hm=f{)8X8fRUnf>%A(Io@YGU|$^exdIlK-O
za`LHFQAgMKZC60Fq+dX{c_(!O0~k%qZ80yK2KZ0lvf9`8ThI^6ARD2YNEFS@zko#n
zRW1P@22bryEsvmTxT~@hryt}d$@x4rVKa|Lq|A~0mdqCgYiHrN9jlD0K_7mLYLWO?
zOxO!@zj%VXu|y%G2lG>^==4bO1^C96_{Bao2DV>huzv<I!|12cEv5Nm`8V~Ev8T?v
zZwqLWrj<cCZ?OF&uiR$b;jH3Rm;%+4xsv5Km_eTWTJ3T9>{Khckb4z@S^^Zhv4=7_
zVd4=SArcegck)Muj2Xs#E~K-fHSPR{DKp56{FpMPOVi8BK`X(Gi`43=L0Q|G)CWbb
zyFtodcQ11u>k@#~^JD<HwKI<>OHSPypXMCCzoBT^@0Dxz`=!7r%|*u2cQncIHwDK=
z-?+y8d`y*oy-DYz6>;4x;aZ&H`j`OPOckkXD(G=P2B5U-a&}O8-#WO+yiOgpNoMqF
zk-br%y;4UZV?!a|h<aA0=@6X;7ZM~hC0A-TXXJePstgRw&a_sqrKqjE&$w|e&ENV|
zm@H0o%%`Uk>R?}y)gj~ewK5?{^{8JE<9d1qQK0&qR^d<FRJTl5=u6~Nr(bMjpj`A8
zD8vL3j^9jC+2!qwNrQ2@j!>ar1v#SS2=B5Z^*P?Lh%i*z%|}s)a;7NKl(K|o;rbjT
z%PE|N$$Bse%-$PpL)U<PkR=-ha;|qXOe(shFM{1mO#L(JLm)3>aq=C+LB4Y>M(s&#
zx>YW!_|qAm+t`3@8XUM;$6R_I^U%xo)&N$GHe{mp=zX=bYP<JqVnS2dxf~#^8DoKO
z=R3;nlH=$kEt~cI8g*R;JWtN+54Z?d``euvvrCUnbOTAhB(G;$@leS~@V25{O^TbC
zrafe-tsLgH477HsQv1~?QmSk%em^$^Y$KWj9}>j#CEY9<?yoL<S55b>xYxbW1AQ1k
zn5Wu@N%YZI0rzEE2R_4+?8MKFns8!4GR7rpvi!UIqML?U<-B6JQ57$4WOwx=$ub4@
zYE^VUK&su<!Cg|doK<<AZ}vU+6Q*!IUK7_ci%HX=xnNJ@4VYgouu)fszB<Wjn|VML
zavwH;?xomj8&UJJ>rd)p_C<F&zt<{s^C6aQhwC^VGLAFJ?Cb+hQ4oNQjO=YiP)y~a
zLqv%20unm8DGjsbn0GV!xVsU~e2&-)CWMLyd4(~#e~?j1)!caf&~WXO<E-UZhXmx3
zg7&SOMk0FBeabu}QITOdc6pzYc#)C&pg&-Wv6ap<%T9at-^n~#qU7Gk3!)Fg;%L-M
zT1D_YB0PY3x{yezp;4&}I`^PbsLej41<JQWMy1MAGVMe@WHfxMH&GV$j+kgKv?;=m
z&Jmcg46X=O_SLi0evk3@M{AEDdw7kyTqtGz{n^tzRXzBNYs;V2#w=B|&6!VERnL*V
zHS%tDfbo`xtmMwvFv^K7f#j;yL$jp3Q*2efp|fe4R<B_^1q<o42c>igN7<ch(P$yE
z!F#Ksl6Cz9!hM{5oZtsH%9vgsjr3TZV?tSd4&7@$wV0!Sk+B7u7r(k2-q~N)eRO*c
z9Kl~&P69%cx-b<l{tP3L`)Gvo0e7AdGyJmnCw*#QREnEdy{n4}=w*EMi*O^&i!Q12
z<8F2;rICPlU}^;r<Rdd#&D<=@JjkfmxQPoK@f9_Q>@T%$XE5x$d@KS=_E9VKv3kgS
zpih7=La5yfs3^!~EmaH13PTBHjtUL=`mhK}^yJGGUPt%ubUlVO-^LaxM{wlH4waM?
zqC563?6wmmD)XI;;5aQ{9l144ne<)1(&|#Fn_wE8o?SetLbd4W;e83{c<4Ux@m5}s
zaeBL#@ORK3rs=EuEF9ESVvLj9Pec@S%G8pK)p9bvmee-T%_8<=7m$%KX&1Rqtur&U
zECw+nO>8uIrk@I7D+5uK6nXlQ>6>NkcKw3X`ZFylLLa5759e8$QiJjOZp0`QE8Fh}
zToollbsNe_;W>QV$zeu~MR=$0B3z-Kw67+|v?-vvwh&fd_=Li&4l3E<p}c%fj(hdz
ziOhPMi~PR;{5<l_wJyfjUi&^yvfYUvsh&*znHFlX#_rq0DL%(zAnwucNA+O~A2EtL
zN9FO?22cc1KlR=sEoD6CVspW%=iW=H>m%1B*a><`*l%dJVRM2+q93A_Tnn|MmyM<S
zL&mk9Nisj_icd{W8tu7L(eQZCIw^4A@y^hP5FuXS4SgMq_2XL3TOk{#U|QsDF!@E<
zT19qhg;=Q!CMj*KSK*}W8K=s4iFQD_Og7wthq=2t>js}4hFDcd!h<fKVVBg(z66-b
zDC(u2r7S_Oo?b|XX7yY_CHrgEu<1E4I`BNs@zGoVj1NuH#gYZQjKvuWBc1jY*|RV@
z>_QMsrI}%6P3W<BYFUEt$E3T@ING013IX7k#^jP??hZo}G5H@~W{cJ)Hwpa((E7O|
zrPImDtbX{Q99f-+Ic>EUJRC&7x`ZGXZ=LAgt~Q?T;mQ=2DDL;I74=(43Zuy_WNvJF
zv8SG0luZAOAY}IlZ%GP0<9ielE;}jJ;zdo?XTABZ$tL8O?bZ7Q%><kDhI`Sax9-?f
zJj;N$dh<!;cQmK=4`__}1@eT7n|!YrQRQ-8tPFOb1_6IEJd<+c<g1Fl7F350&?zzq
zCd>`P4fnkYWhFxPOE|`lDP`gnrGH+FI_h>(7?wT7O&ALt8kLt^LRE!&4s9>rLG~cK
zG_#*}Am3Lqq2yXqC^1?i5GLfM7B-6MzUvtntCvX|%B4k1p#cx2uS-iUkuuyACOzQs
zXd>5sDQ<NC2T%*6@krWBhu}=Ey>nHqreJpIrA6Y*J5Xv-hhzT>K>q?c`Bfk_I=OW*
zDWwfkBCPaHjAw|@ugp~4PlC)jlNUtNZ$dV8Oeec03=xlE-1H4cagM!<kLR6I&1C$X
zM(PMO7Ppj!W{Y^HsM2ARpZ6)!$@iPNehkANS)x~|W3u6o0`3EkA(Q(Sck7=}Dl>|c
zvPnMSlC{ttx5AmOIb;o4N!f!pQ|84OH_***21*W-WuphuoA0Mow})f-=B-dB0rx_L
zNzNGQI0&j<hBmH;Qsc~7K0#cal8`BxpEhzwYY$##Q4A#4-_1Etaw*{}n;lV4YE}Z0
z&Uf0R-k{Nbq`!I&_Iw&$k?B^V9-){sdvlb~m1vtMQOSSnFF;IR`(lNrD^OqUo76!J
zCnI@D<!_^C-)f1A%=%F?o<r~<U}hj$1Bz3%`XY4<whBMwG<6el-%NMqj!Q+8FoP%0
z$X>K79V?tHjpCy6AJtlh{2b4p9aJ2F<F#_M*b!YX-RtPWp5wzCa*>*<Wt3J$Mpwor
zD^&-F&eOW>3txiFiyJPoI$vb_c_;PQy5Tt7mn(RZip1qmzYUT;-&SPcrcx@3f?1X3
zgR$pi+-pk&&J5PgLl4qo8oGn!ojeS&&`l>hUFI42AGeZBxs3WHI&W_oXys<sd{!4$
zPta90$t$PTG0wOj_{CA?XoHsnc9$nB#2@3aYPs68_U`^2nR_JpaJPnblCIb?*Eab5
zeVLmNEeH%FFUa|dQV%yP<Y^y!&>FN*;Y<94FgcG0_RZ7U^0$P*XkiNL>skujh<kp*
zMp?|KJY{Br5+w2GWIo_C*M*V2xbm0{yn8yN>k#I0C}a?pX2GCaPcovK1Bi(&uR~cI
zhh7<BPt$hOh<OifLeu6fqevB=hy+`*%s}Kh9(9XnZL-7jgkIkdQ)tD*&D%YazLuF8
z%ZwSlX$nlm`|2&sy@5;l#-z|oWxSu~x`&qB#Fkoxim&1g7-zZa5Ga%s`8<PnwjSIy
z-zP{-V}s1y%C2IX=&~DY+bz<?jV;jB6{}hq2Z!Caw2q&geqZF7s&`0FruW^?KB?hJ
z+MF&WUE-OPo)drV3$lTN#y}Pki%SphJA-Za9%O?i@+o4H&sRct-m+7J?fMAjmP4jc
zR$}(mo~yQt6gY*O#%4Vi7Jf`lKMnM7Wkv5*2d`T3K__8sPTaUPN9p35_S1M7KJ$XU
zSlyH?{u^e|U%E&0KFNx>q(7>-0jDRJ<jnqLy7!yKz~qhl+p45wwhRq{PziFWOX2@~
z{;Pa$MKYn1Zdm0+EIS<_%E@*|B8>vulO527Kj(hIRG@?YYMkw#K#&L<{}Xo#q-3+O
zG`4HxtFH#T9#a*$7nByvHF|z>ol^D_{Pvl0)E$Xz6<YA#Qjn~_VJuhiUovtoV3Stj
z1C8-r8N!?ye*Tc}jpJW{3~xd8blceEVZMEag(6cOd5itaEUSzo_Q%mlq%SUDK`cr+
zrVYG9Q%O`11MLqg^U%0)=~lU#dkl$}sTsmgUu{qeEt!_GL)dfDE#+$6VgdH$Q1;Fd
zQ@zUY7L8|@70Y|W`r@lPisFE7LKkOxFOh6Gz#k4|yxnf19P;(Vu$ZLQNf^wsY;t4Z
z=?Gb8G$>ejUQI>Fd}qhLoWS}4-&*T)r_$>2(YWYChE>r|w*+M0w#mL6)68zfc#_V}
z8dTiPSe@SG5KPA|u{q2S{nSP}8l6=$LLn%v^pX1fOw@as;Y@jMla5!$rBDAOQ7avx
zJmnTYM0&gS?1N?A`tQoH)i!+7`kiE%@ht2!zW29EvesH;4{vorOnOdPbp<cY%Tt*n
zT#v3Mt7AaK^+u6MQitVOeR%tVYk~K@Rf6_yQsbc!62}oog8Rl>U6EHmI?R(AUjOon
zbj-7v6|c2*pjw|Ds}a;IRTL78pt8Nzwbg6zl@(1gJ;}&Tqpe%2`GO-!TJnA*?o-qB
z7a$Oc3UvG_f!9yo`pqQYL(@mPE%Jk*qUyKzMzRb^Pe|Sh2}kAavQWB|@2c4=HkSL0
z4<_w69o2JyFDB$)yaB)>BS4v$876JLPor3I3D}}*1IK6j-oSe<e*qpWma6dywX$Ct
zDy)wvk#jin;9kbJ?JA;uBvtneL1Pk+&*_W{6f1i)w8)U{q?e)x{msH<YZ7lTFPP}z
zH}nDF>p%XCiBHfrKV<s(Ot6oFRLk{0d<dyQfCbHlNN%0<ICk#oge;;bmEN#fcV}oc
zr~!^QHJ)1!Vg~vm<g?x~X>aN;*-2%>izcRfO1zlhcAopffPmV^C~60I7EJ}y#EoX;
zbD{I>;_7$l4CgGvq9)Lc;^a1EMbX=RbQ8Hy%6I#k(XF{5pTW{qX^k1wd#HixmLW53
z`|Bdw942l*;X<KG6YY-9(Sc8b?8jrT=ejuV!&q8DPPP;AHu~?ir=7CtMgpyW?plFJ
zvfrSE;e|L7S36$`R#h4Ix2rD$q)-(D$s`;-=r4e-St!oR(oRvdtmue>$DZx}t$k_(
zD473ad)%bO<23^Ve0@>vot{In6cr!mX1N7BuAk^dL@nLb*l!t1#lx+rkhc?OJaZ-!
zP^GUW^*fiwOZrklMt<^u@DcJ<xOEcX2HjixO_eGW!M)Xhme8ns5iH6EV`mmrRrP=z
zVn%kS<{Lg;QK!K1d^hr4?;>jfTwBU&^Vzjn(b(K5mO|$6gS2C&@wUliP4K-l<$*TN
z_CubZl%A|WI}_JTQ63Js_}ux^qpA7WQGer1i<{s=O5Y&sQWPU|v&O6boZ#`d30#Ju
zM&s@sSzG~F(N$(&2eV)t+7W2={1+aZ<k*ZTy)N1L4Gl~ZnBmp_^!n)^C`W*uZGc42
z%|rsk^Pu%ge~asA593PK^Xd@=i^tX~kWf^8nUUpn*KfB4#j4GIz>m}lq<4|4x%sh@
zUY<HBFf(v$S<f3O{KC?Gpwy7F8#W#cfiNsm;{v2RDkH3&r$*Fs4I_g&B=c{(2JdoK
zxgrwWDjP}a6FhP{NykLa%I%^$a6yn}a`@pH=?L=>O>+ia`lnZd6~?pYs8s1J@A<LW
z$0MHSh&IE>AVy`0+1cEOa^7Xm6$b93r|hrQlzOGD{Kk3#hV#)kk;SBciq;gLT^P)c
zeMf&aRExZtHQD{iFO;FP?Sy=;{Cw{YN~owjCO4c>&{=pag7x)C5nNMzTRJ*)p9y57
zcIesqO3a5F=^L91n2yk`+qq{5P?TKNivT7ONQ|Sj5KALpJ|@mWe%PdIXsyX=I{;aS
zrfvp83vHMX5O2Xq`R}^WC1;I^>45bSFNxpE>|7!HVl8HZ9w!55)D&O56}d}a^08`8
z+frOs2o^#+A-q>t2JYgG>HfP?+_Uk*>eZmushcM4qJPM~Q(lj0PX=xBCN{+xiAxwi
zD5u~R$pDF;l1I#Pm()Z&Z9v|7?RJGEkMoeNJB2(Ft9Z)ey3lf_vkds<ytVEBiXBL4
zuz5%qLX)@%g3vv4WnXGp0cHdQh32QRn`lj>tvX$n((~r6y&&Bzt-cpB=s55}ui|d1
z&t)kE*{yeY<9-9ImIJVevEqY%i+VYwxQx>zNVp=<p`cgU>vc@Q4u9JyU(99Z9TW*?
zBPB%LK~m^Y0bV!qNq}JQXK>@r2~{=uO)b}=o!AQMXX7|3PM4p5jI<8{2Y9<<+rg~e
z;bEM9viv@1{&}*i;oQ6a&(k%PrVRIBP!SKDM?`feQ<9zG9-S#P=do9XB;xz`eG#V&
zrm0!BZN8XDgSW~@@iqDRdg8%(oe+<~Ue0Rw*K^|2E4}mPK_H*!2@MiYXf-*b7gFt0
zCJ`F?-Vz0&VWzt4i3H1f<H$@Vb$hZ`iZ`tzv(SU)Er&8BeF}LTTS@dQRipf*z_XZa
zf3xfiVHA7b_$C5Bpe6jQ@RMOYUm*`tse^^FC5W?vtBl?YV51S6FJ&n6`UyGtN3Gy8
zfwCRtb~_-rHT|o&oRyCWY>@v~$_~T+Ek;E8^BL=!dgpf0il9MdM?I@=dg^pc<{cz{
zUqw<mZZT3lEw8hIrJrr(%%gX!^ekaM#aYZJ%GZ@8tk+pi3SDb*bG45mS-9iKMoLLH
zM704tIW0NF=u<J<rq&O&n<pDG&<-j}VVNQMfMW?pT~cejnw|F9zGvU;u(n((y}tJY
zG7slkE2T?~sn^e@6_g~{BOJ0se54qGPixtcjkp(djYfp=;O*x&l+J=zo%ui4ni6Ly
zF)#`zF;JXTqrUVzvTx(=?%BcZ^QJu|3wruf3`}snvOBpdQk-sy-wlw9bF}{HwG_{Y
z>ut6T94G*7(sTr6eiZ;-cgEA%M|Ki7X?(*m<5@G@peqfUtouFn6fij?x=us2N)k@B
zsv%xnKC>y;_NGniWK_=~z}1@E44_kH2_GwM;*9Toz9@Ms<m(|lZ&By%>H%3U@&Oc>
z7C1kQqw|aN&cWX3TXP3dGEX2%*{k;T)Tq2{IpB+aBuioZ&jxl2=CR7|xCSig?5hGo
zZz*WKPRl(JPSJdLg>IVp4z%pllV=Rd<)y?&a`&Y*IDHH5*|p9w9r%@ZE%s!h#Gm6N
zMZ<d0d8hTWlb$R2>Iyy~-;erbQ&52Tl&re>Pk%J~Bsm+J&A72*4*POA^p){{a#hT0
z+Csv%MjePR)B{7t_5G?pWPl>6b{U^|<gId(-rmlokJwjMAw>*idGn8|gXu&}K52{!
znX2@1_IXPG)Sh2UC*>37#>JwTx!B<+BBpQ-XbRf*%!Lx;4|g_Id~>J>aC<{VY3#aj
zsmNHNY&05Y^d8dplh4sHN1=gZ7wFXK6puvcP1OAbbme>i84MX`i}Qz)P`5=LAgWf`
zIFnDFvt!WGeQ$0jR)|mAU+~s@wU-jwepg26QG$)4!k;{?O*3G1x`ShF&1?E$!<@$7
zFZz*@r2Eg*71#NxbgwA+UWU(kU2KA&Hpt0flr+g8t-kd=GQu|Z4jYXmR<S<ZKjx1~
z7C=B7$tLTia9vFzR_%2Fh>lgu6t6@nlGe2AY3D{r!8ilFEuiG#jxxSc-(+g^!&CxL
zRcX>cf_e4BjbA+wbGgO#=1^JB`t?)IO(d`SprejJ+Do*McG`c|zq0$4Y^78mUwFl1
zjn`Z~b~mE|@J~_FvsD@i(;xkLA5S&K30ZsyrJhylbwMLZ$RGXAF*3zVU)TNzW1n#!
zc34o&_%aPy9nzQrKiL2}Tosqn_T$<JqB!zO@O7P9h~D!TU{d$SL++#Ajc<gTndzu0
zf%(o%*y?FTFmqRybFo~<$5Y=F_PUskEWsT};%5GRinH`7!%xioj8ab0FVPz$$*_ZV
zZyo9(t2sa(ofWqK4(~wwhWj&p{;~Vvj@Bz)p3MWW*I0=!cK$2JN-LtEn0;1>>A?6n
zlUX*TM}^j2_Hz_`sng-C%#b2qleyu=ShX5zY^b*T(!-29n15e+D^S7T1)f?0q4-ti
zQ6UucN1x=~4Gjj^AwaB0oYIXPpZxCACry!R+g?j~L^F8tN#vaUfHFqM#*7pf0=j>V
zXbNqIP?)b4T^llUkk+3a!WHzWS~7#CvPMi^eqgE?djF0IWr#fVIMzn%Mbh$pV4CJ4
znQj*X(0qLZ@Y+zxR86B}t~?eG;Y@MPK@=vC2JC*%+akFT;;wT_>1Fpk56IL7`ga_Y
zEgdoS;JF^Sh(pP31(s&ri4oHl8MN`eBuIlvyMpx588R4?(VKZWinTCFBi#8QHZwF|
z%7}=MtyCd$JTr4%=nI>6Y(g^Ad%!_KiPEdBA)Ckua#&DR1~G($`Sfap)D6+qfk(6C
zhvNm;Qk{20{WFv~#()daC3UY<N`%u-o*|Fcq2IQRGRU6|f0GO}2DsS>Iu(AE*kh7#
zPF!^t^ak2L?JR6~QCu!qoH{bu!Ble|+EJ|{n0+GwHpA457|9v^atLA#&kSJhD+zKK
zRYw*wny*zo7%^>`yUYM}zOo6iXL{MHU>q3jMgF#H$x)JbpvxQd^V9p&V{u7l(!T5z
z7kLrm5loDj@7u6g?F#!JD<0x0CkxY!gG;nXKy4IRXY0@8poU9C3al5U?Wl$8&33|h
zUvJPXpOO`Z^KY!y7KX8^tM+8k0y@>dlvzX#K1^gB_+(bJ+WguQHAEuuV%<o)m8$Hc
zS8}%o#odBGEB*t;mN0g|W?S3We4;5-y}HxSX`(`9nEuG>V07sRP=Tl{X7={%sO{wl
z^Y!#4ri`uB(74zPdl;{hv*EHjE1}@eT!@cTD}l0&oGw;S@`d;{tb^j&{YBQa_s5Ol
zB3U);)JM7!MZCOp&o<uPNfsb4kvpQPlDHao^~~3-ZDyC!qPi6DT+LaLr=|PM!LHqG
zQ)PmB(OPWA7~=9fv~!MH$(@n&O93mHBx+z$#BphzJ$&<HQ|W+BoW7>?N^}w>@M)>!
zNf&>uVM&*x?C5O8JBen=5rZ9H8%1&70aaYc`?ubeQpe0%ptau*LlhQrVl<wkYa19p
z&vF6Yd99vbW=^s1$jx#)MLc{VHtKdMcE>!DA(VAtPVI>wB{=zQP^yQxT9bU*>-JD9
zD&4LKg85Bzzb?ja+*~|pw}owUV`1&hF!ATC^na$9aDgTh4B!G3-a=a{sv0?nS3y6D
zr*l^la@DGYo8G*KsDY7va)h?h${0;<3Qj|T)}|CqS^8NeGA*d~(}4_>mq}J5;RgA(
zX2YTaX>!Bp2R7D^6#P5Qyvw<n6@ZJNoBfjDFm)A|?5sV~AFHJGVAa>VOxHOF4wcDJ
zwe!pDmx2(c6uAD5pBO&*E}dck&#qj6?#8Yx@F@0>Jv%)n%`*JMZ+(ZbU54<)88vAT
z#sra!m^>E#7G!6Ly73J~;)*`!_rQ6&YWaj<#rdEO*$*KI!{xSi;deOekvqf~dsT<b
z^;7n&ci=jF7veiG<_(r>!@_LEWVK&l6*w+N^M_z&WNFXFw?oy)WbAaKts``za6Mj-
zGch`p{b3y?^EBn}uq&g}VkfqNGaxg0;rO1+;v!(0?o@KkYk$2F<MR6$<JFWlV1jQx
z9k8;Y7Uf5$Pbvw@t`er$)o_YQGXyq@jj@-u189$QF`nR3jWIZlFWr=}C#@bvQe}$i
zhC)d2KI}&P!Y857#WFTNt^V4!eMx_1>JL3s-5}cmf>cX`n>E(TC^ZLD{)%K0{&a_?
zS8}G$E4*}k?GG(>nrAf>v1hroqLKrjTQI9r<SbL!$QrX8TUW1mf?^GF5H*k-MznIf
z_S~c@$-OHx)5f=vSsWn46}@29_3L50S$gMfE>)W$cUW=8E>{UV{QdfOdXWfE3LFag
z(SmDmIIN7sDC7(`J`q70J}mdzs8zwSBvN0<mtst;DB6<#a8Ks6xLMSDQQ#VB*G0bK
zys4`fzL@<fI>^621!oD>)EUSJC;&D@)5G;il3(P@#0x&YTXbFLSJsAq3Gh_?nJ3<?
z&hk7=$j6QOWF#(vqI#P;=kq)U(~%x;te5-RUx)$GT^}RLTw+&V>si~61|{qIQ5o+G
zLTHQsI3sVC);!=$R(zRI%f;)D?`#K2$4%Wxf_ue{N3!aF2(<J9fs^Y#z+`sZ9LUBv
zvA>-)g?@1Jk&pKUe@O~1+P8gQm-H7<0eM;oN~qyWg>{3Q)g~mj4jq|F=PU$z()J~*
z6~YU!LhXx`)Ov{fQSvq6qZ5-TN}UP^Hm^6U<T_(7k*B=F`s4)q;t%u!s6xBW+&9>X
zH-<=x>Fhp?EOjZYelBP;ZHPY+zWBM80Pv<9r4~oMmcQdkLM)4E7w*x$X=|3mfW@em
z$i!sm*t5nOcS($=p7ZuPmb%mftBure^{K?))884J(0lM9R77JO_KZRFu7AFV$~Cej
z<@-mktkWpBwab*4A;y&|Oi0CAVBPY(Wm9DGHv+HW3sT~eXEO#m5Cj3po7x_WYnRn_
z0rX8B8Z7`b&v;}<)Y)u!Cl+|5ujinthM!-!{n}{%v>RhfF(k}deNfhwIx*{B>r~=X
zHWzLtW~8S{n7Idu;&1yJ5Jultq~C!XqM2@ykU>$ufsyn}^u|;KB}|}iap)4KMSAJ$
z27xA-Nnz|oOsW(xa^5Ob2c1~cJj&v-(6+g;;RfrjB3m^@GanOh3uk|L+QnQ=oPxgO
zj`cvgUiN2sW@u%Qn7wu94ica#R!Dbs(8F@4y)t?U5Ynr{@`jtf#&Ujbdmfxc(h7xS
z`{HRE7HWrd?R&KqB)zE57^7F)AVLA_x5+{%!a5t=PAW>0HP)&)$uOwRk!{4-sABs^
zj9oCPBQ{BFVd)6^XO~`xxZCD0Kt2nX0amd6{=y@epH`t>*=6k3J8~CTpp%XT(4aO1
z3ORUV!4O>n&fWKko9oxW_7&Eg*|FMid|hTliv$Ld`z&9ERR%wKp(>F*sqJ&2&2tdx
zJncyXPNZ;Q23r46{7;MR$%zfJphWb>RZR;}nCG^YIJoq!VwjZJPM#$UAuUg?tL%B_
z&@uP626Gyf5OGDGc8uXDRVzb<W)IIQ%NB2J`oMsBaO^3VWJ0=Da>TjF|5>5hwNN;E
zAJCJ5{Lk`-xa75<jgjHB+#~A7JxaKl#Qh2rqtv;0BXP3)i`MRshmL<Bfw2Y7G97Yl
z)~Y*)qDFpgIDg*lAmu#Q9V#?wMLo({Dffvj(yd~L<k1cm@SWo`9Hu+eQtXq5Yxn+n
z!yzWu)oA?j%06RGWAIAp#MEh)s)6b*z`<WPvQ((@i^%E2T_xbDGruTJGjWxQ;y~`c
zPC5KON>+cU7Rh9M56<%rG|onvltO&_*Piq3&{pYXkKP<5$~H`abg`Q?mT#=r9QpLb
zvUw=`9$COKlY#p=xHrUUTvPF!_F`!>8{e_!1Qj=1HzFDE3eiXMkwCl=UgABp4ELy#
zF=RC!?-xXCix%nQ*I0e*1nYl4x!d_LB(M`S&&Z6tZXl_aA5+OfbQcChK*Tif?b~p1
zn{vu0KJ1pSeD<*eCM4OvZqSsMj_1B?uY3sQQKsZ&B#5G{;uHb)-Q&uZAp7*?84s-N
z+P;i?^{6{=?jB0ndNvqO#`YzYm1^Ou2Q{X-s9_j!>{5)M<pqY40d^xt=ZC;H1qK{o
z<1D#At^pQGTJq24gPs5B|7WGw%Th*m%S4JonRb=UTlAJB10p;9fe?$o6jIcfeU1N&
zuKE>)yw5j}{M2(0`V00}lf^YvjL^(HHM_J<h%H}+>(5X;G~}EQwSUYF2sVKKT!F99
z>}$yh{H&OyvB`#o1mznBP$LY-p&>i=#3+kN)s(;$kJeEoHq>!wMHA+*dO@OB+Yg@b
zY)8$`%8g&Bh%9Jc)?kR`CHmte_n|!W<IS+vyJTl{H=X1%@rqgr%O4Jv-dWVbKEeu_
zkkzSg--Sj}-jem)+N}+|ba`kYDYRH?BRK9FnPe%XA7vL6WV#!m>vLjqDDk~a3)yy=
zi0|z4ZvxFg!js)YGMn6_CT$5EH8-QUTtm~WKi!;XyZ`z|6Wr##gr^WWA}0U$9Vw5v
zIe`?rlmV?w{H?;T26Kmi>Kw<qU5!7=(hT@PFGMUf>ji;W)yJJ?sM-+FVE_7X1Jx$k
zxNeesl7<9{f0`B_B74W42Iw!#p|)(cQBPv6<hWzFM8(dA@1_1qYYAXSD5H3#`xP9q
zfsU^$5#9Rt!0@DeS;1wE<+-22*gq3670l-#*Ji3zD|A1{$6hkny4Jz`$Fa8~#=D-*
z0(dYi1a7@T3`^?b5nve;uJ)K=yzJ|Cklt2ak;<jlIRHZkc{P__ndUD3tnBeC1a7l7
zybJM;bX|5!LJ#a(sJ-mjXD1}2h0dPMR+sI&qTH9!bAH#}!Q(6)Xqg)SATWQVhB1dr
z_-4NFoUv}ei{q%*W9z{}`CRa+7bMlBO+m!U9v18XbnX)!A6w?{DZ-U+6A^pH_xTFn
z!XZ@jAhJ&;*cW8Fo@x5yH0Hedvqhq-F8=cpT!8@-mf$s@ZDSNOBGXMs^*>Jz=dI;O
zTGz;m4Nn#I0wKy;Kme?Cb{v_<!>i{@j45*b&%pdq84rfPxc}L>OIG!klG4}q(9k2>
zDPN;-z(W|nq?j%Bp-+yh2S*b|v8STut6C$r<~t&2!Q*8%q8}^c3Z^&5U_1r&&*Q5_
z%;W0@Qu*`xL})E`)Z#6zGjeS8W%Qk+SO?J^_PLDxl2&|<FPddVn$hSd4Q;4J%4ox&
z5FY^x>4+Huyh*T)+K#JMfOiKucGuqr7E{H^+BYWI)Y`(B!%$2Yc?a(suhi5nK|=Gu
z?ZmX5`-Te$!5#FZ3j<#Hs4UMvf?Oi(3~mp9(MjmQb~M#c&0F8m!OK*Kq?B-_9r15u
zh^Jdc+Uf5=3%Wh(p2J#o9H-q-;>7wC;(8|hn}O-;Q^5CP<9G(`+TrnC=2PSuT~$Q~
z?`(F%Cb^xli5tkUfPSGeL|kAeSF2-%97SzFzcEsou*IsXA6%ecT8A6aZhg8-V(`Q)
z_2vO>GJO4ao_>9bLF~34;(_MJ{H6S$xNBq%RhiQqV3SUC2xmY>Q`(wEB|OlN@|1Y=
z4qT<C-TYGT3u>%5wFfsWvWB0Vka`o6?d-#~od#yCqtg~Ki1a1_VNoBJ`H*ftyl!a-
zGaqQ@?AkEg`)nkiwA-5}&k_j#B;6EF@i``oLWg<}KO+#}l~&G42|w7Lau7f*HFfSg
zwS#;>d7_Xl=xa%{tbmt5b=fN&G|7G9R<rDMX_l0pFtQOo3a*5u?wHB~3wf&t`;Q(H
z$euZ!9!d(CpPQd|#Rsud?wm?Ca-~d}JxUVfW)$&+_pC_lf+_sCOngm0V=~0EHlir6
zH{5Tsb+?GX(&{C)W3#5-KvYb0C+Mnh)JDYkmT79fW2U?28oFZ29FRe2y4Y-{@N~Vf
zR6b2OeOSccRZI>&ZIk!`pbQEVZXpi?I6C1N`!)LVqdEedZBtBBm}X^_jlZEYzE*Dw
z;tFXISTLq>ZJ%;qCtoiE_b$slY}M};n4`&lrfv~s+W9<^>I})b1)HPKQE`7pZqZ*E
zC^k(^sBD0!WJmOeGFeuMj_dZl1^aDsh2-b@ruorp)T8rS)V;)iXi3c6qMO?tcR3Uu
zOY8akN03CIkJ$%;O}A}IzcQSvk3dTm^{l5U&P#;9leYQDr~Slsa5B{c&m$?OZ|7we
zPt4u;*~g7h_2DPC+>0Q2ivu1$sNF63+@A3zPr8G5(xFj-r&3NyXVhd$w2E?w;*$RH
zU7d$CZ2K@3T295}#qdWgtMp^)(em6E(A7v|a!w%12E}#~mf}kLBQ1bt47j9^GSIf#
zaCP-+wsT$0eyq`-9z#A%nXG@6MP+4=#RRIjvRf=>V?RjviTbg3urS+?-Sqt&y5aHV
z7CYkjB%ODo`(%`(>_fmVdn>~Z*067{!ByH7ZHhHqI&<8&DVWlYr6vp6Mz6jTT=)13
zD0;kr9zUb0P>9_ne@on>RCJYZIwypIQF6$w8aRKC4^k?;yBBYBN9LmVm4v|ljh6R+
z!plLCXxpy2+i#a$i?>!?BOxt(mOdKb;F}3#+t(~2`cs~P?R(6RDSt$uRn3i#!8fQO
zpJnn2S5=Zg2B*xjj68#*0r~ViNu7POB)}+*k)m`TOuobl(L*={NbbSgTw}8@nVG)(
z+LN>!#@r=+gyYn={hhUu;y2u2e%ILKFTff3mW6M~M1<5`nS>pk{J7&JU9OKao!iAB
zZwaWuQE3^XH}!%Q?Fz|<=plhs&;Ydt&_M4h)r}DLHkk)JvLPdmRocq#O`krF9ivEZ
zoHG`uS`AJ{cDbN%n{O(b?Q%fmgLT^OFiOC2Y0`#qbD5S;=6$&orTVTU^Y8X+Xr)y4
zxiokcYChx1gtswM5y>C7t<1sF^{MXk85fj8|Cn1D%~&T0?nTEI7s3BJ#`w(Dt#(JW
zlU5mx(qDEMA(m$sg{ss<usnVpej-&pK|;!GoM9V`ql7w$vQaT<|Lkg>oR@eQYGY?)
zX|gjI1e;LP>-YmD{VF>gBC>Du5>uA0a>(KBDt*kodd2VUT%d4G*fbEq$4oTGYUqFg
z)%yT0YWUhQnVrWTW0<zIJ*Z66gSvHvs>lFUrQa%)lWg}%Q2fmL$o+Ky#jb+S8@W?&
zV9qg!g-^}Hoob(j>8nj<ik$*;+bY#6Y2Z^myO6-HtlTPptAM!PK3?NOj|DFoU_Zvy
zS{9a+$20_u<)ls`??XYYlDaj&!?D(W4t_UjzQmSk=gnH(|Ec4x2C;onepwV+F7GK6
z7IkR1Dl8ZND`iW1OP>8y%UQD!k}=zol|-&uK2TD-P?lv+;{1a{`U!L?NHM7@Hu)w!
zJdN3^76H8<c<H|BrZmE2jud#OM3ql@^MR%6Y&Z>#z$$eky{%sGZ6jM&eRBxkE~uIM
z!q~SqYC8V~luYTncF!MN9siMCeAffT5!FrtbvHId6gv`Bowkt7(qx&81=s9c8fEE(
zTJfE}_*x1OOOKcbrYxeJmO-a9Ox+hrWKxCOR<nAqGN@CO#)DN}9f~a3tx%38oh>rM
z&Y1Hm`gOJAX!V9_WuAIdl>#7$m?W=qCj)`W=^$ADgQoRjy<PQ8oCKO8!QGfN{V%{s
z6N3DiMN?X0WtSaw*Mf%2d3?TR=1*52dGC!ptx)doH6tOG5&ad?G=ofT`VSn1g{G7E
z>G$77$kBNaOJ9p#>2ug8Pt3lJFl8kO0&M98jg!Tuf-w%>4{Y{tC6CaKLlKlm`TQyy
z=Fk1gc>I08%}=?Z9%S91{C=oFza|~xV1<TB7h%nbFHD%1ZhzcFqf3_Yj2ysSFA83*
zIVw6_rEdQGmiV70h8yM$b@w0=q=j+>*!D-`<)n4!|3}ezxU>1TVL0|yv3HG9TkKUO
z#HgUL_ZEArt!m4#OA@sG*^Rx4Ss_M=7L6872TD~-b*Pq(&-W+1$9o*_^St+co!8lm
zw-rDYlSQMQhRaKaswVXv?h<$hnuXd4LW)Gy+hHRllPsI6&IDyuXIqV!n@0r+l^-NS
zJT%K%z@10vJAZ1LdfvUh1I1Qk3$6EPOOPMOIi1pxHp2SU=L?BRUl@1+5)QiWQ=)X`
zsY-Nm0e+ftal)x&DJ=VZ5VI?+NmLf^Mp$HKwYPVDRrsC}<V_+3XAT!(U|B+Z@~uVs
z3#|C018)W!Mf>*9=$NlFxcCHiJ4L_}iC$r=M!r<euZk`Z5;Wk1uJrwI;N^q4ObILK
z72)I$OkSl<I^W-RSgWvUmg0R&>0IL^6TT*<TPXSlAGtZ*yMLa`k5YDli9&y22LeB#
z=$@(J>5KOF`_$<BRj){BP_6@BRR{R{5jE~MUX*S`&IZ-$R~j&1Tb`!yH-FU43AyE$
z+3cyh%7*UoJV(9GTm<q|R)zo;%s3^~OC*EnL$lX~*h11lA#^fN6!JcPQ;6vq!tYFS
zbl*3)dbsBe+w<a>S{gTRru|MeD>fH`(<g_(Uf}C2=CK;wUGyLBoCC_*E?1=*nC!87
zh@|Rc!&ZK?1P{@%gd`~M=pX41?P<05Bmy5(K%XhY!BPl%cG2-EGl)N-)9tn`J^jt`
zk*cq}AFN$Bq8vwJZ_kMd2739JbLLs6dMYl!`Vv#Dmzs<vr+MMfTcenty++mfEKMY}
zs1-wFQ^zP423u>n^7{Sze|LU!{4T)p<$m~+(Ug}-Q+nX-BA=CR-BHE4b1O|Ad2^hI
z04<fy=HLBU%z~DP;s9k=d%AmLst6}0P1mnW<a|^Ab<=!49QI-hkcZ}8o-y`pNx><2
zlt?l*zX!uCf+$)CS7=ghL+E8p^c|}QVYL&K;>JU!t%`fHdtVd?9oM|1O+iy%7eQ==
zGn#naUlLyVmlHTM{rK0E9;xGBUg7<CF+acuR?HDP9JNL0Zck4AZrJrOjk`bP3ctQB
zv1;~EuY72=$(4@gcM0yb<_|`m<#W$4jPmYiPE&U0$11;9!=vD=aj*m29u1=Z9^_z~
zLwC=LmZ>~S$7&#DX{MJ3#fo;?7hS04JlbIuzG^)oB5G*MEJC}k7r;()p|jS@ep9vs
zQc`_IuDoRyHq8_bJ2MONieQxY=WvRrp}*z5z55xF>1LWl!(Y5fp`&9Mo1sRi@mu{~
z$U?qCrr>DnnN8$tfqI>6K7j%5-Vn9hCX2~-f;9%LZBWS8cisG=o~vSxZ3Y)Lv5;c1
zZ@{pPA>HBxKTnzjf;nx4JS;Ji{UYtmcuo+bJ7hhOT_iPH_(ljOr#Ja*^4OV}zxkd%
z?XUWp;O!HaAL;Jur!SSc8+K6?<9dBH(Jtu78SN`9WwcML=QJ>-*{WXHKbU^iU)S>#
znTwoD`VGOeH94wtEq5sm$EVtI)=w?J@?7U#8o6-X*<4RzBu6IPhrDsD`v>qSYRfLZ
z*1N{y&9Z5%7iL;TO5>_uyG*^M$fq>RfW1@#W1c)oD|CZDFETbC>G}&~R!k^8t9i7b
z=`~^&>#qHvX|?KvCS~2fnLBsy8~0k2_=C5oOjd&=1>WtQp`P@HWex+9;(rB%Pkh@x
zQ_Niomw`w!i?X+1+#S4seOTu>F)k{}3iCZf)Z9X@VlT)>NL;XL>}k?SelFu&S8)?*
zbkf}@UgNvy!8O{?`o3@T+I0A0I`+2vc$<n)uv2b+c10Zj_hWnG;$4~l^eS@7=FbX8
zJdmufZOg;u4jZ<eHKR)6N^lz-y1z<3usxR^lt!@*1`t;R_SpJaD^8ftbVif7K4Jeu
zq|8S-aVjbzea)StVCp=zGEuKgOXp`N4=p!eJ*v~Y#LgNVyC)HLds&8|A_-J<bQi%@
zE56h1$2W#AUJ}6p#{G6$BPHP3zxM2oc=0#LnO?wu7lKN*xd@rObB4eV4Bh$i=!(da
z2pF4gD%!{TuLL&F%Bppq)_^xnZMvrfQOkgusNL}0g0)xdXl%d+rka2C<jXYGPmo6?
z`<wgM`VHrJHNPh?Nlj{)OR3dh^Rpiz>p<6;`Fv`xunjC|Ch>oPK1UmGj7{_J%G19T
zhu26cPBmSR>0x|V$GzqMnCVvww(mdKD8=vi&F=s>fvM45ho|ZRt7v4uM4M(xDv~Zu
z`qv$hnVhPd(<1)4?GJOCgMyd39Dz6EUa+Z`gdDjH=L`R+R&RJ7oZVpk>HPsqGk1eD
z8o(Df9jm~=`Pgz0JWb`Wk&J{e!G2yqUJFi*R-5XjYHuIZ_5YHgiy6CO*^|%IVq7`-
ztJnQA$0TOvVsS(n?DwQ4Uii_8fSF$PIOVenn&!*arn(aMoh9Y+ZR&Z<<a#)n2n-31
zR+@5=1_*otZn`dmOCG3~DxLhc!FaVc4txPsC9+Ly^CmWGTXvI_^{V~wsD&(a!!1Li
zWw_GdH!moif)tzV_VaqU0-^Mn$0mtijR$DXcdN;S(3FRD){B&CA;`1K#+5BKCh&L2
z9dJd~=qQvORWQ>ozQRsOKaUciZB?{j1JSL0Kw13<*~w*ZyXskk^ozE-G@i0ZilW>v
z7II;ZO+f?Na}5rabqi%>{yXHClE&;V-Q{FbYk%cGQ9t5!B}{Zho(v7R#FZ<OySc*@
z_wi1U+C@Qu6d=t@#Us-6P6CtYWF<Jfe)bL}AVy}QR>(i&A}h#~E7icKW(@T#KfS-@
zdP4J3v}Bk4LBSV?BNf#`mTH;dJ>?W#L(+j3xwHnXo%rQ%En|`3W{_m(MqiM<+bSMe
z`e_Mt%h>0G9N1$N%$%!XyBiDaJOM@vUf-}!8$}s+n3Mx+mG_i*8=>2F9Sm5}3>k#+
z*kbdsP+F9Vf0r6SQ->`z>A~x!?InPm@ZUdEEkP398S~lQGHT!M`pEwSNSH{ip+vji
zZ+kzjqe-TNfwcf!UYCNT?GbP89x*B~ysYY1WT7kVi5dFNkQgLh^n0GtuAFWf%TYQI
zN9NYcqp+(E$BoGP?&~K2{21Fw#vFnp)CS{UlB-X4X)Hn%*c1-zkU@t#6i>7}D6pVU
z-PHjPsOcqtW2u?t<?hL<J@AxJ%-G6(xXQ7oa@491^Nc#;yOU^tlqI4oqdTYINjvPW
zYJX7iL>2V%*aastf7{G_%!y5^H!@EDdJ|y4x<;CwQ&9M|lpTlNKR~^ERZzia@owi&
z#qo^3US%~LUy?+uY`@;iNjK)rK3@1e1un9_OObWJ;DFt%HYE}BBY*@LaFe?C;fO`>
zmh)ff{}_%hbKRDWn$@q|l@aAZQ4ANfBIb$H>1sgZTg85G&)#*NY{nOut&npq{N%++
zG>KtA7JBe9Fupaq5xn_c>Q@o0mTyzpjzcRZu`K1$SRw;h{!^C8UhVd@x%Q$QNd-F$
ze!+U{&}NDk$5CMMd!bkIm5+MCD5qb#rI^Lc*e*}5SVwzz1dVN$AotAytS$;VdIG?|
zMsT?0Zm6Y^F>G#!*~K%h$M;QQ18%r?fAW6YdRKR|F=oTf3yuLk1d9!~lIwjsOzi}e
z>U(<Y8Je0;kkK?PLSzX=JwiY>ye7(b5B5Nz&g`!0jhDbVydzYY5MU$+Y^#^Bvl~t^
zKv=D`9-K0NDil*=)OYJ;cB?;0B8Q7veX?e6J!S9?(%xV~s)|q|64ImvY0H1+g6t80
zccp!;Mqk5k)QKs``23}JQ9-;D1b-3dgQ;PHF`GZEb-N#Nvgz<~rsbh46T{e>@68Fz
z6~Of@S{QkQ2$ET8nbZikDr;5+nM#sNxeDc)`s3*DrkB)bo>Cb^DM9Px3$6CMBMIl(
zdr<a8g^eglhA5?N2}{<>yRaZQp=F+BC}r@|UB;MEHV(;tE9PDkSskaTts9R@VA-^e
zcRl^@UEFcUNen8S{C>Wftz8=Np>EsyQW1UTsz=uJW_$xL4Ny0I2Hk$lyySNn_VoY3
zo*@Ma-_I@IA3??0Jr{JmUdGdASA;AM)8Q4L*Szg4%QzZclPN*9;~45Tv}z6VE{N6f
zyi!fW`AmZwYkZ*i4yhAG;}!of@Fsg_Gj}%~Zlf+w7%k!IMtas4+gO^H71+{ALk-JU
zNae2cC^V@!l`C5qt~Q|+Db$cjg5kA2|B&f?2L+Q8NWNcFk&`8aze;9cXs{fW-=TO8
zr46>;Q@aZh)ZAl@ErhrZvs7^kiU;|NPO9vSj)T2#Ze<y-d+$YoR%mi)f`k~ZE|f9|
zUM8)@`~z5X^76arlNbGWA>uyq8dg4JK$G&UV&q;(Rll3fOpPu0CONT^7YWW*80OB6
zq>faWx&E2v^Bc`H;#B{`VcMf{<q@Q6Urg<fR=PATZtS-O&pEhs6GQ5uYnIO9=(g>M
zQtLeSl^;fGrC_H%!j%9MBpwx$zz8($kODZ45zB#qhxPEwnXPCBWNE6F<6ARr8Uhz+
z`MjH1S{zoJ?GJS|4+McxZ82A=IvkrR{fzGumh*QX9%6Ft6<AD7#w&JDAM6HjuXmRh
z`L?K9w$8&DrQ8fM*MzyaQTf~T^1Er~>+fXJAH|i27Hb~S^^P<G+ByHsY&xJ2c}}Oi
zPC)jK+6ukQ6AX~eD<*^(qD=(2Gd@Ce%kmxzs4yI)VKv$yBU{r@Jp()6KeIz-Z{a$9
z|Ho|<lXQXQpqR5F##sWULH=*8@W{6qJu7?1g&>Sb|3APjKgJJkWw5x4rwNy1;r!k&
zu)neo)H-cut@ukQ;x3ZeE#ne^coN;HnaTKchSHS--j?P)7|2xbz$3Y`C3M)<Ud94$
ze?)KD67L%(CTKV=|GnL6!Q!$S-JKt5yjG){p-C{sJk4y>;r^H3)0b8EN%Q)7cfXuJ
zSivsH88)pPuz5=e<|%CXpvkTWtVgQJh^jyJroUux8uy17i}Or+IrN2!oEcuQhtmOh
z<7Ui-x8M~1?fQTu_OJn^4^f<+Gku9rTMP9C*WULrQhB;mW+7qcW;9Qg0^a1Jc)Aj*
z(~@Zx^8B_$i?V1c$bI&g>9%>_Qa7(+uF>!;6X&jE$0B|q=`|B2jKAr^m!)Hz<u4RT
z3r-;E`@R~^em)ybC-+w~=MJGTUh#sHVjIdDH&P1>^4>4<F>}f};uf-+>_U3pdOJg&
z@A#(O#Q~HxU2vR~#vhxP&+OS-Hbok#3Gh27fpYF%ee{{@?o)H?ujE&G9*TQ@5qVcN
zcv%;IqM=HcRk;UQ8AKb!q7}Y`_{}GF;jy%1P`<;CJKR6G5?}&^^DL#IW|%`|$QdEx
zwRGW^6UCb}tA4O1#dCe6d>MNC+8@1o_eEv5{7w;HsDRy|d2=8a2iMEWy;GVmIv;_7
zVtk@pKe*&HY`J>R3dhw-KdXOb>>TtYYU?`aAq2=Gs3;6dOD@Mo^7oVoi_2Y{Fd*aj
z6HOT?zt-TC6B!*F>tHeka{8b;;IC_8P#D60s5EfoSVV1%@GXuzr75^56{(^_X5sM)
z)B_pD!bi%LD&c|F+q<D(@)<ti!JLO@2$8!-enUMG_}U2OO|`SEK~)bbEgd>@g$O`j
zZ?JLGKkzW!6VGWeT(}rP$h22bTQQ4u5uDW$V7T|gwI}?yC-GNa76+O6QEYO--Yl+s
zjJr9^^?QLJ#_z??qP&w4c^&u07|iSI8*T=vb#a9)wv7~b7C?{%p;zi$4HGXe#eX2-
zxtx2nIfRb_Dbi4g0Qa>Ace%Cu&nhP1rq@QV@5}_{;bgS0K#mv>gb#GAf$-%cLEz50
zeEgHok3wFQC~=;D5KqJk@ZX|mWu-gM8NOd?UlI3)8=VjHj`Aqvw-C%#3%~DQG9@}z
zYHF>B<=)KmJvYloy>R#$%2(mhB^NA^g4&X+P+sl6sa8rmtOwWTzJ$nOmKV(;^pABA
zadYNPb7rM}>;2Z>?7{q#yN9IU_Z@}Wm34CmPQr^mM8OCfh-Sf0TT<Q;EJl52TQKi&
ze5d1?Z=T(=6@yIClDOLL6|$iXp_e&O-kw%^5g2F~>)&Qdc^oFd>%jk9SK6fAZk)0w
z*^-&w!`IozpMEvJ9#R+pn<n<gfbV5E><R;ZnW|cx&FL|!)iQZ#76Bpi+qI4fc}yvC
z1mXNnK74Cpm1Z|O*N^8^`H-ftQ-aJ=3^+1ipMckX^~|`+@`Ty%HbP0*%-U>Doc=;y
zAGfE#wa4%Su1j2bb;SBk3snB<j;m(>8>0<i5}vO^bfGcEuDYcqsq)Dg?w+2|cUoqx
zt7_6&Q>(R+chnJRj9;+}eQn{|)ath4DO*ImcM~Cn$*$7Q-pLxo=Is=rUFWHX9uk<{
zeGAXAzh{4zxpdEIX270lZBhyUnT@rzezDspqzqIUzU^19hNV%#%v{3nS-lIWe$#lM
zES~4Je#@%~$huWyN>taj6o^ALY0NFl4Z}OBcaU8z$X02mg3Ix+&3Kkx7tO4oP7U{<
zJW!i7#J_x7AQyDK!3^N#=~%u8t@Rpgbq3kz4R$tERXFdy3+X=9#1FBW0wFFS;`kGj
z^|ScDbv+CI%BifAt}Zz$Y6%;NxFc8AwJ$#EJqL<`0ljVsuq3GhQcp0$B>%@1#JaIp
zt6Zx*|4tWQjC}_+Ng{97Cd!BTCE34^cm#jQ`CnYSb2%$r`8vkYqE9YUP>il+c->Z!
z`)_knlhXHA0G4In?dCKsM`WWw=gIHIny{CGPso3LDT0@nr`xFTqM{MhNF|()NMQiG
zEgd<V$Y3(}{4`^ZyqxNEXk9tlXE?uV$unFgGpab9AzY2@3}y7LH63dmxX{D|6-e7<
zKEH#@+${L-!Io=HZHxuV{qeBrFY5AOQ1w|=NEnU9iel%@2!IWb4%OXxPEL07REfK%
zv%$6DK2W}RlR#C7zfBUBvL5KAI+9)9;+ZH4$cNerB#8#M6Hdh<-Qi---S-Eu5INRf
zRW5@;QDc)SjOo~9PGpqeS?_zHg4%d#1n&z>P^W(0xP_t+_Axf|9@oIL>V<L7#;hUp
zBYN){_t^_;ks#sQ;AORHvBc)A1A6sq`hM^z62TZcqHZzC*nuw+4jpmMXy7TkrD$ZC
z#<ttyqu!v*`^4s24^t>oJwC>qg?%TeX%ncYhpBU~r7)4B93QOomnxfoZp%MIVsD8;
zb3&P5c>{Ggni@guof|Hq{9)pV45ncVg5r_BdG;ws_Q!c&vPsiI;P+H?BEVT6QHe%q
zrrHA8-G3ECHBRI6b6YRS{pH92ME#-}>k<4e_pWX_uYz+1+)0f(J$8<a+i&-Nn`W<i
zMDL!HFW~NBxi%VO{!s*(pRI%mWD@wEsU__Elz_0R{Yh3+zoN2p(PT#l72^sY9rG08
zqAQH$Fj0SnGGACpkD}LOYOUZJDzH{LB|{k*Rp`v+B#j|)j?u{64UL$o3LQ>*cFfe`
zPQLXwcIK8qhi(h@KEXiy7gbqM(5Z$Hf+*JWg|<@mW8F4e=LZVKjB#4-4SA5+?Rhdf
znF%r$Z1*W=R-E~UFbbvE8`Eu&i$eJpIGu7AxAe!%0kF>m?H<K2b+1(y5BuT)ejb*q
zb%~&7EVBqX%~$mwS}J)>X16*t`Uy(;bJ1~`1}iYS3aAS#l;DzFi8pxE-stb&|MxML
zTF0tG1k}tR!LYzDg4Isx_1du_H%fK&63y%rgvYJsr4(iFu*^S%*>Kfvzxk$K(OjHj
z{eHX;ujFk?xz@40Ze<!k8w+x<apMw+RSo@#^uCMjb;QxLc!~I}@ESppxmGPM2$HBE
z+Q100XqV{)tr?Z57pz=Io!8YM9<|xs0kO5oWR0?7db?u6`74$9@+}BOZMsEjf?MB?
zJw7noPG9tzxMmYysxD4$$SD>P;dAm%>T~&w-vy3wpc4kKn7_}o=bb+U7CnU&Y$g5!
zuvBb)gt75Ws@nF~>f*kiFxzO*`&b*h7gr^CJb*j(LsX`z>`V=~EH>Q~WTwq>0e9Bx
z`wQ7K2a!VggczR#0S@J6hW+Scg2|J3-r1QmDR9C+z-x_FSnPrG%eP&45UgF20eaN}
zwhakflyZ(av$8S}0}532GB#Z)(o!`Qr7PEV!VQ?V=dsc|^zPV8*GftTv47*oD|>xm
zGi^~V5#R}Y@#wPJZ%wkYN$t77)0b3wmW%r1+a@Zz&a$;07y9g&X2jQ{1D6jk85oPe
zEO3cm*EjqegV!iVr5_75@5swpZ)8yk;qSat{st^D=?e^#gkN@{QKLyqM+`wW1$aRA
z?HL{a543|O(ko=2F~?y@n@{aOfc=ki=J#_9vGk}aCI2DuIq_O^SZKu>INSHqCzN1_
z0Twih7GU5h6XPv*sNnUzZC$LOLPH*z%KAf1pmLhwYN!bF`)U#N*^#pKGMkJ?L01I;
zm>pc)#k6C;u;IFx&E*oB913a6Nu9ApV(^@7T^N5!F8mn{bLhDY>Y-kBWlHgp;~#D`
z#)pJwT=&1?bOAQf+4iaIdb88eK(X9Y2<<<U8LaK+@Ol0+<J$H|LzC`dUP>Bjo`%Sl
zc;+G>*NU8XUM989GbU#*X0@EsqPZk^62mwIeV7ipCKWx<5#2p4)>9ost^Ac3C4$(t
zhAviaeQrYPTh{BF5AA<o2fxKf920EgbuFdg+v0M*`%Y73Z*4qWD>JiQJ`V?6%JmMi
zY<~Wc;w&V?SPw02yLJNNa2gV+yOs-j*5g)XGnJ>}?IDemM)~hxLeZU9W}0+>28@q#
z{ge(vZbO8#<`U{-uXP1pgq{3Fco%(uyj<N@Lt<Z8oEU0#AZ{}(PLc_#Vc|b94ueAs
zyzZ&QE8!z6N<wZCm=CMpm{rzxv=|YHby14V$8HfTOXs>(?uGVf9O>#1xj)n1SOrLQ
zZ21vBz*0MburJvV4s!UOi)vGm`lgYf<dJa~FpZ!-)@g00L`9n{kD!Pah1|X86ZWl`
zrk%gA1D=?_bL7A^U^t)rjppk=hEJ8C5-U69H75*O?e%{f7#yx`cp43R-L-tTXYld4
zN>MyBKs51@C*%QN<HQjwzs@VJLCJ%-5-Q|$4u4lME%WtnS*hurkv+Op6E=~}mq#$d
z%p!-CgZM5ocTa*x9>?F#>yZ0b6nc-jx<B~XG=;!<-^9<=@1T<z*3Cjl%N${p)!nk+
zYv9xcE)q`_V03X*7*}DZ$F?s)I1IN!dYQl^*Sy^kC(A@4RJKYK_Q2#yK(#ek>!4?`
zo+P&-%%?RqWBgy(T1jqO^Ge^&#k)6Wlfl{!qg}39UX3zZayijt4+^w46<>UY+s+FS
zjgon5S+|rdQ|qM!Zuxf2mIDC3GchZ8Z?jhQp-^XosEfpQ!gld{N#mpIGA|>%W&pbl
zBPU0q#(2=4awJ}~tW>_kkZe%q;m6q2?yaW$>AlGAZ?JWK7tpn`HZ^B$^d^aaK6YRs
z*^#v{{|5Y>l67$8XLqA2>&DTa;8ts;xB(yFRY!ZB`uThr$~j@Izu*mbu~*Zf<F%Sf
zE#ncb^mJoJ`Z>#%O4lmqV*7sprN%bRcL6r@kCjDGjCy&OtY@rDh_?_X&qIyaukc;z
z)+wB18{!G6qO1s23H~Kqr|;tYNiI2x$0m;E{qPl>7T{&C5mV_D`>r{z1t)U>Ff*Q2
z$x_8*UVI7_nm;+}3$?^R;8^fR8is~HL7+9y9Mzh<BX;LGQC<Mj@ak`maNeWBpjWc{
zad!n5qfM)z>N@{z8@x%e?BUR`@B<a+XM|m`%CGQj8x%gw(#04eD&2o#*e;M@hUfn3
zjEZvl91j{ge|e&XTxzphGJV_78kBHqeDyK7c@Ok@*~0Et#fdJzsQehKea<h!&A<%&
zi-NlQ<U1KVwJ|)oT=<D{+~g47e?bbceDU&baLp+rF{1miv0S1RFtO?$Ijs<@+2v(c
zsPUka8Nlo1_mni3cJE>TRcZdwVkWD9fRrkRkKbDVK+U+6c7{%Qz}0iqCzYTfj;AI(
zJ$`<fa|P8QzO1e~jDe?0HhJj_*;N&LtjXA~;DnpdaDIi*yMA+D#8QX4>^F#=lFMJE
z-}z2)d1O8`H07?Pm??lQPe-JW*)I#aa91WuD}0R#v6_+zu4n;^p4u_SP&Frge-@uS
z*rhh}T}nY$SNm?N)SPM;moA<N>^is^_MvA9K{2vovYuxBGv1v7nA{qFS#JqanQxS`
zHE(<6P3xuM8kd%mXT(J3olAP?${0v{%A9%u<IgHE!)+-K86Omh^Ub$hL6sNGD{X)!
zpMF}$^=3tqRo267BNJ~N7&QFg9+}VB%Ky%)EFF33h`;G;8Cm@KvG<?F0SlHw69vGQ
ziW*8GC$3Oj!m_=?%PLIe0!wg}CzcuzR$|ur@>Sn$NlpmMH@{sGUmSQc`;fF&cyCek
z&j!Rua=0#_m+g+7j-xNEizGOpeh1=Vzt*Y6o&YiE^^!?F<*U3dl9Ow_w2e$yQ;VVP
ze!Zg%nUsCUfbYT|GsmX+cXuv|JxxyH%jzBIquBVbjffF%T}3-|QD5_fsXy=ISEA8<
zsEbxM7MfG|P4(ppQ&u3o9jD<0r@N04@7hcmN~*n?5hPz#xp!VARq@&mUlqP5<c0P+
zq2aONiPd4X?g?8_WP)#NTWaTd)&mT%`l!}0qbZoFzhpguv>O>sy+)N=MxzX^xk{`b
z#m$Y%P^N<O8%o=gj`WB~C-9?K;rU}qv}n_qZe`RqNP_{+%3=(0iK@@#8tH%<B)=mM
zrGDBWOx-~}Y|S^T2;X)x(#W?9eMrdA_PTS^zCL)U^w*K@yyxo)x@;-kTkIwF%^+3>
zl;MnLCHvMW`h!hdFW0A_6+ENdP+DGFmRnZf3$?)<F0g#|I%&z%u@3*DDxrhCm_J@G
z*rJC{Kt$*oV5_{!i)%G2K0kLA=<okHTV2J2o?>NtqTt5TER*Zjtm&_)n0FItCr@xo
z$Wo%`$GlVhiE))+8FjTHG=wIAW#AKPq;XT}^fEJ7{R2fa^JamtI>BtRX`u#Uu_KIO
zpylX^FV)A!BwI0?AmbD<^j5V1_R_<NX3})RltPnn=~(I*C+k-iXpma|tcu=`^9C`>
z9a1=7Ac8xkEqQPUp*Qe_!OW_$?(MXaFLEg_wC_^IBW<oCI|m%cO#5Q~f0>u5J<e|H
z3$>Ey;WR~tC-5tK_eUU_ZwVCxE4$RB7`dMTubdWP^(_H=_D|Sf1P)jZTn|cSV{ew4
zMkLg;MEnCR<Je+2=V=a+H>~9ImL~`Gim~SwT}R6HY@Zv08M;sP5OB6SqSQrjp6~XM
zP@KHOb|gPe1BZz$uK86A?*IB*dP?AzF76*7t}5WVg#)eNmHxI%=@1&3XV`MzyZK=^
z1s3k;E5=7oq3tH)*;h;hrCP*Z97skazl^679KL77BlYU;eVy3!+RKfTDflbylg+G*
zzRt@oVOs1<!GO4|Cmz>aqi3aI9QX_Yq!#l<#U`$!cqH4jUhD2(>A|0Wyj?|Y9E<Bx
z?U=RRUYE-?`YV?pcMu2Ya_uwveT~;Mvg({Bfx5`w3}h3+UzP>YgwIztdk1Vdli9;>
zDypUQxEkPJI60lD?c*O*c`(tQqy2-PFb_U!mMHHvy{EQ=k}bGoH>oh7WUFx?YY;T|
zcelNc(}KOH@`~FynZT9t)h^X>OlDh`nwvNPk87w`9b|2Sdp3MzHT3{_H1ZCKeq)^v
zS0g~I>;ysLy}R&KnJ=Bs10c*_cbOM>jSwc6`fzCYbFP}qo7@$4J?er+q28TctD;Ar
ztxfJHrB9l&cyEE#bRkP?;nRef?P@$1$O>e`PoI(?V&E|yU{@x$@mz~I-p#(*Oo|5q
z-3Ovv2YC>{8&Tzx?739_LM8W2;%Tgy?O2V>9)U(3Vqm_@(O}zlWoEC?{ny9JQ(o7w
zTiFGFHe4CEuqGSoRB&n624&Q0bYlJ+n#&Q{Qr!>P1$hQ#pIk0bsY?@(%XF$*%%GdR
z$WF|7Ew(GqwYMVAi*mZheBI>VDsdC<o3+&=29kJyDK~C3d;M&xDO$Oml4_$a+f1H)
zQ|~qXQ&?(svHvJQ?b@Oa3F!UUh1G@G35R#HJCJG?WA8RQ&c|v{y5ed&rC$wyiA}rY
zp>Ro#7fOK}<J=Pz6KXF5i<IXG+5JMw2hIzIR5mzcdz4@W!<ub+5+Rn6p0@IfrBIZ8
zMC3R7-zKfv33kBVgP)jEIuz#ly#$6ae~wK-es}LW>vjl}pe)DCdyq2U@K;fHP~~ru
zBOCoFd|CA$z>VL-Fr>RafDTs}$LRO7NJG_2)UXdm;=K9cNF#@*iORcv&u~#zux+@&
zm0@7!&7`d%1U=XyN>L)heJjMKTkjz7t8dkBlj?EUewWMu^ScW9C|@h~kj146yX9i)
zEd8VJwtk+*r@v<s_HO_b&1n@JzcWG!Kx5_TU`q3Ia#Nexy@~oG<J2SWr&*zuT4qCS
z)fm+G9>Q16e}GmLi?8D!=xP9AO)tyy`IH_!#8f?zQ$FR-q9t5IVaqjuhB6rXc#zJ^
zWhh34^;99^X^i}6zI!6t&4&6UymC$bf}z?m53>u_Z7m>h>9ip}y|$Gq|4!JWgVssA
z>piq~k`9J-lhn1X2s?YK6_OhiIef)uFiiwSkNh+y4WrG(kCn?4X4v38+p>IY+83d|
z_DtS!X(%I>S%O~~N?VQPD|_r|E0}{i<%`gCyvoY&fyk?hxoTyy%NFKGR3l%7jcnJU
zIWvW&b`xi%25?V>vBEYK4I^3S>&tuI0hvE${IW6#wGAlxmP;GFaqmHp$9(1|YT<Oa
z;|xnDp*->6^*k{BTN_+JVbNhqCi@F~2h9!%+^+oi2oOI7D#me_{R5yhPpB+WqE6`(
zf>5Q1tI5Xj_q^#GQJm1wm;V5A&ooirzaNPQw$<^?G2`o_u9#rIRy4dg;NpG)_y>@;
zT8XPlPHBlyS7_Bn^9X1*d_p<7bGAC-SowzVj$xKe)0RnWk-Im!55gBbJz$GgS?5Gc
z1LHb$<@vC03)8QwifbC`)^pa^I*c9cU!AGY%t%~^FVD#-fRTXgabLp^_J}oAF!j@?
zmE6Ns4(+$dnKLe6479KfPBIqvZ|@$Tc5vDBXXCLn%5{4R3m`%G-!ty7zC#qULm4cR
zM<#rYIuVv3?G2Er*Q=zfb@m;}A<-2{8h>{0Ojns)@1rrCV=KXG^!x_fWEO96>tgG<
z28@3eIOZclDHkH~M~<gVN+_8lK%5r90p=np+UiSo<S3RtY_jt2;WJYX$uD31O67}a
zm08Z<lu~HhxR`=cF*uRC*G3E~!TZTBAw5N#HcVtYHv_3he<Uy#l<)o@!71TS4`csB
zTTJ6&)$wGZYGj5=5A8Sg%6b27IX&hki4qxlI+uz-a~uce5|F+7a7#RE(#AwECN&_(
zm6r1V|7t1Us5iSxj9G*VrdQ}NIalCEYx>l%@1-HMOUCltf4JL6-kJWf{E_*#IB$ht
ze|tt|6J~&1APkknd`W&)!K{<<c2sux>j{ras#2!QfUYmNDY;jhc=Ofl%zCl;EN%Pp
zD=K@FTRJg9RUe+SPj5c55so`)Xro$PlU&k}N|^ZY51{^iB}qSp1zeXQ&5O~^Heiln
zuQM-g(h!@<gQOp@%E~|t^AR1$O|5vg(kz;5lN!>YiJ#u48`I6&bxTbL4Z6317KBsr
zz1*)%y7S=;AO(Jzw^K<rlhC)hpu<8eh4ulD&z>Idf4|C3o)&Uh7D>~8)sg2|eUB3O
zOH%*p_SY{kcF)MF=CH^FuTDvgi#<b5@guBMk33E6%^LGqi+;BuL?!7Tg6syio4HmL
z<?Q<q(3^XK6k)TbRbGj2mC+}vAnl@Iyx8VjHxxsgjvkOLDHtZ{aEkxoK0XxNW<@<v
zVq0_~vl~0!8g2=w^c}wLpIxDrtqs3Tu2n!3agqkyXi(Bl8VPto%*W#9D|OonqJoY|
zG|s~4kA_$BL9eSZW#+{C3F#%k*%xs`P}6lJPlHpF)bE)mS=i{;wzh3Jn2XMdVz`2n
z6+08&u>6@E>Tt}z_LIbAl9elb<iKMfGWktQlqr7rh9O(*yri4gI0^AGASr=;3uW+>
zY+f%C_TLTj*i;~3@mehZJimPBCCb#(f{b}|lS)m6qfk4ruFLr>pY4W2cB@3GJ^7l9
zoiFpC{TP(<<<l1M!!4Rm7tt`khoCGr!p~*H`;!vIl|8X#y7SsiL241vxYy?8{nU^Q
zjpbPRA!#zCzfp-kYPuEat37mVoFac0|2;HY(A|H(D-mCF(C-pr`P3%gfAYF(CMAxq
z1=oV_P<N9XiTQE?*_-eUIusO<f><_X6c$H_f<ul~Nmb>67EaOi&hk$5-cjo*Y^j;1
z_Al_OdD9yrv;$l-i)dcmt|Q6cnK4pM+D7<rK}<Yf$Im0}J8D_41b*Gy)~*nU{$A*3
za1oZZ^39mdU`hg{R;FS0T?pTw`%p~UDpb~d4wRXwJ-n`$#blQ+0wOF|THiRx@dLZ;
z*L0|=madTQXLf$5wifqd+yGUYRf>+U?8Y6Kdso^4UpVUMMAYOT;Bg7H&R2!NMby6F
zW+L)pLVy6>s$9DYR5db2O%$ZCVZp$tvRLs<HJ(jIzcQD$4H32?_d(?{{^RAJwRs3s
z-4u7ewtrp7Fi}Nae%lQnJ>5sq0a0We-3|Ld#^!%pWeu|(eu^z9^1gz2%tnw*)K|A2
zLrLlLk&9FT`Q?On*VjoNFNDR+xLZ@7a<67@Hhq+PyvJ#33$ae#MeuIk4V@~Q`V#%A
zmvoJ!XcL$Apw9RK6@_QT;`>ds@;!UEdTNU#NWu#-FT-v_X_Ml2fTnbfs#{7Z_KB^`
zIyYulS(6{cUK^GB(<icY)X%h<w=H<u#V$qsx&c&#W`62eur^bJrQkrZJN8T0ck{RC
zSboXm`R~E?W*t;fg&H*T+nSxrQ4dyJ@abgBbx73JTTj#~+8<RV@F`X8`98#j@su!L
zr~5rAQgeRnWSb~a-^3L25jJEQmzwbL;^X>c*5e*%iuMtNpXHt5jNH3wB{i73c985f
z6_zIgipsh=U-*hv_u`&n+2!Zs7N^1zgu_C7<vr4CB{J{bWjzSv;-l9X>3pS;fh3PU
z{)&!Zb-`c6xQ9)yXl{*di&-d1b09m}rHPcyppg7ePEoLLn#Nm#i_``%`e2LCJmeW^
zw%TVbIV)59R5knIw_K<lt0uR^jS#`{ZN3VcViguoep+8oW^F&V3a!`D13hey>4NkZ
zV%=&+-XXfTb)^{2dkoaOZ;{BIsvM)on~omb#p1G)`s&>5mtX}=Q$G?8Of?KEDgD>l
z4I#ill}W&dnmol#55y90tKg==SK{C(M*C<ayTe)N&^Q%kP%UJi<ltmh4rflv^Ogdr
z?O&9;ZZg<53f0P*t3!En?H2m~Oz$x-daRtV@Aapf^~xwXWl_3f91r8Yz9O0-W`1_v
ztZ-gCXyYCS%$)trYu4xVzlCh&%&T+cDxitCz$NAnycRb6XQ&E<bHw%LZiS0@lsy|>
zMwn@Z&UPiLoA!jYk}c8tM)sVO@^^ic7Fa|&WLo|f<s9$CyL_(_q|zzFcKHHtYCXi6
z^o5$4Pb?V^k~2^>Q*uj~{AL#S-7H<5k_xM~!FAXS$flbvZ?lzI__Br+#xe;`VRZ~P
zAcG$bx-Z#1-cuw(voG-OGWrPjS7b4`mH$-(TmA#)LS=TiZQePG#J^u~*Xtn@^{TO}
z+_}|&as7IB(3A!Z+HrKqF0Z4zQM#WLRE@OeVR%29v#>~<-B#>ke-sM;%IWe`@NW<>
zDR1W0C>#Luu0OC}9^@Mk8MW&p#xe$X4`glEDqXe8PG-DG$P<WZn!Im{zHjzyqFzt^
zIh*ykP^&<=?v9OuvbK*|B(0<20&1Ja<qPd=S3bu(1l6XlNlBPMeB~@LjN^K%gVo@3
z|KR}Vft(|OV(nCaCPFCZ_Rf7u%uK`hH1M|ZqYp*Lp6btHXMA^Ga*cPj;&4qhB~ef}
z(ha~?GO71TXzxgIF2ydg%I?=>Wt8Q(t5SvxI)4ON8(LYa!p2_OdQXEP*}wL~)M12*
zqhri&YoRL#KQzP#A1vTR;a`|&Cc>c<vlj15aZf9GKUHh;xx`H_4WEsZ?{|#jeE$Jz
z^V%Iw)w<gd)DU~m{%}611yy#qDrXH+i_WJY{bhx*O^;eUwKO@lmBH{{*^}&h*4i_C
zt$0%~`Py;_r)B7lh?nu_G%$W*E=s(9&^=0}x%mEK{f<t&qekSL-1d)zZ!(1(i$w$-
zu837(OlfIM4@u736j9yuv&B@y{r-6+zOo&h<oLUuyD|hNRDI01u#y_IX}xFg>4QTA
z@6hE#`oJ$V?sN%suL6%;aL6U{77@r0(F^?KgI8u>Id%+Cx_a$V|A3=pqS>f;-$&rg
zeIaB5-5K#uId(YD^KYqD;&ng36Nd_9WVw$o73eNg-=5xhCGPdr$KP1}kC+muj-2aR
z@i(Uya&6d#mq~R)u>)hlfVsGlu+J3PT0ULaufnjtj2j+NiR|xt-y}=$*?Ngie!~3>
zCfug6V3uD|JDyWH%yuDKkZc5Ki!IrpqH@&@j>b5~?eCIK<qg=P;$;r|B|J}@U6Lwe
z>X8a9%LgTQ`vFzj^73zhtlmO0RNEmd+x-Dh-cr=MLVCzX&@5y)X+K_AOB5G#%1W|E
zeHPw#^R<d8i6e<f+0O)$MU8s7_}bkdRcih6u2oR9Rsx}3lAkL(D$GOU#4d4f_aPEt
z^B34j!0k{VWc?@n+GIvV_ec6merjKdllD-7(Ia=x4e<s%m^en%yme9OF2?oDTRwOf
z<|e#!d*Mp;2y?>N(Vi5h`{=5e^tOzdnatw32BC6!{U`f^e`E`&2=iPG;oU4%G2@C>
z+zZ-XB{@$SU#Ehv_Dd6(Axi^Q%j`2ebqBHs-LSY7=C2F?g@E-~!!Ad3Qo)JFZQ;Wu
zdAv(v8I9iVpwtA>;3%o?DuX@YgRm|;c@w$~GP}@=_p9{v9ls~FBAi|~3)!^q9j76s
z9h}bsZce<Von3oM?ofrLFGTG%c+6<~DJ+`|z(uDw)re~<{=n}oXaweLSO|4v?4B0B
z&Xeh)d&VzqRPu5;;2VgfegM#}%lLv!eaNXv+QW10_X5Nxm}5anU$g8fEL-8^_e<W=
z6{ea&p39$ezA>*7rAlIq+t-OH96x=EXFAC2TTe3w=4cAKB7R$WcuMhMq@N-4a3!%`
z^gux^m1fnOd{!79No##9neIQl)}%Qb{{-GidSbSAk!SIjIj{RiyAHXSGZa5jpy#?a
zz(&!O59y`|h13sZwl|B+9&0zVl%E(;8p56HtlvFs6i9qIi63C1f7fW`eh?xz4HVuV
zgtMRFZLXL1sN2Wnp(;yHRa`^y6Eb#1ISk+>qJeU)gOhwHv~d1mMTrFIv6x8RVsv~O
z<4*-e*n}8327u=su~m=?AK79KdmA3>hmUJFmhIzg7P^{50x@9`^#nHY6#?wkxMruO
zJGi)5@>uekn$Qnh70ue!u(!rfFBuVlouI2QWB+(vwjw)9hX9AyG|)^3=Aa$xw`$6f
zAN?*B>8p`N>d*W-nq}LJwy(1}XP>-b{6a%ub`7>rA09K1)$?YBj8}G5W#5!%fBWDi
zg58DW9y~qV@<hy9_*Gx(DUD&G?jt9zM{3d0KHLQ>)(swc)766952OY^9tpj@yzM07
z>NG1KrP)DobA*~JW5VC*-iez!Oz;V3O8+jC{<oIaUOp1TslBu~OP!3?MMk*hwpC|6
z%&kXuJdGoksh1r9Va{gM?#aZb2U1>LoIP?!q#je;_cyUMwx=9a3m0}pJ`F2=oUlAu
z;RAw^QGdB(qa``V?XztiSKGe+0h>bl$Q-P6<R;>SSeZOtcYC{0Io-T_jDD-hYrmq!
zH0f`p;AQ64f^?+)!co&Ni5RaW>Py1qGknFYpy4C{F?OCQwkLwgM!E)sX-x#6J))Np
zWr3e1sP*}sVSX;%YsLplTU7V%$^_<k#y56cjfWGrt?)haQ~)}nPaOQfHw$dX7Sblw
z+7daj+s+y&zWZt`A&?v7CjPaQlo)b;FPRro%W=6Hab<L~sd0hbckrxYpb^{ujG3eI
zV%KoP|F6{9SnL<&@3&eu8;(f5w|s4pZY3CPjgVQdSkW|Is4>JT;h<K&wv4x{ztPiW
z1tW=Ovg=4vU~s?F%c$y5Eo%Uw`r7Fmb`Mh#taRz-zf81+k%``Hry}g?`{uSZ?!U}H
zbXZGz)1Dj-nr$Y8@2^bz^>piqqE1_u9QA8NX)TZ6wNgv>=^<uh7eZyF$vt|nikuPO
z7PD<_Z<V)qm0cyn<f$w?v@c>KkK5GrL?J0*{LuT0As$3QP40a9canlF!A(=w>T|Nv
zc{GVwRhaMAJgFJC=->hvrKhbKQY?`#fAW`M-MX%bA|suq0kQ4E-?n_oGIC$(AK(Y;
zOH6arTenyzlKV|yuPteE#7y@@2OuIz!w=~OGK$jBQxhw?228vcqJGK7@Db!n=&nU0
zR{i%qv=x9>TZanXhk<0fjo25?493U4`Abp9*0mq?0-CMN+lT(+l-Y<+aqmFEzxg>-
z*-3nU#dKcbd!xnVNke)Wbl@>xB-5FUb46sVeeG3eTbfAQ2&;OGRgn$<oI@tdeYI%Z
zWWFe!A$w{8D?E6cV>r`aR$p4esRyt^ZOwC1L54QweT`k<?Z=X*@rqx#9B-5$7OUV(
zrL57OlhKXI#lIMz!rq})aB@y{M|$p6R;EEia<OWH<_F>S<D8<R)*sp<B(N1umNb?h
z{EL_<0DLMRcX+yWsVdtqtA%0O=xqi+QwfJ}G&Gva-P7i*l}dwb{T`(04BAra=)IC{
zDUw$5Z$<Xn{2thbycpu9nbC?!8Hb((z27&P#36YV#N+Uf&Hhh%{5@YAO#aAb?E=*7
z8Q3U8;LY2h;Nc$b@?H^#SXi0>m4CAMn&%)N)a8J)4a!Fi^yD{A(w<K;eZ=)n;HC2K
z&I?sseq9_VQKK+;gGH+6Ci&HTx(XAuOaON^;tms#6eioWggG|;joww?=!podiBgy$
zI|n@r*>F0ZiU?$R2~b!<QCrOV2SjKOVJ|4=&||Zi?;4$aA~4BJrQq*{#vw9oDaOr@
zQ^ZrSo11hv+_MDREgjF&T1U|P7(gP&mvk~E(kKLFdzHBsY~L!#ijUNZbb&$VOk)Q$
z^)MH!8;UVhkCJSbWe|-|xUnsKrz(4D-)Vq1w%6(nACuV43IorJN3B0RlE(<Bmr67*
zk}PTgNuG}5iuj9pNL(#;FiEu2MF+F1m(wos7#-<h|JoyouLHY6lK2+Vsp7PFMuvy}
zGE<uPte)2l@88ae`@^Mj8r!d<@}kAlW?U(4PfktP0s?bWRcWI%y@mHgb<)3ywPqZw
zz0D5ADmOrqbi^Jm?6Cd=WCOt4wISO^Ax#I-(_=?W!7x~p@US1Wx8b%U#&6)N17%y%
zBjv!m$KJ^DEf%u8?@pjeS~9(2pngKzhdi$8-ABi+@5Q>OV!)C~J|t@`Ys0zpe&?RS
zlT)>1iU!hYxY9Y*!mrtWprYGqjPC|>{TCW4>h*oAv!YkmCeO<R{tNV_alq}^h2{>^
zQ`IbQ+c8zuJS=k!q<%v@1D|S(?;hSGpcZ99nPO;pM<a1>y*30?L@=JXJh@%C%Q;H3
z#e2(1Zrqp>cp=-mHSBtvH9EGSqgi+0{r;Ye<V5-alscI(pI?+*g%&E<)328*ZC2@Z
zj9LF}?H8rw5}P?$l!??FSY<o`E(znt>6AS4Qa5Pzv4bkFdS)@qs;arkI3EA><d$1S
zUZ%D%C|ImWy8giKrU1;NH)0muMwlqAWw;;D?Db$HReZPj18S*z6io1bMqtfpK}ukL
zTiMtz{WAU%^RnjMv)E(HhT+K7=*RdE1@k6-Q@b<~$JgnlgyEg_xLZ-7yokyrMZ5K^
zL8B=NhAZoo0Caql83Rrro7OywfIqfRb%^J|(g97zytv+g_A!iD^@fvNDc{S<y5*&)
zg63dE$L3!d-b4*{ys)kR%;i6<LaV$#RY6Bh_=im<cZ^6$A6Zi}3-iNRqbggkDm+y$
zc7ya4Fp;~<M9(lc<&d}9$T4O8GcF+acL%!9WfbZA`J3MCK%iU5JuR*}L#$jKgA@FD
z@L{@8smzw<Zz%SHFyhMOBGT_Ka;dSdV}U+H`8_TGn$TgB9@92KZ?4QeZjr?^)U$#_
z(W#?mH@gTY6UD$psfPjgxRkU<{bh|igYCO3&S-Zl9XOn!Uuu4SG0&BJlW(Km&C?Xb
z>8WT*%Q&TRS48HZz6Xd!DR>RBu~1oE=q>L>t|<70|CPzx2pc_BsyP1dA#ztYm#gi`
za7B^aHtYH2Rkr*uF_n)#*}bw4ExQ4TYCr+unVt>9ll-&OCc-^YAyXimCB6h!iIt=+
z8V<9^kA03ao1JCsM)EW7DbI?^St*rxZajX(o+fp@zx!1D8AMI#%IGnvj=2VLOG3$;
zjv~sMrP8LoZc-Eri8DjIqCpzJ6z3zEMkCt#vhthIgZjA^4|6iEr06g|S<l=n|JeCk
z827FZ&${1Ll~Jj<MpC>VPpf^S)9yBztHnZ(U=LOKI}WMUNuRze?~W1Vm;+)XUs8NR
z-Pg&jWl-otd{KCnN$5zyG@V->A<qgXT2}`&KL~y0$mBPDZK~$N4g;?cj(P|z?Kzzm
zOB`$%4xhG15rhl04nX*}e#%X^QIfNV3kjx0`=jS!m57i(JS9wC02;1|-9GSlxBmks
zx{z-ek6UN=9*Nun-Jf%d>~SxIT(9@-SY%HqH{#w_B#6e#Hz{D+l)a_}xfhO@^FPWY
zaW-0G5l@E)`K4R4^HO%yALo@V&w%Z-RVO9DH0gBNj!!OR5U$QVR2iGWM<sUhejZP@
zcRnSsF)R)BgPq!mlJlnuc?s;`C6-0_3V`8#0Fi5oW+b4D%wYM3$5c@74yg^2XVl+3
zT7z~ok(HSpi+wE#*le>o(k%_u;?r%U_Oz*fF&t>XOJxsIRxU|TW2d;;F84=7blps(
zoe9zAyLQ42z$&~{@O??64aKDqW`!>}^BB8BEyrf}0r?cTLax9JZkP$bqLy+o!yHRc
zYbc3@?i@Kw7~$1~?N{><utU|jsV2+RF{0;7;16DnC%eP7vwUVI8wq@2fyY7!77)$2
z2C|b!X8N7Kj~quwOYIs7Ke$3hy_CV|+q+uD-l@7tE~&$`%_oV9xbn+P>!Dj*wnpz6
zl5mgZ)khq=3x)_<nCkt)v!wWM%AcKYSoG?oR3=yMYl_(v84uhyHm4HP%;yz?t|wL4
zebYV8am(YIyr@j+j3)jpDz!yr1GL+FZKHFaugKJxyA8qMCKP;>QYuy@oBVzssU{Xq
z?3vwdZvsD6v+k=_vrsQ0ikA|RMa^akv2mGU>T`Q}Q#c0EFLl)gdI73i>|(4`RBQi;
z_~S_S=O$jCYB+|zo4zi%zH<^V)*8P-^`y@dQ=V$vRd*c{_E*e_W<^^J<p)luN#C%w
z-hTt6RfdF>#qtNIVih=FZ0{L9)@%l1yxNx*3+S1?A|I34+);=8lLc9XESWtm@GZ2`
z;OjbwSO?d5E7eIZ-2V5d;JR<y9awx-YApBNp&2fyETC0AEr*ZTEc;N+Khk7^JM=cK
zcEwksHrd;g%of0<C#kUe%+tJ6yHIJlW3E<Ydq-dgRGims3r+h?$VR~V(~UA4g0|}`
zOE`TUbyOnX7CsNYiYpM%_`+iH-~R&M4I%O;akRIcP}x~9kmZKg+OL?Z-K$@heof5_
zD$3k84b)=loy%JOK@hc63w^;Em_k;#a`ytI#^L=FGF){30IyM6;9fttMY<Hk>lMs3
zrCr9Vk{iRW<xqoLX9fmpcP9&18r!&<Tt^FXmko@#vJGd=)?ol&Bn3phtIROYCFFoG
z$lOH*J<ov|ZrNe=1%wbmLi^y9Cs(i!m}gh_Fr`CLL;hYE4cY|NMi~-1mT+F7L`*4;
za=KO@+_wv1Lo7*CxZ>Hms8X?gu$owQl^uJ7eloJhP%Yr<SyN2D;0BP^;H)jZPHCpn
z0C6Z=O6?leDd~z4q<Qxem9cRZiy=PdIU;8miqo1+Cg$ilUAcj)QTl~epoxB_c|RM(
z(;TF67Ey)q_<ZJ3!BH^=E?xLC*O92@sAgSh6SV<MRNy~mA}Jf&Z4gqbowbNk(DXAA
z&5B{7Qg&dH;hrK&i%3=*hV!mjUqi*j5LR^+X73jo5Uz;7O>nlIu*4RMCOTz|A{}pW
zRoiaLYA*$@n}ID_C$3mIEngPKGz6??F*8b+tCY2?bc3$|5IJCBI6k8!9@h)Kzj^&c
zfnk>MC=|6SK7`9nOG3GGJI0G#8zZQM$!_D97P5kAhGpZzt9y;%aZL<!?o|o3m{_8X
z(JmuvCqFPY(C<BwRiFqQvcW^(JTKm$+-9~?HyCa^CerwT{25sStvC$E9tPp<Se6LR
zA-|+;IHX`U@56<?qPTEsFb|W9DibWcnwHYqAAp8kL<n(3`pnl2cvS&o@^|3O7>iHh
zH620;%-cD9yM%WD^k6ImT58Uq+OsH++^wo)N9qDx4sK9JpOgqobna5<VHQKi)`@}%
zY*|nNTZpNSqS}>;fseMLmR(bI0hDmWvD5twK}(}idaJ%8A#+(k^brobw2s?=K`Kp-
zPSG2nLb|2i=!!bvx%VmqDFigvLI7S_c&Tmd@DW!oN!SJ^11j1r!FZT(DN)l2O)BEI
zdO>-EbB_k2luM#RWfub)3a)0ou|oy(<4M9pz#6_FLXe6Qo7F_7ZG6pL!HS!!U8fN!
zz=5aKZV#+832(E6%0(9)OJ@p-Tp%vJiCNA@<u9TT<$w*tRRDU!0+502d36GzpAG5-
zpc~gmsERmSwTPYjB2{@c<R#<D)-c!OemU^($(98~8-<DBh}N+z9^gQssbnxx-x8pW
zIo{9(1;+!HWaMmd4pgC65Cq&>xFfrUrdCwl%qG(eRjth1Kty)Aa`DUZh?$HJBvxYG
z%y43&HDoY}La9WgD=R$V{{UnO+&yo=*HeF2QP_339bA^^9_KYzte0Aj{{Yc5#S@Ph
zzEn5p_zJPSSu57YUc}2nxw?+cNWdj)0GZLYr6Pi<sG0M)<gXllIV>5tVoBL@w#Rsi
zgN(r#V47|%_|2=wPzMCtI5Pmz2P{g<hXCAlTeo!TDBIEt_i}@V6BPrRo2!EncZTDG
zN{e&qrGZhk)C<8;$SIL)!w|Bs%LXiWVREf2aR%=(Ko$i3!T`3r8@M^jEU(jul?L5H
z+5|ypU?ty$*u)9|+d-&>q#SqqjnI4ZP$hedO+y5HaZ%AxO{G_Y_6)7Td4@Ditx*fH
zkp5vt67)(MRnhT<tBGFaM;L`1KJx_0^ocg4a6>K}MC3oY-ylrtQykTxuVSJ;As}qj
zVM^YE3>$N5ES5(r4}lAF2YH9{)FSP6g=${vTV-((Cn?oLCIHV6X^DqoG&~M&DaIHY
z^#UNL8QiE;Q#srfZo$FST_Bpv%vuX*C0-bD5n8vG*=&7GFbh2pC$%_K97MG|9^pu%
zx~bJm>tj@>_a9!sU+OVnqfnF`%)1Og)w4F0#gKr71s$^m1x)i}gH<kgEvGjdEmiEt
zVC@ySOu0*rRO`nRYniOj&c(wc_|n678bNIrK$j~JTy1G_@cA&0x`q1TFb~`*^#`Cc
z5TmxCD6R{ZWZ_<;g(Ot{o)T>{5~YG;?me6!h>L;J2hT9;(#htc7ZA7$@l^ewWI5Ek
znra&lF{l@t@_tt?1(z;g;y2HWv2_9sfuQv=K@^?D?7|2F@+JP`IhAtM@HFWwJ{|a}
zT%|w-l|v_Ifc)YBHo0G!kh}-X6%yQ>z!5is0b(Jom4q%v3;-J_K&=#|%RnaUzf+f0
z?HHm~PvI{8KXV!FwpGcm(jp-lYoXpHZY0tt<_RZi?1cvw&32dfQ2Fr(9VFA4V;g?Q
za_=Bm`+>h)RIHp!2|ytbe=&{fI!Y@MWa}qLy&-fW16l~#l&IMWr1GPKOOJ?^PjaPV
z1|@K!M!-s<VfdVzfDKzz-A!$b#)8{rA$rR=sa?vPLB$9U=)tT{)rFY2ppbr3He>ZH
zUgA>;WEo&QGUnH->M(*9`j<sPOuEbhZV6%lq6G>*A%~3?{LZ23WM+aT__&wh{5X6b
za%PwPB_y_bLaP)`<Np9*Pz5wg{mTl4cm5y>fLVrg-*LDm2wJc06r*cyRDH0wz~(4_
zB+@03mW{fFrO%mY4ZhJ847`bkL+VxpFb-JgWoq><CJ1Sq%@Kv!FfAE{{@9B8Xg@F(
zah=PQCfP_W7GzFNW$38?0C0$0gR_J8C<;v+gSKVUx`JTP-bkUQ>rkjdoyMOl1dd8w
zN($=32bREIp$1lumZ4e<z_WIktg3Ab5ZXc`hs-?)^DuEy;PnygHMH*#ex{6NI)rKv
z8#^)UFTpEK8@^>55PC$S-eqrvToon;6q1#NZ!+dGE%3d{rQCAMj6QeRbve2I6Ghc@
zW)C3lpj~y;!of#-@eWwFQQr|*D3nZ_xE)gpx~8`kAQx`XP@z|KcLWMki#e3Aw0q_y
zZuGHI15H%Cr3=kUzM}!liKS6jb16?q;$<}fz`t_B0+H+xr#oT;RP_U%C4rS45DtU7
zg6x2DH**5WufklfI%~n=qRmK)YduQ$aTc8XLl}?;E+RRAQ=P=DSiAD-42xc%-Q&um
zRRK2>v;tjcxU87?i#FT|*t#Mb8jMJdQ@GBEV(l-xXy!d;C@@}OLNp#uC8J=9)v#(c
zkQnBjp$fW`fHDPCq@bQExRDr3OK4Pd60>eTra`kkZaWRY4x3BdQrIZYiAuLs1k^2?
zs+W2RL^tXID#mwTQP-DuX)6usLz5XVlG?<e40ONJ4B4hgz^c|R*=eD*rtVZ*lDn1&
z;6nxXC?-|+Fxo^8p5bDZ&DBh|Fz=bMbDp8c*n@;N-P6Rvm86K(ExKxpidR(?{{V7{
z=Ii=^X>>yY)KJFR!RSMS0+#0CRykF~1uf*lpaRO=a}3rNDurup%8Orap-bq9QvJ$>
zT9>F3aS3TeM4>|~Q)$0C78P(?P8~%{qr#>lhp9s(xn=u`%GAD9WN7n7MWPczQN(bS
zH-$qL%19P1iJFSCYYb_U(g>E7)NhD3&t4Xd#lr~zghQqxn|5_6tX}4jY>)T{lrkU(
z4ax|hL$GM7`b9-;+<y)0@Wck=6eHr7GR0r0A}DBJmp~A4ad;3YST{s?9GP-_kxg3|
z)=)}jX|<)jL0!0j#^F|uY<6Cu@l-ynAS+gdN>ndb+}bTmxFM*UQy0XizsyGFD?&78
zh;qjL!m`mXEudxt&mkS5L<>V44i5hSm_exgmdk1nj##MQFgur*b}PgynR!Q0rPHZ>
zZy_t;9grxqiNFQ}7@!ZB8&cV7?o?f}D|Nlgt<vh5K@=N&M9xl8z!0o&<}{;)x8@6Q
zTU{Vks~2oQ@FkT{B~V)o+wieIbu3OlqmwL{$#-2r$S_N$M&h0wc{n9Rci|n%JUN;~
zw=P7+*mlJ~wj&$muH)Q6S5S;9I=_ez>>{Xhmf<R#kSPvHsj0MkL4)loPQSzoh6xKD
zivIvD%eJKtsD;JU#$N=Z61I+EwU<T1nL@%W-5_t>M&JihjUh+o4YOm4+`|E@NS^dy
zS2E+;bY=elp|s)%x2u;r8Y<!jBn<B`rrBuuH4W>Iq+K9|*GT-7wD*~HsQ$EwJ`6?R
z973VFV5Kwj5w@1C%mt@e97Z<hz|^i5$<q0mF}Jv({4qYwY|J-7ffb?YAX(TVG^n=t
zE-8BP_Zaft0Z3g=c+wpVLEg6JOGvg6Y>xaVbOw!A5ty(}0W%a&vIPTxqvOawQyV)W
zM=T=d2KtDvKR`fZ3M&y?3&o%gcMUFKXuWYbBHeWp2fquIPq?XmD^Sc3RJ-N|(Zn+x
z%y3I<CZ44c%?xTeLT;-UGEl0M4R~->#syzqpamjxGs`ONg%1UsKop6PG3sP$Ez`=;
zZisAZEm)`qchS5|^^2);<-)^rBX<<x0}rWM_cXX<^5D70o0W(bZVn*4E+%^%yMjvK
zse@I%VvcTc1SD{$Qi<zscFK+mVw|jPo2udz_9r8#^BM=M@_C9-)mjdDoKD$+W1n%0
zZlI^i3Xmp2lNyD49KA5%7^d&+l>xK3HoT6GqLr!9#JF88-z>!n&vB}lS-Fc9t7=iZ
zcXJ=Xz)T8hhf8Rsq4(54i1rqK=OPahp5f$QEN_BslC>}pIVHhk^d=i!`i6&1su&Lv
zk(KC0RD9hHUBM1CyW5BrfmIPSqPb$rkln>4EIbxW+`tovCsT;-8G(q52)bgPFP9R7
sQ}n;<9$xj-P%YFM^vlK;{{V@K4JRpUDGw28yvqyZVu@#rg6@C+*+lf*P5=M^

literal 0
HcmV?d00001

diff --git a/tests/main/thumbnails/fixtures/result.png b/tests/main/thumbnails/fixtures/result.png
new file mode 100644
index 0000000000000000000000000000000000000000..7045c49bf70179ec19ba6a02ce517ca2af52dac8
GIT binary patch
literal 45113
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

literal 0
HcmV?d00001

diff --git a/tests/main/thumbnails/fixtures/source.pdf b/tests/main/thumbnails/fixtures/source.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..fa838122760510eaf62b2484f976ab9f26af31b2
GIT binary patch
literal 6044
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

literal 0
HcmV?d00001

diff --git a/tests/main/thumbnails/helpers.ts b/tests/main/thumbnails/helpers.ts
new file mode 100644
index 000000000..f517005a8
--- /dev/null
+++ b/tests/main/thumbnails/helpers.ts
@@ -0,0 +1,37 @@
+import gm from 'gm';
+import { Readable } from 'stream';
+
+export async function getFileSize(
+  buffer: Buffer
+): Promise<{ width: number; height: number }> {
+  return new Promise((resolve, reject) => {
+    gm(buffer).size({ bufferStream: true }, function (err, size) {
+      if (err) reject(err);
+
+      resolve(size);
+    });
+  });
+}
+
+export async function isAnImage(data: Readable): Promise<boolean> {
+  return new Promise((resolve) => {
+    gm(data).identify((err: Error | null) => {
+      resolve(err === null);
+    });
+  });
+}
+
+export function compareImageStreams(
+  a: string,
+  b: string
+): Promise<{ isEqual: boolean; equality: number }> {
+  return new Promise((resolve, reject) => {
+    gm.compare(a, b, (err, isEqual, equality) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve({ isEqual, equality });
+      }
+    });
+  });
+}
diff --git a/tests/main/thumbnails/resize-image.test.ts b/tests/main/thumbnails/resize-image.test.ts
new file mode 100644
index 000000000..a2d50db82
--- /dev/null
+++ b/tests/main/thumbnails/resize-image.test.ts
@@ -0,0 +1,37 @@
+import { execSync } from 'child_process';
+import { createReadStream } from 'fs';
+import path from 'path';
+import { reziseImage } from '../../../src/apps/main/thumbnails/application/resize-image';
+import { ThumbnailProperties } from '../../../src/apps/main/thumbnails/domain/ThumbnailProperties';
+import { getFileSize } from './helpers';
+
+describe.skip('GM Resize Image', () => {
+  it('gm is installed', () => {
+    expect(() => {
+      execSync('gm version', { stdio: 'ignore' });
+    }).not.toThrow();
+  });
+
+  it('The reszise of  an image returns a buffer with contents', async () => {
+    const image = createReadStream(
+      path.join(__dirname, 'fixtures', '1000x1000.jpg')
+    );
+
+    const buffer = await reziseImage(image);
+
+    expect(buffer).not.toBeNull();
+    expect(buffer.length).toBeGreaterThan(0);
+  });
+
+  it('After the resize the file has the thumbnails dimensions', async () => {
+    const image = createReadStream(
+      path.join(__dirname, 'fixtures', '1000x1000.jpg')
+    );
+    const buffer = await reziseImage(image);
+
+    const { width, height } = await getFileSize(buffer);
+
+    expect(width).toBe(ThumbnailProperties.dimensions);
+    expect(height).toBe(ThumbnailProperties.dimensions);
+  });
+});
diff --git a/src/test/onboarding.e2e.ts b/tests/onboarding.e2e.ts
similarity index 100%
rename from src/test/onboarding.e2e.ts
rename to tests/onboarding.e2e.ts
diff --git a/src/test/playwright.config.ts b/tests/playwright.config.ts
similarity index 100%
rename from src/test/playwright.config.ts
rename to tests/playwright.config.ts
diff --git a/src/test/selectors.ts b/tests/selectors.ts
similarity index 100%
rename from src/test/selectors.ts
rename to tests/selectors.ts
diff --git a/src/test/unauthorized.e2e.ts b/tests/unauthorized.e2e.ts
similarity index 100%
rename from src/test/unauthorized.e2e.ts
rename to tests/unauthorized.e2e.ts
diff --git a/src/test/utils.ts b/tests/utils.ts
similarity index 100%
rename from src/test/utils.ts
rename to tests/utils.ts
diff --git a/tsconfig.json b/tsconfig.json
index 7a0b3d492..350064683 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,7 +12,7 @@
     "strict": true,
     "pretty": true,
     "sourceMap": true,
-    "baseUrl": "./src",
+    "rootDir": ".",
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noImplicitReturns": true,
@@ -31,10 +31,11 @@
     "outDir": "release/app/dist"
   },
   "exclude": [
-    "test",
     "release/build",
     "release/app/dist",
     ".erb/dll",
-    "__mock__"
+    "src/workers/backups/process.ts",
+    "src/workers/backups",
+    "src/workers/filesystems",
   ]
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index 929c0b2f9..b08729e41 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1267,10 +1267,10 @@
     "@typescript-eslint/parser" "^5.4.0"
     eslint-config-prettier "^8.3.0"
 
-"@internxt/inxt-js@^2.0.7":
-  version "2.0.7"
-  resolved "https://npm.pkg.github.com/download/@internxt/inxt-js/2.0.7/807b826712ef6092a1c48769875d273108c3e5ed#807b826712ef6092a1c48769875d273108c3e5ed"
-  integrity sha512-W+LoBR06v654sJG6pRv3tMU3JC4LuSgEpeU66Yelnql/CLdIfS25TnDhzvSheatZRB5HmMvrPWjztBiq8hBqhQ==
+"@internxt/inxt-js@^2.0.8":
+  version "2.0.8"
+  resolved "https://npm.pkg.github.com/download/@internxt/inxt-js/2.0.8/24e128938b2a9025ac420f8ffa90ee26416f5663#24e128938b2a9025ac420f8ffa90ee26416f5663"
+  integrity sha512-50qxyL8O222auIU//g5baEQErrHKAy203Fk9b6O0ceSSjnIYBqRs4RYzMqx+/XvIES+kP8+bzrgrSyYARKxdoA==
   dependencies:
     "@internxt/lib" "^1.1.6"
     "@internxt/sdk" "^1.4.27"
@@ -1294,14 +1294,6 @@
     query-string "^7.1.0"
     uuid "^8.3.2"
 
-"@internxt/webdav-server@^1.0.0":
-  version "1.0.0"
-  resolved "https://npm.pkg.github.com/download/@internxt/webdav-server/1.0.0/902e2042c38ec87be32481d8de888ed851ddc796#902e2042c38ec87be32481d8de888ed851ddc796"
-  integrity sha512-qtxDnLkFB6mEWE7zE5F2+2ruZAAMUM6IpplEiZi5v4WxoMiPIZUi3yXAr6wfnRVBrJN5SyvmDvqm5miCjOBguQ==
-  dependencies:
-    mime-types "^2.1.18"
-    xml-js-builder "^1.0.3"
-
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"
@@ -5263,10 +5255,10 @@ electron-updater@^4.6.4:
     lodash.isequal "^4.5.0"
     semver "^7.3.5"
 
-electron@^25.1.0:
-  version "25.1.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-25.1.0.tgz#78c79aba4bef941217c337dca46745b5551b5735"
-  integrity sha512-VKk4G/0euO7ysMKQKHXmI4d3/qR4uHsAtVFXK2WfQUVxBmc160OAm2R6PN9/EXmgXEioKQBtbc2/lvWyYpDbuA==
+electron@^25.8.1:
+  version "25.8.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.1.tgz#092fab5a833db4d9240d4d6f36218cf7ca954f86"
+  integrity sha512-GtcP1nMrROZfFg0+mhyj1hamrHvukfF6of2B/pcWxmWkd5FVY1NJib0tlhiorFZRzQN5Z+APLPr7aMolt7i2AQ==
   dependencies:
     "@electron/get" "^2.0.0"
     "@types/node" "^18.11.18"
@@ -8496,7 +8488,7 @@ mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -8809,6 +8801,13 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
+node-loader@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/node-loader/-/node-loader-2.0.0.tgz#9109a6d828703fd3e0aa03c1baec12a798071562"
+  integrity sha512-I5VN34NO4/5UYJaUBtkrODPWxbobrE4hgDqPrjB25yPkonFhCmZ146vTH+Zg417E9Iwoh1l/MbRs1apc5J295Q==
+  dependencies:
+    loader-utils "^2.0.0"
+
 node-releases@^2.0.12:
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.12.tgz#35627cc224a23bfb06fb3380f2b3afaaa7eb1039"
@@ -11922,20 +11921,6 @@ ws@~8.11.0:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
   integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
 
-xml-js-builder@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/xml-js-builder/-/xml-js-builder-1.0.3.tgz#91d275cb926f9dc4167f029357a5b2875b5d3894"
-  integrity sha512-BoLgG/glT45M0jK5PGh9h+iGrQxa8jJk9ofR63GroRifl2tbGB3/yYiVY3wQWHrZgWWfl9+7fhEB/VoD9mWnSg==
-  dependencies:
-    xml-js "^1.6.2"
-
-xml-js@^1.6.2:
-  version "1.6.11"
-  resolved "https://registry.yarnpkg.com/xml-js/-/xml-js-1.6.11.tgz#927d2f6947f7f1c19a316dd8eea3614e8b18f8e9"
-  integrity sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==
-  dependencies:
-    sax "^1.2.4"
-
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"

From 3b9cb25bdf270fcfac6b4017e547d08beb46ef14 Mon Sep 17 00:00:00 2001
From: Joan Vicens <joanvicens@proton.me>
Date: Fri, 24 Nov 2023 10:03:33 +0100
Subject: [PATCH 066/188] Windows (#425)

merge windows
---
 src/apps/main/preload.d.ts                 | 1 -
 src/apps/renderer/localize/locales/en.json | 4 ----
 src/apps/renderer/localize/locales/es.json | 4 ----
 src/apps/renderer/localize/locales/fr.json | 4 ----
 4 files changed, 13 deletions(-)

diff --git a/src/apps/main/preload.d.ts b/src/apps/main/preload.d.ts
index 8acceb03b..7168f9129 100644
--- a/src/apps/main/preload.d.ts
+++ b/src/apps/main/preload.d.ts
@@ -165,7 +165,6 @@ declare interface Window {
     ): () => void;
     retryVirtualDriveMount(): void;
     startRemoteSync: () => Promise<void>;
-    getDownloadUrls: () => Promise<{ platforms: Record<string, string> }>;
     openUrl: (url: string) => Promise<void>;
     getPreferredAppLanguage: () => Promise<Array<string>>;
   };
diff --git a/src/apps/renderer/localize/locales/en.json b/src/apps/renderer/localize/locales/en.json
index e53efcfd8..7eec344ee 100644
--- a/src/apps/renderer/localize/locales/en.json
+++ b/src/apps/renderer/localize/locales/en.json
@@ -123,10 +123,6 @@
     }
   },
   "widget": {
-    "macos-available": {
-      "title": "Desktop v2.0 is already here!",
-      "message": "The native macOS app is faster and more efficient, install it today"
-    },
     "header": {
       "usage": {
         "of": "of",
diff --git a/src/apps/renderer/localize/locales/es.json b/src/apps/renderer/localize/locales/es.json
index 9ef912f4d..94376a65b 100644
--- a/src/apps/renderer/localize/locales/es.json
+++ b/src/apps/renderer/localize/locales/es.json
@@ -123,10 +123,6 @@
     }
   },
   "widget": {
-    "macos-available": {
-      "title": "Desktop v2.0 está disponible!",
-      "message": "La versión nativa de MacOS es más rapida y eficiente, instálala hoy"
-    },
     "header": {
       "usage": {
         "of": "de",
diff --git a/src/apps/renderer/localize/locales/fr.json b/src/apps/renderer/localize/locales/fr.json
index e0ec54e62..1a43bb3b1 100644
--- a/src/apps/renderer/localize/locales/fr.json
+++ b/src/apps/renderer/localize/locales/fr.json
@@ -123,10 +123,6 @@
     }
   },
   "widget": {
-    "macos-available": {
-      "title": "Desktop v2.0 est disponible!",
-      "message": "L'application native de macOS est plus rapide et plus efficace, installez-la dès aujourd'hui"
-    },
     "header": {
       "usage": {
         "of": "de",

From dfeaebb3c75a0efb6326bf5e18cba676c24a445a Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Wed, 29 Nov 2023 11:33:49 +0100
Subject: [PATCH 067/188] updated and fixed is-logging-in translations

---
 src/apps/renderer/localize/locales/en.json | 2 +-
 src/apps/renderer/localize/locales/es.json | 2 +-
 src/apps/renderer/localize/locales/fr.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/apps/renderer/localize/locales/en.json b/src/apps/renderer/localize/locales/en.json
index 7eec344ee..dda9f07be 100644
--- a/src/apps/renderer/localize/locales/en.json
+++ b/src/apps/renderer/localize/locales/en.json
@@ -12,7 +12,7 @@
     },
     "action": {
       "login": "Login",
-      "is-logging-in": "Loggin in..."
+      "is-logging-in": "Logging you in..."
     },
     "create-account": "Create account",
     "2fa": {
diff --git a/src/apps/renderer/localize/locales/es.json b/src/apps/renderer/localize/locales/es.json
index 94376a65b..00ac23b12 100644
--- a/src/apps/renderer/localize/locales/es.json
+++ b/src/apps/renderer/localize/locales/es.json
@@ -12,7 +12,7 @@
     },
     "action": {
       "login": "Iniciar sesión",
-      "is-loggin-in": "Iniciando sesión"
+      "is-logging-in": "Iniciando sesión..."
     },
     "create-account": "Crear cuenta",
     "2fa": {
diff --git a/src/apps/renderer/localize/locales/fr.json b/src/apps/renderer/localize/locales/fr.json
index 1a43bb3b1..14abc98bb 100644
--- a/src/apps/renderer/localize/locales/fr.json
+++ b/src/apps/renderer/localize/locales/fr.json
@@ -12,7 +12,7 @@
     },
     "action": {
       "login": "S'identifier",
-      "is-loggin-in": "Se connecter"
+      "is-logging-in": "Se connecter..."
     },
     "create-account": "Créer un compte",
     "2fa": {

From edcb869d92219af48efcd2f2b7be921b4d906a9a Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Wed, 29 Nov 2023 12:11:12 +0100
Subject: [PATCH 068/188] fixed share feedback fr and es translations

---
 src/apps/renderer/localize/locales/es.json | 12 ++++++------
 src/apps/renderer/localize/locales/fr.json |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/apps/renderer/localize/locales/es.json b/src/apps/renderer/localize/locales/es.json
index 94376a65b..236e946dc 100644
--- a/src/apps/renderer/localize/locales/es.json
+++ b/src/apps/renderer/localize/locales/es.json
@@ -349,14 +349,14 @@
     }
   },
   "feedback": {
-    "window-title": "Enviar comentatios",
-    "title": "Compartir comentatios con Internxt",
-    "description": "Tus comentarios hacen que Internxt mejore y nos ayudan a crear mejores experiencias de producto",
+    "window-title": "Comentarios sobre Internxt para Escritorio",
+    "title": "Comparte tus opiniones con Internxt",
+    "description": "Tus comentarios hacen que mejoremos y creemos mejores experiencias de producto",
     "placeholder": "Haznos saber lo que tienes en mente, lo que te gustaría mejorar o describe el error o problema",
     "characters-count": "{{character_count}}/{{character_limit}}",
-    "send-feedback": "Enviar comentatios",
-    "sent-title": "Gracias por compartir tu opinión",
-    "sent-message": "Realmente apreciamos tu tiempo y esfuerzo para ayudarnos a mejorar nuestros servicios.",
+    "send-feedback": "Enviar comentarios",
+    "sent-title": "Gracias por compartir tus comentarios",
+    "sent-message": "Apreciamos tu tiempo y esfuerzo para ayudarnos a mejorar nuestros servicios.",
     "close": "Cerrar"
   },
   "common": {
diff --git a/src/apps/renderer/localize/locales/fr.json b/src/apps/renderer/localize/locales/fr.json
index 1a43bb3b1..b4fd4de8b 100644
--- a/src/apps/renderer/localize/locales/fr.json
+++ b/src/apps/renderer/localize/locales/fr.json
@@ -344,14 +344,14 @@
     }
   },
   "feedback": {
-    "window-title": "Envoyer les commentaires",
-    "title": "Partager un retour d'expérience avec Internxt",
-    "description": "Vos commentaires permettent à Internxt de s'améliorer et nous aident à créer de meilleures expériences de produits",
+    "window-title": "Commentaires sur Internxt for Desktop",
+    "title": "Faites-nous part de vos commentaires sur Internxt",
+    "description": "Vos commentaires nous aident à améliorer et à créer de meilleures expériences de produits.",
     "placeholder": "Laissez-nous savoir ce qui vous préoccupe, ce que vous aimeriez améliorer ou décrivez l'erreur ou le problème.",
     "characters-count": "{{character_count}}/{{character_limit}}",
     "send-feedback": "Envoyer les commentaire",
     "sent-title": "Merci de nous avoir fait part de vos commentaires",
-    "sent-message": "Nous apprécions vraiment le temps et les efforts que vous consacrez à l'amélioration de nos services.",
+    "sent-message": "Nous apprécions le temps et les efforts que vous consacrez à l'amélioration de nos services.",
     "close": "Fermer"
   },
   "common": {

From bc5ae2742a01739d1718d9c70503a051b24c089f Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Fri, 1 Dec 2023 08:27:59 -0500
Subject: [PATCH 069/188] add notification error for non-extensions files

---
 src/apps/renderer/localize/locales/en.json  | 8 +++++---
 src/apps/renderer/localize/locales/es.json  | 8 +++++---
 src/apps/renderer/localize/locales/fr.json  | 5 +++--
 src/apps/renderer/messages/process-error.ts | 2 ++
 src/apps/shared/types.ts                    | 3 +++
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/apps/renderer/localize/locales/en.json b/src/apps/renderer/localize/locales/en.json
index 7eec344ee..fab212561 100644
--- a/src/apps/renderer/localize/locales/en.json
+++ b/src/apps/renderer/localize/locales/en.json
@@ -314,13 +314,14 @@
     },
     "short-error-messages": {
       "unknown": "Unknown error",
-      "empty-file": "File is empty",
+      "empty-file": "Empty files are not supported.",
       "bad-response": "Bad response from Internxt servers",
       "no-remote-connection": "Can't connect to Internxt servers",
       "no-internet-connection": "No internet connection",
       "no-permission": "Insufficient permissions",
       "file-does-not-exist": "File doesn't exist",
-      "file-too-big": "Max upload size is 20GB. Please try smaller files."
+      "file-too-big": "Max upload size is 20GB. Please try smaller files.",
+      "file-non-extension": "Files without extensions are not supported."
     },
     "error-messages": {
       "no-internet": "Looks like you are not connected to the internet, we'll try again later",
@@ -334,7 +335,8 @@
       "empty-file": "We don't support files with a size of 0 bytes because of our processes of sharding and encryption",
       "bad-response": "We got a bad response from our servers while processing this file. Please, try starting the sync process again.",
       "file-does-not-exist": "This file was present when we compared your local folder with your Internxt drive but dissapeared when we tried to access it. If you deleted this file, don't worry, this error should dissapear the next time the sync process starts.",
-      "file-too-big": "Max upload size is 20GB. Please try smaller files."
+      "file-too-big": "Max upload size is 20GB. Please try smaller files.",
+      "file-non-extension": "Files without extensions are not supported. Not synchronized."
     },
     "report-modal": {
       "actions": {
diff --git a/src/apps/renderer/localize/locales/es.json b/src/apps/renderer/localize/locales/es.json
index 94376a65b..167407045 100644
--- a/src/apps/renderer/localize/locales/es.json
+++ b/src/apps/renderer/localize/locales/es.json
@@ -313,13 +313,14 @@
     },
     "short-error-messages": {
       "unknown": "Error desconocido",
-      "emtpy-file": "El archivo está vacío",
+      "emtpy-file": "Archivos vacios no son soportados",
       "bad-response": "Error de los servidores de Internxt",
       "no-remote-connection": "No pudimos conectar con los servidores de Internxt",
       "no-internet-connection": "No hay conexión a Internet",
       "no-permission": "Permisos insuficientes",
       "file-does-not-exist": "El archivo no existe",
-      "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños."
+      "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños.",
+      "file-non-extension": "Archivos sin extensión no son soportados"
     },
     "error-messages": {
       "no-internet": "No estás conectado a Internet, lo intentaremos más tarde",
@@ -333,7 +334,8 @@
       "empty-file": "No admitimos archivos con un tamaño de 0 bytes debido a nuestros procesos de cifrado",
       "bad-response": "Error de servidor al procesar este archivo. Por favor, intente iniciar de nuevo el proceso de sincronización",
       "file-does-not-exist": "Este archivo estaba presente cuando comparamos su carpeta local con su unidad Internxt, pero desapareció cuando intentamos acceder a él. Si has eliminado este archivo, no te preocupes, este error debería desaparecer la próxima vez que se inicie el proceso de sincronización",
-      "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños."
+      "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños.",
+      "file-non-extension": "Los archivos sin extensiones no son soportados. No sincronizado"
     },
     "report-modal": {
       "actions": {
diff --git a/src/apps/renderer/localize/locales/fr.json b/src/apps/renderer/localize/locales/fr.json
index 1a43bb3b1..43f89e37c 100644
--- a/src/apps/renderer/localize/locales/fr.json
+++ b/src/apps/renderer/localize/locales/fr.json
@@ -308,7 +308,7 @@
     },
     "short-error-messages": {
       "unknown": "Erreur inconnue",
-      "empty-file": "Le fichier est vide",
+      "empty-file": "Les fichiers vides ne sont pas pris en charge",
       "bad-response": "Mauvaise réponse des serveurs Internxt",
       "no-remote-connection": "Impossible de se connecter aux serveurs Internxt",
       "no-internet-connection": "Pas de connexion internet",
@@ -328,7 +328,8 @@
       "empty-file": "Nous ne prenons pas en charge les fichiers d'une taille de 0 octet en raison de nos processus de  chiffrement",
       "bad-response": "Nous avons reçu une mauvaise réponse de nos serveurs lors du traitement de ce fichier. Veuillez essayer de relancer le processus de synchronisation.",
       "file-does-not-exist": "Ce fichier était présent lorsque nous avons comparé votre dossier local avec votre disque interne, mais il a disparu lorsque nous avons essayé d'y accéder. Si vous avez supprimé ce fichier, ne vous inquiétez pas, cette erreur devrait disparaître au prochain démarrage du processus de synchronisation.",
-      "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits."
+      "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits.",
+      "file-non-extension": "Les archives sans extensions ne sont pas supportées. Non synchronisées"
     },
     "report-modal": {
       "actions": {
diff --git a/src/apps/renderer/messages/process-error.ts b/src/apps/renderer/messages/process-error.ts
index 90b76900b..34df86b4a 100644
--- a/src/apps/renderer/messages/process-error.ts
+++ b/src/apps/renderer/messages/process-error.ts
@@ -11,6 +11,7 @@ export const shortMessages: ProcessErrorMessages = {
   EMPTY_FILE: 'issues.short-error-messages.empty-file',
   UNKNOWN: 'issues.short-error-messages.unknown',
   FILE_TOO_BIG: 'issues.short-error-messages.file-too-big',
+  FILE_NON_EXTENSION: 'issues.short-error-messages.file-non-extension',
 };
 
 export const longMessages: ProcessErrorMessages = {
@@ -23,4 +24,5 @@ export const longMessages: ProcessErrorMessages = {
   EMPTY_FILE: 'issues.error-messages.empty-file',
   UNKNOWN: 'issues.error-messages.unknown',
   FILE_TOO_BIG: 'issues.error-messages.file-too-big',
+  FILE_NON_EXTENSION: 'issues.error-messages.file-non-extension',
 };
diff --git a/src/apps/shared/types.ts b/src/apps/shared/types.ts
index 0b6409d00..8c204661b 100644
--- a/src/apps/shared/types.ts
+++ b/src/apps/shared/types.ts
@@ -145,6 +145,9 @@ export type ProcessErrorName =
   // The file is bigger than the current upload limit
   | 'FILE_TOO_BIG'
 
+  // The file don't have an extension
+  | 'FILE_NON_EXTENSION'
+
   // Unknown error
   | 'UNKNOWN';
 

From d617160854d22addf82b24682d5564fcbb7c594c Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Tue, 5 Dec 2023 16:45:35 +0100
Subject: [PATCH 070/188] added helper to clean temp folder on user log in and
 out

---
 src/apps/main/analytics/user-handlers.ts        |  5 ++++-
 src/apps/main/app-info/handlers.ts              |  3 ++-
 src/apps/main/app-info/helpers.ts               | 17 +++++++++++++++++
 .../contents/application/ContentsDownloader.ts  |  6 +++---
 .../infrastructure/FSLocalFileWriter.ts         |  5 ++---
 5 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 src/apps/main/app-info/helpers.ts

diff --git a/src/apps/main/analytics/user-handlers.ts b/src/apps/main/analytics/user-handlers.ts
index e92349bad..2f878d385 100644
--- a/src/apps/main/analytics/user-handlers.ts
+++ b/src/apps/main/analytics/user-handlers.ts
@@ -1,5 +1,4 @@
 import { ipcMain } from 'electron';
-
 import eventBus from '../event-bus';
 import {
   sendFeedback,
@@ -8,13 +7,17 @@ import {
   userSigninFailed,
 } from './service';
 import { clearRemoteSyncStore } from '../remote-sync/helpers';
+import { clearTempFolder } from '../app-info/helpers';
+
 eventBus.on('USER_LOGGED_IN', () => {
   userSignin();
+  clearTempFolder();
 });
 
 eventBus.on('USER_LOGGED_OUT', () => {
   userLogout();
   clearRemoteSyncStore();
+  clearTempFolder();
 });
 
 ipcMain.on('USER_LOGIN_FAILED', (_, email: string) => {
diff --git a/src/apps/main/app-info/handlers.ts b/src/apps/main/app-info/handlers.ts
index 0f0b19fce..3d2f1a31a 100644
--- a/src/apps/main/app-info/handlers.ts
+++ b/src/apps/main/app-info/handlers.ts
@@ -1,4 +1,5 @@
 import { ipcMain, app } from 'electron';
+import { getInxtTempFolder } from './helpers';
 
 ipcMain.handle('get-path', (_, path) => {
   const result = app.getPath(path);
@@ -6,7 +7,7 @@ ipcMain.handle('get-path', (_, path) => {
 });
 
 ipcMain.handle('APP:TEMPORAL_FILES_FOLDER', () => {
-  return app.getPath('temp');
+  return getInxtTempFolder();
 });
 
 ipcMain.handle('APP:PREFERRED_LANGUAGE', (): Array<string> => {
diff --git a/src/apps/main/app-info/helpers.ts b/src/apps/main/app-info/helpers.ts
new file mode 100644
index 000000000..67609db3d
--- /dev/null
+++ b/src/apps/main/app-info/helpers.ts
@@ -0,0 +1,17 @@
+import { app } from 'electron';
+import path from 'path';
+import { clearDirectory } from '../virtual-root-folder/service';
+
+const getTempFolder = (): string => {
+    return app.getPath('temp');
+};
+
+export const getInxtTempFolder = (): string => {
+    return path.join(getTempFolder(), 'internxt');
+};
+
+export const clearTempFolder = (): Promise<boolean> => {
+    const tempFolder = getInxtTempFolder();
+
+    return clearDirectory(tempFolder);
+};
diff --git a/src/context/virtual-drive/contents/application/ContentsDownloader.ts b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
index 833886af7..aa8353e6b 100644
--- a/src/context/virtual-drive/contents/application/ContentsDownloader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
@@ -30,9 +30,9 @@ export class ContentsDownloader {
     cb: CallbackDownload
   ) {
     const location = await this.temporalFolderProvider();
-    const folderPath = path.join(location, 'internxt');
-    ensureFolderExists(folderPath);
-    const filePath = path.join(folderPath, file.nameWithExtension);
+    ensureFolderExists(location);
+
+    const filePath = path.join(location, file.nameWithExtension);
 
     downloader.on('start', () => {
       this.ipc.send('FILE_DOWNLOADING', {
diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
index 812f1d4b1..51b26fcc2 100644
--- a/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileWriter.ts
@@ -12,10 +12,9 @@ export class FSLocalFileWriter implements LocalFileWriter {
   async write(contents: LocalFileContents): Promise<string> {
     const location = await this.getLocation();
 
-    const folderPath = path.join(location, 'internxt');
-    ensureFolderExists(folderPath);
+    ensureFolderExists(location);
 
-    const filePath = path.join(folderPath, contents.nameWithExtension);
+    const filePath = path.join(location, contents.nameWithExtension);
 
     await WriteReadableToFile.write(contents.stream, filePath);
 

From 99f46d7fbe6bb998af2148c458719ff894a1c342 Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Tue, 5 Dec 2023 16:46:50 +0100
Subject: [PATCH 071/188] fixed naming typo

---
 src/apps/main/auth/handlers.ts                        |  2 +-
 src/apps/main/main.ts                                 |  2 +-
 src/apps/main/preload.d.ts                            |  2 +-
 .../handlers.ts                                       |  0
 .../service.ts                                        | 11 +++++++++++
 src/apps/main/windows/index.ts                        |  2 +-
 6 files changed, 15 insertions(+), 4 deletions(-)
 rename src/apps/main/{virutal-root-folder => virtual-root-folder}/handlers.ts (100%)
 rename src/apps/main/{virutal-root-folder => virtual-root-folder}/service.ts (91%)

diff --git a/src/apps/main/auth/handlers.ts b/src/apps/main/auth/handlers.ts
index 47e102e47..9b5adfd5b 100644
--- a/src/apps/main/auth/handlers.ts
+++ b/src/apps/main/auth/handlers.ts
@@ -4,7 +4,7 @@ import Logger from 'electron-log';
 import { AccessResponse } from '../../renderer/pages/Login/service';
 import { applicationOpened } from '../analytics/service';
 import eventBus from '../event-bus';
-import { setupRootFolder } from '../virutal-root-folder/service';
+import { setupRootFolder } from '../virtual-root-folder/service';
 import { getWidget } from '../windows/widget';
 import { createTokenSchedule } from './refresh-token';
 import {
diff --git a/src/apps/main/main.ts b/src/apps/main/main.ts
index 29975eb81..1b3e9d76f 100644
--- a/src/apps/main/main.ts
+++ b/src/apps/main/main.ts
@@ -8,7 +8,7 @@ import 'regenerator-runtime/runtime';
 // via webpack in prod
 import 'dotenv/config';
 // ***** APP BOOTSTRAPPING ****************************************************** //
-import './virutal-root-folder/handlers';
+import './virtual-root-folder/handlers';
 import './auto-launch/handlers';
 import './logger';
 import './bug-report/handlers';
diff --git a/src/apps/main/preload.d.ts b/src/apps/main/preload.d.ts
index 7168f9129..bd484f6ab 100644
--- a/src/apps/main/preload.d.ts
+++ b/src/apps/main/preload.d.ts
@@ -103,7 +103,7 @@ declare interface Window {
 
     getVirtualDriveRoot(): Promise<string>;
 
-    chooseSyncRootWithDialog: typeof import('./virutal-root-folder/service').chooseSyncRootWithDialog;
+    chooseSyncRootWithDialog: typeof import('./virtual-root-folder/service').chooseSyncRootWithDialog;
 
     path: typeof import('path');
 
diff --git a/src/apps/main/virutal-root-folder/handlers.ts b/src/apps/main/virtual-root-folder/handlers.ts
similarity index 100%
rename from src/apps/main/virutal-root-folder/handlers.ts
rename to src/apps/main/virtual-root-folder/handlers.ts
diff --git a/src/apps/main/virutal-root-folder/service.ts b/src/apps/main/virtual-root-folder/service.ts
similarity index 91%
rename from src/apps/main/virutal-root-folder/service.ts
rename to src/apps/main/virtual-root-folder/service.ts
index f76540e12..44cb76700 100644
--- a/src/apps/main/virutal-root-folder/service.ts
+++ b/src/apps/main/virtual-root-folder/service.ts
@@ -20,6 +20,17 @@ async function existsFolder(pathname: string): Promise<boolean> {
   }
 }
 
+export async function clearDirectory(pathname: string): Promise<boolean> {
+  try {
+    await fs.rm(pathname, { recursive: true });
+    await fs.mkdir(pathname);
+
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 async function isEmptyFolder(pathname: string): Promise<boolean> {
   const filesInFolder = await fs.readdir(pathname);
 
diff --git a/src/apps/main/windows/index.ts b/src/apps/main/windows/index.ts
index b15a099bd..7bedb6266 100644
--- a/src/apps/main/windows/index.ts
+++ b/src/apps/main/windows/index.ts
@@ -7,7 +7,7 @@ import { getProcessIssuesWindow } from './process-issues';
 import { getSettingsWindow } from './settings';
 import { getFeedbackWindow } from './feedback';
 import { getWidget } from './widget';
-import { openVirtualDriveRootFolder } from '../virutal-root-folder/service';
+import { openVirtualDriveRootFolder } from '../virtual-root-folder/service';
 
 function closeAuxWindows() {
   getProcessIssuesWindow()?.close();

From 9c19f1b159bcd90d63f696322cf7476fcb1ea376 Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Wed, 6 Dec 2023 14:15:24 -0500
Subject: [PATCH 072/188] add pathEngine

---
 src/apps/main/config.ts                           |  5 +++++
 src/apps/main/virutal-root-folder/service.ts      |  8 +++++++-
 .../dependency-injection/common/logEnginePath.ts  | 15 +++++++++++++++
 .../dependency-injection/common/virtualDrive.ts   |  5 +++--
 4 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 src/apps/sync-engine/dependency-injection/common/logEnginePath.ts

diff --git a/src/apps/main/config.ts b/src/apps/main/config.ts
index 61be4e76e..9a59413d7 100644
--- a/src/apps/main/config.ts
+++ b/src/apps/main/config.ts
@@ -26,6 +26,7 @@ export interface AppStore {
   backupInterval: number;
   lastBackup: number;
   syncRoot: string;
+  logEnginePath: string;
   lastSavedListing: string;
   lastSync: number;
   savedConfigs: Record<string, Pick<AppStore, (typeof fieldsToSave)[number]>>;
@@ -69,6 +70,9 @@ const schema: Schema<AppStore> = {
   syncRoot: {
     type: 'string',
   },
+  logEnginePath: {
+    type: 'string',
+  },
   lastSavedListing: {
     type: 'string',
   },
@@ -112,6 +116,7 @@ export const defaults: AppStore = {
   backupInterval: 86_400_000, // 24h
   lastBackup: -1,
   syncRoot: '',
+  logEnginePath: '',
   lastSavedListing: '',
   lastSync: -1,
   savedConfigs: {},
diff --git a/src/apps/main/virutal-root-folder/service.ts b/src/apps/main/virutal-root-folder/service.ts
index f76540e12..217096f2c 100644
--- a/src/apps/main/virutal-root-folder/service.ts
+++ b/src/apps/main/virutal-root-folder/service.ts
@@ -29,7 +29,13 @@ async function isEmptyFolder(pathname: string): Promise<boolean> {
 function setSyncRoot(pathname: string): void {
   const pathNameWithSepInTheEnd =
     pathname[pathname.length - 1] === path.sep ? pathname : pathname + path.sep;
-
+  const logEnginePath = path.join(
+    app.getPath('appData'),
+    'internxt-drive',
+    'logs',
+    'node-win.txt'
+  );
+  configStore.set('logEnginePath', logEnginePath);
   configStore.set('syncRoot', pathNameWithSepInTheEnd);
   configStore.set('lastSavedListing', '');
 }
diff --git a/src/apps/sync-engine/dependency-injection/common/logEnginePath.ts b/src/apps/sync-engine/dependency-injection/common/logEnginePath.ts
new file mode 100644
index 000000000..40fb6410b
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/common/logEnginePath.ts
@@ -0,0 +1,15 @@
+import configStore from '../../../main/config';
+
+export class DependencyInjectionLogEnginePath {
+  private static path: string;
+
+  static get(): string {
+    if (DependencyInjectionLogEnginePath.path) {
+      return DependencyInjectionLogEnginePath.path;
+    }
+
+    DependencyInjectionLogEnginePath.path = configStore.get('logEnginePath');
+
+    return DependencyInjectionLogEnginePath.path;
+  }
+}
diff --git a/src/apps/sync-engine/dependency-injection/common/virtualDrive.ts b/src/apps/sync-engine/dependency-injection/common/virtualDrive.ts
index e74b97645..eeb519736 100644
--- a/src/apps/sync-engine/dependency-injection/common/virtualDrive.ts
+++ b/src/apps/sync-engine/dependency-injection/common/virtualDrive.ts
@@ -1,5 +1,6 @@
 import { VirtualDrive } from 'virtual-drive/dist';
 import { DependencyInjectionLocalRootFolderPath } from './localRootFolderPath';
+import { DependencyInjectionLogEnginePath } from './logEnginePath';
 
 export class DependencyInjectionVirtualDrive {
   private static _vd: VirtualDrive;
@@ -10,8 +11,8 @@ export class DependencyInjectionVirtualDrive {
     }
 
     const root = DependencyInjectionLocalRootFolderPath.get();
-
-    const vd = new VirtualDrive(root);
+    const logPath = DependencyInjectionLogEnginePath.get();
+    const vd = new VirtualDrive(root, logPath);
 
     DependencyInjectionVirtualDrive._vd = vd;
 

From c739eedf255d1e650a0d86ea7d7ae0d5a1ff856b Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Mon, 11 Dec 2023 06:19:17 -0500
Subject: [PATCH 073/188] remove logic queue

---
 src/apps/sync-engine/BindingManager.ts        |  2 +
 .../controllers/AddController.ts              | 64 +++++++++++--------
 .../files/application/FileCreator.ts          |  2 +-
 .../folders/application/FolderFinder.ts       | 15 ++++-
 4 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/src/apps/sync-engine/BindingManager.ts b/src/apps/sync-engine/BindingManager.ts
index 5a33533d1..0f19d8dc8 100644
--- a/src/apps/sync-engine/BindingManager.ts
+++ b/src/apps/sync-engine/BindingManager.ts
@@ -9,6 +9,7 @@ import { executeControllerWithFallback } from './callbacks-controllers/middlewar
 import { DependencyContainer } from './dependency-injection/DependencyContainer';
 import { ipcRendererSyncEngine } from './ipcRendererSyncEngine';
 import { ProcessIssue } from '../shared/types';
+import logger from 'electron-log';
 
 export type CallbackDownload = (
   success: boolean,
@@ -77,6 +78,7 @@ export class BindingsManager {
         absolutePath: string,
         callback: (acknowledge: boolean, id: string) => boolean
       ) => {
+        logger.debug('[Order]', absolutePath);
         controllers.addFile.execute(absolutePath, callback);
       },
       fetchDataCallback: async (
diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
index 6530dbbeb..b0ca87861 100644
--- a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
@@ -10,6 +10,7 @@ import { PlatformPathConverter } from '../../../../context/virtual-drive/shared/
 import { MapObserver } from '../../../../context/virtual-drive/shared/domain/MapObserver';
 import { PathTypeChecker } from '../../../shared/fs/PathTypeChecker ';
 import { CallbackController } from './CallbackController';
+import logger from 'electron-log';
 
 type FileCreationQueue = Map<
   string,
@@ -55,9 +56,10 @@ export class AddController extends CallbackController {
       const contentsId = await this.fileCreationOrchestrator.run(
         posixRelativePath
       );
-      return callback(true, createFilePlaceholderId(contentsId));
+      logger.debug('[TEST]', posixRelativePath);
+      callback(true, createFilePlaceholderId(contentsId));
     } catch (error: unknown) {
-      Logger.error('Error when adding a file: ', error);
+      Logger.error('Error when adding a file: ' + posixRelativePath, error);
       callback(false, '');
     } finally {
       this.filesQueue.delete(posixRelativePath);
@@ -65,6 +67,7 @@ export class AddController extends CallbackController {
   };
 
   private createFiles = async () => {
+    Logger.debug('FILES TO CREATE', this.foldersQueue.size);
     for (const [posixRelativePath, callback] of this.filesQueue) {
       await this.createFile(posixRelativePath, callback);
     }
@@ -84,6 +87,8 @@ export class AddController extends CallbackController {
     Logger.info('Creating folder', offlineFolder);
     try {
       await this.folderCreator.run(offlineFolder);
+      logger.debug('[TEST]', 'folder created callback emited');
+      callback(true, createFolderPlaceholderId(offlineFolder.uuid));
     } catch (error: unknown) {
       Logger.error('Error creating a folder: ', error);
       callback(false, '');
@@ -96,16 +101,16 @@ export class AddController extends CallbackController {
     posixRelativePath: string,
     callback: CreationCallback
   ) => {
-    try {
-      const offlineFolder = this.offlineFolderCreator.run(posixRelativePath);
-      callback(true, createFolderPlaceholderId(offlineFolder.uuid));
-      this.foldersQueue.set(offlineFolder, () => {
-        //no-op
-      });
-    } catch (error: unknown) {
-      Logger.error('Error on folder creation: ', error);
-      callback(false, '');
-    }
+    // try {
+    const offlineFolder = this.offlineFolderCreator.run(posixRelativePath);
+    // callback(true, createFolderPlaceholderId(offlineFolder.uuid));
+    this.foldersQueue.set(offlineFolder, () => {
+      //no-op
+    });
+    // } catch (error: unknown) {
+    //   Logger.error('Error on folder creation: ', error);
+    //   callback(false, '');
+    // }
   };
 
   async execute(
@@ -121,22 +126,27 @@ export class AddController extends CallbackController {
     const isFolder = await PathTypeChecker.isFolder(absolutePath);
 
     if (isFolder) {
-      this.enqueueFolder(posixRelativePath, callback);
-      await this.createFolders();
-      await this.createFiles();
-      return;
-    }
-
-    this.filesQueue.set(posixRelativePath, callback);
-
-    if (this.foldersQueue.size === 0) {
-      Logger.debug(
-        'File is not going to be queued. Creating...',
-        posixRelativePath
-      );
-      await this.createFiles();
+      logger.debug('[Is Folder]', posixRelativePath);
+      // this.enqueueFolder(posixRelativePath, callback);
+      const offlineFolder = this.offlineFolderCreator.run(posixRelativePath);
+      this.createFolder(offlineFolder, callback);
+      // await this.createFolders();
+      // await this.createFiles();
+      // return;
     } else {
-      Logger.debug('File has been queued: ', posixRelativePath);
+      logger.debug('[Is Not Folder]', posixRelativePath);
+      // this.filesQueue.set(posixRelativePath, callback);
+
+      this.createFile(posixRelativePath, callback);
+      // if (this.foldersQueue.size === 0) {
+      //   Logger.debug(
+      //     'File is not going to be queued. Creating...',
+      //     posixRelativePath
+      //   );
+      //   await this.createFiles();
+      // } else {
+      //   Logger.debug('File has been queued: ', posixRelativePath);
+      // }
     }
   }
 }
diff --git a/src/context/virtual-drive/files/application/FileCreator.ts b/src/context/virtual-drive/files/application/FileCreator.ts
index 9515a6fbd..4aeea6e06 100644
--- a/src/context/virtual-drive/files/application/FileCreator.ts
+++ b/src/context/virtual-drive/files/application/FileCreator.ts
@@ -33,7 +33,7 @@ export class FileCreator {
 
       const size = new FileSize(contents.size);
 
-      const folder = this.folderFinder.findFromFilePath(filePath);
+      const folder = await this.folderFinder.findFromFilePath(filePath);
 
       const offline = OfflineFile.create(contents.id, folder, size, filePath);
 
diff --git a/src/context/virtual-drive/folders/application/FolderFinder.ts b/src/context/virtual-drive/folders/application/FolderFinder.ts
index 8f50d9b46..52f03e49f 100644
--- a/src/context/virtual-drive/folders/application/FolderFinder.ts
+++ b/src/context/virtual-drive/folders/application/FolderFinder.ts
@@ -2,6 +2,7 @@ import { FilePath } from '../../files/domain/FilePath';
 import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
 import { Folder } from '../domain/Folder';
 import { FolderRepository } from '../domain/FolderRepository';
+import logger from 'electron-log';
 
 export class FolderFinder {
   constructor(private readonly repository: FolderRepository) {}
@@ -16,8 +17,18 @@ export class FolderFinder {
     return folder;
   }
 
-  findFromFilePath(path: FilePath): Folder {
-    const folder = this.repository.searchByPartial({ path: path.dirname() });
+  async findFromFilePath(path: FilePath): Promise<Folder> {
+    let folder = this.repository.searchByPartial({ path: path.dirname() });
+    let times = 5;
+    // repetir intentos 5 veces
+    while (!folder && times > 0) {
+      logger.info('Folder not found, retrying in 1 second...');
+      folder = this.repository.searchByPartial({ path: path.dirname() });
+      await new Promise((resolve) => {
+        setTimeout(resolve, 1000);
+      });
+      times--;
+    }
 
     if (!folder) {
       throw new FolderNotFoundError(path.dirname());

From 0daa64fca54ff53950efcb14601d14bc84bcc458 Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Wed, 13 Dec 2023 09:26:17 -0500
Subject: [PATCH 074/188] remove queue not used

---
 .../controllers/AddController.ts              | 134 +++++++-----------
 .../folders/application/FolderFinder.ts       |  13 +-
 .../infrastructure/HttpRemoteFileSystem.ts    |   2 +-
 3 files changed, 56 insertions(+), 93 deletions(-)

diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
index b0ca87861..65a4b692f 100644
--- a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
@@ -7,19 +7,11 @@ import { createFolderPlaceholderId } from '../../../../context/virtual-drive/fol
 import { OfflineFolder } from '../../../../context/virtual-drive/folders/domain/OfflineFolder';
 import { AbsolutePathToRelativeConverter } from '../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
 import { PlatformPathConverter } from '../../../../context/virtual-drive/shared/application/PlatformPathConverter';
-import { MapObserver } from '../../../../context/virtual-drive/shared/domain/MapObserver';
 import { PathTypeChecker } from '../../../shared/fs/PathTypeChecker ';
 import { CallbackController } from './CallbackController';
-import logger from 'electron-log';
+import { FolderNotFoundError } from '../../../../context/virtual-drive/folders/domain/errors/FolderNotFoundError';
+import path from 'path';
 
-type FileCreationQueue = Map<
-  string,
-  (acknowledge: boolean, id: string) => void
->;
-type FolderCreationQueue = Map<
-  OfflineFolder,
-  (acknowledge: boolean, id: string) => void
->;
 type CreationCallback = (acknowledge: boolean, id: string) => void;
 
 export class AddController extends CallbackController {
@@ -28,11 +20,6 @@ export class AddController extends CallbackController {
   //  -a file has been saved
   //  - after a file has been moved to a folder
 
-  private readonly filesQueue: FileCreationQueue;
-  private readonly foldersQueue: FolderCreationQueue;
-
-  private readonly observer: MapObserver;
-
   constructor(
     private readonly absolutePathToRelativeConverter: AbsolutePathToRelativeConverter,
     private readonly fileCreationOrchestrator: FileCreationOrchestrator,
@@ -40,78 +27,80 @@ export class AddController extends CallbackController {
     private readonly offlineFolderCreator: OfflineFolderCreator
   ) {
     super();
-
-    this.filesQueue = new Map();
-    this.foldersQueue = new Map();
-
-    this.observer = new MapObserver(this.foldersQueue, this.createFiles);
-    this.observer.startObserving();
   }
 
   private createFile = async (
     posixRelativePath: string,
-    callback: (acknowledge: boolean, id: string) => void
+    callback: (acknowledge: boolean, id: string) => void,
+    attempts = 3
   ) => {
     try {
       const contentsId = await this.fileCreationOrchestrator.run(
         posixRelativePath
       );
-      logger.debug('[TEST]', posixRelativePath);
+      Logger.debug(
+        'File created callback emited by',
+        posixRelativePath,
+        'contentsId',
+        contentsId
+      );
       callback(true, createFilePlaceholderId(contentsId));
     } catch (error: unknown) {
       Logger.error('Error when adding a file: ' + posixRelativePath, error);
+      if (error instanceof FolderNotFoundError) {
+        await this.createFolderFromFile(posixRelativePath);
+      }
+      if (attempts > 0) {
+        Logger.debug('[Creating file]', 'retrying...', attempts);
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+        await this.createFile(posixRelativePath, callback, attempts - 1);
+        attempts--;
+        return;
+      }
+      Logger.error('[Creating file]', 'Max retries reached', 'callback emited');
       callback(false, '');
-    } finally {
-      this.filesQueue.delete(posixRelativePath);
-    }
-  };
-
-  private createFiles = async () => {
-    Logger.debug('FILES TO CREATE', this.foldersQueue.size);
-    for (const [posixRelativePath, callback] of this.filesQueue) {
-      await this.createFile(posixRelativePath, callback);
-    }
-  };
-
-  private createFolders = async () => {
-    Logger.debug('FOLDERS TO CREATE', this.foldersQueue.size);
-    for (const [offlineFolder, callback] of this.foldersQueue) {
-      await this.createFolder(offlineFolder, callback);
     }
   };
 
   private createFolder = async (
     offlineFolder: OfflineFolder,
-    callback: (acknowledge: boolean, id: string) => void
+    callback: (acknowledge: boolean, id: string) => void,
+    attempts = 3
   ) => {
-    Logger.info('Creating folder', offlineFolder);
     try {
       await this.folderCreator.run(offlineFolder);
-      logger.debug('[TEST]', 'folder created callback emited');
+      Logger.debug('Folder created callback emited', offlineFolder.name);
       callback(true, createFolderPlaceholderId(offlineFolder.uuid));
     } catch (error: unknown) {
-      Logger.error('Error creating a folder: ', error);
+      Logger.error('Error creating folder', error);
+      if (attempts > 0) {
+        Logger.info('[Creating folder]', 'retrying...', attempts);
+        await new Promise((resolve) => setTimeout(resolve, 2000));
+        await this.createFolder(offlineFolder, callback, attempts - 1);
+        attempts--;
+        return;
+      }
+      Logger.debug(
+        '[Creating folder]',
+        'Max retries reached',
+        'callback emited'
+      );
       callback(false, '');
-    } finally {
-      this.foldersQueue.delete(offlineFolder);
     }
   };
 
-  private enqueueFolder = (
-    posixRelativePath: string,
-    callback: CreationCallback
-  ) => {
-    // try {
-    const offlineFolder = this.offlineFolderCreator.run(posixRelativePath);
-    // callback(true, createFolderPlaceholderId(offlineFolder.uuid));
-    this.foldersQueue.set(offlineFolder, () => {
-      //no-op
-    });
-    // } catch (error: unknown) {
-    //   Logger.error('Error on folder creation: ', error);
-    //   callback(false, '');
-    // }
-  };
+  private async createFolderFromFile(posixRelativePath: string) {
+    try {
+      const dir = path.dirname(posixRelativePath);
+      const offlineFolder = this.offlineFolderCreator.run(dir);
+      const newFolder = await this.folderCreator.run(offlineFolder);
+      // TODO: we need to add from node-win a function to convert folders to placeholders manually here
+      Logger.debug('Folder created from file creation', newFolder);
+    } catch (folderCreationError) {
+      Logger.error('Error creating folder from file:', folderCreationError);
+      // TODO: Handle error
+    }
+  }
 
   async execute(
     absolutePath: string,
@@ -124,29 +113,14 @@ export class AddController extends CallbackController {
       PlatformPathConverter.winToPosix(win32RelativePath);
 
     const isFolder = await PathTypeChecker.isFolder(absolutePath);
-
+    const attempts = 3;
     if (isFolder) {
-      logger.debug('[Is Folder]', posixRelativePath);
-      // this.enqueueFolder(posixRelativePath, callback);
+      Logger.debug('[Is Folder]', posixRelativePath);
       const offlineFolder = this.offlineFolderCreator.run(posixRelativePath);
-      this.createFolder(offlineFolder, callback);
-      // await this.createFolders();
-      // await this.createFiles();
-      // return;
+      await this.createFolder(offlineFolder, callback, attempts);
     } else {
-      logger.debug('[Is Not Folder]', posixRelativePath);
-      // this.filesQueue.set(posixRelativePath, callback);
-
-      this.createFile(posixRelativePath, callback);
-      // if (this.foldersQueue.size === 0) {
-      //   Logger.debug(
-      //     'File is not going to be queued. Creating...',
-      //     posixRelativePath
-      //   );
-      //   await this.createFiles();
-      // } else {
-      //   Logger.debug('File has been queued: ', posixRelativePath);
-      // }
+      Logger.debug('[Is File]', posixRelativePath);
+      await this.createFile(posixRelativePath, callback, attempts);
     }
   }
 }
diff --git a/src/context/virtual-drive/folders/application/FolderFinder.ts b/src/context/virtual-drive/folders/application/FolderFinder.ts
index 52f03e49f..13e6fb789 100644
--- a/src/context/virtual-drive/folders/application/FolderFinder.ts
+++ b/src/context/virtual-drive/folders/application/FolderFinder.ts
@@ -2,7 +2,6 @@ import { FilePath } from '../../files/domain/FilePath';
 import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
 import { Folder } from '../domain/Folder';
 import { FolderRepository } from '../domain/FolderRepository';
-import logger from 'electron-log';
 
 export class FolderFinder {
   constructor(private readonly repository: FolderRepository) {}
@@ -18,17 +17,7 @@ export class FolderFinder {
   }
 
   async findFromFilePath(path: FilePath): Promise<Folder> {
-    let folder = this.repository.searchByPartial({ path: path.dirname() });
-    let times = 5;
-    // repetir intentos 5 veces
-    while (!folder && times > 0) {
-      logger.info('Folder not found, retrying in 1 second...');
-      folder = this.repository.searchByPartial({ path: path.dirname() });
-      await new Promise((resolve) => {
-        setTimeout(resolve, 1000);
-      });
-      times--;
-    }
+    const folder = this.repository.searchByPartial({ path: path.dirname() });
 
     if (!folder) {
       throw new FolderNotFoundError(path.dirname());
diff --git a/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
index fa86fe46c..101b2413d 100644
--- a/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
+++ b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
@@ -25,7 +25,7 @@ export class HttpRemoteFileSystem implements RemoteFileSystem {
     const body: CreateFolderDTO = {
       folderName: offline.name,
       parentFolderId: offline.parentId,
-      uuid: offline.uuid,
+      // uuid: offline.uuid, // TODO: Maybe we can avoid errors sending the uuid, because it's optional
     };
 
     const response = await this.driveClient.post(

From 602630f6a15952fd2c6f913a64aa03648952fdf2 Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Wed, 13 Dec 2023 09:39:34 -0500
Subject: [PATCH 075/188] use logger used

---
 src/apps/sync-engine/BindingManager.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/apps/sync-engine/BindingManager.ts b/src/apps/sync-engine/BindingManager.ts
index 0f19d8dc8..08fd6d9a4 100644
--- a/src/apps/sync-engine/BindingManager.ts
+++ b/src/apps/sync-engine/BindingManager.ts
@@ -9,7 +9,6 @@ import { executeControllerWithFallback } from './callbacks-controllers/middlewar
 import { DependencyContainer } from './dependency-injection/DependencyContainer';
 import { ipcRendererSyncEngine } from './ipcRendererSyncEngine';
 import { ProcessIssue } from '../shared/types';
-import logger from 'electron-log';
 
 export type CallbackDownload = (
   success: boolean,
@@ -78,7 +77,7 @@ export class BindingsManager {
         absolutePath: string,
         callback: (acknowledge: boolean, id: string) => boolean
       ) => {
-        logger.debug('[Order]', absolutePath);
+        Logger.debug('Path received from callback', absolutePath);
         controllers.addFile.execute(absolutePath, callback);
       },
       fetchDataCallback: async (

From b8a794845078fb59a43dfee206e72dd23804bf8c Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Tue, 19 Dec 2023 07:39:52 -0500
Subject: [PATCH 076/188] add creation item father recursive

---
 .../controllers/AddController.ts              | 59 ++++++++++++-------
 .../application/PlatformPathConverter.ts      |  6 ++
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
index 65a4b692f..d734e052b 100644
--- a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
@@ -10,7 +10,6 @@ import { PlatformPathConverter } from '../../../../context/virtual-drive/shared/
 import { PathTypeChecker } from '../../../shared/fs/PathTypeChecker ';
 import { CallbackController } from './CallbackController';
 import { FolderNotFoundError } from '../../../../context/virtual-drive/folders/domain/errors/FolderNotFoundError';
-import path from 'path';
 
 type CreationCallback = (acknowledge: boolean, id: string) => void;
 
@@ -38,23 +37,23 @@ export class AddController extends CallbackController {
       const contentsId = await this.fileCreationOrchestrator.run(
         posixRelativePath
       );
-      Logger.debug(
-        'File created callback emited by',
-        posixRelativePath,
-        'contentsId',
-        contentsId
-      );
+      // Logger.debug(
+      //   'File created callback emited by',
+      //   posixRelativePath,
+      //   'contentsId',
+      //   contentsId
+      // );
       callback(true, createFilePlaceholderId(contentsId));
     } catch (error: unknown) {
       Logger.error('Error when adding a file: ' + posixRelativePath, error);
       if (error instanceof FolderNotFoundError) {
-        await this.createFolderFromFile(posixRelativePath);
+        await this.createFolderFather(posixRelativePath);
       }
       if (attempts > 0) {
-        Logger.debug('[Creating file]', 'retrying...', attempts);
+        Logger.info('[Creating file]', 'retrying...', attempts);
         await new Promise((resolve) => setTimeout(resolve, 2000));
         await this.createFile(posixRelativePath, callback, attempts - 1);
-        attempts--;
+        // attempts--;
         return;
       }
       Logger.error('[Creating file]', 'Max retries reached', 'callback emited');
@@ -69,7 +68,6 @@ export class AddController extends CallbackController {
   ) => {
     try {
       await this.folderCreator.run(offlineFolder);
-      Logger.debug('Folder created callback emited', offlineFolder.name);
       callback(true, createFolderPlaceholderId(offlineFolder.uuid));
     } catch (error: unknown) {
       Logger.error('Error creating folder', error);
@@ -77,10 +75,9 @@ export class AddController extends CallbackController {
         Logger.info('[Creating folder]', 'retrying...', attempts);
         await new Promise((resolve) => setTimeout(resolve, 2000));
         await this.createFolder(offlineFolder, callback, attempts - 1);
-        attempts--;
         return;
       }
-      Logger.debug(
+      Logger.error(
         '[Creating folder]',
         'Max retries reached',
         'callback emited'
@@ -89,16 +86,36 @@ export class AddController extends CallbackController {
     }
   };
 
-  private async createFolderFromFile(posixRelativePath: string) {
+  private async createFolderFather(posixRelativePath: string) {
+    const posixDir =
+      PlatformPathConverter.getFatherPathPosix(posixRelativePath);
     try {
-      const dir = path.dirname(posixRelativePath);
-      const offlineFolder = this.offlineFolderCreator.run(dir);
+      const offlineFolder = this.offlineFolderCreator.run(posixDir);
       const newFolder = await this.folderCreator.run(offlineFolder);
       // TODO: we need to add from node-win a function to convert folders to placeholders manually here
-      Logger.debug('Folder created from file creation', newFolder);
-    } catch (folderCreationError) {
-      Logger.error('Error creating folder from file:', folderCreationError);
-      // TODO: Handle error
+      Logger.debug('Folder created from father creation:', newFolder);
+    } catch (e) {
+      Logger.error('Error creating folder father creation:', e);
+      if (e instanceof FolderNotFoundError) {
+        await this.createFolderFather(posixDir);
+      }
+      const offlineFolder = this.offlineFolderCreator.run(posixDir);
+      const newFolder = await this.folderCreator.run(offlineFolder);
+      // TODO: we need to add from node-win a function to convert folders to placeholders manually here
+      Logger.debug('Folder created from father creation:', newFolder);
+    }
+  }
+
+  private async createOfflineFolder(
+    posixRelativePath: string
+  ): Promise<OfflineFolder> {
+    try {
+      return this.offlineFolderCreator.run(posixRelativePath);
+    } catch (error) {
+      if (error instanceof FolderNotFoundError) {
+        await this.createFolderFather(posixRelativePath);
+      }
+      return this.createOfflineFolder(posixRelativePath);
     }
   }
 
@@ -116,7 +133,7 @@ export class AddController extends CallbackController {
     const attempts = 3;
     if (isFolder) {
       Logger.debug('[Is Folder]', posixRelativePath);
-      const offlineFolder = this.offlineFolderCreator.run(posixRelativePath);
+      const offlineFolder = await this.createOfflineFolder(posixRelativePath);
       await this.createFolder(offlineFolder, callback, attempts);
     } else {
       Logger.debug('[Is File]', posixRelativePath);
diff --git a/src/context/virtual-drive/shared/application/PlatformPathConverter.ts b/src/context/virtual-drive/shared/application/PlatformPathConverter.ts
index 634c9273f..1c6a33184 100644
--- a/src/context/virtual-drive/shared/application/PlatformPathConverter.ts
+++ b/src/context/virtual-drive/shared/application/PlatformPathConverter.ts
@@ -18,4 +18,10 @@ export class PlatformPathConverter {
   static posixToWin(posix: string): string {
     return posix.split(path.posix.sep).join(path.win32.sep);
   }
+
+  static getFatherPathPosix(posixPath: string): string {
+    const normalizedPath = path.normalize(posixPath);
+    const dir = path.dirname(normalizedPath);
+    return this.winToPosix(dir);
+  }
 }

From a4a97662cda8fa600980f5b3e4e5594a60e0101e Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Tue, 19 Dec 2023 08:44:02 -0500
Subject: [PATCH 077/188] update loggers

---
 .../callbacks-controllers/controllers/AddController.ts    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
index d734e052b..451412e18 100644
--- a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
@@ -37,12 +37,6 @@ export class AddController extends CallbackController {
       const contentsId = await this.fileCreationOrchestrator.run(
         posixRelativePath
       );
-      // Logger.debug(
-      //   'File created callback emited by',
-      //   posixRelativePath,
-      //   'contentsId',
-      //   contentsId
-      // );
       callback(true, createFilePlaceholderId(contentsId));
     } catch (error: unknown) {
       Logger.error('Error when adding a file: ' + posixRelativePath, error);
@@ -53,7 +47,6 @@ export class AddController extends CallbackController {
         Logger.info('[Creating file]', 'retrying...', attempts);
         await new Promise((resolve) => setTimeout(resolve, 2000));
         await this.createFile(posixRelativePath, callback, attempts - 1);
-        // attempts--;
         return;
       }
       Logger.error('[Creating file]', 'Max retries reached', 'callback emited');
@@ -87,6 +80,7 @@ export class AddController extends CallbackController {
   };
 
   private async createFolderFather(posixRelativePath: string) {
+    Logger.info('posixRelativePath', posixRelativePath);
     const posixDir =
       PlatformPathConverter.getFatherPathPosix(posixRelativePath);
     try {

From 0d835517dcea513f5691cf413fb72ecf1c7bd16e Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Tue, 19 Dec 2023 10:43:21 -0500
Subject: [PATCH 078/188] remove unnecessary async

---
 src/context/virtual-drive/files/application/FileCreator.ts    | 2 +-
 src/context/virtual-drive/folders/application/FolderFinder.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/context/virtual-drive/files/application/FileCreator.ts b/src/context/virtual-drive/files/application/FileCreator.ts
index 4aeea6e06..9515a6fbd 100644
--- a/src/context/virtual-drive/files/application/FileCreator.ts
+++ b/src/context/virtual-drive/files/application/FileCreator.ts
@@ -33,7 +33,7 @@ export class FileCreator {
 
       const size = new FileSize(contents.size);
 
-      const folder = await this.folderFinder.findFromFilePath(filePath);
+      const folder = this.folderFinder.findFromFilePath(filePath);
 
       const offline = OfflineFile.create(contents.id, folder, size, filePath);
 
diff --git a/src/context/virtual-drive/folders/application/FolderFinder.ts b/src/context/virtual-drive/folders/application/FolderFinder.ts
index 13e6fb789..8f50d9b46 100644
--- a/src/context/virtual-drive/folders/application/FolderFinder.ts
+++ b/src/context/virtual-drive/folders/application/FolderFinder.ts
@@ -16,7 +16,7 @@ export class FolderFinder {
     return folder;
   }
 
-  async findFromFilePath(path: FilePath): Promise<Folder> {
+  findFromFilePath(path: FilePath): Folder {
     const folder = this.repository.searchByPartial({ path: path.dirname() });
 
     if (!folder) {

From 95866389042b0567eefa5ad34a2e73ab4c1a73fe Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Tue, 19 Dec 2023 16:44:05 -0500
Subject: [PATCH 079/188] refactor

---
 .../controllers/AddController.ts              | 31 ++++++++++++-------
 .../application/PlatformPathConverter.ts      |  7 +++--
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
index 451412e18..79a8fc81c 100644
--- a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
@@ -10,6 +10,7 @@ import { PlatformPathConverter } from '../../../../context/virtual-drive/shared/
 import { PathTypeChecker } from '../../../shared/fs/PathTypeChecker ';
 import { CallbackController } from './CallbackController';
 import { FolderNotFoundError } from '../../../../context/virtual-drive/folders/domain/errors/FolderNotFoundError';
+import { Folder } from '../../../../context/virtual-drive/folders/domain/Folder';
 
 type CreationCallback = (acknowledge: boolean, id: string) => void;
 
@@ -78,25 +79,27 @@ export class AddController extends CallbackController {
       callback(false, '');
     }
   };
+  private async runFolderCreator(posixRelativePath: string): Promise<Folder> {
+    const offlineFolder = this.offlineFolderCreator.run(posixRelativePath);
+    return this.folderCreator.run(offlineFolder);
+  }
 
   private async createFolderFather(posixRelativePath: string) {
     Logger.info('posixRelativePath', posixRelativePath);
     const posixDir =
       PlatformPathConverter.getFatherPathPosix(posixRelativePath);
     try {
-      const offlineFolder = this.offlineFolderCreator.run(posixDir);
-      const newFolder = await this.folderCreator.run(offlineFolder);
-      // TODO: we need to add from node-win a function to convert folders to placeholders manually here
-      Logger.debug('Folder created from father creation:', newFolder);
-    } catch (e) {
-      Logger.error('Error creating folder father creation:', e);
-      if (e instanceof FolderNotFoundError) {
+      await this.runFolderCreator(posixDir);
+    } catch (error) {
+      Logger.error('Error creating folder father creation:', error);
+      if (error instanceof FolderNotFoundError) {
+        // father created
         await this.createFolderFather(posixDir);
+        // child created
+        await this.runFolderCreator(posixDir);
+      } else {
+        throw error;
       }
-      const offlineFolder = this.offlineFolderCreator.run(posixDir);
-      const newFolder = await this.folderCreator.run(offlineFolder);
-      // TODO: we need to add from node-win a function to convert folders to placeholders manually here
-      Logger.debug('Folder created from father creation:', newFolder);
     }
   }
 
@@ -107,9 +110,13 @@ export class AddController extends CallbackController {
       return this.offlineFolderCreator.run(posixRelativePath);
     } catch (error) {
       if (error instanceof FolderNotFoundError) {
+        // father created
         await this.createFolderFather(posixRelativePath);
+        // child created
+        return this.createOfflineFolder(posixRelativePath);
+      } else {
+        throw error;
       }
-      return this.createOfflineFolder(posixRelativePath);
     }
   }
 
diff --git a/src/context/virtual-drive/shared/application/PlatformPathConverter.ts b/src/context/virtual-drive/shared/application/PlatformPathConverter.ts
index 1c6a33184..fb1133e1f 100644
--- a/src/context/virtual-drive/shared/application/PlatformPathConverter.ts
+++ b/src/context/virtual-drive/shared/application/PlatformPathConverter.ts
@@ -20,8 +20,9 @@ export class PlatformPathConverter {
   }
 
   static getFatherPathPosix(posixPath: string): string {
-    const normalizedPath = path.normalize(posixPath);
-    const dir = path.dirname(normalizedPath);
-    return this.winToPosix(dir);
+    const pathArray = posixPath.split('/');
+    const folderToCreate = pathArray.pop();
+    const parentPath = pathArray.join('/');
+    return this.winToPosix(parentPath);
   }
 }

From 394cd7ac6146504397b99f51375cd7211868956c Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Wed, 20 Dec 2023 19:17:25 -0500
Subject: [PATCH 080/188] [wip] add uuid again maybe is used in offlineCreation

---
 .../controllers/AddController.ts              | 24 +++++++++++++++----
 .../infrastructure/HttpRemoteFileSystem.ts    |  2 +-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
index 79a8fc81c..c56cc9ecc 100644
--- a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
@@ -76,7 +76,7 @@ export class AddController extends CallbackController {
         'Max retries reached',
         'callback emited'
       );
-      callback(false, '');
+      throw error;
     }
   };
   private async runFolderCreator(posixRelativePath: string): Promise<Folder> {
@@ -98,6 +98,10 @@ export class AddController extends CallbackController {
         // child created
         await this.runFolderCreator(posixDir);
       } else {
+        Logger.error(
+          'Error creating folder father creation inside catch:',
+          error
+        );
         throw error;
       }
     }
@@ -115,6 +119,7 @@ export class AddController extends CallbackController {
         // child created
         return this.createOfflineFolder(posixRelativePath);
       } else {
+        Logger.error('Error creating offline folder:', error);
         throw error;
       }
     }
@@ -134,11 +139,22 @@ export class AddController extends CallbackController {
     const attempts = 3;
     if (isFolder) {
       Logger.debug('[Is Folder]', posixRelativePath);
-      const offlineFolder = await this.createOfflineFolder(posixRelativePath);
-      await this.createFolder(offlineFolder, callback, attempts);
+      let offlineFolder: OfflineFolder;
+      try {
+        offlineFolder = await this.createOfflineFolder(posixRelativePath);
+        await this.createFolder(offlineFolder, callback, attempts);
+      } catch (error) {
+        Logger.error('[folder creation] Error captured:', error);
+        callback(false, '');
+      }
     } else {
       Logger.debug('[Is File]', posixRelativePath);
-      await this.createFile(posixRelativePath, callback, attempts);
+      try {
+        await this.createFile(posixRelativePath, callback, attempts);
+      } catch (error) {
+        Logger.error('[file creation] Error captured:', error);
+        callback(false, '');
+      }
     }
   }
 }
diff --git a/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
index 101b2413d..ce5fe9de5 100644
--- a/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
+++ b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
@@ -25,7 +25,7 @@ export class HttpRemoteFileSystem implements RemoteFileSystem {
     const body: CreateFolderDTO = {
       folderName: offline.name,
       parentFolderId: offline.parentId,
-      // uuid: offline.uuid, // TODO: Maybe we can avoid errors sending the uuid, because it's optional
+      uuid: offline.uuid, // TODO: Maybe we can avoid errors sending the uuid, because it's optional
     };
 
     const response = await this.driveClient.post(

From 9cf81c93ae997778a82f9fa10160f9218c122fe4 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 21 Dec 2023 11:01:34 +0100
Subject: [PATCH 081/188] chore: use http client to trash files

---
 .../dependency-injection/files/builder.ts     | 10 ++++++-
 .../infrastructure/SDKRemoteFileSystem.ts     | 27 +++++++++++++------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/apps/sync-engine/dependency-injection/files/builder.ts b/src/apps/sync-engine/dependency-injection/files/builder.ts
index 94969cb85..e9cf5c424 100644
--- a/src/apps/sync-engine/dependency-injection/files/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/files/builder.ts
@@ -23,6 +23,7 @@ import { InMemoryFileRepository } from '../../../../context/virtual-drive/files/
 import { SDKRemoteFileSystem } from '../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
 import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem';
 import { LocalFileIdProvider } from '../../../../context/virtual-drive/shared/application/LocalFileIdProvider';
+import { DependencyInjectionHttpClientsProvider } from '../common/clients';
 
 export async function buildFilesContainer(
   folderContainer: FoldersContainer,
@@ -37,7 +38,14 @@ export async function buildFilesContainer(
   const { virtualDrive } = DependencyInjectionVirtualDrive;
   const sdk = await DependencyInjectionStorageSdk.get();
 
-  const remoteFileSystem = new SDKRemoteFileSystem(sdk, crypt, user.bucket);
+  const clients = DependencyInjectionHttpClientsProvider.get();
+
+  const remoteFileSystem = new SDKRemoteFileSystem(
+    sdk,
+    clients,
+    crypt,
+    user.bucket
+  );
   const localFileSystem = new NodeWinLocalFileSystem(
     virtualDrive,
     sharedContainer.relativePathToAbsoluteConverter
diff --git a/src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts b/src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts
index d0b85607a..6208baced 100644
--- a/src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts
+++ b/src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts
@@ -6,10 +6,13 @@ import { FileStatuses } from '../domain/FileStatus';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 import { OfflineFile } from '../domain/OfflineFile';
 import * as uuid from 'uuid';
+import { AuthorizedClients } from '../../../../apps/shared/HttpClient/Clients';
+import Logger from 'electron-log';
 
 export class SDKRemoteFileSystem implements RemoteFileSystem {
   constructor(
     private readonly sdk: Storage,
+    private readonly clients: AuthorizedClients,
     private readonly crypt: Crypt,
     private readonly bucket: string
   ) {}
@@ -45,14 +48,22 @@ export class SDKRemoteFileSystem implements RemoteFileSystem {
   }
 
   async trash(contentsId: string): Promise<void> {
-    await this.sdk.addItemsToTrash({
-      items: [
-        {
-          type: 'file',
-          id: contentsId,
-        },
-      ],
-    });
+    const result = await this.clients.newDrive.post(
+      `${process.env.NEW_DRIVE_URL}/drive/storage/trash/add`,
+      {
+        items: [{ type: 'file', id: contentsId }],
+      }
+    );
+
+    if (result.status !== 200) {
+      Logger.error(
+        '[FILE FILE SYSTEM] File deletion failed with status: ',
+        result.status,
+        result.statusText
+      );
+
+      throw new Error('Error when deleting file');
+    }
   }
 
   async rename(file: File): Promise<void> {

From 0eb57f1176254babeb62a021dd2bf8ca32e789e8 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 21 Dec 2023 12:09:57 +0100
Subject: [PATCH 082/188] fix: update trashed folder instead of deletin it from
 memory

---
 src/context/virtual-drive/folders/application/FolderDeleter.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/context/virtual-drive/folders/application/FolderDeleter.ts b/src/context/virtual-drive/folders/application/FolderDeleter.ts
index 03348721d..67cabbfc3 100644
--- a/src/context/virtual-drive/folders/application/FolderDeleter.ts
+++ b/src/context/virtual-drive/folders/application/FolderDeleter.ts
@@ -42,7 +42,7 @@ export class FolderDeleter {
       folder.trash();
 
       await this.remote.trash(folder.id);
-      await this.repository.delete(folder.id);
+      await this.repository.update(folder);
     } catch (error: unknown) {
       Logger.error(`Error deleting the folder ${folder.name}: `, error);
 

From 0e62a09541575b5e050c558f3f4b5154b8394282 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 21 Dec 2023 12:12:09 +0100
Subject: [PATCH 083/188] fix: update trashed folder instead of deletin it from
 memory

---
 src/context/virtual-drive/files/application/FileDeleter.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/context/virtual-drive/files/application/FileDeleter.ts b/src/context/virtual-drive/files/application/FileDeleter.ts
index 59a32e25b..70ac81bfd 100644
--- a/src/context/virtual-drive/files/application/FileDeleter.ts
+++ b/src/context/virtual-drive/files/application/FileDeleter.ts
@@ -50,7 +50,7 @@ export class FileDeleter {
       file.trash();
 
       await this.remote.trash(file.contentsId);
-      await this.repository.delete(file.contentsId);
+      await this.repository.update(file);
 
       this.ipc.send('FILE_DELETED', {
         name: file.name,

From 0047ef79b2598187524a8ec11d4815a0e235af36 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 21 Dec 2023 12:44:57 +0100
Subject: [PATCH 084/188] fix: update unit test

---
 .../files/application/FileDeleter.test.ts           | 13 ++++++++-----
 .../folders/application/FolderDeleter.test.ts       |  6 ++----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/context/virtual-drive/files/application/FileDeleter.test.ts b/tests/context/virtual-drive/files/application/FileDeleter.test.ts
index f0119a682..3f97a2c8c 100644
--- a/tests/context/virtual-drive/files/application/FileDeleter.test.ts
+++ b/tests/context/virtual-drive/files/application/FileDeleter.test.ts
@@ -7,12 +7,13 @@ import { FileDeleter } from '../../../../../src/context/virtual-drive/files/appl
 import { FolderRepositoryMock } from '../../folders/__mocks__/FolderRepositoryMock';
 import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
 import { AllParentFoldersStatusIsExists } from '../../../../../src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
+import { FileStatus } from '../../../../../src/context/virtual-drive/files/domain/FileStatus';
 
 describe('File Deleter', () => {
   let repository: FileRepositoryMock;
   let allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
   let remoteFileSystemMock: RemoteFileSystemMock;
-  let localFilseSystemMock: LocalFileSystemMock;
+  let localFileSystemMock: LocalFileSystemMock;
   let ipc: IpcRendererSyncEngineMock;
 
   let SUT: FileDeleter;
@@ -23,13 +24,13 @@ describe('File Deleter', () => {
     allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
       folderRepository
     );
-    localFilseSystemMock = new LocalFileSystemMock();
+    localFileSystemMock = new LocalFileSystemMock();
     remoteFileSystemMock = new RemoteFileSystemMock();
     ipc = new IpcRendererSyncEngineMock();
 
     SUT = new FileDeleter(
       remoteFileSystemMock,
-      localFilseSystemMock,
+      localFileSystemMock,
       repository,
       allParentFoldersStatusIsExists,
       ipc
@@ -70,7 +71,7 @@ describe('File Deleter', () => {
 
     await SUT.run(file.contentsId);
 
-    expect(repository.deleteMock).toBeCalled();
+    expect(remoteFileSystemMock.trashMock).toBeCalled();
   });
 
   it('trashes the file with the status trashed', async () => {
@@ -82,6 +83,8 @@ describe('File Deleter', () => {
     await SUT.run(file.contentsId);
 
     expect(remoteFileSystemMock.trashMock).toBeCalledWith(file.contentsId);
-    expect(repository.deleteMock).toBeCalledWith(file.contentsId);
+    expect(repository.updateMock).toBeCalledWith(
+      expect.objectContaining({ status: FileStatus.Trashed })
+    );
   });
 });
diff --git a/tests/context/virtual-drive/folders/application/FolderDeleter.test.ts b/tests/context/virtual-drive/folders/application/FolderDeleter.test.ts
index 42917c90f..451086e4a 100644
--- a/tests/context/virtual-drive/folders/application/FolderDeleter.test.ts
+++ b/tests/context/virtual-drive/folders/application/FolderDeleter.test.ts
@@ -36,7 +36,7 @@ describe('Folder deleter', () => {
 
     await SUT.run(folder.uuid);
 
-    expect(repository.deleteMock).toBeCalledWith(folder.id);
+    expect(remote.trashMock).toBeCalledWith(folder.id);
   });
 
   it('throws an error when trashing a folder already trashed', async () => {
@@ -72,9 +72,7 @@ describe('Folder deleter', () => {
 
     repository.searchByPartialMock.mockReturnValueOnce(folder);
     jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
-    repository.deleteMock.mockRejectedValue(
-      new Error('Error during the deletion')
-    );
+    remote.trashMock.mockRejectedValue(new Error('Error during the deletion'));
 
     await SUT.run(folder.uuid);
 

From 3c8930bff41485d30023dbe10ee8534027d3d44b Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Fri, 22 Dec 2023 01:06:53 -0500
Subject: [PATCH 085/188] change name to basename to create folders

---
 .../virtual-drive/folders/application/FolderCreator.ts        | 2 +-
 src/context/virtual-drive/folders/domain/FolderPath.ts        | 4 ++++
 src/context/virtual-drive/folders/domain/OfflineFolder.ts     | 4 ++++
 .../folders/infrastructure/HttpRemoteFileSystem.ts            | 4 ++--
 src/context/virtual-drive/shared/domain/Path.ts               | 4 ++++
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/context/virtual-drive/folders/application/FolderCreator.ts b/src/context/virtual-drive/folders/application/FolderCreator.ts
index 6b09c3eea..1e3a83f36 100644
--- a/src/context/virtual-drive/folders/application/FolderCreator.ts
+++ b/src/context/virtual-drive/folders/application/FolderCreator.ts
@@ -15,7 +15,7 @@ export class FolderCreator {
 
   async run(offlineFolder: OfflineFolder): Promise<Folder> {
     this.ipc.send('FOLDER_CREATING', {
-      name: offlineFolder.name,
+      name: offlineFolder.basename,
     });
 
     const attributes = await this.remote.persist(offlineFolder);
diff --git a/src/context/virtual-drive/folders/domain/FolderPath.ts b/src/context/virtual-drive/folders/domain/FolderPath.ts
index d6dc7c0e4..4e4724aba 100644
--- a/src/context/virtual-drive/folders/domain/FolderPath.ts
+++ b/src/context/virtual-drive/folders/domain/FolderPath.ts
@@ -20,6 +20,10 @@ export class FolderPath extends Path {
     return super.name();
   }
 
+  basename(): string {
+    return super.basename();
+  }
+
   updateName(name: string): FolderPath {
     return FolderPath.fromParts(this.dirname(), name);
   }
diff --git a/src/context/virtual-drive/folders/domain/OfflineFolder.ts b/src/context/virtual-drive/folders/domain/OfflineFolder.ts
index 4ff81e1e7..d1be25396 100644
--- a/src/context/virtual-drive/folders/domain/OfflineFolder.ts
+++ b/src/context/virtual-drive/folders/domain/OfflineFolder.ts
@@ -38,6 +38,10 @@ export class OfflineFolder extends AggregateRoot {
     return this._path.name();
   }
 
+  public get basename() {
+    return this._path.basename();
+  }
+
   public get dirname() {
     return this._path.dirname();
   }
diff --git a/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
index ce5fe9de5..38420a6e7 100644
--- a/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
+++ b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
@@ -18,12 +18,12 @@ export class HttpRemoteFileSystem implements RemoteFileSystem {
   ) {}
 
   async persist(offline: OfflineFolder): Promise<FolderAttributes> {
-    if (!offline.name) {
+    if (!offline.name || !offline.basename) {
       throw new Error('Bad folder name');
     }
 
     const body: CreateFolderDTO = {
-      folderName: offline.name,
+      folderName: offline.basename,
       parentFolderId: offline.parentId,
       uuid: offline.uuid, // TODO: Maybe we can avoid errors sending the uuid, because it's optional
     };
diff --git a/src/context/virtual-drive/shared/domain/Path.ts b/src/context/virtual-drive/shared/domain/Path.ts
index d864f5b20..2c5e3293f 100644
--- a/src/context/virtual-drive/shared/domain/Path.ts
+++ b/src/context/virtual-drive/shared/domain/Path.ts
@@ -44,6 +44,10 @@ export abstract class Path extends ValueObject<string> {
     return name;
   }
 
+  basename(): string {
+    return path.posix.basename(this.value);
+  }
+
   dirname(): string {
     const dirname = path.posix.dirname(this.value);
     if (dirname === '.') {

From cd483c486711ea9a90c5ef5b2b4281689bbe970b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Gonz=C3=A1lez?= <cgonzalez@shokworks.io>
Date: Fri, 22 Dec 2023 06:43:09 -0400
Subject: [PATCH 086/188] fix: prevents the deletion of unsynchronized files

---
 src/apps/sync-engine/BindingManager.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/apps/sync-engine/BindingManager.ts b/src/apps/sync-engine/BindingManager.ts
index 08fd6d9a4..76c4ea410 100644
--- a/src/apps/sync-engine/BindingManager.ts
+++ b/src/apps/sync-engine/BindingManager.ts
@@ -262,14 +262,6 @@ export class BindingsManager {
         Logger.error(error);
       }
     });
-
-    toDeleteFolder.forEach((item) => {
-      try {
-        fs.rmdirSync(item, { recursive: true });
-      } catch (error) {
-        Logger.error(error);
-      }
-    });
   }
 
   async update() {

From c731ae9107582b1c047704097578ae0a6ac6d39a Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Fri, 22 Dec 2023 05:50:00 -0500
Subject: [PATCH 087/188] add exist filter in searchbypartial

---
 src/context/virtual-drive/files/application/FileCreator.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/context/virtual-drive/files/application/FileCreator.ts b/src/context/virtual-drive/files/application/FileCreator.ts
index 9515a6fbd..7fdb5a74f 100644
--- a/src/context/virtual-drive/files/application/FileCreator.ts
+++ b/src/context/virtual-drive/files/application/FileCreator.ts
@@ -25,6 +25,7 @@ export class FileCreator {
     try {
       const existingFile = this.repository.searchByPartial({
         path: PlatformPathConverter.winToPosix(filePath.value),
+        status: 'EXISTS',
       });
 
       if (existingFile) {

From 8795bc7d20e53b6aa9a672e0a5e9a352d8d52703 Mon Sep 17 00:00:00 2001
From: migueldev01 <miguel.ram.dev01@gmail.com>
Date: Fri, 22 Dec 2023 07:53:21 -0500
Subject: [PATCH 088/188] add exist filter file creator

---
 .../files/application/FileCreator.ts          |  3 +-
 .../infrastructure/HttpRemoteFileSystem.ts    | 50 +++++++++++--------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/context/virtual-drive/files/application/FileCreator.ts b/src/context/virtual-drive/files/application/FileCreator.ts
index 7fdb5a74f..3128d7828 100644
--- a/src/context/virtual-drive/files/application/FileCreator.ts
+++ b/src/context/virtual-drive/files/application/FileCreator.ts
@@ -10,6 +10,7 @@ import { FileRepository } from '../domain/FileRepository';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 import { OfflineFile } from '../domain/OfflineFile';
 import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
+import { FileStatuses } from '../domain/FileStatus';
 
 export class FileCreator {
   constructor(
@@ -25,7 +26,7 @@ export class FileCreator {
     try {
       const existingFile = this.repository.searchByPartial({
         path: PlatformPathConverter.winToPosix(filePath.value),
-        status: 'EXISTS',
+        status: FileStatuses.EXISTS,
       });
 
       if (existingFile) {
diff --git a/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
index ce5fe9de5..eff84596e 100644
--- a/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
+++ b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
@@ -1,4 +1,4 @@
-import { Axios } from 'axios';
+import axios, { Axios } from 'axios';
 import Logger from 'electron-log';
 import * as uuid from 'uuid';
 import { Folder, FolderAttributes } from '../domain/Folder';
@@ -28,30 +28,36 @@ export class HttpRemoteFileSystem implements RemoteFileSystem {
       uuid: offline.uuid, // TODO: Maybe we can avoid errors sending the uuid, because it's optional
     };
 
-    const response = await this.driveClient.post(
-      `${process.env.API_URL}/api/storage/folder`,
-      body
-    );
-
-    if (response.status !== 201) {
-      throw new Error('Folder creation failed');
-    }
+    try {
+      const response = await this.driveClient.post(
+        `${process.env.API_URL}/api/storage/folder`,
+        body
+      );
+      if (response.status !== 201) {
+        throw new Error('Folder creation failed');
+      }
 
-    const serverFolder = response.data as ServerFolder | null;
+      const serverFolder = response.data as ServerFolder | null;
 
-    if (!serverFolder) {
-      throw new Error('Folder creation failed, no data returned');
+      if (!serverFolder) {
+        throw new Error('Folder creation failed, no data returned');
+      }
+      return {
+        id: serverFolder.id,
+        uuid: serverFolder.uuid,
+        parentId: serverFolder.parentId,
+        updatedAt: serverFolder.updatedAt,
+        createdAt: serverFolder.createdAt,
+        path: offline.path.value,
+        status: FolderStatuses.EXISTS,
+      };
+    } catch (error: any) {
+      Logger.error('[FOLDER FILE SYSTEM] Error creating folder', error);
+      if (axios.isAxiosError(error)) {
+        Logger.error('[Is Axios Error]', error.response?.data);
+      }
+      throw error;
     }
-
-    return {
-      id: serverFolder.id,
-      uuid: serverFolder.uuid,
-      parentId: serverFolder.parentId,
-      updatedAt: serverFolder.updatedAt,
-      createdAt: serverFolder.createdAt,
-      path: offline.path.value,
-      status: FolderStatuses.EXISTS,
-    };
   }
 
   async trash(id: Folder['id']): Promise<void> {

From a707cbc3fe3a3f404e4b56724ba0b8076297b6fd Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Fri, 22 Dec 2023 15:54:44 +0100
Subject: [PATCH 089/188] chore: version bump

---
 package.json             | 2 +-
 release/app/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e45027c46..75f7653f6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "author": "Internxt <hello@internxt.com>",
   "description": "Internxt Drive client UI",
   "license": "AGPL-3.0",
diff --git a/release/app/package.json b/release/app/package.json
index 7b17b894d..27ab2e60f 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "internxt-drive",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Internxt Drive client UI",
   "main": "./dist/main/main.js",
   "author": "Internxt <hello@internxt.com>",

From baa4ac110fcfa6e7242fb660b4a56885b29d80e9 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 27 Dec 2023 12:25:49 +0100
Subject: [PATCH 090/188] feat: rename

---
 .vscode/settings.json                         |  4 +-
 src/apps/fuse/FuseApp.ts                      | 46 ++-----------------
 src/apps/fuse/callbacks/RenameAndMove.ts      | 41 +++++++++++++++++
 .../DependencyContainerFactory.ts             |  8 ++--
 .../dependency-injection/common/clients.ts    |  2 +-
 .../fuse/dependency-injection/common/sdk.ts   |  4 +-
 .../files/FilesContainer.ts                   |  2 +
 .../dependency-injection/files/builder.ts     | 32 ++++++++++++-
 .../folders/FoldersContainer.ts               |  2 +
 .../dependency-injection/folders/builder.ts   | 32 +++++++++++++
 .../main/background-processes/sync-engine.ts  |  6 +--
 src/apps/main/main.ts                         |  1 +
 .../files/application/FilePathUpdater.ts      | 35 +++++++-------
 .../virtual-drive/files/domain/File.ts        |  3 ++
 .../events/FileRenameFailedDomainEvent.ts     | 44 ++++++++++++++++++
 .../events/FileRenameStartedDomainEvent.ts    | 34 ++++++++++++++
 .../domain/events/FileRenamedDomainEvent.ts   | 13 +++++-
 .../infrastructure/FuseLocalFileSystem.ts     | 23 ++++++++++
 .../folders/application/FolderRenamer.ts      | 21 +++++----
 .../events/FolderRenameStartedDomainEvent.ts  | 34 ++++++++++++++
 20 files changed, 305 insertions(+), 82 deletions(-)
 create mode 100644 src/apps/fuse/callbacks/RenameAndMove.ts
 create mode 100644 src/context/virtual-drive/files/domain/events/FileRenameFailedDomainEvent.ts
 create mode 100644 src/context/virtual-drive/files/domain/events/FileRenameStartedDomainEvent.ts
 create mode 100644 src/context/virtual-drive/files/infrastructure/FuseLocalFileSystem.ts
 create mode 100644 src/context/virtual-drive/folders/domain/events/FolderRenameStartedDomainEvent.ts

diff --git a/.vscode/settings.json b/.vscode/settings.json
index f5184f683..ea35a1c03 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -26,8 +26,8 @@
   "editor.formatOnSave": true,
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
-    "source.fixAll.format": true
+    "source.fixAll.eslint": "explicit",
+    "source.fixAll.format": "explicit"
   },
   "[jsonc]": {
     "editor.defaultFormatter": "vscode.json-language-features"
diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index 0fe806a7f..376af7caa 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -6,6 +6,7 @@ import { Readdir } from './callbacks/Readdir';
 import { Getattr } from './callbacks/Getattr';
 import { Open } from './callbacks/Open';
 import { Read } from './callbacks/Read';
+import { RenameOrMove } from './callbacks/RenameAndMove';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
@@ -32,38 +33,11 @@ export class FuseApp {
     const Chance = require('chance');
     const chance = new Chance();
 
-    const renameFile = async (src: string, dest: string) => {
-      const srcFile = this.files[src];
-
-      const destFile = { ...srcFile };
-
-      delete this.files[src];
-      this.files[dest] = destFile;
-
-      const oldPath = _path.join(this.paths.local, src);
-      const newPath = _path.join(this.paths.local, dest);
-
-      fs.renameSync(oldPath, newPath);
-    };
-
-    const renameFolder = async (src: string, dest: string) => {
-      const srcFolder = this.folders[src];
-
-      const destFolder = { ...srcFolder };
-
-      delete this.folders[src];
-      this.folders[dest] = destFolder;
-
-      const oldPath = _path.join(this.paths.local, src);
-      const newPath = _path.join(this.paths.local, dest);
-
-      fs.renameSync(oldPath, newPath);
-    };
-
     const readdir = new Readdir(this.container);
     const getattr = new Getattr(this.container);
     const open = new Open(this.container);
     const read = new Read(this.container);
+    const renameOrMove = new RenameOrMove(this.container);
 
     return {
       listxattr: (path: string, cb: (err: number, list?: string[]) => void) => {
@@ -83,21 +57,7 @@ export class FuseApp {
       readdir: readdir.execute.bind(readdir),
       open: open.execute.bind(open),
       read: read.execute.bind(read),
-      rename: async (src: string, dest: string, cb: any) => {
-        Logger.debug(`RENAME ${src} -> ${dest}`);
-        // ALSO HANDLES THE MOVE ACTION
-        if (this.files[src] !== undefined) {
-          await renameFile(src, dest);
-          cb(0);
-        }
-
-        if (this.folders[src] !== undefined) {
-          await renameFolder(src, dest);
-          cb(0);
-        }
-
-        return cb(fuse.ENOENT);
-      },
+      rename: renameOrMove.execute.bind(renameOrMove),
       create: async (path: string, mode: number, cb: any) => {
         Logger.debug(`CREATE ${path}`);
         this.files[path] = {
diff --git a/src/apps/fuse/callbacks/RenameAndMove.ts b/src/apps/fuse/callbacks/RenameAndMove.ts
new file mode 100644
index 000000000..0278d2966
--- /dev/null
+++ b/src/apps/fuse/callbacks/RenameAndMove.ts
@@ -0,0 +1,41 @@
+import { File } from '../../../context/virtual-drive/files/domain/File';
+import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { Folder } from '../../../context/virtual-drive/folders/domain/Folder';
+import { Callback } from './Callback';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const fuse = require('@gcas/fuse');
+
+export class RenameOrMove {
+  constructor(private readonly container: DependencyContainer) {}
+
+  private async findFile(path: string): Promise<File | undefined> {
+    const file = await this.container.filesSearcher.run({ path });
+
+    return file;
+  }
+
+  private async findFolder(path: string): Promise<Folder | undefined> {
+    const folder = await this.container.folderSearcher.run({ path });
+
+    return folder;
+  }
+
+  async execute(src: string, dest: string, cb: Callback) {
+    const file = await this.findFile(src);
+
+    if (file) {
+      await this.container.filePathUpdater.run(file.contentsId, dest);
+      return cb(0);
+    }
+
+    const folder = await this.findFolder(src);
+
+    if (folder) {
+      await this.container.folderPathUpdater.run(folder.uuid, dest);
+      return cb(0);
+    }
+
+    return cb(fuse.ENOENT);
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts b/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts
index cfbb63326..b29f829c4 100644
--- a/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts
+++ b/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts
@@ -27,13 +27,15 @@ export class DependencyContainerFactory {
 
     const tree = await treeContainer.existingNodesTreeBuilder.run();
 
+    const sharedContainer = await buildSharedContainer();
+
     const folderContainer = await buildFoldersContainer(tree.folders);
+    const contentsContainer = await buildContentsContainer();
     const filesContainer = await buildFilesContainer(
       tree.files,
-      folderContainer
+      folderContainer,
+      sharedContainer
     );
-    const contentsContainer = await buildContentsContainer();
-    const sharedContainer = await buildSharedContainer();
 
     const container = {
       ...treeContainer,
diff --git a/src/apps/fuse/dependency-injection/common/clients.ts b/src/apps/fuse/dependency-injection/common/clients.ts
index 61d2b7f88..fa31da77a 100644
--- a/src/apps/fuse/dependency-injection/common/clients.ts
+++ b/src/apps/fuse/dependency-injection/common/clients.ts
@@ -1,5 +1,5 @@
 import { AuthorizedClients } from '../../../shared/HttpClient/Clients';
-import { getClients } from '../../../shared/HttpClient/background-process-clients';
+import { getClients } from '../../../shared/HttpClient/main-process-client';
 
 export class DependencyInjectionHttpClientsProvider {
   private static clients: AuthorizedClients;
diff --git a/src/apps/fuse/dependency-injection/common/sdk.ts b/src/apps/fuse/dependency-injection/common/sdk.ts
index 84437b858..491940010 100644
--- a/src/apps/fuse/dependency-injection/common/sdk.ts
+++ b/src/apps/fuse/dependency-injection/common/sdk.ts
@@ -1,7 +1,7 @@
 import { Storage } from '@internxt/sdk/dist/drive/storage';
-import { ipcRenderer } from 'electron';
 import { onUserUnauthorized } from '../../../shared/HttpClient/background-process-clients';
 import packageJson from '../../../../../package.json';
+import { obtainToken } from '../../../main/auth/service';
 
 export class DependencyInjectionStorageSdk {
   private static sdk: Storage;
@@ -14,7 +14,7 @@ export class DependencyInjectionStorageSdk {
     const url = `${process.env.API_URL}/api`;
     const { name: clientName, version: clientVersion } = packageJson;
 
-    const token = await ipcRenderer.invoke('get-token');
+    const token = obtainToken('bearerToken');
 
     const sdk = Storage.client(
       url,
diff --git a/src/apps/fuse/dependency-injection/files/FilesContainer.ts b/src/apps/fuse/dependency-injection/files/FilesContainer.ts
index f45310bee..8bf90d51e 100644
--- a/src/apps/fuse/dependency-injection/files/FilesContainer.ts
+++ b/src/apps/fuse/dependency-injection/files/FilesContainer.ts
@@ -1,7 +1,9 @@
 import { FilesSearcher } from '../../../../context/virtual-drive/files/application/FilesSearcher';
 import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
+import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
 
 export interface FilesContainer {
   filesByFolderPathNameLister: FilesByFolderPathSearcher;
   filesSearcher: FilesSearcher;
+  filePathUpdater: FilePathUpdater;
 }
diff --git a/src/apps/fuse/dependency-injection/files/builder.ts b/src/apps/fuse/dependency-injection/files/builder.ts
index ff222e458..87e5ccd30 100644
--- a/src/apps/fuse/dependency-injection/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/files/builder.ts
@@ -1,17 +1,30 @@
+import crypt from '../../../../context/shared/infrastructure/crypt';
+import { FileFinderByContentsId } from '../../../../context/virtual-drive/files/application/FileFinderByContentsId';
+import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
 import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
 import { FilesSearcher } from '../../../../context/virtual-drive/files/application/FilesSearcher';
 import { RepositoryPopulator } from '../../../../context/virtual-drive/files/application/RepositoryPopulator';
 import { File } from '../../../../context/virtual-drive/files/domain/File';
+import { FuseLocalFileSystem } from '../../../../context/virtual-drive/files/infrastructure/FuseLocalFileSystem';
 import { InMemoryFileRepository } from '../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
+import { SDKRemoteFileSystem } from '../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
+import { DependencyInjectionEventBus } from '../common/eventBus';
+import { DependencyInjectionStorageSdk } from '../common/sdk';
+import { DependencyInjectionUserProvider } from '../common/user';
 import { FoldersContainer } from '../folders/FoldersContainer';
+import { SharedContainer } from '../shared/SharedContainer';
 import { FilesContainer } from './FilesContainer';
 
 export async function buildFilesContainer(
   initialFiles: Array<File>,
-  folderContainer: FoldersContainer
+  folderContainer: FoldersContainer,
+  sharedContainer: SharedContainer
 ): Promise<FilesContainer> {
   const repository = new InMemoryFileRepository();
 
+  const user = DependencyInjectionUserProvider.get();
+  const sdk = await DependencyInjectionStorageSdk.get();
+  const { bus: eventBus } = DependencyInjectionEventBus;
   const repositoryPopulator = new RepositoryPopulator(repository);
 
   await repositoryPopulator.run(initialFiles);
@@ -23,8 +36,25 @@ export async function buildFilesContainer(
 
   const filesSearcher = new FilesSearcher(repository);
 
+  const remoteFileSystem = new SDKRemoteFileSystem(sdk, crypt, user.bucket);
+  const localFileSystem = new FuseLocalFileSystem(
+    sharedContainer.relativePathToAbsoluteConverter
+  );
+
+  const fileFinderByContentsId = new FileFinderByContentsId(repository);
+
+  const filePathUpdater = new FilePathUpdater(
+    remoteFileSystem,
+    localFileSystem,
+    repository,
+    fileFinderByContentsId,
+    folderContainer.folderFinder,
+    eventBus
+  );
+
   return {
     filesByFolderPathNameLister,
     filesSearcher,
+    filePathUpdater,
   };
 }
diff --git a/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts b/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
index a87567c8e..3b1f49e1f 100644
--- a/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
+++ b/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
@@ -1,4 +1,5 @@
 import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
+import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
 import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
 import { FoldersByParentPathSearcher } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
 
@@ -6,4 +7,5 @@ export interface FoldersContainer {
   folderFinder: FolderFinder;
   folderSearcher: FolderSearcher;
   foldersByParentPathSearcher: FoldersByParentPathSearcher;
+  folderPathUpdater: FolderPathUpdater;
 }
diff --git a/src/apps/fuse/dependency-injection/folders/builder.ts b/src/apps/fuse/dependency-injection/folders/builder.ts
index 130dff0d0..6b453876e 100644
--- a/src/apps/fuse/dependency-injection/folders/builder.ts
+++ b/src/apps/fuse/dependency-injection/folders/builder.ts
@@ -1,15 +1,28 @@
 import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
+import { FolderMover } from '../../../../context/virtual-drive/folders/application/FolderMover';
+import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
+import { FolderRenamer } from '../../../../context/virtual-drive/folders/application/FolderRenamer';
 import { FolderRepositoryInitiator } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
 import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
 import { FoldersByParentPathSearcher } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
 import { Folder } from '../../../../context/virtual-drive/folders/domain/Folder';
+import { HttpRemoteFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
 import { InMemoryFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
+import { DependencyInjectionHttpClientsProvider } from '../common/clients';
+import { DependencyInjectionEventBus } from '../common/eventBus';
 import { FoldersContainer } from './FoldersContainer';
 
 export async function buildFoldersContainer(
   initialFolders: Array<Folder>
 ): Promise<FoldersContainer> {
   const repository = new InMemoryFolderRepository();
+  const clients = DependencyInjectionHttpClientsProvider.get();
+
+  const remoteFileSystem = new HttpRemoteFileSystem(
+    clients.drive,
+    clients.newDrive
+  );
+  const { bus: eventBus } = DependencyInjectionEventBus;
 
   const folderRepositoryInitiator = new FolderRepositoryInitiator(repository);
 
@@ -24,9 +37,28 @@ export async function buildFoldersContainer(
     repository
   );
 
+  const folderMover = new FolderMover(
+    repository,
+    remoteFileSystem,
+    folderFinder
+  );
+
+  const folderRenamer = new FolderRenamer(
+    repository,
+    remoteFileSystem,
+    eventBus
+  );
+
+  const folderPathUpdater = new FolderPathUpdater(
+    repository,
+    folderMover,
+    folderRenamer
+  );
+
   return {
     folderFinder,
     folderSearcher,
     foldersByParentPathSearcher,
+    folderPathUpdater,
   };
 }
diff --git a/src/apps/main/background-processes/sync-engine.ts b/src/apps/main/background-processes/sync-engine.ts
index 0149fcbb3..e7944fa6e 100644
--- a/src/apps/main/background-processes/sync-engine.ts
+++ b/src/apps/main/background-processes/sync-engine.ts
@@ -167,6 +167,6 @@ export function updateSyncEngine() {
   }
 }
 
-eventBus.on('USER_LOGGED_OUT', stopAndClearSyncEngineWatcher);
-eventBus.on('USER_WAS_UNAUTHORIZED', stopAndClearSyncEngineWatcher);
-eventBus.on('INITIAL_SYNC_READY', spawnSyncEngineWorker);
+// eventBus.on('USER_LOGGED_OUT', stopAndClearSyncEngineWatcher);
+// eventBus.on('USER_WAS_UNAUTHORIZED', stopAndClearSyncEngineWatcher);
+// eventBus.on('INITIAL_SYNC_READY', spawnSyncEngineWorker);
diff --git a/src/apps/main/main.ts b/src/apps/main/main.ts
index 29975eb81..0c3879c15 100644
--- a/src/apps/main/main.ts
+++ b/src/apps/main/main.ts
@@ -17,6 +17,7 @@ import './windows/settings';
 import './windows/process-issues';
 import './windows';
 import './background-processes/sync-engine';
+import '../fuse/index';
 import './background-processes/process-issues';
 import './device/handlers';
 import './usage/handlers';
diff --git a/src/context/virtual-drive/files/application/FilePathUpdater.ts b/src/context/virtual-drive/files/application/FilePathUpdater.ts
index 06896bed7..187b1faef 100644
--- a/src/context/virtual-drive/files/application/FilePathUpdater.ts
+++ b/src/context/virtual-drive/files/application/FilePathUpdater.ts
@@ -8,7 +8,8 @@ import { EventBus } from '../../shared/domain/EventBus';
 import { FileRepository } from '../domain/FileRepository';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
-import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
+import { FileRenameFailedDomainEvent } from '../domain/events/FileRenameFailedDomainEvent';
+import { FileRenameStartedDomainEvent } from '../domain/events/FileRenameStartedDomainEvent';
 
 export class FilePathUpdater {
   constructor(
@@ -17,11 +18,18 @@ export class FilePathUpdater {
     private readonly repository: FileRepository,
     private readonly fileFinderByContentsId: FileFinderByContentsId,
     private readonly folderFinder: FolderFinder,
-    private readonly ipc: SyncEngineIpc,
     private readonly eventBus: EventBus
   ) {}
 
   private async rename(file: File, path: FilePath) {
+    this.eventBus.publish([
+      new FileRenameStartedDomainEvent({
+        aggregateId: file.contentsId,
+        oldName: file.name,
+        nameWithExtension: path.nameWithExtension(),
+      }),
+    ]);
+
     file.rename(path);
 
     await this.remote.rename(file);
@@ -62,25 +70,20 @@ export class FilePathUpdater {
     });
 
     if (destinationFile) {
-      this.ipc.send('FILE_RENAME_ERROR', {
-        name: file.name,
-        extension: file.type,
-        nameWithExtension: file.nameWithExtension,
-        error: 'Renaming error: file already exists',
-      });
+      this.eventBus.publish([
+        new FileRenameFailedDomainEvent({
+          aggregateId: file.contentsId,
+          name: file.name,
+          extension: file.type,
+          nameWithExtension: file.nameWithExtension,
+          error: 'Renaming error: file already exists',
+        }),
+      ]);
       throw new FileAlreadyExistsError(destination.name());
     }
 
     if (destination.extensionMatch(file.type)) {
-      this.ipc.send('FILE_RENAMING', {
-        oldName: file.name,
-        nameWithExtension: destination.nameWithExtension(),
-      });
       await this.rename(file, destination);
-      this.ipc.send('FILE_RENAMED', {
-        oldName: file.name,
-        nameWithExtension: destination.nameWithExtension(),
-      });
       return;
     }
 
diff --git a/src/context/virtual-drive/files/domain/File.ts b/src/context/virtual-drive/files/domain/File.ts
index e95236db2..68a827dfb 100644
--- a/src/context/virtual-drive/files/domain/File.ts
+++ b/src/context/virtual-drive/files/domain/File.ts
@@ -155,6 +155,8 @@ export class File extends AggregateRoot {
   }
 
   rename(newPath: FilePath) {
+    const currentName = this.name;
+
     if (!this._path.hasSameDirname(newPath)) {
       throw new FileActionOnlyCanAffectOneLevelError('rename');
     }
@@ -172,6 +174,7 @@ export class File extends AggregateRoot {
     this.record(
       new FileRenamedDomainEvent({
         aggregateId: this.contentsId,
+        oldName: currentName,
       })
     );
   }
diff --git a/src/context/virtual-drive/files/domain/events/FileRenameFailedDomainEvent.ts b/src/context/virtual-drive/files/domain/events/FileRenameFailedDomainEvent.ts
new file mode 100644
index 000000000..a5ac2a3d2
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/events/FileRenameFailedDomainEvent.ts
@@ -0,0 +1,44 @@
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
+
+export class FileRenameFailedDomainEvent extends DomainEvent {
+  static readonly EVENT_NAME = 'file.rename.failed';
+
+  private name: string;
+  private extension: string;
+  private nameWithExtension: string;
+  private error: string;
+
+  constructor({
+    aggregateId,
+    name,
+    extension,
+    nameWithExtension,
+    error,
+  }: {
+    aggregateId: string;
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    error: string;
+  }) {
+    super({
+      eventName: FileRenameFailedDomainEvent.EVENT_NAME,
+      aggregateId,
+    });
+
+    this.name = name;
+    this.extension = extension;
+    this.nameWithExtension = nameWithExtension;
+    this.error = error;
+  }
+
+  toPrimitives() {
+    return {
+      contentsId: this.aggregateId,
+      name: this.name,
+      extension: this.extension,
+      nameWithExtension: this.nameWithExtension,
+      error: this.error,
+    };
+  }
+}
diff --git a/src/context/virtual-drive/files/domain/events/FileRenameStartedDomainEvent.ts b/src/context/virtual-drive/files/domain/events/FileRenameStartedDomainEvent.ts
new file mode 100644
index 000000000..b7e02f10a
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/events/FileRenameStartedDomainEvent.ts
@@ -0,0 +1,34 @@
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
+
+export class FileRenameStartedDomainEvent extends DomainEvent {
+  static readonly EVENT_NAME = 'file.rename.started';
+
+  private oldName: string;
+  private nameWithExtension: string;
+
+  constructor({
+    aggregateId,
+    oldName,
+    nameWithExtension,
+  }: {
+    aggregateId: string;
+    oldName: string;
+    nameWithExtension: string;
+  }) {
+    super({
+      eventName: FileRenameStartedDomainEvent.EVENT_NAME,
+      aggregateId,
+    });
+
+    this.oldName = oldName;
+    this.nameWithExtension = nameWithExtension;
+  }
+
+  toPrimitives() {
+    return {
+      contentsId: this.aggregateId,
+      oldName: this.oldName,
+      nameWithExtension: this.nameWithExtension,
+    };
+  }
+}
diff --git a/src/context/virtual-drive/files/domain/events/FileRenamedDomainEvent.ts b/src/context/virtual-drive/files/domain/events/FileRenamedDomainEvent.ts
index 7e77db845..a8d63c1fa 100644
--- a/src/context/virtual-drive/files/domain/events/FileRenamedDomainEvent.ts
+++ b/src/context/virtual-drive/files/domain/events/FileRenamedDomainEvent.ts
@@ -3,16 +3,27 @@ import { DomainEvent } from '../../../../shared/domain/DomainEvent';
 export class FileRenamedDomainEvent extends DomainEvent {
   static readonly EVENT_NAME = 'file.renamed';
 
-  constructor({ aggregateId }: { aggregateId: string }) {
+  private oldName: string;
+
+  constructor({
+    aggregateId,
+    oldName,
+  }: {
+    aggregateId: string;
+    oldName: string;
+  }) {
     super({
       eventName: FileRenamedDomainEvent.EVENT_NAME,
       aggregateId,
     });
+
+    this.oldName = oldName;
   }
 
   toPrimitives() {
     return {
       contentsId: this.aggregateId,
+      oldName: this.oldName,
     };
   }
 }
diff --git a/src/context/virtual-drive/files/infrastructure/FuseLocalFileSystem.ts b/src/context/virtual-drive/files/infrastructure/FuseLocalFileSystem.ts
new file mode 100644
index 000000000..09c5d2d72
--- /dev/null
+++ b/src/context/virtual-drive/files/infrastructure/FuseLocalFileSystem.ts
@@ -0,0 +1,23 @@
+import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
+import { File } from '../domain/File';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+import fs from 'fs/promises';
+
+export class FuseLocalFileSystem implements LocalFileSystem {
+  constructor(
+    private readonly relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter
+  ) {}
+  async createPlaceHolder(_file: File): Promise<void> {
+    // no-op
+  }
+
+  async getLocalFileId(file: File): Promise<`${string}-${string}`> {
+    const win32AbsolutePath = this.relativePathToAbsoluteConverter.run(
+      file.path
+    );
+
+    const { ino, dev } = await fs.stat(win32AbsolutePath);
+
+    return `${dev}-${ino}`;
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/FolderRenamer.ts b/src/context/virtual-drive/folders/application/FolderRenamer.ts
index 8304e025c..330e742ab 100644
--- a/src/context/virtual-drive/folders/application/FolderRenamer.ts
+++ b/src/context/virtual-drive/folders/application/FolderRenamer.ts
@@ -2,29 +2,30 @@ import { FolderPath } from '../domain/FolderPath';
 import { Folder } from '../domain/Folder';
 import { FolderRepository } from '../domain/FolderRepository';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
-import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
+import { EventBus } from '../../shared/domain/EventBus';
+import { FolderRenameStartedDomainEvent } from '../domain/events/FolderRenameStartedDomainEvent';
 
 export class FolderRenamer {
   constructor(
     private readonly repository: FolderRepository,
     private readonly remote: RemoteFileSystem,
-    private readonly ipc: SyncEngineIpc
+    private readonly eventBus: EventBus
   ) {}
 
   async run(folder: Folder, destination: FolderPath) {
-    this.ipc.send('FOLDER_RENAMING', {
-      oldName: folder.name,
-      newName: destination.name(),
-    });
+    this.eventBus.publish([
+      new FolderRenameStartedDomainEvent({
+        aggregateId: folder.uuid,
+        oldName: folder.name,
+        newName: destination.name(),
+      }),
+    ]);
 
     folder.rename(destination);
 
     await this.remote.rename(folder);
     await this.repository.update(folder);
 
-    this.ipc.send('FOLDER_RENAMED', {
-      oldName: folder.name,
-      newName: destination.name(),
-    });
+    this.eventBus.publish(folder.pullDomainEvents());
   }
 }
diff --git a/src/context/virtual-drive/folders/domain/events/FolderRenameStartedDomainEvent.ts b/src/context/virtual-drive/folders/domain/events/FolderRenameStartedDomainEvent.ts
new file mode 100644
index 000000000..4aa1332f8
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/events/FolderRenameStartedDomainEvent.ts
@@ -0,0 +1,34 @@
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
+
+export class FolderRenameStartedDomainEvent extends DomainEvent {
+  static readonly EVENT_NAME = 'file.rename.started';
+
+  private oldName: string;
+  private newName: string;
+
+  constructor({
+    aggregateId,
+    oldName,
+    newName,
+  }: {
+    aggregateId: string;
+    oldName: string;
+    newName: string;
+  }) {
+    super({
+      eventName: FolderRenameStartedDomainEvent.EVENT_NAME,
+      aggregateId,
+    });
+
+    this.oldName = oldName;
+    this.newName = newName;
+  }
+
+  toPrimitives() {
+    return {
+      contentsId: this.aggregateId,
+      oldName: this.oldName,
+      newName: this.newName,
+    };
+  }
+}

From cffe8819bc01dfd2bc51720d3bf3afff51303216 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 27 Dec 2023 12:27:06 +0100
Subject: [PATCH 091/188] chore: rename

---
 src/apps/fuse/FuseApp.ts                                 | 4 ++--
 src/apps/fuse/callbacks/{Getattr.ts => GetAttributes.ts} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/apps/fuse/callbacks/{Getattr.ts => GetAttributes.ts} (96%)

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index 376af7caa..e27bf9521 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -3,7 +3,7 @@ import _path from 'path';
 import Logger from 'electron-log';
 import { DependencyContainer } from './dependency-injection/DependencyContainer';
 import { Readdir } from './callbacks/Readdir';
-import { Getattr } from './callbacks/Getattr';
+import { GetAttributes } from './callbacks/GetAttributes';
 import { Open } from './callbacks/Open';
 import { Read } from './callbacks/Read';
 import { RenameOrMove } from './callbacks/RenameAndMove';
@@ -34,7 +34,7 @@ export class FuseApp {
     const chance = new Chance();
 
     const readdir = new Readdir(this.container);
-    const getattr = new Getattr(this.container);
+    const getattr = new GetAttributes(this.container);
     const open = new Open(this.container);
     const read = new Read(this.container);
     const renameOrMove = new RenameOrMove(this.container);
diff --git a/src/apps/fuse/callbacks/Getattr.ts b/src/apps/fuse/callbacks/GetAttributes.ts
similarity index 96%
rename from src/apps/fuse/callbacks/Getattr.ts
rename to src/apps/fuse/callbacks/GetAttributes.ts
index 4916c3fae..208cffc58 100644
--- a/src/apps/fuse/callbacks/Getattr.ts
+++ b/src/apps/fuse/callbacks/GetAttributes.ts
@@ -4,7 +4,7 @@ import { Callback } from './Callback';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
 
-export class Getattr {
+export class GetAttributes {
   constructor(private readonly container: DependencyContainer) {}
 
   async execute(path: string, cb: Callback): Promise<void> {

From 4fd759a954ac329715aaf4ef92b9cd8d198c511c Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 27 Dec 2023 12:35:24 +0100
Subject: [PATCH 092/188] chore: x attributes callbacks

---
 src/apps/fuse/FuseApp.ts                   | 19 ++++++-------------
 src/apps/fuse/callbacks/GetXAttribute.ts   | 18 ++++++++++++++++++
 src/apps/fuse/callbacks/ListXAttributes.ts |  9 +++++++++
 3 files changed, 33 insertions(+), 13 deletions(-)
 create mode 100644 src/apps/fuse/callbacks/GetXAttribute.ts
 create mode 100644 src/apps/fuse/callbacks/ListXAttributes.ts

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index e27bf9521..3ad491e9d 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -7,6 +7,8 @@ import { GetAttributes } from './callbacks/GetAttributes';
 import { Open } from './callbacks/Open';
 import { Read } from './callbacks/Read';
 import { RenameOrMove } from './callbacks/RenameAndMove';
+import { ListXAttributes } from './callbacks/ListXAttributes';
+import { GetXAttribute } from './callbacks/GetXAttribute';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
@@ -33,6 +35,8 @@ export class FuseApp {
     const Chance = require('chance');
     const chance = new Chance();
 
+    const listXAttributes = new ListXAttributes();
+    const getXAttribute = new GetXAttribute();
     const readdir = new Readdir(this.container);
     const getattr = new GetAttributes(this.container);
     const open = new Open(this.container);
@@ -40,19 +44,8 @@ export class FuseApp {
     const renameOrMove = new RenameOrMove(this.container);
 
     return {
-      listxattr: (path: string, cb: (err: number, list?: string[]) => void) => {
-        cb(0, []);
-      },
-      getxattr: (
-        path: string,
-        name: string,
-        size: number,
-        cb: (err: number, data: Buffer) => void
-      ) => {
-        Logger.debug('GETXATTR', path, name, size, cb);
-        const buff = Buffer.from('in sync');
-        cb(0, buff);
-      },
+      listxattr: listXAttributes.execute.bind(listXAttributes),
+      getxattr: getXAttribute.export.bind(getXAttribute),
       getattr: getattr.execute.bind(getattr),
       readdir: readdir.execute.bind(readdir),
       open: open.execute.bind(open),
diff --git a/src/apps/fuse/callbacks/GetXAttribute.ts b/src/apps/fuse/callbacks/GetXAttribute.ts
new file mode 100644
index 000000000..4b19bff35
--- /dev/null
+++ b/src/apps/fuse/callbacks/GetXAttribute.ts
@@ -0,0 +1,18 @@
+import Logger from 'electron-log';
+import { TypedCallback } from './Callback';
+
+type GetXAttributeCallback = TypedCallback<Buffer>;
+
+export class GetXAttribute {
+  async export(
+    path: string,
+    name: string,
+    size: string,
+    cb: GetXAttributeCallback
+  ): Promise<void> {
+    Logger.debug('GETXATTR', path, name, size, cb);
+
+    const buff = Buffer.from('in sync');
+    cb(0, buff);
+  }
+}
diff --git a/src/apps/fuse/callbacks/ListXAttributes.ts b/src/apps/fuse/callbacks/ListXAttributes.ts
new file mode 100644
index 000000000..69a7f33bc
--- /dev/null
+++ b/src/apps/fuse/callbacks/ListXAttributes.ts
@@ -0,0 +1,9 @@
+import { TypedCallback } from './Callback';
+
+type ListXAttributesCallback = TypedCallback<Array<string>>;
+
+export class ListXAttributes {
+  async execute(_path: string, cb: ListXAttributesCallback): Promise<void> {
+    cb(0, []);
+  }
+}

From 5a2e8a2cdc287b682680f750aa7bbb276927fef2 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 27 Dec 2023 13:02:34 +0100
Subject: [PATCH 093/188] feat: create callback

---
 src/apps/fuse/FuseApp.ts                      | 17 +---
 src/apps/fuse/callbacks/Create.ts             | 21 +++++
 .../DependencyContainerFactory.ts             |  2 +-
 .../boundaryBridge/BoundaryBridgeContainer.ts |  5 ++
 .../boundaryBridge/builder.ts                 | 19 ++++
 .../contents/ContentsContainer.ts             |  2 +
 .../dependency-injection/contents/builder.ts  | 19 +++-
 .../files/FilesContainer.ts                   |  4 +
 .../dependency-injection/files/builder.ts     | 30 ++++++-
 .../folders/FoldersContainer.ts               |  2 +
 .../dependency-injection/folders/builder.ts   |  6 ++
 .../contents/application/ContentsUploader.ts  | 86 +++++++++----------
 .../files/application/FileCreator.ts          | 30 +++----
 .../files/application/FileDeleter.ts          | 56 ++++++------
 14 files changed, 191 insertions(+), 108 deletions(-)
 create mode 100644 src/apps/fuse/callbacks/Create.ts
 create mode 100644 src/apps/fuse/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/boundaryBridge/builder.ts

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index 3ad491e9d..42f6b3ec4 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -9,6 +9,7 @@ import { Read } from './callbacks/Read';
 import { RenameOrMove } from './callbacks/RenameAndMove';
 import { ListXAttributes } from './callbacks/ListXAttributes';
 import { GetXAttribute } from './callbacks/GetXAttribute';
+import { Create } from './callbacks/Create';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
@@ -31,10 +32,6 @@ export class FuseApp {
   }
 
   private getOpt() {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const Chance = require('chance');
-    const chance = new Chance();
-
     const listXAttributes = new ListXAttributes();
     const getXAttribute = new GetXAttribute();
     const readdir = new Readdir(this.container);
@@ -42,6 +39,7 @@ export class FuseApp {
     const open = new Open(this.container);
     const read = new Read(this.container);
     const renameOrMove = new RenameOrMove(this.container);
+    const create = new Create(this.container);
 
     return {
       listxattr: listXAttributes.execute.bind(listXAttributes),
@@ -51,16 +49,7 @@ export class FuseApp {
       open: open.execute.bind(open),
       read: read.execute.bind(read),
       rename: renameOrMove.execute.bind(renameOrMove),
-      create: async (path: string, mode: number, cb: any) => {
-        Logger.debug(`CREATE ${path}`);
-        this.files[path] = {
-          uid: chance.integer({ min: 100 }),
-          gid: chance.integer({ min: 100 }),
-          mode: 33188,
-        };
-
-        cb(0);
-      },
+      create: create.execute.bind(create),
       write: (
         path: string,
         fd: string,
diff --git a/src/apps/fuse/callbacks/Create.ts b/src/apps/fuse/callbacks/Create.ts
new file mode 100644
index 000000000..8e65a61c7
--- /dev/null
+++ b/src/apps/fuse/callbacks/Create.ts
@@ -0,0 +1,21 @@
+import Logger from 'electron-log';
+import { TypedCallback } from './Callback';
+import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+
+type CreateCallback = TypedCallback<never>;
+
+export class Create {
+  constructor(private readonly container: DependencyContainer) {}
+
+  async execute(
+    path: string,
+    _mode: number,
+    cb: CreateCallback
+  ): Promise<void> {
+    Logger.debug(`CREATE ${path}`);
+
+    await this.container.retryContentsUploader.run(path);
+
+    cb(0);
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts b/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts
index b29f829c4..3391393a9 100644
--- a/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts
+++ b/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts
@@ -30,7 +30,7 @@ export class DependencyContainerFactory {
     const sharedContainer = await buildSharedContainer();
 
     const folderContainer = await buildFoldersContainer(tree.folders);
-    const contentsContainer = await buildContentsContainer();
+    const contentsContainer = await buildContentsContainer(sharedContainer);
     const filesContainer = await buildFilesContainer(
       tree.files,
       folderContainer,
diff --git a/src/apps/fuse/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts b/src/apps/fuse/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts
new file mode 100644
index 000000000..a885d570f
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts
@@ -0,0 +1,5 @@
+import { FileCreationOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
+
+export interface BoundaryBridgeContainer {
+  fileCreationOrchestrator: FileCreationOrchestrator;
+}
diff --git a/src/apps/fuse/dependency-injection/boundaryBridge/builder.ts b/src/apps/fuse/dependency-injection/boundaryBridge/builder.ts
new file mode 100644
index 000000000..1c2f850a2
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/boundaryBridge/builder.ts
@@ -0,0 +1,19 @@
+import { BoundaryBridgeContainer } from './BoundaryBridgeContainer';
+import { ContentsContainer } from '../contents/ContentsContainer';
+import { FilesContainer } from '../files/FilesContainer';
+import { FileCreationOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
+
+export function buildBoundaryBridgeContainer(
+  contentsContainer: ContentsContainer,
+  filesContainer: FilesContainer
+): BoundaryBridgeContainer {
+  const fileCreationOrchestrator = new FileCreationOrchestrator(
+    contentsContainer.retryContentsUploader,
+    filesContainer.fileCreator,
+    filesContainer.sameFileWasMoved
+  );
+
+  return {
+    fileCreationOrchestrator,
+  };
+}
diff --git a/src/apps/fuse/dependency-injection/contents/ContentsContainer.ts b/src/apps/fuse/dependency-injection/contents/ContentsContainer.ts
index da7c526e2..170f83ac7 100644
--- a/src/apps/fuse/dependency-injection/contents/ContentsContainer.ts
+++ b/src/apps/fuse/dependency-injection/contents/ContentsContainer.ts
@@ -1,7 +1,9 @@
 import { DownloadContentsToPlainFile } from '../../../../context/virtual-drive/contents/application/DownloadContentsToPlainFile';
 import { LocalContentChecker } from '../../../../context/virtual-drive/contents/application/LocalContentChecker';
+import { RetryContentsUploader } from '../../../../context/virtual-drive/contents/application/RetryContentsUploader';
 
 export interface ContentsContainer {
+  retryContentsUploader: RetryContentsUploader;
   downloadContentsToPlainFile: DownloadContentsToPlainFile;
   localContentChecker: LocalContentChecker;
 }
diff --git a/src/apps/fuse/dependency-injection/contents/builder.ts b/src/apps/fuse/dependency-injection/contents/builder.ts
index 201f53847..3c887223a 100644
--- a/src/apps/fuse/dependency-injection/contents/builder.ts
+++ b/src/apps/fuse/dependency-injection/contents/builder.ts
@@ -8,8 +8,14 @@ import { FSLocalFileSystem } from '../../../../context/virtual-drive/contents/in
 import { DependencyInjectionEventBus } from '../common/eventBus';
 import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
 import { LocalContentChecker } from '../../../../context/virtual-drive/contents/application/LocalContentChecker';
-
-export async function buildContentsContainer(): Promise<ContentsContainer> {
+import { RetryContentsUploader } from '../../../../context/virtual-drive/contents/application/RetryContentsUploader';
+import { ContentsUploader } from '../../../../context/virtual-drive/contents/application/ContentsUploader';
+import { FSLocalFileProvider } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileProvider';
+import { SharedContainer } from '../shared/SharedContainer';
+
+export async function buildContentsContainer(
+  sharedContainer: SharedContainer
+): Promise<ContentsContainer> {
   const user = DependencyInjectionUserProvider.get();
   const mnemonic = DependencyInjectionMnemonicProvider.get();
   const { bus: eventBus } = DependencyInjectionEventBus;
@@ -40,8 +46,17 @@ export async function buildContentsContainer(): Promise<ContentsContainer> {
 
   const localContentChecker = new LocalContentChecker(localFS);
 
+  const contentsUploader = new ContentsUploader(
+    contentsManagerFactory,
+    new FSLocalFileProvider(),
+    sharedContainer.relativePathToAbsoluteConverter
+  );
+
+  const retryContentsUploader = new RetryContentsUploader(contentsUploader);
+
   return {
     downloadContentsToPlainFile,
     localContentChecker,
+    retryContentsUploader,
   };
 }
diff --git a/src/apps/fuse/dependency-injection/files/FilesContainer.ts b/src/apps/fuse/dependency-injection/files/FilesContainer.ts
index 8bf90d51e..ee037577c 100644
--- a/src/apps/fuse/dependency-injection/files/FilesContainer.ts
+++ b/src/apps/fuse/dependency-injection/files/FilesContainer.ts
@@ -1,9 +1,13 @@
 import { FilesSearcher } from '../../../../context/virtual-drive/files/application/FilesSearcher';
 import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
 import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
+import { FileCreator } from '../../../../context/virtual-drive/files/application/FileCreator';
+import { SameFileWasMoved } from '../../../../context/virtual-drive/files/application/SameFileWasMoved';
 
 export interface FilesContainer {
   filesByFolderPathNameLister: FilesByFolderPathSearcher;
   filesSearcher: FilesSearcher;
   filePathUpdater: FilePathUpdater;
+  fileCreator: FileCreator;
+  sameFileWasMoved: SameFileWasMoved;
 }
diff --git a/src/apps/fuse/dependency-injection/files/builder.ts b/src/apps/fuse/dependency-injection/files/builder.ts
index 87e5ccd30..28d8ecec4 100644
--- a/src/apps/fuse/dependency-injection/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/files/builder.ts
@@ -1,14 +1,18 @@
 import crypt from '../../../../context/shared/infrastructure/crypt';
+import { FileCreator } from '../../../../context/virtual-drive/files/application/FileCreator';
+import { FileDeleter } from '../../../../context/virtual-drive/files/application/FileDeleter';
 import { FileFinderByContentsId } from '../../../../context/virtual-drive/files/application/FileFinderByContentsId';
 import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
 import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
 import { FilesSearcher } from '../../../../context/virtual-drive/files/application/FilesSearcher';
 import { RepositoryPopulator } from '../../../../context/virtual-drive/files/application/RepositoryPopulator';
+import { SameFileWasMoved } from '../../../../context/virtual-drive/files/application/SameFileWasMoved';
 import { File } from '../../../../context/virtual-drive/files/domain/File';
 import { FuseLocalFileSystem } from '../../../../context/virtual-drive/files/infrastructure/FuseLocalFileSystem';
 import { InMemoryFileRepository } from '../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
 import { SDKRemoteFileSystem } from '../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
 import { DependencyInjectionEventBus } from '../common/eventBus';
+import { DependencyInjectionEventRepository } from '../common/eventRepository';
 import { DependencyInjectionStorageSdk } from '../common/sdk';
 import { DependencyInjectionUserProvider } from '../common/user';
 import { FoldersContainer } from '../folders/FoldersContainer';
@@ -21,10 +25,11 @@ export async function buildFilesContainer(
   sharedContainer: SharedContainer
 ): Promise<FilesContainer> {
   const repository = new InMemoryFileRepository();
-
+  const eventRepository = DependencyInjectionEventRepository.get();
   const user = DependencyInjectionUserProvider.get();
   const sdk = await DependencyInjectionStorageSdk.get();
   const { bus: eventBus } = DependencyInjectionEventBus;
+
   const repositoryPopulator = new RepositoryPopulator(repository);
 
   await repositoryPopulator.run(initialFiles);
@@ -52,9 +57,32 @@ export async function buildFilesContainer(
     eventBus
   );
 
+  const sameFileWasMoved = new SameFileWasMoved(
+    repository,
+    localFileSystem,
+    eventRepository
+  );
+
+  const fileDeleter = new FileDeleter(
+    remoteFileSystem,
+    localFileSystem,
+    repository,
+    folderContainer.allParentFoldersStatusIsExists
+  );
+
+  const fileCreator = new FileCreator(
+    remoteFileSystem,
+    repository,
+    folderContainer.folderFinder,
+    fileDeleter,
+    eventBus
+  );
+
   return {
     filesByFolderPathNameLister,
     filesSearcher,
     filePathUpdater,
+    sameFileWasMoved,
+    fileCreator,
   };
 }
diff --git a/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts b/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
index 3b1f49e1f..5bf68ca19 100644
--- a/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
+++ b/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
@@ -1,3 +1,4 @@
+import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
 import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
 import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
@@ -8,4 +9,5 @@ export interface FoldersContainer {
   folderSearcher: FolderSearcher;
   foldersByParentPathSearcher: FoldersByParentPathSearcher;
   folderPathUpdater: FolderPathUpdater;
+  allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
 }
diff --git a/src/apps/fuse/dependency-injection/folders/builder.ts b/src/apps/fuse/dependency-injection/folders/builder.ts
index 6b453876e..ed6d94bea 100644
--- a/src/apps/fuse/dependency-injection/folders/builder.ts
+++ b/src/apps/fuse/dependency-injection/folders/builder.ts
@@ -1,3 +1,4 @@
+import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
 import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderMover } from '../../../../context/virtual-drive/folders/application/FolderMover';
 import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
@@ -55,10 +56,15 @@ export async function buildFoldersContainer(
     folderRenamer
   );
 
+  const allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
+    repository
+  );
+
   return {
     folderFinder,
     folderSearcher,
     foldersByParentPathSearcher,
     folderPathUpdater,
+    allParentFoldersStatusIsExists,
   };
 }
diff --git a/src/context/virtual-drive/contents/application/ContentsUploader.ts b/src/context/virtual-drive/contents/application/ContentsUploader.ts
index 3bd65c842..15f1247e7 100644
--- a/src/context/virtual-drive/contents/application/ContentsUploader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsUploader.ts
@@ -1,63 +1,59 @@
-import { ContentFileUploader } from '../domain/contentHandlers/ContentFileUploader';
 import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
 import { LocalContentsProvider } from '../domain/LocalFileProvider';
 import { RemoteFileContents } from '../domain/RemoteFileContents';
-import { LocalFileContents } from '../domain/LocalFileContents';
 import { PlatformPathConverter } from '../../shared/application/PlatformPathConverter';
 import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
-import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 
 export class ContentsUploader {
   constructor(
     private readonly remoteContentsManagersFactory: ContentsManagersFactory,
     private readonly contentProvider: LocalContentsProvider,
-    private readonly ipc: SyncEngineIpc,
     private readonly relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter
   ) {}
 
-  private registerEvents(
-    uploader: ContentFileUploader,
-    localFileContents: LocalFileContents
-  ) {
-    uploader.on('start', () => {
-      this.ipc.send('FILE_UPLOADING', {
-        name: localFileContents.name,
-        extension: localFileContents.extension,
-        nameWithExtension: localFileContents.nameWithExtension,
-        size: localFileContents.size,
-        processInfo: { elapsedTime: uploader.elapsedTime() },
-      });
-    });
+  // private registerEvents(
+  //   uploader: ContentFileUploader,
+  //   localFileContents: LocalFileContents
+  // ) {
+  //   uploader.on('start', () => {
+  //     this.ipc.send('FILE_UPLOADING', {
+  //       name: localFileContents.name,
+  //       extension: localFileContents.extension,
+  //       nameWithExtension: localFileContents.nameWithExtension,
+  //       size: localFileContents.size,
+  //       processInfo: { elapsedTime: uploader.elapsedTime() },
+  //     });
+  //   });
 
-    uploader.on('progress', (progress: number) => {
-      this.ipc.send('FILE_UPLOADING', {
-        name: localFileContents.name,
-        extension: localFileContents.extension,
-        nameWithExtension: localFileContents.nameWithExtension,
-        size: localFileContents.size,
-        processInfo: { elapsedTime: uploader.elapsedTime(), progress },
-      });
-    });
+  //   uploader.on('progress', (progress: number) => {
+  //     this.ipc.send('FILE_UPLOADING', {
+  //       name: localFileContents.name,
+  //       extension: localFileContents.extension,
+  //       nameWithExtension: localFileContents.nameWithExtension,
+  //       size: localFileContents.size,
+  //       processInfo: { elapsedTime: uploader.elapsedTime(), progress },
+  //     });
+  //   });
 
-    uploader.on('error', (error: Error) => {
-      this.ipc.send('FILE_UPLOAD_ERROR', {
-        name: localFileContents.name,
-        extension: localFileContents.extension,
-        nameWithExtension: localFileContents.nameWithExtension,
-        error: error.message,
-      });
-    });
+  //   uploader.on('error', (error: Error) => {
+  //     this.ipc.send('FILE_UPLOAD_ERROR', {
+  //       name: localFileContents.name,
+  //       extension: localFileContents.extension,
+  //       nameWithExtension: localFileContents.nameWithExtension,
+  //       error: error.message,
+  //     });
+  //   });
 
-    uploader.on('finish', () => {
-      this.ipc.send('FILE_UPLOADED', {
-        name: localFileContents.name,
-        extension: localFileContents.extension,
-        nameWithExtension: localFileContents.nameWithExtension,
-        size: localFileContents.size,
-        processInfo: { elapsedTime: uploader.elapsedTime() },
-      });
-    });
-  }
+  //   uploader.on('finish', () => {
+  //     this.ipc.send('FILE_UPLOADED', {
+  //       name: localFileContents.name,
+  //       extension: localFileContents.extension,
+  //       nameWithExtension: localFileContents.nameWithExtension,
+  //       size: localFileContents.size,
+  //       processInfo: { elapsedTime: uploader.elapsedTime() },
+  //     });
+  //   });
+  // }
 
   async run(posixRelativePath: string): Promise<RemoteFileContents> {
     const win32RelativePath =
@@ -75,7 +71,7 @@ export class ContentsUploader {
       abortSignal
     );
 
-    this.registerEvents(uploader, contents);
+    // this.registerEvents(uploader, contents);
 
     const contentsId = await uploader.upload(contents.stream, contents.size);
 
diff --git a/src/context/virtual-drive/files/application/FileCreator.ts b/src/context/virtual-drive/files/application/FileCreator.ts
index 9515a6fbd..370a52d41 100644
--- a/src/context/virtual-drive/files/application/FileCreator.ts
+++ b/src/context/virtual-drive/files/application/FileCreator.ts
@@ -9,7 +9,6 @@ import { PlatformPathConverter } from '../../shared/application/PlatformPathConv
 import { FileRepository } from '../domain/FileRepository';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 import { OfflineFile } from '../domain/OfflineFile';
-import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 
 export class FileCreator {
   constructor(
@@ -17,8 +16,7 @@ export class FileCreator {
     private readonly repository: FileRepository,
     private readonly folderFinder: FolderFinder,
     private readonly fileDeleter: FileDeleter,
-    private readonly eventBus: EventBus,
-    private readonly ipc: SyncEngineIpc
+    private readonly eventBus: EventBus
   ) {}
 
   async run(filePath: FilePath, contents: RemoteFileContents): Promise<File> {
@@ -43,22 +41,22 @@ export class FileCreator {
       await this.repository.add(file);
 
       await this.eventBus.publish(offline.pullDomainEvents());
-      this.ipc.send('FILE_CREATED', {
-        name: file.name,
-        extension: file.type,
-        nameWithExtension: file.nameWithExtension,
-      });
+      // this.ipc.send('FILE_CREATED', {
+      //   name: file.name,
+      //   extension: file.type,
+      //   nameWithExtension: file.nameWithExtension,
+      // });
 
       return file;
     } catch (error: unknown) {
-      const message = error instanceof Error ? error.message : 'unknown error';
-
-      this.ipc.send('FILE_UPLOAD_ERROR', {
-        name: filePath.name(),
-        extension: filePath.extension(),
-        nameWithExtension: filePath.nameWithExtension(),
-        error: message,
-      });
+      const _message = error instanceof Error ? error.message : 'unknown error';
+
+      // this.ipc.send('FILE_UPLOAD_ERROR', {
+      //   name: filePath.name(),
+      //   extension: filePath.extension(),
+      //   nameWithExtension: filePath.nameWithExtension(),
+      //   error: message,
+      // });
       throw error;
     }
   }
diff --git a/src/context/virtual-drive/files/application/FileDeleter.ts b/src/context/virtual-drive/files/application/FileDeleter.ts
index 59a32e25b..9e2159041 100644
--- a/src/context/virtual-drive/files/application/FileDeleter.ts
+++ b/src/context/virtual-drive/files/application/FileDeleter.ts
@@ -5,15 +5,13 @@ import { File } from '../domain/File';
 import { FileRepository } from '../domain/FileRepository';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
-import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 
 export class FileDeleter {
   constructor(
     private readonly remote: RemoteFileSystem,
     private readonly local: LocalFileSystem,
     private readonly repository: FileRepository,
-    private readonly allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists,
-    private readonly ipc: SyncEngineIpc
+    private readonly allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists
   ) {}
 
   async run(contentsId: File['contentsId']): Promise<void> {
@@ -39,12 +37,12 @@ export class FileDeleter {
       return;
     }
 
-    this.ipc.send('FILE_DELETING', {
-      name: file.name,
-      extension: file.type,
-      nameWithExtension: file.nameWithExtension,
-      size: file.size,
-    });
+    // this.ipc.send('FILE_DELETING', {
+    //   name: file.name,
+    //   extension: file.type,
+    //   nameWithExtension: file.nameWithExtension,
+    //   size: file.size,
+    // });
 
     try {
       file.trash();
@@ -52,34 +50,34 @@ export class FileDeleter {
       await this.remote.trash(file.contentsId);
       await this.repository.delete(file.contentsId);
 
-      this.ipc.send('FILE_DELETED', {
-        name: file.name,
-        extension: file.type,
-        nameWithExtension: file.nameWithExtension,
-        size: file.size,
-      });
+      // this.ipc.send('FILE_DELETED', {
+      //   name: file.name,
+      //   extension: file.type,
+      //   nameWithExtension: file.nameWithExtension,
+      //   size: file.size,
+      // });
     } catch (error: unknown) {
       Logger.error(
         `Error deleting the file ${file.nameWithExtension}: `,
         error
       );
 
-      const message = error instanceof Error ? error.message : 'Unknown error';
+      // const message = error instanceof Error ? error.message : 'Unknown error';
 
-      this.ipc.send('FILE_DELETION_ERROR', {
-        name: file.name,
-        extension: file.type,
-        nameWithExtension: file.nameWithExtension,
-        error: message,
-      });
+      // this.ipc.send('FILE_DELETION_ERROR', {
+      //   name: file.name,
+      //   extension: file.type,
+      //   nameWithExtension: file.nameWithExtension,
+      //   error: message,
+      // });
 
-      this.ipc.send('SYNC_INFO_UPDATE', {
-        kind: 'REMOTE',
-        name: file.nameWithExtension,
-        action: 'DELETE_ERROR',
-        errorName: 'BAD_RESPONSE',
-        process: 'SYNC',
-      });
+      // this.ipc.send('SYNC_INFO_UPDATE', {
+      //   kind: 'REMOTE',
+      //   name: file.nameWithExtension,
+      //   action: 'DELETE_ERROR',
+      //   errorName: 'BAD_RESPONSE',
+      //   process: 'SYNC',
+      // });
 
       this.local.createPlaceHolder(file);
     }

From bfe11968ad6a92c21561315c1edad42245691b83 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 27 Dec 2023 13:19:29 +0100
Subject: [PATCH 094/188] feat: create folders

---
 src/apps/fuse/FuseApp.ts                      | 23 +++++--------------
 .../callbacks/{Create.ts => CreateFile.ts}    |  2 +-
 src/apps/fuse/callbacks/CreateFolder.ts       | 14 +++++++++++
 .../folders/FoldersContainer.ts               |  6 +++++
 .../dependency-injection/folders/builder.ts   | 23 +++++++++++++++++++
 .../folders/application/FolderCreator.ts      | 14 +++++------
 6 files changed, 56 insertions(+), 26 deletions(-)
 rename src/apps/fuse/callbacks/{Create.ts => CreateFile.ts} (94%)
 create mode 100644 src/apps/fuse/callbacks/CreateFolder.ts

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index 42f6b3ec4..c55e5aa07 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -9,7 +9,8 @@ import { Read } from './callbacks/Read';
 import { RenameOrMove } from './callbacks/RenameAndMove';
 import { ListXAttributes } from './callbacks/ListXAttributes';
 import { GetXAttribute } from './callbacks/GetXAttribute';
-import { Create } from './callbacks/Create';
+import { CreateFile } from './callbacks/CreateFile';
+import { CreateFolder } from './callbacks/CreateFolder';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
@@ -39,7 +40,8 @@ export class FuseApp {
     const open = new Open(this.container);
     const read = new Read(this.container);
     const renameOrMove = new RenameOrMove(this.container);
-    const create = new Create(this.container);
+    const createFile = new CreateFile(this.container);
+    const createFolder = new CreateFolder(this.container);
 
     return {
       listxattr: listXAttributes.execute.bind(listXAttributes),
@@ -49,7 +51,7 @@ export class FuseApp {
       open: open.execute.bind(open),
       read: read.execute.bind(read),
       rename: renameOrMove.execute.bind(renameOrMove),
-      create: create.execute.bind(create),
+      create: createFile.execute.bind(createFile),
       write: (
         path: string,
         fd: string,
@@ -88,20 +90,7 @@ export class FuseApp {
           });
         });
       },
-      mkdir: async (path: string, mode: number, cb: any) => {
-        Logger.debug(`MKDIR ${path}`);
-        this.folders[path] = {
-          uid: 123401,
-          gid: 123401,
-          mode: 16877,
-        };
-
-        Logger.debug('Folder created:', path);
-
-        fs.mkdirSync(_path.join(this.paths.local, path));
-
-        cb(0);
-      },
+      mkdir: createFolder.execute.bind(createFolder),
       release: function (
         readPath: string,
         fd: number,
diff --git a/src/apps/fuse/callbacks/Create.ts b/src/apps/fuse/callbacks/CreateFile.ts
similarity index 94%
rename from src/apps/fuse/callbacks/Create.ts
rename to src/apps/fuse/callbacks/CreateFile.ts
index 8e65a61c7..0806f5235 100644
--- a/src/apps/fuse/callbacks/Create.ts
+++ b/src/apps/fuse/callbacks/CreateFile.ts
@@ -4,7 +4,7 @@ import { DependencyContainer } from '../dependency-injection/DependencyContainer
 
 type CreateCallback = TypedCallback<never>;
 
-export class Create {
+export class CreateFile {
   constructor(private readonly container: DependencyContainer) {}
 
   async execute(
diff --git a/src/apps/fuse/callbacks/CreateFolder.ts b/src/apps/fuse/callbacks/CreateFolder.ts
new file mode 100644
index 000000000..734489789
--- /dev/null
+++ b/src/apps/fuse/callbacks/CreateFolder.ts
@@ -0,0 +1,14 @@
+import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { Callback } from './Callback';
+
+export class CreateFolder {
+  constructor(private readonly container: DependencyContainer) {}
+
+  async execute(path: string, _mode: number, cb: Callback): Promise<void> {
+    const offlineFolder = this.container.offline.offlineFolderCreator.run(path);
+
+    await this.container.folderCreator.run(offlineFolder);
+
+    cb(0);
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts b/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
index 5bf68ca19..704813338 100644
--- a/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
+++ b/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
@@ -1,8 +1,10 @@
 import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
+import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
 import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
 import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
 import { FoldersByParentPathSearcher } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
+import { OfflineFolderCreator } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
 
 export interface FoldersContainer {
   folderFinder: FolderFinder;
@@ -10,4 +12,8 @@ export interface FoldersContainer {
   foldersByParentPathSearcher: FoldersByParentPathSearcher;
   folderPathUpdater: FolderPathUpdater;
   allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
+  folderCreator: FolderCreator;
+  offline: {
+    offlineFolderCreator: OfflineFolderCreator;
+  };
 }
diff --git a/src/apps/fuse/dependency-injection/folders/builder.ts b/src/apps/fuse/dependency-injection/folders/builder.ts
index ed6d94bea..c44fb20ce 100644
--- a/src/apps/fuse/dependency-injection/folders/builder.ts
+++ b/src/apps/fuse/dependency-injection/folders/builder.ts
@@ -1,4 +1,5 @@
 import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
+import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
 import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderMover } from '../../../../context/virtual-drive/folders/application/FolderMover';
 import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
@@ -6,9 +7,11 @@ import { FolderRenamer } from '../../../../context/virtual-drive/folders/applica
 import { FolderRepositoryInitiator } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
 import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
 import { FoldersByParentPathSearcher } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
+import { OfflineFolderCreator } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
 import { Folder } from '../../../../context/virtual-drive/folders/domain/Folder';
 import { HttpRemoteFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
 import { InMemoryFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
+import { InMemoryOfflineFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository';
 import { DependencyInjectionHttpClientsProvider } from '../common/clients';
 import { DependencyInjectionEventBus } from '../common/eventBus';
 import { FoldersContainer } from './FoldersContainer';
@@ -25,6 +28,8 @@ export async function buildFoldersContainer(
   );
   const { bus: eventBus } = DependencyInjectionEventBus;
 
+  const offlineFolderRepository = new InMemoryOfflineFolderRepository();
+
   const folderRepositoryInitiator = new FolderRepositoryInitiator(repository);
 
   await folderRepositoryInitiator.run(initialFolders);
@@ -60,11 +65,29 @@ export async function buildFoldersContainer(
     repository
   );
 
+  const folderCreator = new FolderCreator(
+    repository,
+    remoteFileSystem,
+    eventBus
+  );
+
+  const offlineFolderCreator = new OfflineFolderCreator(
+    folderFinder,
+    offlineFolderRepository,
+    repository
+  );
+
+  const offline = {
+    offlineFolderCreator,
+  };
+
   return {
     folderFinder,
     folderSearcher,
     foldersByParentPathSearcher,
     folderPathUpdater,
     allParentFoldersStatusIsExists,
+    folderCreator,
+    offline,
   };
 }
diff --git a/src/context/virtual-drive/folders/application/FolderCreator.ts b/src/context/virtual-drive/folders/application/FolderCreator.ts
index 6b09c3eea..352466509 100644
--- a/src/context/virtual-drive/folders/application/FolderCreator.ts
+++ b/src/context/virtual-drive/folders/application/FolderCreator.ts
@@ -1,4 +1,3 @@
-import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 import { EventBus } from '../../shared/domain/EventBus';
 import { Folder } from '../domain/Folder';
 import { FolderRepository } from '../domain/FolderRepository';
@@ -9,14 +8,13 @@ export class FolderCreator {
   constructor(
     private readonly repository: FolderRepository,
     private readonly remote: RemoteFileSystem,
-    private readonly ipc: SyncEngineIpc,
     private readonly eventBus: EventBus
   ) {}
 
   async run(offlineFolder: OfflineFolder): Promise<Folder> {
-    this.ipc.send('FOLDER_CREATING', {
-      name: offlineFolder.name,
-    });
+    // this.ipc.send('FOLDER_CREATING', {
+    //   name: offlineFolder.name,
+    // });
 
     const attributes = await this.remote.persist(offlineFolder);
 
@@ -27,9 +25,9 @@ export class FolderCreator {
     const events = folder.pullDomainEvents();
     this.eventBus.publish(events);
 
-    this.ipc.send('FOLDER_CREATED', {
-      name: offlineFolder.name,
-    });
+    // this.ipc.send('FOLDER_CREATED', {
+    //   name: offlineFolder.name,
+    // });
 
     return folder;
   }

From 77c725b73c1ebfeeb852e7ef2f468bf33f529fbf Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 27 Dec 2023 13:59:00 +0100
Subject: [PATCH 095/188] feat: delete file

---
 src/apps/fuse/FuseApp.ts                      | 16 ++---------
 src/apps/fuse/callbacks/DeleteFile.ts         | 28 +++++++++++++++++++
 .../files/FilesContainer.ts                   |  2 ++
 .../dependency-injection/files/builder.ts     |  1 +
 4 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 src/apps/fuse/callbacks/DeleteFile.ts

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index c55e5aa07..3d6d6f8be 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -11,6 +11,7 @@ import { ListXAttributes } from './callbacks/ListXAttributes';
 import { GetXAttribute } from './callbacks/GetXAttribute';
 import { CreateFile } from './callbacks/CreateFile';
 import { CreateFolder } from './callbacks/CreateFolder';
+import { DeleteFile } from './callbacks/DeleteFile';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
@@ -42,6 +43,7 @@ export class FuseApp {
     const renameOrMove = new RenameOrMove(this.container);
     const createFile = new CreateFile(this.container);
     const createFolder = new CreateFolder(this.container);
+    const deleteFile = new DeleteFile(this.container);
 
     return {
       listxattr: listXAttributes.execute.bind(listXAttributes),
@@ -99,19 +101,7 @@ export class FuseApp {
         Logger.debug(`RELEASE ${readPath}`);
         cb(0);
       },
-      unlink: (path: string, cb: (code: number) => void) => {
-        Logger.debug(`UNLINK ${path}`);
-        delete this.files[path];
-
-        unlink(_path.join(this.paths.local, path), (err) => {
-          if (err) {
-            Logger.error('ERROR DELETING FILE', err);
-            return cb(fuse.EIO);
-          }
-
-          cb(0);
-        });
-      },
+      unlink: deleteFile.execute.bind(deleteFile),
       rmdir: (path: string, cb: (code: number) => void) => {
         Logger.debug(`RMDIR ${path}`);
         delete this.folders[path];
diff --git a/src/apps/fuse/callbacks/DeleteFile.ts b/src/apps/fuse/callbacks/DeleteFile.ts
new file mode 100644
index 000000000..4e2c5ce59
--- /dev/null
+++ b/src/apps/fuse/callbacks/DeleteFile.ts
@@ -0,0 +1,28 @@
+import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { Callback } from './Callback';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const fuse = require('@gcas/fuse');
+
+export class DeleteFile {
+  constructor(private readonly container: DependencyContainer) {}
+
+  async execute(path: string, cb: Callback): Promise<void> {
+    try {
+      const file = await this.container.filesSearcher.run({ path });
+
+      if (!file) {
+        cb(fuse.ENOENT);
+        return;
+      }
+
+      await this.container.fileDeleter.run(file.contentsId);
+
+      cb(0);
+      return;
+    } catch {
+      cb(fuse.EIO);
+      return;
+    }
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/files/FilesContainer.ts b/src/apps/fuse/dependency-injection/files/FilesContainer.ts
index ee037577c..1faa57a28 100644
--- a/src/apps/fuse/dependency-injection/files/FilesContainer.ts
+++ b/src/apps/fuse/dependency-injection/files/FilesContainer.ts
@@ -3,11 +3,13 @@ import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/fil
 import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
 import { FileCreator } from '../../../../context/virtual-drive/files/application/FileCreator';
 import { SameFileWasMoved } from '../../../../context/virtual-drive/files/application/SameFileWasMoved';
+import { FileDeleter } from '../../../../context/virtual-drive/files/application/FileDeleter';
 
 export interface FilesContainer {
   filesByFolderPathNameLister: FilesByFolderPathSearcher;
   filesSearcher: FilesSearcher;
   filePathUpdater: FilePathUpdater;
   fileCreator: FileCreator;
+  fileDeleter: FileDeleter;
   sameFileWasMoved: SameFileWasMoved;
 }
diff --git a/src/apps/fuse/dependency-injection/files/builder.ts b/src/apps/fuse/dependency-injection/files/builder.ts
index 28d8ecec4..a1e9517c2 100644
--- a/src/apps/fuse/dependency-injection/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/files/builder.ts
@@ -84,5 +84,6 @@ export async function buildFilesContainer(
     filePathUpdater,
     sameFileWasMoved,
     fileCreator,
+    fileDeleter,
   };
 }

From 816b4ce6fbe9db2cbcffae5a00fa452020562253 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 27 Dec 2023 14:09:42 +0100
Subject: [PATCH 096/188] feat: trash folders

---
 src/apps/fuse/FuseApp.ts                      | 25 +++++------------
 .../callbacks/{DeleteFile.ts => TrashFile.ts} |  3 +--
 src/apps/fuse/callbacks/TrashFolder.ts        | 27 +++++++++++++++++++
 .../folders/FoldersContainer.ts               |  2 ++
 .../dependency-injection/folders/builder.ts   | 13 +++++++++
 .../infrastructure/FuseLocalFileSystem.ts     |  8 ++++++
 6 files changed, 58 insertions(+), 20 deletions(-)
 rename src/apps/fuse/callbacks/{DeleteFile.ts => TrashFile.ts} (94%)
 create mode 100644 src/apps/fuse/callbacks/TrashFolder.ts
 create mode 100644 src/context/virtual-drive/folders/infrastructure/FuseLocalFileSystem.ts

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index 3d6d6f8be..ee84421d7 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -11,15 +11,13 @@ import { ListXAttributes } from './callbacks/ListXAttributes';
 import { GetXAttribute } from './callbacks/GetXAttribute';
 import { CreateFile } from './callbacks/CreateFile';
 import { CreateFolder } from './callbacks/CreateFolder';
-import { DeleteFile } from './callbacks/DeleteFile';
+import { TrashFile } from './callbacks/TrashFile';
+import { TrashFolder } from './callbacks/TrashFolder';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
 
 export class FuseApp {
-  private files: Record<string, any>;
-  private folders: Record<string, any>;
-
   private _fuse: any;
 
   constructor(
@@ -28,10 +26,7 @@ export class FuseApp {
       root: string;
       local: string;
     }
-  ) {
-    this.files = {};
-    this.folders = {};
-  }
+  ) {}
 
   private getOpt() {
     const listXAttributes = new ListXAttributes();
@@ -43,7 +38,8 @@ export class FuseApp {
     const renameOrMove = new RenameOrMove(this.container);
     const createFile = new CreateFile(this.container);
     const createFolder = new CreateFolder(this.container);
-    const deleteFile = new DeleteFile(this.container);
+    const trashFile = new TrashFile(this.container);
+    const trashFolder = new TrashFolder(this.container);
 
     return {
       listxattr: listXAttributes.execute.bind(listXAttributes),
@@ -101,15 +97,8 @@ export class FuseApp {
         Logger.debug(`RELEASE ${readPath}`);
         cb(0);
       },
-      unlink: deleteFile.execute.bind(deleteFile),
-      rmdir: (path: string, cb: (code: number) => void) => {
-        Logger.debug(`RMDIR ${path}`);
-        delete this.folders[path];
-
-        fs.rmdirSync(_path.join(this.paths.local, path));
-
-        cb(0);
-      },
+      unlink: trashFile.execute.bind(trashFile),
+      rmdir: trashFolder.execute.bind(trashFolder),
     };
   }
 
diff --git a/src/apps/fuse/callbacks/DeleteFile.ts b/src/apps/fuse/callbacks/TrashFile.ts
similarity index 94%
rename from src/apps/fuse/callbacks/DeleteFile.ts
rename to src/apps/fuse/callbacks/TrashFile.ts
index 4e2c5ce59..75b2d594c 100644
--- a/src/apps/fuse/callbacks/DeleteFile.ts
+++ b/src/apps/fuse/callbacks/TrashFile.ts
@@ -4,7 +4,7 @@ import { Callback } from './Callback';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
 
-export class DeleteFile {
+export class TrashFile {
   constructor(private readonly container: DependencyContainer) {}
 
   async execute(path: string, cb: Callback): Promise<void> {
@@ -19,7 +19,6 @@ export class DeleteFile {
       await this.container.fileDeleter.run(file.contentsId);
 
       cb(0);
-      return;
     } catch {
       cb(fuse.EIO);
       return;
diff --git a/src/apps/fuse/callbacks/TrashFolder.ts b/src/apps/fuse/callbacks/TrashFolder.ts
new file mode 100644
index 000000000..5e269127a
--- /dev/null
+++ b/src/apps/fuse/callbacks/TrashFolder.ts
@@ -0,0 +1,27 @@
+import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { Callback } from './Callback';
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const fuse = require('@gcas/fuse');
+
+export class TrashFolder {
+  constructor(private readonly container: DependencyContainer) {}
+
+  async execute(path: string, cb: Callback): Promise<void> {
+    try {
+      const folder = await this.container.folderSearcher.run({ path });
+
+      if (!folder) {
+        cb(fuse.ENOENT);
+        return;
+      }
+
+      await this.container.folderDeleter.run(folder.uuid);
+
+      cb(0);
+    } catch {
+      cb(fuse.EIO);
+      return;
+    }
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts b/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
index 704813338..469586345 100644
--- a/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
+++ b/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
@@ -1,5 +1,6 @@
 import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
 import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
+import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
 import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
 import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
@@ -13,6 +14,7 @@ export interface FoldersContainer {
   folderPathUpdater: FolderPathUpdater;
   allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
   folderCreator: FolderCreator;
+  folderDeleter: FolderDeleter;
   offline: {
     offlineFolderCreator: OfflineFolderCreator;
   };
diff --git a/src/apps/fuse/dependency-injection/folders/builder.ts b/src/apps/fuse/dependency-injection/folders/builder.ts
index c44fb20ce..ff9da8c1a 100644
--- a/src/apps/fuse/dependency-injection/folders/builder.ts
+++ b/src/apps/fuse/dependency-injection/folders/builder.ts
@@ -1,5 +1,6 @@
 import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
 import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
+import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
 import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderMover } from '../../../../context/virtual-drive/folders/application/FolderMover';
 import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
@@ -9,6 +10,7 @@ import { FolderSearcher } from '../../../../context/virtual-drive/folders/applic
 import { FoldersByParentPathSearcher } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
 import { OfflineFolderCreator } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
 import { Folder } from '../../../../context/virtual-drive/folders/domain/Folder';
+import { FuseLocalFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/FuseLocalFileSystem';
 import { HttpRemoteFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
 import { InMemoryFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
 import { InMemoryOfflineFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository';
@@ -26,6 +28,9 @@ export async function buildFoldersContainer(
     clients.drive,
     clients.newDrive
   );
+
+  const localFileSystem = new FuseLocalFileSystem();
+
   const { bus: eventBus } = DependencyInjectionEventBus;
 
   const offlineFolderRepository = new InMemoryOfflineFolderRepository();
@@ -77,6 +82,13 @@ export async function buildFoldersContainer(
     repository
   );
 
+  const folderDeleter = new FolderDeleter(
+    repository,
+    remoteFileSystem,
+    localFileSystem,
+    allParentFoldersStatusIsExists
+  );
+
   const offline = {
     offlineFolderCreator,
   };
@@ -88,6 +100,7 @@ export async function buildFoldersContainer(
     folderPathUpdater,
     allParentFoldersStatusIsExists,
     folderCreator,
+    folderDeleter,
     offline,
   };
 }
diff --git a/src/context/virtual-drive/folders/infrastructure/FuseLocalFileSystem.ts b/src/context/virtual-drive/folders/infrastructure/FuseLocalFileSystem.ts
new file mode 100644
index 000000000..e84bfb096
--- /dev/null
+++ b/src/context/virtual-drive/folders/infrastructure/FuseLocalFileSystem.ts
@@ -0,0 +1,8 @@
+import { Folder } from '../domain/Folder';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+
+export class FuseLocalFileSystem implements LocalFileSystem {
+  async createPlaceHolder(_folder: Folder): Promise<void> {
+    //no-op
+  }
+}

From da64ff7a9f04cd5d8193808e9b96f039cb0009ab Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 28 Dec 2023 12:34:21 +0100
Subject: [PATCH 097/188] feat: write to offline file

---
 src/apps/fuse/FuseApp.ts                      |  68 ++++-------
 src/apps/fuse/callbacks/CreateFile.ts         |   6 +-
 src/apps/fuse/callbacks/CreateFolder.ts       |   2 +-
 src/apps/fuse/callbacks/GetAttributes.ts      |  24 +++-
 src/apps/fuse/callbacks/Open.ts               |   2 +-
 src/apps/fuse/callbacks/Read.ts               |   2 +-
 src/apps/fuse/callbacks/Readdir.ts            |   2 +-
 src/apps/fuse/callbacks/RenameAndMove.ts      |   2 +-
 src/apps/fuse/callbacks/TrashFile.ts          |   2 +-
 src/apps/fuse/callbacks/TrashFolder.ts        |   2 +-
 src/apps/fuse/callbacks/WriteFile.ts          |  21 ++++
 .../common/virtualDrive.ts                    |  20 ----
 .../contents/ContentsContainer.ts             |   9 --
 .../files/FilesContainer.ts                   |  15 ---
 .../folders/FoldersContainer.ts               |  21 ----
 .../dependency-injection/folders/builder.ts   | 106 -----------------
 .../OfflineDriveDependencyContainer.ts        |   3 +
 .../OfflineDriveDependencyContainerFactory.ts |  33 ++++++
 .../OfflineFiles/OfflineFilesContainer.ts     |   9 ++
 .../offline/OfflineFiles/builder.ts           |  38 +++++++
 .../shared/SharedContainer.ts                 |   5 -
 .../DependencyContainer.ts                    |   0
 .../DependencyContainerFactory.ts             |   0
 .../boundaryBridge/BoundaryBridgeContainer.ts |   0
 .../boundaryBridge/builder.ts                 |   0
 .../contents/ContentsContainer.ts             |   9 ++
 .../{ => virtual-drive}/contents/builder.ts   |  24 ++--
 .../virtual-drive/files/FilesContainer.ts     |  15 +++
 .../{ => virtual-drive}/files/builder.ts      |  34 +++---
 .../virtual-drive/folders/FoldersContainer.ts |  21 ++++
 .../virtual-drive/folders/builder.ts          | 107 ++++++++++++++++++
 .../virtual-drive/shared/SharedContainer.ts   |   5 +
 .../{ => virtual-drive}/shared/builder.ts     |   4 +-
 .../{ => virtual-drive}/tree/TreeContainer.ts |   0
 .../{ => virtual-drive}/tree/builder.ts       |  10 +-
 src/apps/fuse/index.ts                        |  15 ++-
 .../files/application/CreateOfflineFile.ts    |  29 +++++
 .../files/application/OfflineFileSearcher.ts  |  10 ++
 .../files/application/WriteToOfflineFile.ts   |  29 +++++
 .../offline-drive/files/domain/OfflineFile.ts |  60 ++++++++++
 .../files/domain/OfflineFileFileSystem.ts     |  12 ++
 .../files/domain/OfflineFileRepository.ts     |   9 ++
 .../infrastructure/FSOfflineFileFileSystem.ts |  88 ++++++++++++++
 .../InMemoryOfflineFileRepository.ts          |  28 +++++
 ...pDataLocalFileContentsDirectoryProvider.ts |   5 +-
 45 files changed, 625 insertions(+), 281 deletions(-)
 create mode 100644 src/apps/fuse/callbacks/WriteFile.ts
 delete mode 100644 src/apps/fuse/dependency-injection/common/virtualDrive.ts
 delete mode 100644 src/apps/fuse/dependency-injection/contents/ContentsContainer.ts
 delete mode 100644 src/apps/fuse/dependency-injection/files/FilesContainer.ts
 delete mode 100644 src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
 delete mode 100644 src/apps/fuse/dependency-injection/folders/builder.ts
 create mode 100644 src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainerFactory.ts
 create mode 100644 src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts
 delete mode 100644 src/apps/fuse/dependency-injection/shared/SharedContainer.ts
 rename src/apps/fuse/dependency-injection/{ => virtual-drive}/DependencyContainer.ts (100%)
 rename src/apps/fuse/dependency-injection/{ => virtual-drive}/DependencyContainerFactory.ts (100%)
 rename src/apps/fuse/dependency-injection/{ => virtual-drive}/boundaryBridge/BoundaryBridgeContainer.ts (100%)
 rename src/apps/fuse/dependency-injection/{ => virtual-drive}/boundaryBridge/builder.ts (100%)
 create mode 100644 src/apps/fuse/dependency-injection/virtual-drive/contents/ContentsContainer.ts
 rename src/apps/fuse/dependency-injection/{ => virtual-drive}/contents/builder.ts (57%)
 create mode 100644 src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
 rename src/apps/fuse/dependency-injection/{ => virtual-drive}/files/builder.ts (53%)
 create mode 100644 src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
 create mode 100644 src/apps/fuse/dependency-injection/virtual-drive/shared/SharedContainer.ts
 rename src/apps/fuse/dependency-injection/{ => virtual-drive}/shared/builder.ts (67%)
 rename src/apps/fuse/dependency-injection/{ => virtual-drive}/tree/TreeContainer.ts (100%)
 rename src/apps/fuse/dependency-injection/{ => virtual-drive}/tree/builder.ts (55%)
 create mode 100644 src/context/offline-drive/files/application/CreateOfflineFile.ts
 create mode 100644 src/context/offline-drive/files/application/OfflineFileSearcher.ts
 create mode 100644 src/context/offline-drive/files/application/WriteToOfflineFile.ts
 create mode 100644 src/context/offline-drive/files/domain/OfflineFile.ts
 create mode 100644 src/context/offline-drive/files/domain/OfflineFileFileSystem.ts
 create mode 100644 src/context/offline-drive/files/domain/OfflineFileRepository.ts
 create mode 100644 src/context/offline-drive/files/infrastructure/FSOfflineFileFileSystem.ts
 create mode 100644 src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index ee84421d7..0e34b3dd1 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -1,7 +1,7 @@
 import fs, { unlink } from 'fs';
 import _path from 'path';
 import Logger from 'electron-log';
-import { DependencyContainer } from './dependency-injection/DependencyContainer';
+import { DependencyContainer } from './dependency-injection/virtual-drive/DependencyContainer';
 import { Readdir } from './callbacks/Readdir';
 import { GetAttributes } from './callbacks/GetAttributes';
 import { Open } from './callbacks/Open';
@@ -13,6 +13,8 @@ import { CreateFile } from './callbacks/CreateFile';
 import { CreateFolder } from './callbacks/CreateFolder';
 import { TrashFile } from './callbacks/TrashFile';
 import { TrashFolder } from './callbacks/TrashFolder';
+import { OfflineDriveDependencyContainer } from './dependency-injection/offline/OfflineDriveDependencyContainer';
+import { WriteFile } from './callbacks/WriteFile';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
@@ -21,7 +23,8 @@ export class FuseApp {
   private _fuse: any;
 
   constructor(
-    private readonly container: DependencyContainer,
+    private readonly virtualDriveContainer: DependencyContainer,
+    private readonly offlineDriveContainer: OfflineDriveDependencyContainer,
     private readonly paths: {
       root: string;
       local: string;
@@ -31,15 +34,19 @@ export class FuseApp {
   private getOpt() {
     const listXAttributes = new ListXAttributes();
     const getXAttribute = new GetXAttribute();
-    const readdir = new Readdir(this.container);
-    const getattr = new GetAttributes(this.container);
-    const open = new Open(this.container);
-    const read = new Read(this.container);
-    const renameOrMove = new RenameOrMove(this.container);
-    const createFile = new CreateFile(this.container);
-    const createFolder = new CreateFolder(this.container);
-    const trashFile = new TrashFile(this.container);
-    const trashFolder = new TrashFolder(this.container);
+    const readdir = new Readdir(this.virtualDriveContainer);
+    const getattr = new GetAttributes(
+      this.virtualDriveContainer,
+      this.offlineDriveContainer
+    );
+    const open = new Open(this.virtualDriveContainer);
+    const read = new Read(this.virtualDriveContainer);
+    const renameOrMove = new RenameOrMove(this.virtualDriveContainer);
+    const createFile = new CreateFile(this.offlineDriveContainer);
+    const createFolder = new CreateFolder(this.virtualDriveContainer);
+    const trashFile = new TrashFile(this.virtualDriveContainer);
+    const trashFolder = new TrashFolder(this.virtualDriveContainer);
+    const writeFile = new WriteFile(this.offlineDriveContainer);
 
     return {
       listxattr: listXAttributes.execute.bind(listXAttributes),
@@ -50,44 +57,7 @@ export class FuseApp {
       read: read.execute.bind(read),
       rename: renameOrMove.execute.bind(renameOrMove),
       create: createFile.execute.bind(createFile),
-      write: (
-        path: string,
-        fd: string,
-        buffer: Buffer,
-        len: number,
-        pos: number,
-        cb: any
-      ) => {
-        Logger.debug(`WRITE ${path}`);
-        const fullPath = _path.join(this.paths.local, path);
-        fs.open(fullPath, 'w', (err, fileDescriptor) => {
-          if (err) {
-            console.error(`Error opening file for writing: ${err}`);
-            cb(fuse.ENOENT); // Indicate an error code, e.g., if the file doesn't exist
-            return;
-          }
-
-          // Create a Buffer from the incoming data
-          const dataBuffer = Buffer.from(buffer.slice(0, len));
-
-          // Write data to the file at the specified position
-          fs.write(fileDescriptor, dataBuffer, 0, len, pos, (writeErr) => {
-            if (writeErr) {
-              console.error(`Error writing to file: ${writeErr}`);
-              cb(fuse.EIO); // Indicate an error code, e.g., EIO for I/O error
-            } else {
-              cb(len); // Indicate success by returning the number of bytes written
-            }
-
-            // Close the file
-            fs.close(fileDescriptor, () => {
-              if (writeErr) {
-                console.error(`Error closing file: ${writeErr}`);
-              }
-            });
-          });
-        });
-      },
+      write: writeFile.execute.bind(writeFile),
       mkdir: createFolder.execute.bind(createFolder),
       release: function (
         readPath: string,
diff --git a/src/apps/fuse/callbacks/CreateFile.ts b/src/apps/fuse/callbacks/CreateFile.ts
index 0806f5235..156bd9309 100644
--- a/src/apps/fuse/callbacks/CreateFile.ts
+++ b/src/apps/fuse/callbacks/CreateFile.ts
@@ -1,11 +1,11 @@
 import Logger from 'electron-log';
 import { TypedCallback } from './Callback';
-import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
 
 type CreateCallback = TypedCallback<never>;
 
 export class CreateFile {
-  constructor(private readonly container: DependencyContainer) {}
+  constructor(private readonly container: OfflineDriveDependencyContainer) {}
 
   async execute(
     path: string,
@@ -14,7 +14,7 @@ export class CreateFile {
   ): Promise<void> {
     Logger.debug(`CREATE ${path}`);
 
-    await this.container.retryContentsUploader.run(path);
+    await this.container.createOfflineFile.run(path);
 
     cb(0);
   }
diff --git a/src/apps/fuse/callbacks/CreateFolder.ts b/src/apps/fuse/callbacks/CreateFolder.ts
index 734489789..1e88461b7 100644
--- a/src/apps/fuse/callbacks/CreateFolder.ts
+++ b/src/apps/fuse/callbacks/CreateFolder.ts
@@ -1,4 +1,4 @@
-import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
 import { Callback } from './Callback';
 
 export class CreateFolder {
diff --git a/src/apps/fuse/callbacks/GetAttributes.ts b/src/apps/fuse/callbacks/GetAttributes.ts
index 208cffc58..8e5d118f4 100644
--- a/src/apps/fuse/callbacks/GetAttributes.ts
+++ b/src/apps/fuse/callbacks/GetAttributes.ts
@@ -1,29 +1,45 @@
-import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
+import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
 import { Callback } from './Callback';
+import Logger from 'electron-log';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
 
 export class GetAttributes {
-  constructor(private readonly container: DependencyContainer) {}
+  constructor(
+    private readonly virtualDriveContainer: DependencyContainer,
+    private readonly offlineDriveContainer: OfflineDriveDependencyContainer
+  ) {}
 
   async execute(path: string, cb: Callback): Promise<void> {
+    Logger.debug('GET ATTRIBUTES OF ', path);
+
     if (path === '/') {
       return cb(0, { mode: 16877, size: 0 });
     }
 
-    const file = await this.container.filesSearcher.run({ path });
+    const file = await this.virtualDriveContainer.filesSearcher.run({ path });
 
     if (file) {
       return cb(0, { mode: 33188, size: file.size });
     }
 
-    const folder = await this.container.folderSearcher.run({ path });
+    const folder = await this.virtualDriveContainer.folderSearcher.run({
+      path,
+    });
 
     if (folder) {
       return cb(0, { mode: 16877, size: 0 });
     }
 
+    const offlineFile =
+      await this.offlineDriveContainer.offlineFileSearcher.execute(path);
+
+    if (offlineFile) {
+      return cb(0, { mode: 33188, size: offlineFile.size });
+    }
+
     cb(fuse.ENOENT);
   }
 }
diff --git a/src/apps/fuse/callbacks/Open.ts b/src/apps/fuse/callbacks/Open.ts
index ee137d054..2316fe091 100644
--- a/src/apps/fuse/callbacks/Open.ts
+++ b/src/apps/fuse/callbacks/Open.ts
@@ -1,4 +1,4 @@
-import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
 import { Callback } from './Callback';
 import Logger from 'electron-log';
 
diff --git a/src/apps/fuse/callbacks/Read.ts b/src/apps/fuse/callbacks/Read.ts
index 823599f06..a804ea66c 100644
--- a/src/apps/fuse/callbacks/Read.ts
+++ b/src/apps/fuse/callbacks/Read.ts
@@ -1,6 +1,6 @@
 import Logger from 'electron-log';
 import fs from 'fs';
-import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
diff --git a/src/apps/fuse/callbacks/Readdir.ts b/src/apps/fuse/callbacks/Readdir.ts
index 7c2515d69..8d6542cb8 100644
--- a/src/apps/fuse/callbacks/Readdir.ts
+++ b/src/apps/fuse/callbacks/Readdir.ts
@@ -1,5 +1,5 @@
 import Logger from 'electron-log';
-import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
 import { TypedCallback } from './Callback';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
diff --git a/src/apps/fuse/callbacks/RenameAndMove.ts b/src/apps/fuse/callbacks/RenameAndMove.ts
index 0278d2966..52f867ee7 100644
--- a/src/apps/fuse/callbacks/RenameAndMove.ts
+++ b/src/apps/fuse/callbacks/RenameAndMove.ts
@@ -1,5 +1,5 @@
 import { File } from '../../../context/virtual-drive/files/domain/File';
-import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
 import { Folder } from '../../../context/virtual-drive/folders/domain/Folder';
 import { Callback } from './Callback';
 
diff --git a/src/apps/fuse/callbacks/TrashFile.ts b/src/apps/fuse/callbacks/TrashFile.ts
index 75b2d594c..5f2f6b121 100644
--- a/src/apps/fuse/callbacks/TrashFile.ts
+++ b/src/apps/fuse/callbacks/TrashFile.ts
@@ -1,4 +1,4 @@
-import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
 import { Callback } from './Callback';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
diff --git a/src/apps/fuse/callbacks/TrashFolder.ts b/src/apps/fuse/callbacks/TrashFolder.ts
index 5e269127a..a86ced10c 100644
--- a/src/apps/fuse/callbacks/TrashFolder.ts
+++ b/src/apps/fuse/callbacks/TrashFolder.ts
@@ -1,4 +1,4 @@
-import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
 import { Callback } from './Callback';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
diff --git a/src/apps/fuse/callbacks/WriteFile.ts b/src/apps/fuse/callbacks/WriteFile.ts
new file mode 100644
index 000000000..0a035b494
--- /dev/null
+++ b/src/apps/fuse/callbacks/WriteFile.ts
@@ -0,0 +1,21 @@
+import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
+import { TypedCallback } from './Callback';
+
+type WriteFileCallback = TypedCallback<number>;
+
+export class WriteFile {
+  constructor(private readonly container: OfflineDriveDependencyContainer) {}
+
+  async execute(
+    path: string,
+    _fd: string,
+    buffer: Buffer,
+    len: number,
+    pos: number,
+    cb: WriteFileCallback
+  ): Promise<void> {
+    await this.container.writeToOfflineFile.run(path, buffer, len, pos);
+
+    cb(len);
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/common/virtualDrive.ts b/src/apps/fuse/dependency-injection/common/virtualDrive.ts
deleted file mode 100644
index e74b97645..000000000
--- a/src/apps/fuse/dependency-injection/common/virtualDrive.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { VirtualDrive } from 'virtual-drive/dist';
-import { DependencyInjectionLocalRootFolderPath } from './localRootFolderPath';
-
-export class DependencyInjectionVirtualDrive {
-  private static _vd: VirtualDrive;
-
-  static get virtualDrive(): VirtualDrive {
-    if (DependencyInjectionVirtualDrive._vd) {
-      return DependencyInjectionVirtualDrive._vd;
-    }
-
-    const root = DependencyInjectionLocalRootFolderPath.get();
-
-    const vd = new VirtualDrive(root);
-
-    DependencyInjectionVirtualDrive._vd = vd;
-
-    return DependencyInjectionVirtualDrive._vd;
-  }
-}
diff --git a/src/apps/fuse/dependency-injection/contents/ContentsContainer.ts b/src/apps/fuse/dependency-injection/contents/ContentsContainer.ts
deleted file mode 100644
index 170f83ac7..000000000
--- a/src/apps/fuse/dependency-injection/contents/ContentsContainer.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { DownloadContentsToPlainFile } from '../../../../context/virtual-drive/contents/application/DownloadContentsToPlainFile';
-import { LocalContentChecker } from '../../../../context/virtual-drive/contents/application/LocalContentChecker';
-import { RetryContentsUploader } from '../../../../context/virtual-drive/contents/application/RetryContentsUploader';
-
-export interface ContentsContainer {
-  retryContentsUploader: RetryContentsUploader;
-  downloadContentsToPlainFile: DownloadContentsToPlainFile;
-  localContentChecker: LocalContentChecker;
-}
diff --git a/src/apps/fuse/dependency-injection/files/FilesContainer.ts b/src/apps/fuse/dependency-injection/files/FilesContainer.ts
deleted file mode 100644
index 1faa57a28..000000000
--- a/src/apps/fuse/dependency-injection/files/FilesContainer.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { FilesSearcher } from '../../../../context/virtual-drive/files/application/FilesSearcher';
-import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
-import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
-import { FileCreator } from '../../../../context/virtual-drive/files/application/FileCreator';
-import { SameFileWasMoved } from '../../../../context/virtual-drive/files/application/SameFileWasMoved';
-import { FileDeleter } from '../../../../context/virtual-drive/files/application/FileDeleter';
-
-export interface FilesContainer {
-  filesByFolderPathNameLister: FilesByFolderPathSearcher;
-  filesSearcher: FilesSearcher;
-  filePathUpdater: FilePathUpdater;
-  fileCreator: FileCreator;
-  fileDeleter: FileDeleter;
-  sameFileWasMoved: SameFileWasMoved;
-}
diff --git a/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts b/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
deleted file mode 100644
index 469586345..000000000
--- a/src/apps/fuse/dependency-injection/folders/FoldersContainer.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
-import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
-import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
-import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
-import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
-import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
-import { FoldersByParentPathSearcher } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
-import { OfflineFolderCreator } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
-
-export interface FoldersContainer {
-  folderFinder: FolderFinder;
-  folderSearcher: FolderSearcher;
-  foldersByParentPathSearcher: FoldersByParentPathSearcher;
-  folderPathUpdater: FolderPathUpdater;
-  allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
-  folderCreator: FolderCreator;
-  folderDeleter: FolderDeleter;
-  offline: {
-    offlineFolderCreator: OfflineFolderCreator;
-  };
-}
diff --git a/src/apps/fuse/dependency-injection/folders/builder.ts b/src/apps/fuse/dependency-injection/folders/builder.ts
deleted file mode 100644
index ff9da8c1a..000000000
--- a/src/apps/fuse/dependency-injection/folders/builder.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
-import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
-import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
-import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
-import { FolderMover } from '../../../../context/virtual-drive/folders/application/FolderMover';
-import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
-import { FolderRenamer } from '../../../../context/virtual-drive/folders/application/FolderRenamer';
-import { FolderRepositoryInitiator } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
-import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
-import { FoldersByParentPathSearcher } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
-import { OfflineFolderCreator } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
-import { Folder } from '../../../../context/virtual-drive/folders/domain/Folder';
-import { FuseLocalFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/FuseLocalFileSystem';
-import { HttpRemoteFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
-import { InMemoryFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
-import { InMemoryOfflineFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository';
-import { DependencyInjectionHttpClientsProvider } from '../common/clients';
-import { DependencyInjectionEventBus } from '../common/eventBus';
-import { FoldersContainer } from './FoldersContainer';
-
-export async function buildFoldersContainer(
-  initialFolders: Array<Folder>
-): Promise<FoldersContainer> {
-  const repository = new InMemoryFolderRepository();
-  const clients = DependencyInjectionHttpClientsProvider.get();
-
-  const remoteFileSystem = new HttpRemoteFileSystem(
-    clients.drive,
-    clients.newDrive
-  );
-
-  const localFileSystem = new FuseLocalFileSystem();
-
-  const { bus: eventBus } = DependencyInjectionEventBus;
-
-  const offlineFolderRepository = new InMemoryOfflineFolderRepository();
-
-  const folderRepositoryInitiator = new FolderRepositoryInitiator(repository);
-
-  await folderRepositoryInitiator.run(initialFolders);
-
-  const folderFinder = new FolderFinder(repository);
-
-  const folderSearcher = new FolderSearcher(repository);
-
-  const foldersByParentPathSearcher = new FoldersByParentPathSearcher(
-    folderFinder,
-    repository
-  );
-
-  const folderMover = new FolderMover(
-    repository,
-    remoteFileSystem,
-    folderFinder
-  );
-
-  const folderRenamer = new FolderRenamer(
-    repository,
-    remoteFileSystem,
-    eventBus
-  );
-
-  const folderPathUpdater = new FolderPathUpdater(
-    repository,
-    folderMover,
-    folderRenamer
-  );
-
-  const allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
-    repository
-  );
-
-  const folderCreator = new FolderCreator(
-    repository,
-    remoteFileSystem,
-    eventBus
-  );
-
-  const offlineFolderCreator = new OfflineFolderCreator(
-    folderFinder,
-    offlineFolderRepository,
-    repository
-  );
-
-  const folderDeleter = new FolderDeleter(
-    repository,
-    remoteFileSystem,
-    localFileSystem,
-    allParentFoldersStatusIsExists
-  );
-
-  const offline = {
-    offlineFolderCreator,
-  };
-
-  return {
-    folderFinder,
-    folderSearcher,
-    foldersByParentPathSearcher,
-    folderPathUpdater,
-    allParentFoldersStatusIsExists,
-    folderCreator,
-    folderDeleter,
-    offline,
-  };
-}
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainer.ts b/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainer.ts
new file mode 100644
index 000000000..5507c8281
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainer.ts
@@ -0,0 +1,3 @@
+import { OfflineFilesContainer } from './OfflineFiles/OfflineFilesContainer';
+
+export type OfflineDriveDependencyContainer = OfflineFilesContainer;
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainerFactory.ts b/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainerFactory.ts
new file mode 100644
index 000000000..e17677446
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainerFactory.ts
@@ -0,0 +1,33 @@
+import { OfflineDriveDependencyContainer } from './OfflineDriveDependencyContainer';
+import { buildOfflineFilesContainer } from './OfflineFiles/builder';
+
+export class OfflineDriveDependencyContainerFactory {
+  private static _container: OfflineDriveDependencyContainer | undefined;
+
+  static readonly subscribers: Array<keyof OfflineDriveDependencyContainer> =
+    [];
+
+  eventSubscribers(
+    key: keyof OfflineDriveDependencyContainer
+  ):
+    | OfflineDriveDependencyContainer[keyof OfflineDriveDependencyContainer]
+    | undefined {
+    if (!OfflineDriveDependencyContainerFactory._container) return undefined;
+
+    return OfflineDriveDependencyContainerFactory._container[key];
+  }
+
+  async build(): Promise<OfflineDriveDependencyContainer> {
+    if (OfflineDriveDependencyContainerFactory._container !== undefined) {
+      return OfflineDriveDependencyContainerFactory._container;
+    }
+
+    const filesContainer = await buildOfflineFilesContainer();
+
+    const container = {
+      ...filesContainer,
+    };
+
+    return container;
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts b/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts
new file mode 100644
index 000000000..a449dae2b
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts
@@ -0,0 +1,9 @@
+import { CreateOfflineFile } from '../../../../../context/offline-drive/files/application/CreateOfflineFile';
+import { OfflineFileSearcher } from '../../../../../context/offline-drive/files/application/OfflineFileSearcher';
+import { WriteToOfflineFile } from '../../../../../context/offline-drive/files/application/WriteToOfflineFile';
+
+export interface OfflineFilesContainer {
+  createOfflineFile: CreateOfflineFile;
+  offlineFileSearcher: OfflineFileSearcher;
+  writeToOfflineFile: WriteToOfflineFile;
+}
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts b/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts
new file mode 100644
index 000000000..fb20a520e
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts
@@ -0,0 +1,38 @@
+import { CreateOfflineFile } from '../../../../../context/offline-drive/files/application/CreateOfflineFile';
+import { OfflineFileSearcher } from '../../../../../context/offline-drive/files/application/OfflineFileSearcher';
+import { WriteToOfflineFile } from '../../../../../context/offline-drive/files/application/WriteToOfflineFile';
+import { FSOfflineFileFileSystem } from '../../../../../context/offline-drive/files/infrastructure/FSOfflineFileFileSystem';
+import { InMemoryOfflineFileRepository } from '../../../../../context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository';
+import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
+import { DependencyInjectionEventBus } from '../../common/eventBus';
+import { OfflineFilesContainer } from './OfflineFilesContainer';
+
+export async function buildOfflineFilesContainer(): Promise<OfflineFilesContainer> {
+  const { bus: eventBus } = DependencyInjectionEventBus;
+  const repository = new InMemoryOfflineFileRepository();
+
+  const localFileContentsDirectoryProvider =
+    new FuseAppDataLocalFileContentsDirectoryProvider();
+  const fileSystem = new FSOfflineFileFileSystem(
+    localFileContentsDirectoryProvider,
+    'uploads'
+  );
+
+  await fileSystem.init();
+
+  const createOfflineFile = new CreateOfflineFile(
+    repository,
+    fileSystem,
+    eventBus
+  );
+
+  const offlineFileSearcher = new OfflineFileSearcher(repository);
+
+  const writeToOfflineFile = new WriteToOfflineFile(repository, fileSystem);
+
+  return {
+    createOfflineFile,
+    offlineFileSearcher,
+    writeToOfflineFile,
+  };
+}
diff --git a/src/apps/fuse/dependency-injection/shared/SharedContainer.ts b/src/apps/fuse/dependency-injection/shared/SharedContainer.ts
deleted file mode 100644
index bbd756a66..000000000
--- a/src/apps/fuse/dependency-injection/shared/SharedContainer.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { RelativePathToAbsoluteConverter } from '../../../../context/virtual-drive/shared/application/RelativePathToAbsoluteConverter';
-
-export interface SharedContainer {
-  relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter;
-}
diff --git a/src/apps/fuse/dependency-injection/DependencyContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/DependencyContainer.ts
similarity index 100%
rename from src/apps/fuse/dependency-injection/DependencyContainer.ts
rename to src/apps/fuse/dependency-injection/virtual-drive/DependencyContainer.ts
diff --git a/src/apps/fuse/dependency-injection/DependencyContainerFactory.ts b/src/apps/fuse/dependency-injection/virtual-drive/DependencyContainerFactory.ts
similarity index 100%
rename from src/apps/fuse/dependency-injection/DependencyContainerFactory.ts
rename to src/apps/fuse/dependency-injection/virtual-drive/DependencyContainerFactory.ts
diff --git a/src/apps/fuse/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/boundaryBridge/BoundaryBridgeContainer.ts
similarity index 100%
rename from src/apps/fuse/dependency-injection/boundaryBridge/BoundaryBridgeContainer.ts
rename to src/apps/fuse/dependency-injection/virtual-drive/boundaryBridge/BoundaryBridgeContainer.ts
diff --git a/src/apps/fuse/dependency-injection/boundaryBridge/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/boundaryBridge/builder.ts
similarity index 100%
rename from src/apps/fuse/dependency-injection/boundaryBridge/builder.ts
rename to src/apps/fuse/dependency-injection/virtual-drive/boundaryBridge/builder.ts
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/contents/ContentsContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/contents/ContentsContainer.ts
new file mode 100644
index 000000000..2582bb43a
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/virtual-drive/contents/ContentsContainer.ts
@@ -0,0 +1,9 @@
+import { DownloadContentsToPlainFile } from '../../../../../context/virtual-drive/contents/application/DownloadContentsToPlainFile';
+import { LocalContentChecker } from '../../../../../context/virtual-drive/contents/application/LocalContentChecker';
+import { RetryContentsUploader } from '../../../../../context/virtual-drive/contents/application/RetryContentsUploader';
+
+export interface ContentsContainer {
+  retryContentsUploader: RetryContentsUploader;
+  downloadContentsToPlainFile: DownloadContentsToPlainFile;
+  localContentChecker: LocalContentChecker;
+}
diff --git a/src/apps/fuse/dependency-injection/contents/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
similarity index 57%
rename from src/apps/fuse/dependency-injection/contents/builder.ts
rename to src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
index 3c887223a..d0bc4069d 100644
--- a/src/apps/fuse/dependency-injection/contents/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
@@ -1,17 +1,17 @@
 import { Environment } from '@internxt/inxt-js';
-import { DownloadContentsToPlainFile } from '../../../../context/virtual-drive/contents/application/DownloadContentsToPlainFile';
-import { ContentsContainer } from './ContentsContainer';
-import { DependencyInjectionUserProvider } from '../common/user';
-import { DependencyInjectionMnemonicProvider } from '../common/mnemonic';
-import { EnvironmentRemoteFileContentsManagersFactory } from '../../../../context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
-import { FSLocalFileSystem } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileSystem';
-import { DependencyInjectionEventBus } from '../common/eventBus';
-import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
-import { LocalContentChecker } from '../../../../context/virtual-drive/contents/application/LocalContentChecker';
-import { RetryContentsUploader } from '../../../../context/virtual-drive/contents/application/RetryContentsUploader';
-import { ContentsUploader } from '../../../../context/virtual-drive/contents/application/ContentsUploader';
-import { FSLocalFileProvider } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileProvider';
+import { ContentsUploader } from '../../../../../context/virtual-drive/contents/application/ContentsUploader';
+import { DownloadContentsToPlainFile } from '../../../../../context/virtual-drive/contents/application/DownloadContentsToPlainFile';
+import { LocalContentChecker } from '../../../../../context/virtual-drive/contents/application/LocalContentChecker';
+import { RetryContentsUploader } from '../../../../../context/virtual-drive/contents/application/RetryContentsUploader';
+import { EnvironmentRemoteFileContentsManagersFactory } from '../../../../../context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
+import { FSLocalFileProvider } from '../../../../../context/virtual-drive/contents/infrastructure/FSLocalFileProvider';
+import { FSLocalFileSystem } from '../../../../../context/virtual-drive/contents/infrastructure/FSLocalFileSystem';
+import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
+import { DependencyInjectionEventBus } from '../../common/eventBus';
+import { DependencyInjectionMnemonicProvider } from '../../common/mnemonic';
+import { DependencyInjectionUserProvider } from '../../common/user';
 import { SharedContainer } from '../shared/SharedContainer';
+import { ContentsContainer } from './ContentsContainer';
 
 export async function buildContentsContainer(
   sharedContainer: SharedContainer
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
new file mode 100644
index 000000000..d188570a4
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
@@ -0,0 +1,15 @@
+import { FilesSearcher } from '../../../../../context/virtual-drive/files/application/FilesSearcher';
+import { FilesByFolderPathSearcher } from '../../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
+import { FilePathUpdater } from '../../../../../context/virtual-drive/files/application/FilePathUpdater';
+import { FileCreator } from '../../../../../context/virtual-drive/files/application/FileCreator';
+import { SameFileWasMoved } from '../../../../../context/virtual-drive/files/application/SameFileWasMoved';
+import { FileDeleter } from '../../../../../context/virtual-drive/files/application/FileDeleter';
+
+export interface FilesContainer {
+  filesByFolderPathNameLister: FilesByFolderPathSearcher;
+  filesSearcher: FilesSearcher;
+  filePathUpdater: FilePathUpdater;
+  fileCreator: FileCreator;
+  fileDeleter: FileDeleter;
+  sameFileWasMoved: SameFileWasMoved;
+}
diff --git a/src/apps/fuse/dependency-injection/files/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
similarity index 53%
rename from src/apps/fuse/dependency-injection/files/builder.ts
rename to src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
index a1e9517c2..083b248de 100644
--- a/src/apps/fuse/dependency-injection/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
@@ -1,20 +1,20 @@
-import crypt from '../../../../context/shared/infrastructure/crypt';
-import { FileCreator } from '../../../../context/virtual-drive/files/application/FileCreator';
-import { FileDeleter } from '../../../../context/virtual-drive/files/application/FileDeleter';
-import { FileFinderByContentsId } from '../../../../context/virtual-drive/files/application/FileFinderByContentsId';
-import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
-import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
-import { FilesSearcher } from '../../../../context/virtual-drive/files/application/FilesSearcher';
-import { RepositoryPopulator } from '../../../../context/virtual-drive/files/application/RepositoryPopulator';
-import { SameFileWasMoved } from '../../../../context/virtual-drive/files/application/SameFileWasMoved';
-import { File } from '../../../../context/virtual-drive/files/domain/File';
-import { FuseLocalFileSystem } from '../../../../context/virtual-drive/files/infrastructure/FuseLocalFileSystem';
-import { InMemoryFileRepository } from '../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
-import { SDKRemoteFileSystem } from '../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
-import { DependencyInjectionEventBus } from '../common/eventBus';
-import { DependencyInjectionEventRepository } from '../common/eventRepository';
-import { DependencyInjectionStorageSdk } from '../common/sdk';
-import { DependencyInjectionUserProvider } from '../common/user';
+import crypt from '../../../../../context/shared/infrastructure/crypt';
+import { FileCreator } from '../../../../../context/virtual-drive/files/application/FileCreator';
+import { FileDeleter } from '../../../../../context/virtual-drive/files/application/FileDeleter';
+import { FileFinderByContentsId } from '../../../../../context/virtual-drive/files/application/FileFinderByContentsId';
+import { FilePathUpdater } from '../../../../../context/virtual-drive/files/application/FilePathUpdater';
+import { FilesByFolderPathSearcher } from '../../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
+import { FilesSearcher } from '../../../../../context/virtual-drive/files/application/FilesSearcher';
+import { RepositoryPopulator } from '../../../../../context/virtual-drive/files/application/RepositoryPopulator';
+import { SameFileWasMoved } from '../../../../../context/virtual-drive/files/application/SameFileWasMoved';
+import { File } from '../../../../../context/virtual-drive/files/domain/File';
+import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/files/infrastructure/FuseLocalFileSystem';
+import { InMemoryFileRepository } from '../../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
+import { SDKRemoteFileSystem } from '../../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
+import { DependencyInjectionEventBus } from '../../common/eventBus';
+import { DependencyInjectionEventRepository } from '../../common/eventRepository';
+import { DependencyInjectionStorageSdk } from '../../common/sdk';
+import { DependencyInjectionUserProvider } from '../../common/user';
 import { FoldersContainer } from '../folders/FoldersContainer';
 import { SharedContainer } from '../shared/SharedContainer';
 import { FilesContainer } from './FilesContainer';
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
new file mode 100644
index 000000000..c81a1d3e7
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
@@ -0,0 +1,21 @@
+import { AllParentFoldersStatusIsExists } from '../../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
+import { FolderCreator } from '../../../../../context/virtual-drive/folders/application/FolderCreator';
+import { FolderDeleter } from '../../../../../context/virtual-drive/folders/application/FolderDeleter';
+import { FolderFinder } from '../../../../../context/virtual-drive/folders/application/FolderFinder';
+import { FolderPathUpdater } from '../../../../../context/virtual-drive/folders/application/FolderPathUpdater';
+import { FolderSearcher } from '../../../../../context/virtual-drive/folders/application/FolderSearcher';
+import { FoldersByParentPathSearcher } from '../../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
+import { OfflineFolderCreator } from '../../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
+
+export interface FoldersContainer {
+  folderFinder: FolderFinder;
+  folderSearcher: FolderSearcher;
+  foldersByParentPathSearcher: FoldersByParentPathSearcher;
+  folderPathUpdater: FolderPathUpdater;
+  allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
+  folderCreator: FolderCreator;
+  folderDeleter: FolderDeleter;
+  offline: {
+    offlineFolderCreator: OfflineFolderCreator;
+  };
+}
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
new file mode 100644
index 000000000..0ed97feef
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
@@ -0,0 +1,107 @@
+import { AllParentFoldersStatusIsExists } from '../../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
+import { FolderCreator } from '../../../../../context/virtual-drive/folders/application/FolderCreator';
+import { FolderDeleter } from '../../../../../context/virtual-drive/folders/application/FolderDeleter';
+import { FolderFinder } from '../../../../../context/virtual-drive/folders/application/FolderFinder';
+import { FolderMover } from '../../../../../context/virtual-drive/folders/application/FolderMover';
+import { FolderPathUpdater } from '../../../../../context/virtual-drive/folders/application/FolderPathUpdater';
+import { FolderRenamer } from '../../../../../context/virtual-drive/folders/application/FolderRenamer';
+import { FolderRepositoryInitiator } from '../../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
+import { FolderSearcher } from '../../../../../context/virtual-drive/folders/application/FolderSearcher';
+import { FoldersByParentPathSearcher } from '../../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
+import { OfflineFolderCreator } from '../../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
+import { Folder } from '../../../../../context/virtual-drive/folders/domain/Folder';
+import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/FuseLocalFileSystem';
+import { HttpRemoteFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
+import { InMemoryFolderRepository } from '../../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
+import { InMemoryOfflineFolderRepository } from '../../../../../context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository';
+import { DependencyInjectionHttpClientsProvider } from '../../common/clients';
+import { DependencyInjectionEventBus } from '../../common/eventBus';
+
+import { FoldersContainer } from './FoldersContainer';
+
+export async function buildFoldersContainer(
+  initialFolders: Array<Folder>
+): Promise<FoldersContainer> {
+  const repository = new InMemoryFolderRepository();
+  const clients = DependencyInjectionHttpClientsProvider.get();
+
+  const remoteFileSystem = new HttpRemoteFileSystem(
+    clients.drive,
+    clients.newDrive
+  );
+
+  const localFileSystem = new FuseLocalFileSystem();
+
+  const { bus: eventBus } = DependencyInjectionEventBus;
+
+  const offlineFolderRepository = new InMemoryOfflineFolderRepository();
+
+  const folderRepositoryInitiator = new FolderRepositoryInitiator(repository);
+
+  await folderRepositoryInitiator.run(initialFolders);
+
+  const folderFinder = new FolderFinder(repository);
+
+  const folderSearcher = new FolderSearcher(repository);
+
+  const foldersByParentPathSearcher = new FoldersByParentPathSearcher(
+    folderFinder,
+    repository
+  );
+
+  const folderMover = new FolderMover(
+    repository,
+    remoteFileSystem,
+    folderFinder
+  );
+
+  const folderRenamer = new FolderRenamer(
+    repository,
+    remoteFileSystem,
+    eventBus
+  );
+
+  const folderPathUpdater = new FolderPathUpdater(
+    repository,
+    folderMover,
+    folderRenamer
+  );
+
+  const allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
+    repository
+  );
+
+  const folderCreator = new FolderCreator(
+    repository,
+    remoteFileSystem,
+    eventBus
+  );
+
+  const offlineFolderCreator = new OfflineFolderCreator(
+    folderFinder,
+    offlineFolderRepository,
+    repository
+  );
+
+  const folderDeleter = new FolderDeleter(
+    repository,
+    remoteFileSystem,
+    localFileSystem,
+    allParentFoldersStatusIsExists
+  );
+
+  const offline = {
+    offlineFolderCreator,
+  };
+
+  return {
+    folderFinder,
+    folderSearcher,
+    foldersByParentPathSearcher,
+    folderPathUpdater,
+    allParentFoldersStatusIsExists,
+    folderCreator,
+    folderDeleter,
+    offline,
+  };
+}
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/shared/SharedContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/shared/SharedContainer.ts
new file mode 100644
index 000000000..b2df0b7f1
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/virtual-drive/shared/SharedContainer.ts
@@ -0,0 +1,5 @@
+import { RelativePathToAbsoluteConverter } from '../../../../../context/virtual-drive/shared/application/RelativePathToAbsoluteConverter';
+
+export interface SharedContainer {
+  relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter;
+}
diff --git a/src/apps/fuse/dependency-injection/shared/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/shared/builder.ts
similarity index 67%
rename from src/apps/fuse/dependency-injection/shared/builder.ts
rename to src/apps/fuse/dependency-injection/virtual-drive/shared/builder.ts
index ed840797e..76eab314c 100644
--- a/src/apps/fuse/dependency-injection/shared/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/shared/builder.ts
@@ -1,6 +1,6 @@
 import path from 'path';
-import { RelativePathToAbsoluteConverter } from '../../../../context/virtual-drive/shared/application/RelativePathToAbsoluteConverter';
-import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
+import { RelativePathToAbsoluteConverter } from '../../../../../context/virtual-drive/shared/application/RelativePathToAbsoluteConverter';
+import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
 import { SharedContainer } from './SharedContainer';
 
 export async function buildSharedContainer(): Promise<SharedContainer> {
diff --git a/src/apps/fuse/dependency-injection/tree/TreeContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/tree/TreeContainer.ts
similarity index 100%
rename from src/apps/fuse/dependency-injection/tree/TreeContainer.ts
rename to src/apps/fuse/dependency-injection/virtual-drive/tree/TreeContainer.ts
diff --git a/src/apps/fuse/dependency-injection/tree/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/tree/builder.ts
similarity index 55%
rename from src/apps/fuse/dependency-injection/tree/builder.ts
rename to src/apps/fuse/dependency-injection/virtual-drive/tree/builder.ts
index 018c5a2be..ae2c42812 100644
--- a/src/apps/fuse/dependency-injection/tree/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/tree/builder.ts
@@ -1,9 +1,9 @@
-import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
-import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
-import { CryptoJsNameDecrypt } from '../../../../context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt';
-import { getUser } from '../../../main/auth/service';
+import { Traverser } from '../../../../../context/virtual-drive/items/application/Traverser';
+import { TreeBuilder } from '../../../../../context/virtual-drive/items/application/TreeBuilder';
+import { CryptoJsNameDecrypt } from '../../../../../context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt';
+import { SQLiteRemoteItemsGenerator } from '../../../../../context/virtual-drive/items/infrastructure/SQLiteRemoteItemsGenerator';
+import { getUser } from '../../../../main/auth/service';
 import { TreeContainer } from './TreeContainer';
-import { SQLiteRemoteItemsGenerator } from '../../../../context/virtual-drive/items/infrastructure/SQLiteRemoteItemsGenerator';
 
 export function buildTreeContainer(): TreeContainer {
   const user = getUser();
diff --git a/src/apps/fuse/index.ts b/src/apps/fuse/index.ts
index 5debce2f6..087f17d99 100644
--- a/src/apps/fuse/index.ts
+++ b/src/apps/fuse/index.ts
@@ -5,9 +5,10 @@ import { app } from 'electron';
 import { getRootVirtualDrive } from '../main/virutal-root-folder/service';
 import eventBus from '../main/event-bus';
 import { FuseApp } from './FuseApp';
-import { DependencyContainerFactory } from './dependency-injection/DependencyContainerFactory';
+import { DependencyContainerFactory } from './dependency-injection/virtual-drive/DependencyContainerFactory';
 import path from 'path';
 import { HidratationApi } from '../hydratation-api/HidratationApi';
+import { OfflineDriveDependencyContainerFactory } from './dependency-injection/offline/OfflineDriveDependencyContainerFactory';
 
 let fuseApp: FuseApp;
 
@@ -22,14 +23,20 @@ async function spawnSyncEngineWorker() {
 
   Logger.debug('ROOT FOLDER: ', root);
 
-  const containerFactory = new DependencyContainerFactory();
+  const virtualDriveContainerFactory = new DependencyContainerFactory();
+  const virtualDriveContainer = await virtualDriveContainerFactory.build();
 
-  const container = await containerFactory.build();
+  const offlineDriveContainerFactory =
+    new OfflineDriveDependencyContainerFactory();
+  const offlineDriveContainer = await offlineDriveContainerFactory.build();
 
   const appData = app.getPath('appData');
   const local = path.join(appData, 'internxt-drive', 'downloaded');
 
-  fuseApp = new FuseApp(container, { root, local });
+  fuseApp = new FuseApp(virtualDriveContainer, offlineDriveContainer, {
+    root,
+    local,
+  });
 
   await fuseApp.start();
 }
diff --git a/src/context/offline-drive/files/application/CreateOfflineFile.ts b/src/context/offline-drive/files/application/CreateOfflineFile.ts
new file mode 100644
index 000000000..5152e7094
--- /dev/null
+++ b/src/context/offline-drive/files/application/CreateOfflineFile.ts
@@ -0,0 +1,29 @@
+import { FilePath } from '../../../virtual-drive/files/domain/FilePath';
+import { FileSize } from '../../../virtual-drive/files/domain/FileSize';
+import { EventBus } from '../../../virtual-drive/shared/domain/EventBus';
+import { OfflineFile } from '../domain/OfflineFile';
+import { OfflineFileFileSystem } from '../domain/OfflineFileFileSystem';
+import { OfflineFileRepository } from '../domain/OfflineFileRepository';
+import * as uuid from 'uuid';
+
+export class CreateOfflineFile {
+  constructor(
+    private readonly repository: OfflineFileRepository,
+    private readonly offlineFileSystem: OfflineFileFileSystem,
+    private readonly eventBus: EventBus
+  ) {}
+
+  async run(path: string): Promise<void> {
+    const id = uuid.v4();
+    const createdAt = Date.now();
+    const filePath = new FilePath(path);
+    const size = new FileSize(0);
+
+    const file = OfflineFile.create(id, createdAt, filePath, size);
+
+    await this.offlineFileSystem.createEmptyFile(file.id);
+
+    await this.repository.save(file);
+    await this.eventBus.publish(file.pullDomainEvents());
+  }
+}
diff --git a/src/context/offline-drive/files/application/OfflineFileSearcher.ts b/src/context/offline-drive/files/application/OfflineFileSearcher.ts
new file mode 100644
index 000000000..7f6ec1327
--- /dev/null
+++ b/src/context/offline-drive/files/application/OfflineFileSearcher.ts
@@ -0,0 +1,10 @@
+import { OfflineFile } from '../domain/OfflineFile';
+import { OfflineFileRepository } from '../domain/OfflineFileRepository';
+
+export class OfflineFileSearcher {
+  constructor(private readonly repository: OfflineFileRepository) {}
+
+  async execute(path: string): Promise<OfflineFile | undefined> {
+    return await this.repository.searchByPartial({ path });
+  }
+}
diff --git a/src/context/offline-drive/files/application/WriteToOfflineFile.ts b/src/context/offline-drive/files/application/WriteToOfflineFile.ts
new file mode 100644
index 000000000..1d5fbda79
--- /dev/null
+++ b/src/context/offline-drive/files/application/WriteToOfflineFile.ts
@@ -0,0 +1,29 @@
+import { OfflineFileFileSystem } from '../domain/OfflineFileFileSystem';
+import { OfflineFileRepository } from '../domain/OfflineFileRepository';
+
+export class WriteToOfflineFile {
+  constructor(
+    private readonly repository: OfflineFileRepository,
+    private readonly fileSystem: OfflineFileFileSystem
+  ) {}
+
+  async run(
+    path: string,
+    buffer: Buffer,
+    length: number,
+    position: number
+  ): Promise<void> {
+    const file = await this.repository.searchByPartial({ path });
+
+    if (!file) {
+      // TODO: IMPROVE THE
+      throw new Error('File not found');
+    }
+
+    await this.fileSystem.writeToFile(file.id, buffer, length, position);
+
+    file.increaseSizeBy(length);
+
+    await this.repository.save(file);
+  }
+}
diff --git a/src/context/offline-drive/files/domain/OfflineFile.ts b/src/context/offline-drive/files/domain/OfflineFile.ts
new file mode 100644
index 000000000..9427fed71
--- /dev/null
+++ b/src/context/offline-drive/files/domain/OfflineFile.ts
@@ -0,0 +1,60 @@
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
+import { FilePath } from '../../../virtual-drive/files/domain/FilePath';
+import { FileSize } from '../../../virtual-drive/files/domain/FileSize';
+
+export type OfflineFileAttributes = {
+  id: string;
+  createdAt: number;
+  path: string;
+  size: number;
+};
+
+export class OfflineFile extends AggregateRoot {
+  private constructor(
+    private _id: string,
+    private _createdAt: number,
+    private _path: FilePath,
+    private _size: FileSize
+  ) {
+    super();
+  }
+
+  public get id() {
+    return this._id;
+  }
+  public get createdAt() {
+    return this._createdAt;
+  }
+  public get path() {
+    return this._path.value;
+  }
+  public get size() {
+    return this._size.value;
+  }
+
+  static create(
+    id: string,
+    createdAt: number,
+    path: FilePath,
+    size: FileSize
+  ): OfflineFile {
+    const file = new OfflineFile(id, createdAt, path, size);
+
+    return file;
+  }
+
+  increaseSizeBy(bytes: number): void {
+    const newSize = this.size + bytes;
+
+    this._size = new FileSize(newSize);
+  }
+
+  attributes(): OfflineFileAttributes {
+    return {
+      id: this.id,
+      createdAt: this.createdAt,
+      path: this.path,
+      size: this.size,
+    };
+  }
+}
diff --git a/src/context/offline-drive/files/domain/OfflineFileFileSystem.ts b/src/context/offline-drive/files/domain/OfflineFileFileSystem.ts
new file mode 100644
index 000000000..e964a99ad
--- /dev/null
+++ b/src/context/offline-drive/files/domain/OfflineFileFileSystem.ts
@@ -0,0 +1,12 @@
+import { OfflineFileAttributes } from './OfflineFile';
+
+export interface OfflineFileFileSystem {
+  writeToFile(
+    id: OfflineFileAttributes['id'],
+    buffer: Buffer,
+    length: number,
+    position: number
+  ): Promise<void>;
+
+  createEmptyFile(id: OfflineFileAttributes['id']): Promise<void>;
+}
diff --git a/src/context/offline-drive/files/domain/OfflineFileRepository.ts b/src/context/offline-drive/files/domain/OfflineFileRepository.ts
new file mode 100644
index 000000000..b3bf0b015
--- /dev/null
+++ b/src/context/offline-drive/files/domain/OfflineFileRepository.ts
@@ -0,0 +1,9 @@
+import { OfflineFile, OfflineFileAttributes } from './OfflineFile';
+
+export interface OfflineFileRepository {
+  save(file: OfflineFile): Promise<void>;
+
+  searchByPartial(
+    partial: Partial<OfflineFileAttributes>
+  ): Promise<OfflineFile | undefined>;
+}
diff --git a/src/context/offline-drive/files/infrastructure/FSOfflineFileFileSystem.ts b/src/context/offline-drive/files/infrastructure/FSOfflineFileFileSystem.ts
new file mode 100644
index 000000000..07e0ca983
--- /dev/null
+++ b/src/context/offline-drive/files/infrastructure/FSOfflineFileFileSystem.ts
@@ -0,0 +1,88 @@
+import fs from 'fs';
+import { OfflineFileFileSystem } from '../domain/OfflineFileFileSystem';
+import { OfflineFileAttributes } from '../domain/OfflineFile';
+import { LocalFileContentsDirectoryProvider } from '../../../virtual-drive/shared/domain/LocalFileContentsDirectoryProvider';
+import path from 'path';
+import Logger from 'electron-log';
+
+export class FSOfflineFileFileSystem implements OfflineFileFileSystem {
+  constructor(
+    private readonly locationProvider: LocalFileContentsDirectoryProvider,
+    private readonly subfolder: string
+  ) {}
+
+  private async folderPath(): Promise<string> {
+    const location = await this.locationProvider.provide();
+
+    return path.join(location, this.subfolder);
+  }
+
+  private async filePath(id: string): Promise<string> {
+    const folder = await this.folderPath();
+
+    return path.join(folder, id);
+  }
+
+  async init(): Promise<void> {
+    const folder = await this.folderPath();
+
+    fs.mkdirSync(folder, { recursive: true });
+  }
+
+  async writeToFile(
+    id: OfflineFileAttributes['id'],
+    buffer: Buffer,
+    length: number,
+    position: number
+  ): Promise<void> {
+    const file = await this.filePath(id);
+
+    return new Promise((resolve) => {
+      fs.open(file, 'w', (err, fileDescriptor) => {
+        if (err) {
+          throw err;
+        }
+
+        const dataBuffer = Buffer.from(buffer.slice(0, length));
+
+        fs.write(
+          fileDescriptor,
+          dataBuffer,
+          0,
+          length,
+          position,
+          (writeErr) => {
+            if (writeErr) {
+              throw writeErr;
+            }
+
+            fs.close(fileDescriptor, () => {
+              if (writeErr) {
+                throw writeErr; // TODO: is this needed?
+              }
+
+              resolve();
+            });
+          }
+        );
+      });
+    });
+  }
+
+  async createEmptyFile(id: string): Promise<void> {
+    const file = await this.filePath(id);
+
+    Logger.debug('Creating an empty file on ', file);
+
+    return new Promise((resolve) => {
+      fs.writeFile(file, '', (err) => {
+        if (err) {
+          Logger.error('[FSOfflineFileFileSystem] ', err);
+          throw new Error(`could not create empty file for id: ${id}`);
+        }
+
+        resolve();
+      });
+    });
+  }
+}
diff --git a/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts b/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts
new file mode 100644
index 000000000..521486e38
--- /dev/null
+++ b/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts
@@ -0,0 +1,28 @@
+import { OfflineFile, OfflineFileAttributes } from '../domain/OfflineFile';
+import { OfflineFileRepository } from '../domain/OfflineFileRepository';
+
+export class InMemoryOfflineFileRepository implements OfflineFileRepository {
+  private readonly files = new Map<string, OfflineFile>();
+
+  async save(file: OfflineFile): Promise<void> {
+    this.files.set(file.id, file);
+  }
+
+  async searchByPartial(
+    partial: Partial<OfflineFileAttributes>
+  ): Promise<OfflineFile | undefined> {
+    const keys = Object.keys(partial) as Array<
+      keyof Partial<OfflineFileAttributes>
+    >;
+
+    const values = Array.from(this.files.values());
+
+    const file = values.find((attributes) => {
+      return keys.every(
+        (key: keyof OfflineFileAttributes) => attributes[key] == partial[key]
+      );
+    });
+
+    return file;
+  }
+}
diff --git a/src/context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider.ts b/src/context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider.ts
index 0f33da651..4b5af99e1 100644
--- a/src/context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider.ts
+++ b/src/context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider.ts
@@ -2,6 +2,7 @@ import { app } from 'electron';
 import { LocalFileContentsDirectoryProvider } from '../../domain/LocalFileContentsDirectoryProvider';
 import path from 'path';
 
+// TODO: move it to shared
 export class FuseAppDataLocalFileContentsDirectoryProvider
   implements LocalFileContentsDirectoryProvider
 {
@@ -10,11 +11,11 @@ export class FuseAppDataLocalFileContentsDirectoryProvider
   provide(): Promise<string> {
     const appData = app.getPath('appData');
 
-    const interxtDriveFolder = path.join(
+    const internxtDriveFolder = path.join(
       appData,
       FuseAppDataLocalFileContentsDirectoryProvider.APP_FOLDER_NAME
     );
 
-    return Promise.resolve(interxtDriveFolder);
+    return Promise.resolve(internxtDriveFolder);
   }
 }

From f4610086a215f8aa92cde4ae4ab484210ac42612 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 28 Dec 2023 16:53:46 +0100
Subject: [PATCH 098/188] wip

---
 src/apps/fuse/FuseApp.ts                      | 11 +--
 src/apps/fuse/callbacks/ReleaseCallback.ts    | 12 +++
 .../common/inxt-environment.ts                | 27 +++++++
 .../BoundaryBridge/BoundaryBridgeContainer.ts |  5 ++
 .../boundaryBridgeContainerBuilder.ts         | 24 ++++++
 .../OfflineDriveDependencyContainer.ts        |  9 +++
 .../offlineContentsContainerBuilder.ts        | 53 +++++++++++++
 .../OfflineDriveDependencyContainer.ts        |  7 +-
 .../OfflineDriveDependencyContainerFactory.ts | 12 +++
 .../OfflineFiles/OfflineFilesContainer.ts     |  8 +-
 .../offline/OfflineFiles/builder.ts           | 31 ++------
 .../application/OfflineFileCreator.ts}        | 17 ++--
 .../application/OfflineFilePathRetriever.ts   | 15 ++++
 .../application/OfflineFileUploader.ts        | 15 ++++
 .../application/OfflineContentsAppended.ts    | 29 +++++++
 .../OfflineContentsPathCalculator.ts          | 10 +++
 .../application/OfflineContentsUploader.ts    | 78 +++++++++++++++++++
 .../contents/domain/OfflineContents.ts        | 71 +++++++++++++++++
 .../contents/domain/OfflineContentsId.ts      |  3 +
 .../domain/OfflineContentsManagersFactory.ts  | 25 ++++++
 .../domain/OfflineContentsRepository.ts       | 21 +++++
 .../contents/domain/OfflineContentsSize.ts    |  3 +
 .../events/ContentsDownloadedDomainEvent.ts   | 53 +++++++++++++
 .../OfflineContentsUploadedDomainEvent.ts     | 34 ++++++++
 .../EnvironmentOfflineContentsUploader.ts     | 66 ++++++++++++++++
 ...onmentRemoteFileContentsManagersFactory.ts | 28 +++++++
 .../NodeFSOfflineContentsRepository.ts}       | 17 +++-
 .../ClearOfflineFileOnFileCreated.ts          | 18 +++++
 .../files/application/OfflineFileDeleter.ts   | 15 ++++
 .../files/application/OfflineFileFinder.ts    | 16 ++++
 .../files/application/OfflineFileSearcher.ts  |  8 +-
 .../application/OfflineFileSizeIncreaser.ts   | 17 ++++
 .../files/application/WriteToOfflineFile.ts   | 29 -------
 .../files/domain/OfflineFileFileSystem.ts     | 12 ---
 .../files/domain/OfflineFileRepository.ts     |  2 +
 .../domain/events/OfflineFileUploaded.ts      | 39 ++++++++++
 .../InMemoryOfflineFileRepository.ts          |  4 +
 .../application/FileCreationOrchestrator.ts   |  6 +-
 .../contents/application/ContentsUploader.ts  |  6 +-
 .../application/LocalContentsMover.ts         | 18 +++++
 .../MoveOfflineContentsOnContentsUploaded.ts  | 17 ++++
 .../contents/domain/LocalFileSystem.ts        |  8 +-
 .../contents/domain/RemoteFileContents.ts     |  9 ++-
 .../events/ContentsDownloadedDomainEvent.ts   |  2 +-
 .../events/ContentsUploadedDomainEvent.ts     | 23 ++++++
 .../infrastructure/FSLocalFileSystem.ts       | 10 ++-
 .../CreateFileOnOfflineFileUplodaded.ts       | 24 ++++++
 .../files/application/FileCreator.ts          | 16 ++--
 .../virtual-drive/files/domain/File.ts        | 28 +++----
 .../domain/events/FileCreatedDomainEvent.ts   |  9 ++-
 .../virtual-drive/shared/domain/Uuid.ts       | 20 +++++
 51 files changed, 917 insertions(+), 123 deletions(-)
 create mode 100644 src/apps/fuse/callbacks/ReleaseCallback.ts
 create mode 100644 src/apps/fuse/dependency-injection/common/inxt-environment.ts
 create mode 100644 src/apps/fuse/dependency-injection/offline/BoundaryBridge/BoundaryBridgeContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/offline/BoundaryBridge/boundaryBridgeContainerBuilder.ts
 create mode 100644 src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
 rename src/context/offline-drive/{files/application/CreateOfflineFile.ts => boundaryBridge/application/OfflineFileCreator.ts} (55%)
 create mode 100644 src/context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever.ts
 create mode 100644 src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
 create mode 100644 src/context/offline-drive/contents/application/OfflineContentsAppended.ts
 create mode 100644 src/context/offline-drive/contents/application/OfflineContentsPathCalculator.ts
 create mode 100644 src/context/offline-drive/contents/application/OfflineContentsUploader.ts
 create mode 100644 src/context/offline-drive/contents/domain/OfflineContents.ts
 create mode 100644 src/context/offline-drive/contents/domain/OfflineContentsId.ts
 create mode 100644 src/context/offline-drive/contents/domain/OfflineContentsManagersFactory.ts
 create mode 100644 src/context/offline-drive/contents/domain/OfflineContentsRepository.ts
 create mode 100644 src/context/offline-drive/contents/domain/OfflineContentsSize.ts
 create mode 100644 src/context/offline-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts
 create mode 100644 src/context/offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent.ts
 create mode 100644 src/context/offline-drive/contents/infrastructure/EnvironmentOfflineContentsUploader.ts
 create mode 100644 src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
 rename src/context/offline-drive/{files/infrastructure/FSOfflineFileFileSystem.ts => contents/infrastructure/NodeFSOfflineContentsRepository.ts} (81%)
 create mode 100644 src/context/offline-drive/files/application/ClearOfflineFileOnFileCreated.ts
 create mode 100644 src/context/offline-drive/files/application/OfflineFileDeleter.ts
 create mode 100644 src/context/offline-drive/files/application/OfflineFileFinder.ts
 create mode 100644 src/context/offline-drive/files/application/OfflineFileSizeIncreaser.ts
 delete mode 100644 src/context/offline-drive/files/application/WriteToOfflineFile.ts
 delete mode 100644 src/context/offline-drive/files/domain/OfflineFileFileSystem.ts
 create mode 100644 src/context/offline-drive/files/domain/events/OfflineFileUploaded.ts
 create mode 100644 src/context/virtual-drive/contents/application/LocalContentsMover.ts
 create mode 100644 src/context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded.ts
 create mode 100644 src/context/virtual-drive/contents/domain/events/ContentsUploadedDomainEvent.ts
 create mode 100644 src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts
 create mode 100644 src/context/virtual-drive/shared/domain/Uuid.ts

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index 0e34b3dd1..1be3c2c54 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -15,6 +15,7 @@ import { TrashFile } from './callbacks/TrashFile';
 import { TrashFolder } from './callbacks/TrashFolder';
 import { OfflineDriveDependencyContainer } from './dependency-injection/offline/OfflineDriveDependencyContainer';
 import { WriteFile } from './callbacks/WriteFile';
+import { ReleaseCallback } from './callbacks/ReleaseCallback';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
@@ -47,6 +48,7 @@ export class FuseApp {
     const trashFile = new TrashFile(this.virtualDriveContainer);
     const trashFolder = new TrashFolder(this.virtualDriveContainer);
     const writeFile = new WriteFile(this.offlineDriveContainer);
+    const release = new ReleaseCallback(this.offlineDriveContainer);
 
     return {
       listxattr: listXAttributes.execute.bind(listXAttributes),
@@ -59,14 +61,7 @@ export class FuseApp {
       create: createFile.execute.bind(createFile),
       write: writeFile.execute.bind(writeFile),
       mkdir: createFolder.execute.bind(createFolder),
-      release: function (
-        readPath: string,
-        fd: number,
-        cb: (status: number) => void
-      ): void {
-        Logger.debug(`RELEASE ${readPath}`);
-        cb(0);
-      },
+      release: release.execute.bind(release),
       unlink: trashFile.execute.bind(trashFile),
       rmdir: trashFolder.execute.bind(trashFolder),
     };
diff --git a/src/apps/fuse/callbacks/ReleaseCallback.ts b/src/apps/fuse/callbacks/ReleaseCallback.ts
new file mode 100644
index 000000000..d7b99c7f4
--- /dev/null
+++ b/src/apps/fuse/callbacks/ReleaseCallback.ts
@@ -0,0 +1,12 @@
+import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
+import { Callback } from './Callback';
+
+export class ReleaseCallback {
+  constructor(private readonly container: OfflineDriveDependencyContainer) {}
+
+  async execute(path: string, _fd: number, cb: Callback): Promise<void> {
+    await this.container.offlineContentsUploader.run(path);
+
+    cb(0);
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/common/inxt-environment.ts b/src/apps/fuse/dependency-injection/common/inxt-environment.ts
new file mode 100644
index 000000000..d1b019315
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/common/inxt-environment.ts
@@ -0,0 +1,27 @@
+import { Environment } from '@internxt/inxt-js';
+import { DependencyInjectionUserProvider } from './user';
+import { DependencyInjectionMnemonicProvider } from './mnemonic';
+
+export class DependencyInjectionInxtEnvironment {
+  private static environment: Environment;
+
+  static get(): Environment {
+    if (DependencyInjectionInxtEnvironment.environment) {
+      return DependencyInjectionInxtEnvironment.environment;
+    }
+
+    const user = DependencyInjectionUserProvider.get();
+    const mnemonic = DependencyInjectionMnemonicProvider.get();
+
+    const environment = new Environment({
+      bridgeUrl: process.env.BRIDGE_URL,
+      bridgeUser: user.bridgeUser,
+      bridgePass: user.userId,
+      encryptionKey: mnemonic,
+    });
+
+    DependencyInjectionInxtEnvironment.environment = environment;
+
+    return DependencyInjectionInxtEnvironment.environment;
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/offline/BoundaryBridge/BoundaryBridgeContainer.ts b/src/apps/fuse/dependency-injection/offline/BoundaryBridge/BoundaryBridgeContainer.ts
new file mode 100644
index 000000000..677f102c0
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/offline/BoundaryBridge/BoundaryBridgeContainer.ts
@@ -0,0 +1,5 @@
+import { OfflineFileUploader } from '../../../../../context/offline-drive/boundaryBridge/application/OfflineFileUploader';
+
+export interface BoundaryBridgeContainer {
+  offlineFileUploader: OfflineFileUploader;
+}
diff --git a/src/apps/fuse/dependency-injection/offline/BoundaryBridge/boundaryBridgeContainerBuilder.ts b/src/apps/fuse/dependency-injection/offline/BoundaryBridge/boundaryBridgeContainerBuilder.ts
new file mode 100644
index 000000000..2030f3faf
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/offline/BoundaryBridge/boundaryBridgeContainerBuilder.ts
@@ -0,0 +1,24 @@
+import { OfflineFilePathRetriever } from '../../../../../context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever';
+import { OfflineFileUploader } from '../../../../../context/offline-drive/boundaryBridge/application/OfflineFileUploader';
+import { OfflineContentsDependencyContainer } from '../OfflineContents/OfflineDriveDependencyContainer';
+import { OfflineFilesContainer } from '../OfflineFiles/OfflineFilesContainer';
+import { BoundaryBridgeContainer } from './BoundaryBridgeContainer';
+
+export async function buildBoundaryBridgeContainer(
+  offlineFileContainer: OfflineFilesContainer,
+  offlineContentsContainer: OfflineContentsDependencyContainer
+): Promise<BoundaryBridgeContainer> {
+  const offlineFilePathRetriever = new OfflineFilePathRetriever(
+    offlineFileContainer.offlineFileFinder,
+    offlineContentsContainer.offlineContentsPathCalculator
+  );
+
+  const offlineFileUploader = new OfflineFileUploader(
+    offlineFilePathRetriever,
+    offlineContentsContainer.offlineContentsUploader
+  );
+
+  return {
+    offlineFileUploader,
+  };
+}
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts b/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts
new file mode 100644
index 000000000..e261e1a33
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts
@@ -0,0 +1,9 @@
+import { OfflineContentsAppended } from '../../../../../context/offline-drive/contents/application/OfflineContentsAppended';
+import { OfflineContentsPathCalculator } from '../../../../../context/offline-drive/contents/application/OfflineContentsPathCalculator';
+import { OfflineContentsUploader } from '../../../../../context/offline-drive/contents/application/OfflineContentsUploader';
+
+export interface OfflineContentsDependencyContainer {
+  offlineContentsAppended: OfflineContentsAppended;
+  offlineContentsUploader: OfflineContentsUploader;
+  offlineContentsPathCalculator: OfflineContentsPathCalculator;
+}
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts b/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
new file mode 100644
index 000000000..f118f47b7
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
@@ -0,0 +1,53 @@
+import { OfflineContentsAppended } from '../../../../../context/offline-drive/contents/application/OfflineContentsAppended';
+import { OfflineContentsPathCalculator } from '../../../../../context/offline-drive/contents/application/OfflineContentsPathCalculator';
+import { OfflineContentsUploader } from '../../../../../context/offline-drive/contents/application/OfflineContentsUploader';
+import { EnvironmentOfflineContentsManagersFactory } from '../../../../../context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
+import { NodeFSOfflineContentsRepository } from '../../../../../context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository';
+import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
+import { DependencyInjectionEventBus } from '../../common/eventBus';
+import { DependencyInjectionInxtEnvironment } from '../../common/inxt-environment';
+import { DependencyInjectionUserProvider } from '../../common/user';
+import { OfflineFilesContainer } from '../OfflineFiles/OfflineFilesContainer';
+import { OfflineContentsDependencyContainer } from './OfflineDriveDependencyContainer';
+
+export async function buildOfflineContentsContainer(
+  offlineFilesContainer: OfflineFilesContainer
+): Promise<OfflineContentsDependencyContainer> {
+  const environment = DependencyInjectionInxtEnvironment.get();
+  const user = DependencyInjectionUserProvider.get();
+  const { bus: eventBus } = DependencyInjectionEventBus;
+
+  const localFileContentsDirectoryProvider =
+    new FuseAppDataLocalFileContentsDirectoryProvider();
+  const repository = new NodeFSOfflineContentsRepository(
+    localFileContentsDirectoryProvider,
+    'uploads'
+  );
+
+  await repository.init();
+
+  const offlineContentsAppended = new OfflineContentsAppended(
+    offlineFilesContainer.offlineFileFinder,
+    offlineFilesContainer.offlineFileSizeIncreaser,
+    repository
+  );
+
+  const offlineContentsPathCalculator = new OfflineContentsPathCalculator(
+    repository
+  );
+
+  const environmentOfflineContentsManagersFactory =
+    new EnvironmentOfflineContentsManagersFactory(environment, user.bucket);
+
+  const offlineContentsUploader = new OfflineContentsUploader(
+    environmentOfflineContentsManagersFactory,
+    repository,
+    eventBus
+  );
+
+  return {
+    offlineContentsAppended,
+    offlineContentsPathCalculator,
+    offlineContentsUploader,
+  };
+}
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainer.ts b/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainer.ts
index 5507c8281..f8c4bac93 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainer.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainer.ts
@@ -1,3 +1,8 @@
+import { BoundaryBridgeContainer } from './BoundaryBridge/BoundaryBridgeContainer';
+import { OfflineContentsDependencyContainer } from './OfflineContents/OfflineDriveDependencyContainer';
 import { OfflineFilesContainer } from './OfflineFiles/OfflineFilesContainer';
 
-export type OfflineDriveDependencyContainer = OfflineFilesContainer;
+export interface OfflineDriveDependencyContainer
+  extends OfflineFilesContainer,
+    OfflineContentsDependencyContainer,
+    BoundaryBridgeContainer {}
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainerFactory.ts b/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainerFactory.ts
index e17677446..9beccb69e 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainerFactory.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainerFactory.ts
@@ -1,3 +1,5 @@
+import { buildBoundaryBridgeContainer } from './BoundaryBridge/boundaryBridgeContainerBuilder';
+import { buildOfflineContentsContainer } from './OfflineContents/offlineContentsContainerBuilder';
 import { OfflineDriveDependencyContainer } from './OfflineDriveDependencyContainer';
 import { buildOfflineFilesContainer } from './OfflineFiles/builder';
 
@@ -23,9 +25,19 @@ export class OfflineDriveDependencyContainerFactory {
     }
 
     const filesContainer = await buildOfflineFilesContainer();
+    const contentsContainer = await buildOfflineContentsContainer(
+      filesContainer
+    );
+
+    const boundaryBridgeContainer = await buildBoundaryBridgeContainer(
+      filesContainer,
+      contentsContainer
+    );
 
     const container = {
       ...filesContainer,
+      ...contentsContainer,
+      ...boundaryBridgeContainer,
     };
 
     return container;
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts b/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts
index a449dae2b..7c2210fb9 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts
@@ -1,9 +1,9 @@
-import { CreateOfflineFile } from '../../../../../context/offline-drive/files/application/CreateOfflineFile';
+import { OfflineFileFinder } from '../../../../../context/offline-drive/files/application/OfflineFileFinder';
 import { OfflineFileSearcher } from '../../../../../context/offline-drive/files/application/OfflineFileSearcher';
-import { WriteToOfflineFile } from '../../../../../context/offline-drive/files/application/WriteToOfflineFile';
+import { OfflineFileSizeIncreaser } from '../../../../../context/offline-drive/files/application/OfflineFileSizeIncreaser';
 
 export interface OfflineFilesContainer {
-  createOfflineFile: CreateOfflineFile;
   offlineFileSearcher: OfflineFileSearcher;
-  writeToOfflineFile: WriteToOfflineFile;
+  offlineFileFinder: OfflineFileFinder;
+  offlineFileSizeIncreaser: OfflineFileSizeIncreaser;
 }
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts b/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts
index fb20a520e..1669e4c65 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts
@@ -1,38 +1,21 @@
-import { CreateOfflineFile } from '../../../../../context/offline-drive/files/application/CreateOfflineFile';
 import { OfflineFileSearcher } from '../../../../../context/offline-drive/files/application/OfflineFileSearcher';
-import { WriteToOfflineFile } from '../../../../../context/offline-drive/files/application/WriteToOfflineFile';
-import { FSOfflineFileFileSystem } from '../../../../../context/offline-drive/files/infrastructure/FSOfflineFileFileSystem';
 import { InMemoryOfflineFileRepository } from '../../../../../context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository';
-import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
-import { DependencyInjectionEventBus } from '../../common/eventBus';
 import { OfflineFilesContainer } from './OfflineFilesContainer';
+import { OfflineFileFinder } from '../../../../../context/offline-drive/files/application/OfflineFileFinder';
+import { OfflineFileSizeIncreaser } from '../../../../../context/offline-drive/files/application/OfflineFileSizeIncreaser';
 
 export async function buildOfflineFilesContainer(): Promise<OfflineFilesContainer> {
-  const { bus: eventBus } = DependencyInjectionEventBus;
   const repository = new InMemoryOfflineFileRepository();
 
-  const localFileContentsDirectoryProvider =
-    new FuseAppDataLocalFileContentsDirectoryProvider();
-  const fileSystem = new FSOfflineFileFileSystem(
-    localFileContentsDirectoryProvider,
-    'uploads'
-  );
-
-  await fileSystem.init();
-
-  const createOfflineFile = new CreateOfflineFile(
-    repository,
-    fileSystem,
-    eventBus
-  );
-
   const offlineFileSearcher = new OfflineFileSearcher(repository);
 
-  const writeToOfflineFile = new WriteToOfflineFile(repository, fileSystem);
+  const offlineFileFinder = new OfflineFileFinder(offlineFileSearcher);
+
+  const offlineFileSizeIncreaser = new OfflineFileSizeIncreaser(repository);
 
   return {
-    createOfflineFile,
     offlineFileSearcher,
-    writeToOfflineFile,
+    offlineFileFinder,
+    offlineFileSizeIncreaser,
   };
 }
diff --git a/src/context/offline-drive/files/application/CreateOfflineFile.ts b/src/context/offline-drive/boundaryBridge/application/OfflineFileCreator.ts
similarity index 55%
rename from src/context/offline-drive/files/application/CreateOfflineFile.ts
rename to src/context/offline-drive/boundaryBridge/application/OfflineFileCreator.ts
index 5152e7094..d20f2e08c 100644
--- a/src/context/offline-drive/files/application/CreateOfflineFile.ts
+++ b/src/context/offline-drive/boundaryBridge/application/OfflineFileCreator.ts
@@ -1,15 +1,15 @@
 import { FilePath } from '../../../virtual-drive/files/domain/FilePath';
 import { FileSize } from '../../../virtual-drive/files/domain/FileSize';
 import { EventBus } from '../../../virtual-drive/shared/domain/EventBus';
-import { OfflineFile } from '../domain/OfflineFile';
-import { OfflineFileFileSystem } from '../domain/OfflineFileFileSystem';
-import { OfflineFileRepository } from '../domain/OfflineFileRepository';
+import { OfflineFile } from '../../files/domain/OfflineFile';
+import { OfflineContentsRepository } from '../../contents/domain/OfflineContentsRepository';
+import { OfflineFileRepository } from '../../files/domain/OfflineFileRepository';
 import * as uuid from 'uuid';
 
-export class CreateOfflineFile {
+export class OfflineFileCreator {
   constructor(
-    private readonly repository: OfflineFileRepository,
-    private readonly offlineFileSystem: OfflineFileFileSystem,
+    private readonly fileRepository: OfflineFileRepository,
+    private readonly contentsRepository: OfflineContentsRepository,
     private readonly eventBus: EventBus
   ) {}
 
@@ -21,9 +21,10 @@ export class CreateOfflineFile {
 
     const file = OfflineFile.create(id, createdAt, filePath, size);
 
-    await this.offlineFileSystem.createEmptyFile(file.id);
+    await this.contentsRepository.createEmptyFile(file.id);
+
+    await this.fileRepository.save(file);
 
-    await this.repository.save(file);
     await this.eventBus.publish(file.pullDomainEvents());
   }
 }
diff --git a/src/context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever.ts b/src/context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever.ts
new file mode 100644
index 000000000..4f178179f
--- /dev/null
+++ b/src/context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever.ts
@@ -0,0 +1,15 @@
+import { OfflineContentsPathCalculator } from '../../contents/application/OfflineContentsPathCalculator';
+import { OfflineFileFinder } from '../../files/application/OfflineFileFinder';
+
+export class OfflineFilePathRetriever {
+  constructor(
+    private readonly finder: OfflineFileFinder,
+    private readonly pathCalculator: OfflineContentsPathCalculator
+  ) {}
+
+  async run(path: string): Promise<string> {
+    const file = await this.finder.run({ path });
+
+    return await this.pathCalculator.run(file.id);
+  }
+}
diff --git a/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts b/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
new file mode 100644
index 000000000..04583401b
--- /dev/null
+++ b/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
@@ -0,0 +1,15 @@
+import { OfflineContentsUploader } from '../../contents/application/OfflineContentsUploader';
+import { OfflineFilePathRetriever } from './OfflineFilePathRetriever';
+
+export class OfflineFileUploader {
+  constructor(
+    private readonly offlineFilePathRetriever: OfflineFilePathRetriever,
+    private readonly contentsUploader: OfflineContentsUploader
+  ) {}
+
+  async run(path: string): Promise<void> {
+    const absolutePath = await this.offlineFilePathRetriever.run(path);
+
+    await this.contentsUploader.run(absolutePath);
+  }
+}
diff --git a/src/context/offline-drive/contents/application/OfflineContentsAppended.ts b/src/context/offline-drive/contents/application/OfflineContentsAppended.ts
new file mode 100644
index 000000000..0c4b82286
--- /dev/null
+++ b/src/context/offline-drive/contents/application/OfflineContentsAppended.ts
@@ -0,0 +1,29 @@
+import { OfflineFileFinder } from '../../files/application/OfflineFileFinder';
+import { OfflineFileSizeIncreaser } from '../../files/application/OfflineFileSizeIncreaser';
+import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
+
+export class OfflineContentsAppended {
+  constructor(
+    private readonly offlineFileFinder: OfflineFileFinder,
+    private readonly offlineFileSizeIncreaser: OfflineFileSizeIncreaser,
+    private readonly contentsRepository: OfflineContentsRepository
+  ) {}
+
+  async run(
+    path: string,
+    buffer: Buffer,
+    length: number,
+    position: number
+  ): Promise<void> {
+    const file = await this.offlineFileFinder.run({ path });
+
+    await this.contentsRepository.writeToFile(
+      file.id,
+      buffer,
+      length,
+      position
+    );
+
+    await this.offlineFileSizeIncreaser.run(file.id, length);
+  }
+}
diff --git a/src/context/offline-drive/contents/application/OfflineContentsPathCalculator.ts b/src/context/offline-drive/contents/application/OfflineContentsPathCalculator.ts
new file mode 100644
index 000000000..1efc7a0a1
--- /dev/null
+++ b/src/context/offline-drive/contents/application/OfflineContentsPathCalculator.ts
@@ -0,0 +1,10 @@
+import { OfflineFileAttributes } from '../../files/domain/OfflineFile';
+import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
+
+export class OfflineContentsPathCalculator {
+  constructor(private readonly repository: OfflineContentsRepository) {}
+
+  async run(id: OfflineFileAttributes['id']): Promise<string> {
+    return this.repository.getAbsolutePath(id);
+  }
+}
diff --git a/src/context/offline-drive/contents/application/OfflineContentsUploader.ts b/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
new file mode 100644
index 000000000..0435dc276
--- /dev/null
+++ b/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
@@ -0,0 +1,78 @@
+import { EventBus } from '../../../virtual-drive/shared/domain/EventBus';
+import { OfflineContentsManagersFactory } from '../domain/OfflineContentsManagersFactory';
+import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
+import { OfflineContentsUploadedDomainEvent } from '../domain/events/OfflineContentsUploadedDomainEvent';
+
+export class OfflineContentsUploader {
+  constructor(
+    private readonly contentsManagersFactory: OfflineContentsManagersFactory,
+    private readonly repository: OfflineContentsRepository,
+    private readonly eventBus: EventBus
+  ) {}
+
+  // private registerEvents(
+  //   uploader: ContentFileUploader,
+  //   localFileContents: LocalFileContents
+  // ) {
+  //   uploader.on('start', () => {
+  //     this.ipc.send('FILE_UPLOADING', {
+  //       name: localFileContents.name,
+  //       extension: localFileContents.extension,
+  //       nameWithExtension: localFileContents.nameWithExtension,
+  //       size: localFileContents.size,
+  //       processInfo: { elapsedTime: uploader.elapsedTime() },
+  //     });
+  //   });
+
+  //   uploader.on('progress', (progress: number) => {
+  //     this.ipc.send('FILE_UPLOADING', {
+  //       name: localFileContents.name,
+  //       extension: localFileContents.extension,
+  //       nameWithExtension: localFileContents.nameWithExtension,
+  //       size: localFileContents.size,
+  //       processInfo: { elapsedTime: uploader.elapsedTime(), progress },
+  //     });
+  //   });
+
+  //   uploader.on('error', (error: Error) => {
+  //     this.ipc.send('FILE_UPLOAD_ERROR', {
+  //       name: localFileContents.name,
+  //       extension: localFileContents.extension,
+  //       nameWithExtension: localFileContents.nameWithExtension,
+  //       error: error.message,
+  //     });
+  //   });
+
+  //   uploader.on('finish', () => {
+  //     this.ipc.send('FILE_UPLOADED', {
+  //       name: localFileContents.name,
+  //       extension: localFileContents.extension,
+  //       nameWithExtension: localFileContents.nameWithExtension,
+  //       size: localFileContents.size,
+  //       processInfo: { elapsedTime: uploader.elapsedTime() },
+  //     });
+  //   });
+  // }
+
+  async run(absolutePath: string): Promise<string> {
+    const { contents, abortSignal, size } = await this.repository.provide(
+      absolutePath
+    );
+
+    const uploader = this.contentsManagersFactory.uploader(size, abortSignal);
+
+    // this.registerEvents(uploader, contents);
+
+    const contentsId = await uploader.upload(contents, size);
+
+    const uploadedEvent = new OfflineContentsUploadedDomainEvent({
+      aggregateId: contentsId,
+      size,
+      absolutePath,
+    });
+
+    await this.eventBus.publish([uploadedEvent]);
+
+    return contentsId;
+  }
+}
diff --git a/src/context/offline-drive/contents/domain/OfflineContents.ts b/src/context/offline-drive/contents/domain/OfflineContents.ts
new file mode 100644
index 000000000..c601d8efa
--- /dev/null
+++ b/src/context/offline-drive/contents/domain/OfflineContents.ts
@@ -0,0 +1,71 @@
+import { Readable } from 'stream';
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
+import { OfflineContentsSize } from './OfflineContentsSize';
+
+export type LocalFileContentsAttributes = {
+  name: string;
+  extension: string;
+  size: number;
+  birthTime: number;
+  modifiedTime: number;
+  contents: Readable;
+};
+
+export class OfflineContents extends AggregateRoot {
+  private constructor(
+    private readonly _name: string,
+    private readonly _extension: string,
+    private readonly _size: OfflineContentsSize,
+    private readonly _birthTime: number,
+    private readonly _modifiedTime: number,
+    public readonly stream: Readable
+  ) {
+    super();
+  }
+
+  public get name(): string {
+    return this._name;
+  }
+  public get extension(): string {
+    return this._extension;
+  }
+
+  public get nameWithExtension(): string {
+    return this.name + (this.extension.length >= 0 ? '.' + this.extension : '');
+  }
+
+  public get size(): number {
+    return this._size.value;
+  }
+
+  public get birthTime(): number {
+    return this._birthTime;
+  }
+
+  public get modifiedTime(): number {
+    return this._modifiedTime;
+  }
+
+  static from(attributes: LocalFileContentsAttributes): OfflineContents {
+    const remoteContents = new OfflineContents(
+      attributes.name,
+      attributes.extension,
+      new OfflineContentsSize(attributes.size),
+      attributes.birthTime,
+      attributes.modifiedTime,
+      attributes.contents
+    );
+
+    return remoteContents;
+  }
+
+  attributes(): Omit<LocalFileContentsAttributes, 'contents'> {
+    return {
+      name: this.name,
+      extension: this.extension,
+      size: this.size,
+      birthTime: this.birthTime,
+      modifiedTime: this.modifiedTime,
+    };
+  }
+}
diff --git a/src/context/offline-drive/contents/domain/OfflineContentsId.ts b/src/context/offline-drive/contents/domain/OfflineContentsId.ts
new file mode 100644
index 000000000..29f5083b9
--- /dev/null
+++ b/src/context/offline-drive/contents/domain/OfflineContentsId.ts
@@ -0,0 +1,3 @@
+import { Uuid } from '../../../virtual-drive/shared/domain/Uuid';
+
+export class OfflineContentsId extends Uuid {}
diff --git a/src/context/offline-drive/contents/domain/OfflineContentsManagersFactory.ts b/src/context/offline-drive/contents/domain/OfflineContentsManagersFactory.ts
new file mode 100644
index 000000000..fc1b14c78
--- /dev/null
+++ b/src/context/offline-drive/contents/domain/OfflineContentsManagersFactory.ts
@@ -0,0 +1,25 @@
+import { Readable } from 'stream';
+
+type ContentsId = string;
+
+export type OfflineContentsUploadEvents = {
+  start: () => void;
+  progress: (progress: number) => void;
+  finish: (fileId: ContentsId) => void;
+  error: (error: Error) => void;
+};
+
+export interface OfflineContentUploader {
+  upload(contents: Readable, size: number): Promise<ContentsId>;
+
+  on(
+    event: keyof OfflineContentsUploadEvents,
+    fn: OfflineContentsUploadEvents[keyof OfflineContentsUploadEvents]
+  ): void;
+
+  elapsedTime(): number;
+}
+
+export interface OfflineContentsManagersFactory {
+  uploader(size: number, abortSignal?: AbortSignal): OfflineContentUploader;
+}
diff --git a/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts b/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts
new file mode 100644
index 000000000..0a8d4daa1
--- /dev/null
+++ b/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts
@@ -0,0 +1,21 @@
+import { Readable } from 'stream';
+import { OfflineFileAttributes } from '../../files/domain/OfflineFile';
+
+export interface OfflineContentsRepository {
+  writeToFile(
+    id: OfflineFileAttributes['id'],
+    buffer: Buffer,
+    length: number,
+    position: number
+  ): Promise<void>;
+
+  createEmptyFile(id: OfflineFileAttributes['id']): Promise<void>;
+
+  getAbsolutePath(id: OfflineFileAttributes['id']): Promise<string>;
+
+  provide: (path: string) => Promise<{
+    contents: Readable;
+    size: number;
+    abortSignal: AbortSignal;
+  }>;
+}
diff --git a/src/context/offline-drive/contents/domain/OfflineContentsSize.ts b/src/context/offline-drive/contents/domain/OfflineContentsSize.ts
new file mode 100644
index 000000000..aaca41f00
--- /dev/null
+++ b/src/context/offline-drive/contents/domain/OfflineContentsSize.ts
@@ -0,0 +1,3 @@
+import { BucketEntry } from '../../../virtual-drive/shared/domain/BucketEntry';
+
+export class OfflineContentsSize extends BucketEntry {}
diff --git a/src/context/offline-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts b/src/context/offline-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts
new file mode 100644
index 000000000..58b9a823c
--- /dev/null
+++ b/src/context/offline-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts
@@ -0,0 +1,53 @@
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
+
+export class ContentsDownloadedDomainEvent extends DomainEvent {
+  static readonly EVENT_NAME = 'contents.downloaded';
+
+  readonly name: string;
+  readonly extension: string;
+  readonly nameWithExtension: string;
+  readonly size: number;
+  readonly elapsedTime: number;
+
+  constructor({
+    aggregateId,
+    eventId,
+    name,
+    extension,
+    nameWithExtension,
+    size,
+    elapsedTime,
+  }: {
+    aggregateId: string;
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    size: number;
+    elapsedTime: number;
+    eventId?: string;
+  }) {
+    super({
+      eventName: 'contents.downloaded',
+      aggregateId,
+      eventId,
+    });
+
+    this.name = name;
+    this.extension = extension;
+    this.nameWithExtension = nameWithExtension;
+    this.size = size;
+    this.elapsedTime = elapsedTime;
+  }
+
+  toPrimitives() {
+    return {
+      aggregateId: this.aggregateId,
+      eventId: this.eventId,
+      name: this.name,
+      extension: this.extension,
+      nameWithExtension: this.nameWithExtension,
+      size: this.size,
+      elapsedTime: this.elapsedTime,
+    };
+  }
+}
diff --git a/src/context/offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent.ts b/src/context/offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent.ts
new file mode 100644
index 000000000..38c751b65
--- /dev/null
+++ b/src/context/offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent.ts
@@ -0,0 +1,34 @@
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
+
+export class OfflineContentsUploadedDomainEvent extends DomainEvent {
+  static readonly EVENT_NAME = 'offline.contents.uploaded';
+
+  readonly size: number;
+  readonly absolutePath: string;
+
+  constructor({
+    aggregateId,
+    size,
+    absolutePath,
+  }: {
+    aggregateId: string;
+    size: number;
+    absolutePath: string;
+  }) {
+    super({
+      aggregateId,
+      eventName: OfflineContentsUploadedDomainEvent.EVENT_NAME,
+    });
+
+    this.size = size;
+    this.absolutePath = absolutePath;
+  }
+
+  toPrimitives() {
+    return {
+      aggregateId: this.aggregateId,
+      size: this.size,
+      absolutePath: this.absolutePath,
+    };
+  }
+}
diff --git a/src/context/offline-drive/contents/infrastructure/EnvironmentOfflineContentsUploader.ts b/src/context/offline-drive/contents/infrastructure/EnvironmentOfflineContentsUploader.ts
new file mode 100644
index 000000000..f8959539b
--- /dev/null
+++ b/src/context/offline-drive/contents/infrastructure/EnvironmentOfflineContentsUploader.ts
@@ -0,0 +1,66 @@
+import { UploadStrategyFunction } from '@internxt/inxt-js/build/lib/core/upload/strategy';
+import { EventEmitter, Readable } from 'stream';
+import { Stopwatch } from '../../../../apps/shared/types/Stopwatch';
+import {
+  OfflineContentUploader,
+  OfflineContentsUploadEvents,
+} from '../domain/OfflineContentsManagersFactory';
+
+export class EnvironmentOfflineContentsUploader
+  implements OfflineContentUploader
+{
+  private eventEmitter: EventEmitter;
+  private stopwatch: Stopwatch;
+
+  constructor(
+    private readonly fn: UploadStrategyFunction,
+    private readonly bucket: string,
+    private readonly abortSignal?: AbortSignal
+  ) {
+    this.eventEmitter = new EventEmitter();
+    this.stopwatch = new Stopwatch();
+  }
+
+  async upload(contents: Readable, size: number): Promise<string> {
+    this.eventEmitter.emit('start');
+    this.stopwatch.start();
+
+    return new Promise((resolve, reject) => {
+      const state = this.fn(this.bucket, {
+        source: contents,
+        fileSize: size,
+        finishedCallback: (err: Error | null, contentsId: string) => {
+          this.stopwatch.finish();
+
+          if (err) {
+            this.eventEmitter.emit('error', err);
+            return reject(err);
+          }
+          this.eventEmitter.emit('finish', contentsId);
+          resolve(contentsId);
+        },
+        progressCallback: (progress: number) => {
+          this.eventEmitter.emit('progress', progress);
+        },
+      });
+
+      if (this.abortSignal) {
+        this.abortSignal.addEventListener('abort', () => {
+          state.stop();
+          contents.destroy();
+        });
+      }
+    });
+  }
+
+  on(
+    event: keyof OfflineContentsUploadEvents,
+    handler: OfflineContentsUploadEvents[keyof OfflineContentsUploadEvents]
+  ): void {
+    this.eventEmitter.on(event, handler);
+  }
+
+  elapsedTime(): number {
+    return this.stopwatch.elapsedTime();
+  }
+}
diff --git a/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts b/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
new file mode 100644
index 000000000..edec548a2
--- /dev/null
+++ b/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
@@ -0,0 +1,28 @@
+import { Environment } from '@internxt/inxt-js';
+import {
+  OfflineContentUploader,
+  OfflineContentsManagersFactory,
+} from '../domain/OfflineContentsManagersFactory';
+import { EnvironmentOfflineContentsUploader } from './EnvironmentOfflineContentsUploader';
+
+export class EnvironmentOfflineContentsManagersFactory
+  implements OfflineContentsManagersFactory
+{
+  private static MULTIPART_UPLOAD_SIZE_THRESHOLD = 5 * 1024 * 1024 * 1024;
+
+  constructor(
+    private readonly environment: Environment,
+    private readonly bucket: string
+  ) {}
+
+  uploader(size: number, abortSignal?: AbortSignal): OfflineContentUploader {
+    size;
+    const fn =
+      size >
+      EnvironmentOfflineContentsManagersFactory.MULTIPART_UPLOAD_SIZE_THRESHOLD
+        ? this.environment.uploadMultipartFile
+        : this.environment.upload;
+
+    return new EnvironmentOfflineContentsUploader(fn, this.bucket, abortSignal);
+  }
+}
diff --git a/src/context/offline-drive/files/infrastructure/FSOfflineFileFileSystem.ts b/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
similarity index 81%
rename from src/context/offline-drive/files/infrastructure/FSOfflineFileFileSystem.ts
rename to src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
index 07e0ca983..ba0c67846 100644
--- a/src/context/offline-drive/files/infrastructure/FSOfflineFileFileSystem.ts
+++ b/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
@@ -1,11 +1,14 @@
 import fs from 'fs';
-import { OfflineFileFileSystem } from '../domain/OfflineFileFileSystem';
-import { OfflineFileAttributes } from '../domain/OfflineFile';
+import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
+import { OfflineFileAttributes } from '../../files/domain/OfflineFile';
 import { LocalFileContentsDirectoryProvider } from '../../../virtual-drive/shared/domain/LocalFileContentsDirectoryProvider';
 import path from 'path';
 import Logger from 'electron-log';
+import { Readable } from 'stream';
 
-export class FSOfflineFileFileSystem implements OfflineFileFileSystem {
+export class NodeFSOfflineContentsRepository
+  implements OfflineContentsRepository
+{
   constructor(
     private readonly locationProvider: LocalFileContentsDirectoryProvider,
     private readonly subfolder: string
@@ -85,4 +88,12 @@ export class FSOfflineFileFileSystem implements OfflineFileFileSystem {
       });
     });
   }
+
+  async getAbsolutePath(id: string): Promise<string> {
+    return this.filePath(id);
+  }
+
+  provide: (
+    path: string
+  ) => Promise<{ contents: Readable; size: number; abortSignal: AbortSignal }>;
 }
diff --git a/src/context/offline-drive/files/application/ClearOfflineFileOnFileCreated.ts b/src/context/offline-drive/files/application/ClearOfflineFileOnFileCreated.ts
new file mode 100644
index 000000000..70223983a
--- /dev/null
+++ b/src/context/offline-drive/files/application/ClearOfflineFileOnFileCreated.ts
@@ -0,0 +1,18 @@
+import { DomainEventClass } from '../../../shared/domain/DomainEvent';
+import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
+import { FileCreatedDomainEvent } from '../../../virtual-drive/files/domain/events/FileCreatedDomainEvent';
+import { OfflineFileDeleter } from './OfflineFileDeleter';
+
+export class ClearOfflineFileOnFileCreated
+  implements DomainEventSubscriber<FileCreatedDomainEvent>
+{
+  constructor(private readonly deleter: OfflineFileDeleter) {}
+
+  subscribedTo(): DomainEventClass[] {
+    return [FileCreatedDomainEvent];
+  }
+
+  async on(event: FileCreatedDomainEvent): Promise<void> {
+    await this.deleter.run(event.path);
+  }
+}
diff --git a/src/context/offline-drive/files/application/OfflineFileDeleter.ts b/src/context/offline-drive/files/application/OfflineFileDeleter.ts
new file mode 100644
index 000000000..23ca01079
--- /dev/null
+++ b/src/context/offline-drive/files/application/OfflineFileDeleter.ts
@@ -0,0 +1,15 @@
+import { OfflineFileRepository } from '../domain/OfflineFileRepository';
+
+export class OfflineFileDeleter {
+  constructor(private readonly repository: OfflineFileRepository) {}
+
+  async run(path: string): Promise<void> {
+    const file = await this.repository.searchByPartial({ path });
+
+    if (!file) {
+      return;
+    }
+
+    await this.repository.delete(file.id);
+  }
+}
diff --git a/src/context/offline-drive/files/application/OfflineFileFinder.ts b/src/context/offline-drive/files/application/OfflineFileFinder.ts
new file mode 100644
index 000000000..e58f3fc48
--- /dev/null
+++ b/src/context/offline-drive/files/application/OfflineFileFinder.ts
@@ -0,0 +1,16 @@
+import { OfflineFile, OfflineFileAttributes } from '../domain/OfflineFile';
+import { OfflineFileSearcher } from './OfflineFileSearcher';
+
+export class OfflineFileFinder {
+  constructor(private readonly searcher: OfflineFileSearcher) {}
+
+  async run(partial: Partial<OfflineFileAttributes>): Promise<OfflineFile> {
+    const file = await this.searcher.execute(partial);
+
+    if (!file) {
+      throw new Error('Offline file not founded');
+    }
+
+    return file;
+  }
+}
diff --git a/src/context/offline-drive/files/application/OfflineFileSearcher.ts b/src/context/offline-drive/files/application/OfflineFileSearcher.ts
index 7f6ec1327..84d74810e 100644
--- a/src/context/offline-drive/files/application/OfflineFileSearcher.ts
+++ b/src/context/offline-drive/files/application/OfflineFileSearcher.ts
@@ -1,10 +1,12 @@
-import { OfflineFile } from '../domain/OfflineFile';
+import { OfflineFile, OfflineFileAttributes } from '../domain/OfflineFile';
 import { OfflineFileRepository } from '../domain/OfflineFileRepository';
 
 export class OfflineFileSearcher {
   constructor(private readonly repository: OfflineFileRepository) {}
 
-  async execute(path: string): Promise<OfflineFile | undefined> {
-    return await this.repository.searchByPartial({ path });
+  async execute(
+    partial: Partial<OfflineFileAttributes>
+  ): Promise<OfflineFile | undefined> {
+    return await this.repository.searchByPartial(partial);
   }
 }
diff --git a/src/context/offline-drive/files/application/OfflineFileSizeIncreaser.ts b/src/context/offline-drive/files/application/OfflineFileSizeIncreaser.ts
new file mode 100644
index 000000000..f8f4a59eb
--- /dev/null
+++ b/src/context/offline-drive/files/application/OfflineFileSizeIncreaser.ts
@@ -0,0 +1,17 @@
+import { OfflineFileRepository } from '../domain/OfflineFileRepository';
+
+export class OfflineFileSizeIncreaser {
+  constructor(private readonly repository: OfflineFileRepository) {}
+
+  async run(id: string, amount: number): Promise<void> {
+    const file = await this.repository.searchByPartial({ id });
+
+    if (!file) {
+      throw new Error('Offline file not found');
+    }
+
+    file.increaseSizeBy(amount);
+
+    await this.repository.save(file);
+  }
+}
diff --git a/src/context/offline-drive/files/application/WriteToOfflineFile.ts b/src/context/offline-drive/files/application/WriteToOfflineFile.ts
deleted file mode 100644
index 1d5fbda79..000000000
--- a/src/context/offline-drive/files/application/WriteToOfflineFile.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { OfflineFileFileSystem } from '../domain/OfflineFileFileSystem';
-import { OfflineFileRepository } from '../domain/OfflineFileRepository';
-
-export class WriteToOfflineFile {
-  constructor(
-    private readonly repository: OfflineFileRepository,
-    private readonly fileSystem: OfflineFileFileSystem
-  ) {}
-
-  async run(
-    path: string,
-    buffer: Buffer,
-    length: number,
-    position: number
-  ): Promise<void> {
-    const file = await this.repository.searchByPartial({ path });
-
-    if (!file) {
-      // TODO: IMPROVE THE
-      throw new Error('File not found');
-    }
-
-    await this.fileSystem.writeToFile(file.id, buffer, length, position);
-
-    file.increaseSizeBy(length);
-
-    await this.repository.save(file);
-  }
-}
diff --git a/src/context/offline-drive/files/domain/OfflineFileFileSystem.ts b/src/context/offline-drive/files/domain/OfflineFileFileSystem.ts
deleted file mode 100644
index e964a99ad..000000000
--- a/src/context/offline-drive/files/domain/OfflineFileFileSystem.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { OfflineFileAttributes } from './OfflineFile';
-
-export interface OfflineFileFileSystem {
-  writeToFile(
-    id: OfflineFileAttributes['id'],
-    buffer: Buffer,
-    length: number,
-    position: number
-  ): Promise<void>;
-
-  createEmptyFile(id: OfflineFileAttributes['id']): Promise<void>;
-}
diff --git a/src/context/offline-drive/files/domain/OfflineFileRepository.ts b/src/context/offline-drive/files/domain/OfflineFileRepository.ts
index b3bf0b015..7fc8b4ace 100644
--- a/src/context/offline-drive/files/domain/OfflineFileRepository.ts
+++ b/src/context/offline-drive/files/domain/OfflineFileRepository.ts
@@ -6,4 +6,6 @@ export interface OfflineFileRepository {
   searchByPartial(
     partial: Partial<OfflineFileAttributes>
   ): Promise<OfflineFile | undefined>;
+
+  delete(id: OfflineFileAttributes['id']): Promise<void>;
 }
diff --git a/src/context/offline-drive/files/domain/events/OfflineFileUploaded.ts b/src/context/offline-drive/files/domain/events/OfflineFileUploaded.ts
new file mode 100644
index 000000000..fc18877ad
--- /dev/null
+++ b/src/context/offline-drive/files/domain/events/OfflineFileUploaded.ts
@@ -0,0 +1,39 @@
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
+
+export class OfflineFileUploaded extends DomainEvent {
+  static readonly EVENT_NAME = 'offline.file.uploaded';
+
+  readonly remoteContentsId: string;
+  readonly size: number;
+  readonly createdAt: number;
+
+  constructor({
+    aggregateId,
+    remoteContentsId,
+    size,
+    createdAt,
+  }: {
+    aggregateId: string;
+    remoteContentsId: string;
+    size: number;
+    createdAt: number;
+  }) {
+    super({
+      aggregateId,
+      eventName: OfflineFileUploaded.EVENT_NAME,
+    });
+
+    this.remoteContentsId = remoteContentsId;
+    this.size = size;
+    this.createdAt = createdAt;
+  }
+
+  toPrimitives() {
+    return {
+      aggregateId: this.aggregateId,
+      remoteContentsId: this.remoteContentsId,
+      size: this.size,
+      createdAt: this.createdAt,
+    };
+  }
+}
diff --git a/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts b/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts
index 521486e38..c9360b418 100644
--- a/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts
+++ b/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts
@@ -25,4 +25,8 @@ export class InMemoryOfflineFileRepository implements OfflineFileRepository {
 
     return file;
   }
+
+  async delete(id: OfflineFileAttributes['id']): Promise<void> {
+    this.files.delete(id);
+  }
 }
diff --git a/src/context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator.ts b/src/context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator.ts
index 8e3f8eb9e..98a033698 100644
--- a/src/context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator.ts
+++ b/src/context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator.ts
@@ -24,7 +24,11 @@ export class FileCreationOrchestrator {
 
     const fileContents = await this.contentsUploader.run(posixRelativePath);
 
-    const createdFile = await this.fileCreator.run(path, fileContents);
+    const createdFile = await this.fileCreator.run(
+      path.value,
+      fileContents.id,
+      fileContents.size
+    );
 
     return createdFile.contentsId;
   }
diff --git a/src/context/virtual-drive/contents/application/ContentsUploader.ts b/src/context/virtual-drive/contents/application/ContentsUploader.ts
index 15f1247e7..53c519671 100644
--- a/src/context/virtual-drive/contents/application/ContentsUploader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsUploader.ts
@@ -3,12 +3,14 @@ import { LocalContentsProvider } from '../domain/LocalFileProvider';
 import { RemoteFileContents } from '../domain/RemoteFileContents';
 import { PlatformPathConverter } from '../../shared/application/PlatformPathConverter';
 import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
+import { EventBus } from '../../shared/domain/EventBus';
 
 export class ContentsUploader {
   constructor(
     private readonly remoteContentsManagersFactory: ContentsManagersFactory,
     private readonly contentProvider: LocalContentsProvider,
-    private readonly relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter
+    private readonly relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter,
+    private readonly eventBus: EventBus
   ) {}
 
   // private registerEvents(
@@ -77,6 +79,8 @@ export class ContentsUploader {
 
     const fileContents = RemoteFileContents.create(contentsId, contents.size);
 
+    await this.eventBus.publish(fileContents.pullDomainEvents());
+
     return fileContents;
   }
 }
diff --git a/src/context/virtual-drive/contents/application/LocalContentsMover.ts b/src/context/virtual-drive/contents/application/LocalContentsMover.ts
new file mode 100644
index 000000000..debb1f1b9
--- /dev/null
+++ b/src/context/virtual-drive/contents/application/LocalContentsMover.ts
@@ -0,0 +1,18 @@
+import { ContentsId } from '../domain/ContentsId';
+import { LocalFileSystem } from '../domain/LocalFileSystem';
+
+export class LocalContentsMover {
+  constructor(private readonly fileSystem: LocalFileSystem) {}
+
+  async run(contentsId: string, src: string): Promise<void> {
+    const exists = await this.fileSystem.exists(contentsId);
+
+    if (exists) {
+      this.fileSystem.remove(contentsId);
+    }
+
+    const id = new ContentsId(contentsId);
+
+    await this.fileSystem.add(id, src);
+  }
+}
diff --git a/src/context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded.ts b/src/context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded.ts
new file mode 100644
index 000000000..16fb67357
--- /dev/null
+++ b/src/context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded.ts
@@ -0,0 +1,17 @@
+import { OfflineContentsUploadedDomainEvent } from '../../../offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent';
+import { DomainEventClass } from '../../../shared/domain/DomainEvent';
+import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
+import { LocalContentsMover } from './LocalContentsMover';
+
+export class MoveOfflineContentsOnContentsUploaded
+  implements DomainEventSubscriber<OfflineContentsUploadedDomainEvent>
+{
+  constructor(private readonly mover: LocalContentsMover) {}
+
+  subscribedTo(): DomainEventClass[] {
+    return [OfflineContentsUploadedDomainEvent];
+  }
+  async on(domainEvent: OfflineContentsUploadedDomainEvent): Promise<void> {
+    await this.mover.run(domainEvent.absolutePath, domainEvent.aggregateId);
+  }
+}
diff --git a/src/context/virtual-drive/contents/domain/LocalFileSystem.ts b/src/context/virtual-drive/contents/domain/LocalFileSystem.ts
index e3808ffb2..614e3f4a7 100644
--- a/src/context/virtual-drive/contents/domain/LocalFileSystem.ts
+++ b/src/context/virtual-drive/contents/domain/LocalFileSystem.ts
@@ -1,11 +1,15 @@
+import { ContentsId } from './ContentsId';
 import { LocalFileContents } from './LocalFileContents';
+import { RemoteFileContents } from './RemoteFileContents';
 
 type ResultFilePath = string;
 
 export interface LocalFileSystem {
   write(contents: LocalFileContents, name?: string): Promise<ResultFilePath>;
 
-  remove(path: string): Promise<void>;
+  remove(contentsId: RemoteFileContents['id']): Promise<void>;
 
-  exists(path: string): Promise<boolean>;
+  exists(contentsId: RemoteFileContents['id']): Promise<boolean>;
+
+  add(contentsId: ContentsId, source: string): Promise<void>;
 }
diff --git a/src/context/virtual-drive/contents/domain/RemoteFileContents.ts b/src/context/virtual-drive/contents/domain/RemoteFileContents.ts
index e48baa6a8..bd91e2426 100644
--- a/src/context/virtual-drive/contents/domain/RemoteFileContents.ts
+++ b/src/context/virtual-drive/contents/domain/RemoteFileContents.ts
@@ -1,6 +1,7 @@
 import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
 import { ContentsId } from './ContentsId';
 import { ContentsSize } from './ContentsSize';
+import { ContentsUploadedDomainEvent } from './events/ContentsUploadedDomainEvent';
 
 export type RemoteFileContentsAttributes = {
   id: string;
@@ -24,7 +25,13 @@ export class RemoteFileContents extends AggregateRoot {
   }
 
   static create(id: ContentsId, size: number): RemoteFileContents {
-    return new RemoteFileContents(id, new ContentsSize(size));
+    const contents = new RemoteFileContents(id, new ContentsSize(size));
+
+    contents.record(
+      new ContentsUploadedDomainEvent({ aggregateId: contents.id, size })
+    );
+
+    return contents;
   }
 
   static from(attributes: RemoteFileContentsAttributes): RemoteFileContents {
diff --git a/src/context/virtual-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts b/src/context/virtual-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts
index 7b15bfba5..58b9a823c 100644
--- a/src/context/virtual-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts
+++ b/src/context/virtual-drive/contents/domain/events/ContentsDownloadedDomainEvent.ts
@@ -1,7 +1,7 @@
 import { DomainEvent } from '../../../../shared/domain/DomainEvent';
 
 export class ContentsDownloadedDomainEvent extends DomainEvent {
-  static readonly EVENT_NAME: 'contents.downloaded';
+  static readonly EVENT_NAME = 'contents.downloaded';
 
   readonly name: string;
   readonly extension: string;
diff --git a/src/context/virtual-drive/contents/domain/events/ContentsUploadedDomainEvent.ts b/src/context/virtual-drive/contents/domain/events/ContentsUploadedDomainEvent.ts
new file mode 100644
index 000000000..44fe9d91b
--- /dev/null
+++ b/src/context/virtual-drive/contents/domain/events/ContentsUploadedDomainEvent.ts
@@ -0,0 +1,23 @@
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
+
+export class ContentsUploadedDomainEvent extends DomainEvent {
+  static readonly EVENT_NAME = 'contents.uploaded';
+
+  private readonly size: number;
+
+  constructor({ aggregateId, size }: { aggregateId: string; size: number }) {
+    super({
+      aggregateId,
+      eventName: ContentsUploadedDomainEvent.EVENT_NAME,
+    });
+
+    this.size = size;
+  }
+
+  toPrimitives() {
+    return {
+      aggregateId: this.aggregateId,
+      size: this.size,
+    };
+  }
+}
diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
index 65d52dc5c..314b219dd 100644
--- a/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
@@ -6,6 +6,7 @@ import { LocalFileSystem } from '../domain/LocalFileSystem';
 import path from 'path';
 import fs from 'fs/promises';
 import Logger from 'electron-log';
+import { ContentsId } from '../domain/ContentsId';
 
 export class FSLocalFileSystem implements LocalFileSystem {
   constructor(
@@ -46,11 +47,18 @@ export class FSLocalFileSystem implements LocalFileSystem {
     const absolutePath = path.join(folder, relativePath);
 
     try {
-      Logger.debug(' exists path,', absolutePath);
       await fs.stat(absolutePath);
       return true;
     } catch {
       return false;
     }
   }
+
+  async add(contentsId: ContentsId, source: string): Promise<void> {
+    const folder = await this.baseFolder();
+
+    const destination = path.join(folder, contentsId.value);
+
+    await fs.rename(source, destination);
+  }
 }
diff --git a/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts b/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts
new file mode 100644
index 000000000..3110f85ec
--- /dev/null
+++ b/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts
@@ -0,0 +1,24 @@
+import { OfflineContentsUploadedDomainEvent } from '../../../offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent';
+import { DomainEventClass } from '../../../shared/domain/DomainEvent';
+import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
+import { AbsolutePathToRelativeConverter } from '../../shared/application/AbsolutePathToRelativeConverter';
+import { FileCreator } from './FileCreator';
+
+export class CreateFileOnOfflineFileUploaded
+  implements DomainEventSubscriber<OfflineContentsUploadedDomainEvent>
+{
+  constructor(
+    private readonly creator: FileCreator,
+    private readonly converter: AbsolutePathToRelativeConverter
+  ) {}
+
+  subscribedTo(): DomainEventClass[] {
+    return [OfflineContentsUploadedDomainEvent];
+  }
+
+  async on(event: OfflineContentsUploadedDomainEvent): Promise<void> {
+    const filePath = this.converter.run(event.absolutePath);
+
+    await this.creator.run(filePath, event.aggregateId, event.size);
+  }
+}
diff --git a/src/context/virtual-drive/files/application/FileCreator.ts b/src/context/virtual-drive/files/application/FileCreator.ts
index 370a52d41..df90731e0 100644
--- a/src/context/virtual-drive/files/application/FileCreator.ts
+++ b/src/context/virtual-drive/files/application/FileCreator.ts
@@ -3,7 +3,6 @@ import { FilePath } from '../domain/FilePath';
 import { File } from '../domain/File';
 import { FileSize } from '../domain/FileSize';
 import { EventBus } from '../../shared/domain/EventBus';
-import { RemoteFileContents } from '../../contents/domain/RemoteFileContents';
 import { FileDeleter } from './FileDeleter';
 import { PlatformPathConverter } from '../../shared/application/PlatformPathConverter';
 import { FileRepository } from '../domain/FileRepository';
@@ -19,8 +18,10 @@ export class FileCreator {
     private readonly eventBus: EventBus
   ) {}
 
-  async run(filePath: FilePath, contents: RemoteFileContents): Promise<File> {
+  async run(path: string, contentsId: string, size: number): Promise<File> {
     try {
+      const filePath = new FilePath(path);
+
       const existingFile = this.repository.searchByPartial({
         path: PlatformPathConverter.winToPosix(filePath.value),
       });
@@ -29,14 +30,19 @@ export class FileCreator {
         await this.fileDeleter.run(existingFile.contentsId);
       }
 
-      const size = new FileSize(contents.size);
+      const fileSize = new FileSize(size);
 
       const folder = this.folderFinder.findFromFilePath(filePath);
 
-      const offline = OfflineFile.create(contents.id, folder, size, filePath);
+      const offline = OfflineFile.create(
+        contentsId,
+        folder,
+        fileSize,
+        filePath
+      );
 
       const persistedAttributes = await this.remote.persist(offline);
-      const file = File.from(persistedAttributes);
+      const file = File.create(persistedAttributes);
 
       await this.repository.add(file);
 
diff --git a/src/context/virtual-drive/files/domain/File.ts b/src/context/virtual-drive/files/domain/File.ts
index 68a827dfb..194e3fbbc 100644
--- a/src/context/virtual-drive/files/domain/File.ts
+++ b/src/context/virtual-drive/files/domain/File.ts
@@ -97,29 +97,23 @@ export class File extends AggregateRoot {
     );
   }
 
-  static create(
-    id: number,
-    contentsId: string,
-    folder: Folder,
-    size: FileSize,
-    path: FilePath
-  ): File {
+  static create(attributes: FileAttributes): File {
     const file = new File(
-      id,
-      new ContentsId(contentsId),
-      folder.id,
-      path,
-      size,
-      new Date(),
-      new Date(),
-      FileStatus.Exists
+      attributes.id,
+      new ContentsId(attributes.contentsId),
+      attributes.folderId,
+      new FilePath(attributes.path),
+      new FileSize(attributes.size),
+      new Date(attributes.createdAt),
+      new Date(attributes.updatedAt),
+      FileStatus.fromValue(attributes.status)
     );
 
     file.record(
       new FileCreatedDomainEvent({
-        aggregateId: contentsId,
+        aggregateId: file.contentsId,
         size: file.size,
-        type: path.extension(),
+        type: file.type,
       })
     );
 
diff --git a/src/context/virtual-drive/files/domain/events/FileCreatedDomainEvent.ts b/src/context/virtual-drive/files/domain/events/FileCreatedDomainEvent.ts
index c52845306..2f01703e5 100644
--- a/src/context/virtual-drive/files/domain/events/FileCreatedDomainEvent.ts
+++ b/src/context/virtual-drive/files/domain/events/FileCreatedDomainEvent.ts
@@ -3,6 +3,7 @@ import { DomainEvent } from '../../../../shared/domain/DomainEvent';
 export type CreatedWebdavFileDomainEventAttributes = {
   readonly size: number;
   readonly type: string;
+  readonly path: string;
 };
 
 export class FileCreatedDomainEvent extends DomainEvent {
@@ -10,17 +11,20 @@ export class FileCreatedDomainEvent extends DomainEvent {
 
   readonly size: number;
   readonly type: string;
+  readonly path: string;
 
   constructor({
     aggregateId,
     eventId,
     size,
     type,
+    path,
   }: {
     aggregateId: string;
     eventId?: string;
     size: number;
     type: string;
+    path: string;
   }) {
     super({
       eventName: FileCreatedDomainEvent.EVENT_NAME,
@@ -29,11 +33,12 @@ export class FileCreatedDomainEvent extends DomainEvent {
     });
     this.size = size;
     this.type = type;
+    this.path = path;
   }
 
   toPrimitives(): CreatedWebdavFileDomainEventAttributes {
-    const { size, type } = this;
+    const { size, type, path } = this;
 
-    return { size, type };
+    return { size, type, path };
   }
 }
diff --git a/src/context/virtual-drive/shared/domain/Uuid.ts b/src/context/virtual-drive/shared/domain/Uuid.ts
new file mode 100644
index 000000000..1a72dbaef
--- /dev/null
+++ b/src/context/virtual-drive/shared/domain/Uuid.ts
@@ -0,0 +1,20 @@
+import * as uuid from 'uuid';
+import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { ValueObject } from '../../../shared/domain/ValueObject';
+
+export class Uuid extends ValueObject<string> {
+  constructor(value: string) {
+    super(value);
+    this.ensureIsValid(value);
+  }
+
+  private ensureIsValid(value: string) {
+    if (!uuid.validate(value)) {
+      throw new InvalidArgumentError(`Value: ${value} is not a valid uuid`);
+    }
+  }
+
+  static random(): Uuid {
+    return new Uuid(uuid.v4());
+  }
+}

From e24a20d80e541e55e49d15db52c0b9844f0d0a79 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Tue, 2 Jan 2024 14:03:44 +0100
Subject: [PATCH 099/188] feat: upload complete

---
 src/apps/fuse/FuseApp.ts                      | 43 +++++-----
 src/apps/fuse/callbacks/CreateFile.ts         |  2 +-
 src/apps/fuse/callbacks/CreateFolder.ts       |  4 +-
 src/apps/fuse/callbacks/GetAttributes.ts      |  6 +-
 src/apps/fuse/callbacks/GetXAttribute.ts      |  2 +-
 src/apps/fuse/callbacks/Open.ts               |  4 +-
 src/apps/fuse/callbacks/Read.ts               |  4 +-
 src/apps/fuse/callbacks/Readdir.ts            |  4 +-
 src/apps/fuse/callbacks/ReleaseCallback.ts    |  8 +-
 src/apps/fuse/callbacks/RenameAndMove.ts      |  4 +-
 src/apps/fuse/callbacks/TrashFile.ts          |  4 +-
 src/apps/fuse/callbacks/TrashFolder.ts        |  4 +-
 .../{WriteFile.ts => WriteCallback.ts}        |  4 +-
 .../FuseDependencyContainer.ts                |  7 ++
 .../FuseDependencyContainerFactory.ts         | 53 ++++++++++++
 .../FuseDomainEventSubscribers.ts             | 23 +++++
 .../BoundaryBridge/BoundaryBridgeContainer.ts |  2 +
 .../boundaryBridgeContainerBuilder.ts         | 14 +++-
 .../OfflineDriveDependencyContainer.ts        |  6 +-
 .../offlineContentsContainerBuilder.ts        | 10 ++-
 .../OfflineFiles/OfflineFilesContainer.ts     |  2 +
 .../offline/OfflineFiles/builder.ts           |  7 ++
 ....ts => VirtualDriveDependencyContainer.ts} |  2 +-
 ...VirtualDriveDependencyContainerFactory.ts} | 26 +++---
 .../boundaryBridge/BoundaryBridgeContainer.ts |  2 +-
 .../virtual-drive/boundaryBridge/builder.ts   |  2 +-
 .../virtual-drive/contents/builder.ts         |  3 +-
 .../virtual-drive/files/FilesContainer.ts     |  2 +
 .../virtual-drive/files/builder.ts            |  6 ++
 .../virtual-drive/shared/SharedContainer.ts   |  2 +
 .../virtual-drive/shared/builder.ts           |  6 ++
 src/apps/fuse/index.ts                        | 15 ++--
 src/apps/sync-engine/BindingManager.ts        |  4 +-
 .../callbacks-controllers/buildControllers.ts |  4 +-
 ...er.ts => SyncEngineDependencyContainer.ts} |  2 +-
 ...> SyncEngineDependencyContainerFactory.ts} | 30 +++----
 .../SyncEngineDomainEventSubscribers.ts       | 20 +++++
 src/apps/sync-engine/index.ts                 |  4 +-
 .../OfflineFileAndContentsCreator.ts          | 15 ++++
 .../application/OfflineFilePathRetriever.ts   | 11 +--
 .../application/OfflineFileUploader.ts        | 20 ++++-
 .../application/OfflineContentsAppended.ts    |  2 +-
 .../application/OfflineContentsCreator.ts     |  9 ++
 .../application/OfflineContentsUploader.ts    | 83 +++++++------------
 .../OfflineContentsUploadedDomainEvent.ts     | 10 +--
 .../NodeFSOfflineContentsRepository.ts        | 48 ++++++++++-
 .../application/OfflineFileCreator.ts         | 16 ++--
 .../files/application/OfflineFileFinder.ts    |  2 +-
 .../files/application/OfflineFileSearcher.ts  |  2 +-
 .../MoveOfflineContentsOnContentsUploaded.ts  |  2 +-
 .../CreateFileOnOfflineFileUplodaded.ts       | 10 +--
 .../virtual-drive/shared/domain/EventBus.ts   |  4 +-
 .../infrastructure/DomainEventSubscribers.ts  | 18 ----
 .../shared/infrastructure/EventRecorder.ts    |  4 +-
 .../shared/infrastructure/NodeJsEventBus.ts   |  4 +-
 .../shared/__mock__/EventBusMock.ts           |  4 +-
 56 files changed, 396 insertions(+), 215 deletions(-)
 rename src/apps/fuse/callbacks/{WriteFile.ts => WriteCallback.ts} (81%)
 create mode 100644 src/apps/fuse/dependency-injection/FuseDependencyContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/FuseDependencyContainerFactory.ts
 create mode 100644 src/apps/fuse/dependency-injection/FuseDomainEventSubscribers.ts
 rename src/apps/fuse/dependency-injection/virtual-drive/{DependencyContainer.ts => VirtualDriveDependencyContainer.ts} (89%)
 rename src/apps/fuse/dependency-injection/virtual-drive/{DependencyContainerFactory.ts => VirtualDriveDependencyContainerFactory.ts} (53%)
 rename src/apps/sync-engine/dependency-injection/{DependencyContainer.ts => SyncEngineDependencyContainer.ts} (93%)
 rename src/apps/sync-engine/dependency-injection/{DependencyContainerFactory.ts => SyncEngineDependencyContainerFactory.ts} (62%)
 create mode 100644 src/apps/sync-engine/dependency-injection/SyncEngineDomainEventSubscribers.ts
 create mode 100644 src/context/offline-drive/boundaryBridge/application/OfflineFileAndContentsCreator.ts
 create mode 100644 src/context/offline-drive/contents/application/OfflineContentsCreator.ts
 rename src/context/offline-drive/{boundaryBridge => files}/application/OfflineFileCreator.ts (54%)
 delete mode 100644 src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers.ts

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index 1be3c2c54..d6ab59820 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -1,7 +1,5 @@
-import fs, { unlink } from 'fs';
 import _path from 'path';
 import Logger from 'electron-log';
-import { DependencyContainer } from './dependency-injection/virtual-drive/DependencyContainer';
 import { Readdir } from './callbacks/Readdir';
 import { GetAttributes } from './callbacks/GetAttributes';
 import { Open } from './callbacks/Open';
@@ -13,9 +11,9 @@ import { CreateFile } from './callbacks/CreateFile';
 import { CreateFolder } from './callbacks/CreateFolder';
 import { TrashFile } from './callbacks/TrashFile';
 import { TrashFolder } from './callbacks/TrashFolder';
-import { OfflineDriveDependencyContainer } from './dependency-injection/offline/OfflineDriveDependencyContainer';
-import { WriteFile } from './callbacks/WriteFile';
+import { WriteCallback } from './callbacks/WriteCallback';
 import { ReleaseCallback } from './callbacks/ReleaseCallback';
+import { FuseDependencyContainer } from './dependency-injection/FuseDependencyContainer';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
@@ -24,8 +22,7 @@ export class FuseApp {
   private _fuse: any;
 
   constructor(
-    private readonly virtualDriveContainer: DependencyContainer,
-    private readonly offlineDriveContainer: OfflineDriveDependencyContainer,
+    private readonly fuseContainer: FuseDependencyContainer,
     private readonly paths: {
       root: string;
       local: string;
@@ -35,20 +32,28 @@ export class FuseApp {
   private getOpt() {
     const listXAttributes = new ListXAttributes();
     const getXAttribute = new GetXAttribute();
-    const readdir = new Readdir(this.virtualDriveContainer);
+    const readdir = new Readdir(this.fuseContainer.virtualDriveContainer);
     const getattr = new GetAttributes(
-      this.virtualDriveContainer,
-      this.offlineDriveContainer
+      this.fuseContainer.virtualDriveContainer,
+      this.fuseContainer.offlineDriveContainer
+    );
+    const open = new Open(this.fuseContainer.virtualDriveContainer);
+    const read = new Read(this.fuseContainer.virtualDriveContainer);
+    const renameOrMove = new RenameOrMove(
+      this.fuseContainer.virtualDriveContainer
+    );
+    const createFile = new CreateFile(this.fuseContainer.offlineDriveContainer);
+    const createFolder = new CreateFolder(
+      this.fuseContainer.virtualDriveContainer
+    );
+    const trashFile = new TrashFile(this.fuseContainer.virtualDriveContainer);
+    const trashFolder = new TrashFolder(
+      this.fuseContainer.virtualDriveContainer
+    );
+    const write = new WriteCallback(this.fuseContainer.offlineDriveContainer);
+    const release = new ReleaseCallback(
+      this.fuseContainer.offlineDriveContainer
     );
-    const open = new Open(this.virtualDriveContainer);
-    const read = new Read(this.virtualDriveContainer);
-    const renameOrMove = new RenameOrMove(this.virtualDriveContainer);
-    const createFile = new CreateFile(this.offlineDriveContainer);
-    const createFolder = new CreateFolder(this.virtualDriveContainer);
-    const trashFile = new TrashFile(this.virtualDriveContainer);
-    const trashFolder = new TrashFolder(this.virtualDriveContainer);
-    const writeFile = new WriteFile(this.offlineDriveContainer);
-    const release = new ReleaseCallback(this.offlineDriveContainer);
 
     return {
       listxattr: listXAttributes.execute.bind(listXAttributes),
@@ -59,7 +64,7 @@ export class FuseApp {
       read: read.execute.bind(read),
       rename: renameOrMove.execute.bind(renameOrMove),
       create: createFile.execute.bind(createFile),
-      write: writeFile.execute.bind(writeFile),
+      write: write.execute.bind(write),
       mkdir: createFolder.execute.bind(createFolder),
       release: release.execute.bind(release),
       unlink: trashFile.execute.bind(trashFile),
diff --git a/src/apps/fuse/callbacks/CreateFile.ts b/src/apps/fuse/callbacks/CreateFile.ts
index 156bd9309..ddf89ec9f 100644
--- a/src/apps/fuse/callbacks/CreateFile.ts
+++ b/src/apps/fuse/callbacks/CreateFile.ts
@@ -14,7 +14,7 @@ export class CreateFile {
   ): Promise<void> {
     Logger.debug(`CREATE ${path}`);
 
-    await this.container.createOfflineFile.run(path);
+    await this.container.offlineFileAndContentsCreator.run(path);
 
     cb(0);
   }
diff --git a/src/apps/fuse/callbacks/CreateFolder.ts b/src/apps/fuse/callbacks/CreateFolder.ts
index 1e88461b7..6bd972818 100644
--- a/src/apps/fuse/callbacks/CreateFolder.ts
+++ b/src/apps/fuse/callbacks/CreateFolder.ts
@@ -1,8 +1,8 @@
-import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
+import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { Callback } from './Callback';
 
 export class CreateFolder {
-  constructor(private readonly container: DependencyContainer) {}
+  constructor(private readonly container: VirtualDriveDependencyContainer) {}
 
   async execute(path: string, _mode: number, cb: Callback): Promise<void> {
     const offlineFolder = this.container.offline.offlineFolderCreator.run(path);
diff --git a/src/apps/fuse/callbacks/GetAttributes.ts b/src/apps/fuse/callbacks/GetAttributes.ts
index 8e5d118f4..203f95aa6 100644
--- a/src/apps/fuse/callbacks/GetAttributes.ts
+++ b/src/apps/fuse/callbacks/GetAttributes.ts
@@ -1,5 +1,5 @@
 import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
-import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
+import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { Callback } from './Callback';
 import Logger from 'electron-log';
 
@@ -8,7 +8,7 @@ const fuse = require('@gcas/fuse');
 
 export class GetAttributes {
   constructor(
-    private readonly virtualDriveContainer: DependencyContainer,
+    private readonly virtualDriveContainer: VirtualDriveDependencyContainer,
     private readonly offlineDriveContainer: OfflineDriveDependencyContainer
   ) {}
 
@@ -34,7 +34,7 @@ export class GetAttributes {
     }
 
     const offlineFile =
-      await this.offlineDriveContainer.offlineFileSearcher.execute(path);
+      await this.offlineDriveContainer.offlineFileSearcher.run({ path });
 
     if (offlineFile) {
       return cb(0, { mode: 33188, size: offlineFile.size });
diff --git a/src/apps/fuse/callbacks/GetXAttribute.ts b/src/apps/fuse/callbacks/GetXAttribute.ts
index 4b19bff35..4867f1854 100644
--- a/src/apps/fuse/callbacks/GetXAttribute.ts
+++ b/src/apps/fuse/callbacks/GetXAttribute.ts
@@ -10,7 +10,7 @@ export class GetXAttribute {
     size: string,
     cb: GetXAttributeCallback
   ): Promise<void> {
-    Logger.debug('GETXATTR', path, name, size, cb);
+    Logger.debug('GETXATTR', path, name, size);
 
     const buff = Buffer.from('in sync');
     cb(0, buff);
diff --git a/src/apps/fuse/callbacks/Open.ts b/src/apps/fuse/callbacks/Open.ts
index 2316fe091..64cd63422 100644
--- a/src/apps/fuse/callbacks/Open.ts
+++ b/src/apps/fuse/callbacks/Open.ts
@@ -1,4 +1,4 @@
-import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
+import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { Callback } from './Callback';
 import Logger from 'electron-log';
 
@@ -6,7 +6,7 @@ import Logger from 'electron-log';
 const fuse = require('@gcas/fuse');
 
 export class Open {
-  constructor(private readonly container: DependencyContainer) {}
+  constructor(private readonly container: VirtualDriveDependencyContainer) {}
 
   async execute(path: string, _flags: Array<any>, cb: Callback): Promise<void> {
     Logger.debug('OPEN ', path);
diff --git a/src/apps/fuse/callbacks/Read.ts b/src/apps/fuse/callbacks/Read.ts
index a804ea66c..8f4a6c6d5 100644
--- a/src/apps/fuse/callbacks/Read.ts
+++ b/src/apps/fuse/callbacks/Read.ts
@@ -1,12 +1,12 @@
 import Logger from 'electron-log';
 import fs from 'fs';
-import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
+import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
 
 export class Read {
-  constructor(private readonly container: DependencyContainer) {}
+  constructor(private readonly container: VirtualDriveDependencyContainer) {}
 
   async execute(
     path: string,
diff --git a/src/apps/fuse/callbacks/Readdir.ts b/src/apps/fuse/callbacks/Readdir.ts
index 8d6542cb8..fd289df1b 100644
--- a/src/apps/fuse/callbacks/Readdir.ts
+++ b/src/apps/fuse/callbacks/Readdir.ts
@@ -1,11 +1,11 @@
 import Logger from 'electron-log';
-import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
+import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { TypedCallback } from './Callback';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
 
 export class Readdir {
-  constructor(private readonly container: DependencyContainer) {}
+  constructor(private readonly container: VirtualDriveDependencyContainer) {}
 
   async execute(path: string, cb: TypedCallback<Array<string>>): Promise<void> {
     try {
diff --git a/src/apps/fuse/callbacks/ReleaseCallback.ts b/src/apps/fuse/callbacks/ReleaseCallback.ts
index d7b99c7f4..70875643c 100644
--- a/src/apps/fuse/callbacks/ReleaseCallback.ts
+++ b/src/apps/fuse/callbacks/ReleaseCallback.ts
@@ -5,7 +5,13 @@ export class ReleaseCallback {
   constructor(private readonly container: OfflineDriveDependencyContainer) {}
 
   async execute(path: string, _fd: number, cb: Callback): Promise<void> {
-    await this.container.offlineContentsUploader.run(path);
+    const file = await this.container.offlineFileSearcher.run({ path });
+
+    if (!file) {
+      return cb(0);
+    }
+
+    await this.container.offlineFileUploader.run(file);
 
     cb(0);
   }
diff --git a/src/apps/fuse/callbacks/RenameAndMove.ts b/src/apps/fuse/callbacks/RenameAndMove.ts
index 52f867ee7..e4b7c970c 100644
--- a/src/apps/fuse/callbacks/RenameAndMove.ts
+++ b/src/apps/fuse/callbacks/RenameAndMove.ts
@@ -1,5 +1,5 @@
 import { File } from '../../../context/virtual-drive/files/domain/File';
-import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
+import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { Folder } from '../../../context/virtual-drive/folders/domain/Folder';
 import { Callback } from './Callback';
 
@@ -7,7 +7,7 @@ import { Callback } from './Callback';
 const fuse = require('@gcas/fuse');
 
 export class RenameOrMove {
-  constructor(private readonly container: DependencyContainer) {}
+  constructor(private readonly container: VirtualDriveDependencyContainer) {}
 
   private async findFile(path: string): Promise<File | undefined> {
     const file = await this.container.filesSearcher.run({ path });
diff --git a/src/apps/fuse/callbacks/TrashFile.ts b/src/apps/fuse/callbacks/TrashFile.ts
index 5f2f6b121..863444d8c 100644
--- a/src/apps/fuse/callbacks/TrashFile.ts
+++ b/src/apps/fuse/callbacks/TrashFile.ts
@@ -1,11 +1,11 @@
-import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
+import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { Callback } from './Callback';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
 
 export class TrashFile {
-  constructor(private readonly container: DependencyContainer) {}
+  constructor(private readonly container: VirtualDriveDependencyContainer) {}
 
   async execute(path: string, cb: Callback): Promise<void> {
     try {
diff --git a/src/apps/fuse/callbacks/TrashFolder.ts b/src/apps/fuse/callbacks/TrashFolder.ts
index a86ced10c..8b6576d6a 100644
--- a/src/apps/fuse/callbacks/TrashFolder.ts
+++ b/src/apps/fuse/callbacks/TrashFolder.ts
@@ -1,11 +1,11 @@
-import { DependencyContainer } from '../dependency-injection/virtual-drive/DependencyContainer';
+import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { Callback } from './Callback';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
 
 export class TrashFolder {
-  constructor(private readonly container: DependencyContainer) {}
+  constructor(private readonly container: VirtualDriveDependencyContainer) {}
 
   async execute(path: string, cb: Callback): Promise<void> {
     try {
diff --git a/src/apps/fuse/callbacks/WriteFile.ts b/src/apps/fuse/callbacks/WriteCallback.ts
similarity index 81%
rename from src/apps/fuse/callbacks/WriteFile.ts
rename to src/apps/fuse/callbacks/WriteCallback.ts
index 0a035b494..82e7a02c6 100644
--- a/src/apps/fuse/callbacks/WriteFile.ts
+++ b/src/apps/fuse/callbacks/WriteCallback.ts
@@ -3,7 +3,7 @@ import { TypedCallback } from './Callback';
 
 type WriteFileCallback = TypedCallback<number>;
 
-export class WriteFile {
+export class WriteCallback {
   constructor(private readonly container: OfflineDriveDependencyContainer) {}
 
   async execute(
@@ -14,7 +14,7 @@ export class WriteFile {
     pos: number,
     cb: WriteFileCallback
   ): Promise<void> {
-    await this.container.writeToOfflineFile.run(path, buffer, len, pos);
+    await this.container.offlineContentsAppender.run(path, buffer, len, pos);
 
     cb(len);
   }
diff --git a/src/apps/fuse/dependency-injection/FuseDependencyContainer.ts b/src/apps/fuse/dependency-injection/FuseDependencyContainer.ts
new file mode 100644
index 000000000..0e28e2da9
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/FuseDependencyContainer.ts
@@ -0,0 +1,7 @@
+import { OfflineDriveDependencyContainer } from './offline/OfflineDriveDependencyContainer';
+import { VirtualDriveDependencyContainer } from './virtual-drive/VirtualDriveDependencyContainer';
+
+export interface FuseDependencyContainer {
+  offlineDriveContainer: OfflineDriveDependencyContainer;
+  virtualDriveContainer: VirtualDriveDependencyContainer;
+}
diff --git a/src/apps/fuse/dependency-injection/FuseDependencyContainerFactory.ts b/src/apps/fuse/dependency-injection/FuseDependencyContainerFactory.ts
new file mode 100644
index 000000000..12bb98384
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/FuseDependencyContainerFactory.ts
@@ -0,0 +1,53 @@
+import { FuseDependencyContainer } from './FuseDependencyContainer';
+import { FuseDomainEventSubscribers } from './FuseDomainEventSubscribers';
+import { DependencyInjectionEventBus } from './common/eventBus';
+import { OfflineDriveDependencyContainerFactory } from './offline/OfflineDriveDependencyContainerFactory';
+import { VirtualDriveDependencyContainerFactory } from './virtual-drive/VirtualDriveDependencyContainerFactory';
+
+type FuseDependencyContainerFactorySubscribers = Array<
+  | keyof FuseDependencyContainer['offlineDriveContainer']
+  | keyof FuseDependencyContainer['virtualDriveContainer']
+>;
+
+export class FuseDependencyContainerFactory {
+  private static _container: FuseDependencyContainer | undefined;
+
+  static readonly subscribers: FuseDependencyContainerFactorySubscribers = [
+    ...VirtualDriveDependencyContainerFactory.subscribers,
+    ...OfflineDriveDependencyContainerFactory.subscribers,
+  ];
+
+  eventSubscribers(
+    key: keyof FuseDependencyContainer
+  ): FuseDependencyContainer[keyof FuseDependencyContainer] | undefined {
+    if (!FuseDependencyContainerFactory._container) return undefined;
+
+    return FuseDependencyContainerFactory._container[key];
+  }
+
+  async build(): Promise<FuseDependencyContainer> {
+    if (FuseDependencyContainerFactory._container !== undefined) {
+      return FuseDependencyContainerFactory._container;
+    }
+
+    const { bus } = DependencyInjectionEventBus;
+
+    const virtualDriveContainerFactory =
+      new VirtualDriveDependencyContainerFactory();
+    const virtualDriveContainer = await virtualDriveContainerFactory.build();
+
+    const offlineDriveContainerFactory =
+      new OfflineDriveDependencyContainerFactory();
+    const offlineDriveContainer = await offlineDriveContainerFactory.build();
+
+    const container = {
+      offlineDriveContainer,
+      virtualDriveContainer,
+    };
+
+    bus.addSubscribers(FuseDomainEventSubscribers.from(container));
+    FuseDependencyContainerFactory._container = container;
+
+    return container;
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/FuseDomainEventSubscribers.ts b/src/apps/fuse/dependency-injection/FuseDomainEventSubscribers.ts
new file mode 100644
index 000000000..db66dbd2b
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/FuseDomainEventSubscribers.ts
@@ -0,0 +1,23 @@
+import { DomainEvent } from '../../../context/shared/domain/DomainEvent';
+import { DomainEventSubscriber } from '../../../context/shared/domain/DomainEventSubscriber';
+import { FuseDependencyContainer } from './FuseDependencyContainer';
+import { FuseDependencyContainerFactory } from './FuseDependencyContainerFactory';
+
+export class FuseDomainEventSubscribers {
+  constructor(public items: Array<DomainEventSubscriber<DomainEvent>>) {}
+
+  static from(container: FuseDependencyContainer): FuseDomainEventSubscribers {
+    const plainContainer = {
+      ...container.offlineDriveContainer,
+      ...container.virtualDriveContainer,
+    };
+
+    const subscribers = FuseDependencyContainerFactory.subscribers.map(
+      (subscriber) => {
+        return plainContainer[subscriber];
+      }
+    ) as unknown as Array<DomainEventSubscriber<DomainEvent>>;
+
+    return new FuseDomainEventSubscribers(subscribers);
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/offline/BoundaryBridge/BoundaryBridgeContainer.ts b/src/apps/fuse/dependency-injection/offline/BoundaryBridge/BoundaryBridgeContainer.ts
index 677f102c0..0e0c0b5ad 100644
--- a/src/apps/fuse/dependency-injection/offline/BoundaryBridge/BoundaryBridgeContainer.ts
+++ b/src/apps/fuse/dependency-injection/offline/BoundaryBridge/BoundaryBridgeContainer.ts
@@ -1,5 +1,7 @@
+import { OfflineFileAndContentsCreator } from '../../../../../context/offline-drive/boundaryBridge/application/OfflineFileAndContentsCreator';
 import { OfflineFileUploader } from '../../../../../context/offline-drive/boundaryBridge/application/OfflineFileUploader';
 
 export interface BoundaryBridgeContainer {
   offlineFileUploader: OfflineFileUploader;
+  offlineFileAndContentsCreator: OfflineFileAndContentsCreator;
 }
diff --git a/src/apps/fuse/dependency-injection/offline/BoundaryBridge/boundaryBridgeContainerBuilder.ts b/src/apps/fuse/dependency-injection/offline/BoundaryBridge/boundaryBridgeContainerBuilder.ts
index 2030f3faf..f4f25cda7 100644
--- a/src/apps/fuse/dependency-injection/offline/BoundaryBridge/boundaryBridgeContainerBuilder.ts
+++ b/src/apps/fuse/dependency-injection/offline/BoundaryBridge/boundaryBridgeContainerBuilder.ts
@@ -1,5 +1,7 @@
+import { OfflineFileAndContentsCreator } from '../../../../../context/offline-drive/boundaryBridge/application/OfflineFileAndContentsCreator';
 import { OfflineFilePathRetriever } from '../../../../../context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever';
 import { OfflineFileUploader } from '../../../../../context/offline-drive/boundaryBridge/application/OfflineFileUploader';
+import { DependencyInjectionEventBus } from '../../common/eventBus';
 import { OfflineContentsDependencyContainer } from '../OfflineContents/OfflineDriveDependencyContainer';
 import { OfflineFilesContainer } from '../OfflineFiles/OfflineFilesContainer';
 import { BoundaryBridgeContainer } from './BoundaryBridgeContainer';
@@ -8,17 +10,25 @@ export async function buildBoundaryBridgeContainer(
   offlineFileContainer: OfflineFilesContainer,
   offlineContentsContainer: OfflineContentsDependencyContainer
 ): Promise<BoundaryBridgeContainer> {
+  const { bus } = DependencyInjectionEventBus;
+
   const offlineFilePathRetriever = new OfflineFilePathRetriever(
-    offlineFileContainer.offlineFileFinder,
     offlineContentsContainer.offlineContentsPathCalculator
   );
 
   const offlineFileUploader = new OfflineFileUploader(
     offlineFilePathRetriever,
-    offlineContentsContainer.offlineContentsUploader
+    offlineContentsContainer.offlineContentsUploader,
+    bus
+  );
+
+  const offlineFileAndContentsCreator = new OfflineFileAndContentsCreator(
+    offlineFileContainer.offlineFileCreator,
+    offlineContentsContainer.offlineContentsCreator
   );
 
   return {
     offlineFileUploader,
+    offlineFileAndContentsCreator,
   };
 }
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts b/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts
index e261e1a33..decbe7adb 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts
@@ -1,9 +1,11 @@
-import { OfflineContentsAppended } from '../../../../../context/offline-drive/contents/application/OfflineContentsAppended';
+import { OfflineContentsAppender } from '../../../../../context/offline-drive/contents/application/OfflineContentsAppended';
+import { OfflineContentsCreator } from '../../../../../context/offline-drive/contents/application/OfflineContentsCreator';
 import { OfflineContentsPathCalculator } from '../../../../../context/offline-drive/contents/application/OfflineContentsPathCalculator';
 import { OfflineContentsUploader } from '../../../../../context/offline-drive/contents/application/OfflineContentsUploader';
 
 export interface OfflineContentsDependencyContainer {
-  offlineContentsAppended: OfflineContentsAppended;
+  offlineContentsCreator: OfflineContentsCreator;
+  offlineContentsAppender: OfflineContentsAppender;
   offlineContentsUploader: OfflineContentsUploader;
   offlineContentsPathCalculator: OfflineContentsPathCalculator;
 }
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts b/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
index f118f47b7..3d35aabb5 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
@@ -1,4 +1,5 @@
-import { OfflineContentsAppended } from '../../../../../context/offline-drive/contents/application/OfflineContentsAppended';
+import { OfflineContentsAppender } from '../../../../../context/offline-drive/contents/application/OfflineContentsAppended';
+import { OfflineContentsCreator } from '../../../../../context/offline-drive/contents/application/OfflineContentsCreator';
 import { OfflineContentsPathCalculator } from '../../../../../context/offline-drive/contents/application/OfflineContentsPathCalculator';
 import { OfflineContentsUploader } from '../../../../../context/offline-drive/contents/application/OfflineContentsUploader';
 import { EnvironmentOfflineContentsManagersFactory } from '../../../../../context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
@@ -26,7 +27,7 @@ export async function buildOfflineContentsContainer(
 
   await repository.init();
 
-  const offlineContentsAppended = new OfflineContentsAppended(
+  const offlineContentsAppender = new OfflineContentsAppender(
     offlineFilesContainer.offlineFileFinder,
     offlineFilesContainer.offlineFileSizeIncreaser,
     repository
@@ -45,8 +46,11 @@ export async function buildOfflineContentsContainer(
     eventBus
   );
 
+  const offlineContentsCreator = new OfflineContentsCreator(repository);
+
   return {
-    offlineContentsAppended,
+    offlineContentsCreator,
+    offlineContentsAppender,
     offlineContentsPathCalculator,
     offlineContentsUploader,
   };
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts b/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts
index 7c2210fb9..23411f4c6 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts
@@ -1,8 +1,10 @@
+import { OfflineFileCreator } from '../../../../../context/offline-drive/files/application/OfflineFileCreator';
 import { OfflineFileFinder } from '../../../../../context/offline-drive/files/application/OfflineFileFinder';
 import { OfflineFileSearcher } from '../../../../../context/offline-drive/files/application/OfflineFileSearcher';
 import { OfflineFileSizeIncreaser } from '../../../../../context/offline-drive/files/application/OfflineFileSizeIncreaser';
 
 export interface OfflineFilesContainer {
+  offlineFileCreator: OfflineFileCreator;
   offlineFileSearcher: OfflineFileSearcher;
   offlineFileFinder: OfflineFileFinder;
   offlineFileSizeIncreaser: OfflineFileSizeIncreaser;
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts b/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts
index 1669e4c65..6ae26efe9 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts
@@ -3,8 +3,12 @@ import { InMemoryOfflineFileRepository } from '../../../../../context/offline-dr
 import { OfflineFilesContainer } from './OfflineFilesContainer';
 import { OfflineFileFinder } from '../../../../../context/offline-drive/files/application/OfflineFileFinder';
 import { OfflineFileSizeIncreaser } from '../../../../../context/offline-drive/files/application/OfflineFileSizeIncreaser';
+import { OfflineFileCreator } from '../../../../../context/offline-drive/files/application/OfflineFileCreator';
+import { DependencyInjectionEventBus } from '../../common/eventBus';
 
 export async function buildOfflineFilesContainer(): Promise<OfflineFilesContainer> {
+  const { bus: eventBus } = DependencyInjectionEventBus;
+
   const repository = new InMemoryOfflineFileRepository();
 
   const offlineFileSearcher = new OfflineFileSearcher(repository);
@@ -13,7 +17,10 @@ export async function buildOfflineFilesContainer(): Promise<OfflineFilesContaine
 
   const offlineFileSizeIncreaser = new OfflineFileSizeIncreaser(repository);
 
+  const offlineFileCreator = new OfflineFileCreator(repository, eventBus);
+
   return {
+    offlineFileCreator,
     offlineFileSearcher,
     offlineFileFinder,
     offlineFileSizeIncreaser,
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/DependencyContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/VirtualDriveDependencyContainer.ts
similarity index 89%
rename from src/apps/fuse/dependency-injection/virtual-drive/DependencyContainer.ts
rename to src/apps/fuse/dependency-injection/virtual-drive/VirtualDriveDependencyContainer.ts
index 65c6cbab3..140832b54 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/DependencyContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/VirtualDriveDependencyContainer.ts
@@ -4,7 +4,7 @@ import { FoldersContainer } from './folders/FoldersContainer';
 import { SharedContainer } from './shared/SharedContainer';
 import { TreeContainer } from './tree/TreeContainer';
 
-export interface DependencyContainer
+export interface VirtualDriveDependencyContainer
   extends TreeContainer,
     FilesContainer,
     FoldersContainer,
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/DependencyContainerFactory.ts b/src/apps/fuse/dependency-injection/virtual-drive/VirtualDriveDependencyContainerFactory.ts
similarity index 53%
rename from src/apps/fuse/dependency-injection/virtual-drive/DependencyContainerFactory.ts
rename to src/apps/fuse/dependency-injection/virtual-drive/VirtualDriveDependencyContainerFactory.ts
index 3391393a9..5aaf0377a 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/DependencyContainerFactory.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/VirtualDriveDependencyContainerFactory.ts
@@ -1,26 +1,30 @@
-import { DependencyContainer } from './DependencyContainer';
+import { VirtualDriveDependencyContainer } from './VirtualDriveDependencyContainer';
 import { buildContentsContainer } from './contents/builder';
 import { buildFilesContainer } from './files/builder';
 import { buildFoldersContainer } from './folders/builder';
 import { buildSharedContainer } from './shared/builder';
 import { buildTreeContainer } from './tree/builder';
 
-export class DependencyContainerFactory {
-  private static _container: DependencyContainer | undefined;
+export class VirtualDriveDependencyContainerFactory {
+  private static _container: VirtualDriveDependencyContainer | undefined;
 
-  static readonly subscribers: Array<keyof DependencyContainer> = [];
+  static readonly subscribers: Array<keyof VirtualDriveDependencyContainer> = [
+    'createFileOnOfflineFileUploaded',
+  ];
 
   eventSubscribers(
-    key: keyof DependencyContainer
-  ): DependencyContainer[keyof DependencyContainer] | undefined {
-    if (!DependencyContainerFactory._container) return undefined;
+    key: keyof VirtualDriveDependencyContainer
+  ):
+    | VirtualDriveDependencyContainer[keyof VirtualDriveDependencyContainer]
+    | undefined {
+    if (!VirtualDriveDependencyContainerFactory._container) return undefined;
 
-    return DependencyContainerFactory._container[key];
+    return VirtualDriveDependencyContainerFactory._container[key];
   }
 
-  async build(): Promise<DependencyContainer> {
-    if (DependencyContainerFactory._container !== undefined) {
-      return DependencyContainerFactory._container;
+  async build(): Promise<VirtualDriveDependencyContainer> {
+    if (VirtualDriveDependencyContainerFactory._container !== undefined) {
+      return VirtualDriveDependencyContainerFactory._container;
     }
 
     const treeContainer = buildTreeContainer();
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/boundaryBridge/BoundaryBridgeContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/boundaryBridge/BoundaryBridgeContainer.ts
index a885d570f..7dd899f9a 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/boundaryBridge/BoundaryBridgeContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/boundaryBridge/BoundaryBridgeContainer.ts
@@ -1,4 +1,4 @@
-import { FileCreationOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
+import { FileCreationOrchestrator } from '../../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
 
 export interface BoundaryBridgeContainer {
   fileCreationOrchestrator: FileCreationOrchestrator;
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/boundaryBridge/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/boundaryBridge/builder.ts
index 1c2f850a2..feecbc07a 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/boundaryBridge/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/boundaryBridge/builder.ts
@@ -1,7 +1,7 @@
 import { BoundaryBridgeContainer } from './BoundaryBridgeContainer';
 import { ContentsContainer } from '../contents/ContentsContainer';
 import { FilesContainer } from '../files/FilesContainer';
-import { FileCreationOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
+import { FileCreationOrchestrator } from '../../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
 
 export function buildBoundaryBridgeContainer(
   contentsContainer: ContentsContainer,
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
index d0bc4069d..5008e08ab 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
@@ -49,7 +49,8 @@ export async function buildContentsContainer(
   const contentsUploader = new ContentsUploader(
     contentsManagerFactory,
     new FSLocalFileProvider(),
-    sharedContainer.relativePathToAbsoluteConverter
+    sharedContainer.relativePathToAbsoluteConverter,
+    eventBus
   );
 
   const retryContentsUploader = new RetryContentsUploader(contentsUploader);
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
index d188570a4..5c748db86 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
@@ -4,6 +4,7 @@ import { FilePathUpdater } from '../../../../../context/virtual-drive/files/appl
 import { FileCreator } from '../../../../../context/virtual-drive/files/application/FileCreator';
 import { SameFileWasMoved } from '../../../../../context/virtual-drive/files/application/SameFileWasMoved';
 import { FileDeleter } from '../../../../../context/virtual-drive/files/application/FileDeleter';
+import { CreateFileOnOfflineFileUploaded } from '../../../../../context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded';
 
 export interface FilesContainer {
   filesByFolderPathNameLister: FilesByFolderPathSearcher;
@@ -12,4 +13,5 @@ export interface FilesContainer {
   fileCreator: FileCreator;
   fileDeleter: FileDeleter;
   sameFileWasMoved: SameFileWasMoved;
+  createFileOnOfflineFileUploaded: CreateFileOnOfflineFileUploaded;
 }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
index 083b248de..6f5b69780 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
@@ -1,4 +1,5 @@
 import crypt from '../../../../../context/shared/infrastructure/crypt';
+import { CreateFileOnOfflineFileUploaded } from '../../../../../context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded';
 import { FileCreator } from '../../../../../context/virtual-drive/files/application/FileCreator';
 import { FileDeleter } from '../../../../../context/virtual-drive/files/application/FileDeleter';
 import { FileFinderByContentsId } from '../../../../../context/virtual-drive/files/application/FileFinderByContentsId';
@@ -78,6 +79,10 @@ export async function buildFilesContainer(
     eventBus
   );
 
+  const createFileOnOfflineFileUploaded = new CreateFileOnOfflineFileUploaded(
+    fileCreator
+  );
+
   return {
     filesByFolderPathNameLister,
     filesSearcher,
@@ -85,5 +90,6 @@ export async function buildFilesContainer(
     sameFileWasMoved,
     fileCreator,
     fileDeleter,
+    createFileOnOfflineFileUploaded,
   };
 }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/shared/SharedContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/shared/SharedContainer.ts
index b2df0b7f1..2d9dab84f 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/shared/SharedContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/shared/SharedContainer.ts
@@ -1,5 +1,7 @@
+import { AbsolutePathToRelativeConverter } from '../../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
 import { RelativePathToAbsoluteConverter } from '../../../../../context/virtual-drive/shared/application/RelativePathToAbsoluteConverter';
 
 export interface SharedContainer {
   relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter;
+  absolutePathToRelativeConverter: AbsolutePathToRelativeConverter;
 }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/shared/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/shared/builder.ts
index 76eab314c..94d02f65b 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/shared/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/shared/builder.ts
@@ -2,6 +2,7 @@ import path from 'path';
 import { RelativePathToAbsoluteConverter } from '../../../../../context/virtual-drive/shared/application/RelativePathToAbsoluteConverter';
 import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
 import { SharedContainer } from './SharedContainer';
+import { AbsolutePathToRelativeConverter } from '../../../../../context/virtual-drive/shared/application/AbsolutePathToRelativeConverter';
 
 export async function buildSharedContainer(): Promise<SharedContainer> {
   const localFileContentsDirectoryProvider =
@@ -15,7 +16,12 @@ export async function buildSharedContainer(): Promise<SharedContainer> {
     base
   );
 
+  const absolutePathToRelativeConverter = new AbsolutePathToRelativeConverter(
+    base
+  );
+
   return {
     relativePathToAbsoluteConverter,
+    absolutePathToRelativeConverter,
   };
 }
diff --git a/src/apps/fuse/index.ts b/src/apps/fuse/index.ts
index 087f17d99..92a97bbb3 100644
--- a/src/apps/fuse/index.ts
+++ b/src/apps/fuse/index.ts
@@ -5,10 +5,9 @@ import { app } from 'electron';
 import { getRootVirtualDrive } from '../main/virutal-root-folder/service';
 import eventBus from '../main/event-bus';
 import { FuseApp } from './FuseApp';
-import { DependencyContainerFactory } from './dependency-injection/virtual-drive/DependencyContainerFactory';
 import path from 'path';
 import { HidratationApi } from '../hydratation-api/HidratationApi';
-import { OfflineDriveDependencyContainerFactory } from './dependency-injection/offline/OfflineDriveDependencyContainerFactory';
+import { FuseDependencyContainerFactory } from './dependency-injection/FuseDependencyContainerFactory';
 
 let fuseApp: FuseApp;
 
@@ -23,17 +22,13 @@ async function spawnSyncEngineWorker() {
 
   Logger.debug('ROOT FOLDER: ', root);
 
-  const virtualDriveContainerFactory = new DependencyContainerFactory();
-  const virtualDriveContainer = await virtualDriveContainerFactory.build();
-
-  const offlineDriveContainerFactory =
-    new OfflineDriveDependencyContainerFactory();
-  const offlineDriveContainer = await offlineDriveContainerFactory.build();
-
   const appData = app.getPath('appData');
   const local = path.join(appData, 'internxt-drive', 'downloaded');
 
-  fuseApp = new FuseApp(virtualDriveContainer, offlineDriveContainer, {
+  const containerFactory = new FuseDependencyContainerFactory();
+  const container = await containerFactory.build();
+
+  fuseApp = new FuseApp(container, {
     root,
     local,
   });
diff --git a/src/apps/sync-engine/BindingManager.ts b/src/apps/sync-engine/BindingManager.ts
index 5a33533d1..fd0ac9ddc 100644
--- a/src/apps/sync-engine/BindingManager.ts
+++ b/src/apps/sync-engine/BindingManager.ts
@@ -6,7 +6,7 @@ import { ItemsSearcher } from '../../context/virtual-drive/items/application/Ite
 import { PlatformPathConverter } from '../../context/virtual-drive/shared/application/PlatformPathConverter';
 import { buildControllers } from './callbacks-controllers/buildControllers';
 import { executeControllerWithFallback } from './callbacks-controllers/middlewares/executeControllerWithFallback';
-import { DependencyContainer } from './dependency-injection/DependencyContainer';
+import { SyncEngineDependencyContainer } from './dependency-injection/SyncEngineDependencyContainer';
 import { ipcRendererSyncEngine } from './ipcRendererSyncEngine';
 import { ProcessIssue } from '../shared/types';
 
@@ -18,7 +18,7 @@ export class BindingsManager {
   private static readonly PROVIDER_NAME = 'Internxt';
   private progressBuffer = 0;
   constructor(
-    private readonly container: DependencyContainer,
+    private readonly container: SyncEngineDependencyContainer,
     private readonly paths: {
       root: string;
       icon: string;
diff --git a/src/apps/sync-engine/callbacks-controllers/buildControllers.ts b/src/apps/sync-engine/callbacks-controllers/buildControllers.ts
index 1f749a02d..c492d32c5 100644
--- a/src/apps/sync-engine/callbacks-controllers/buildControllers.ts
+++ b/src/apps/sync-engine/callbacks-controllers/buildControllers.ts
@@ -1,4 +1,4 @@
-import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { SyncEngineDependencyContainer } from '../dependency-injection/SyncEngineDependencyContainer';
 import { AddController } from './controllers/AddController';
 import { DeleteController } from './controllers/DeleteController';
 import { DownloadFileController } from './controllers/DownloadFileController';
@@ -6,7 +6,7 @@ import { NotifyPlaceholderHydrationFinished } from './controllers/NotifyPlacehol
 import { RenameOrMoveController } from './controllers/RenameOrMoveController';
 import { OfflineRenameOrMoveController } from './controllers/offline/OfflineRenameOrMoveController';
 
-export function buildControllers(container: DependencyContainer) {
+export function buildControllers(container: SyncEngineDependencyContainer) {
   const addFileController = new AddController(
     container.absolutePathToRelativeConverter,
     container.fileCreationOrchestrator,
diff --git a/src/apps/sync-engine/dependency-injection/DependencyContainer.ts b/src/apps/sync-engine/dependency-injection/SyncEngineDependencyContainer.ts
similarity index 93%
rename from src/apps/sync-engine/dependency-injection/DependencyContainer.ts
rename to src/apps/sync-engine/dependency-injection/SyncEngineDependencyContainer.ts
index ebd6870b5..42540d7ee 100644
--- a/src/apps/sync-engine/dependency-injection/DependencyContainer.ts
+++ b/src/apps/sync-engine/dependency-injection/SyncEngineDependencyContainer.ts
@@ -7,7 +7,7 @@ import { ItemsContainer } from './items/ItemsContainer';
 import { BoundaryBridgeContainer } from './boundaryBridge/BoundaryBridgeContainer';
 import { SharedContainer } from './shared/SharedContainer';
 
-export interface DependencyContainer
+export interface SyncEngineDependencyContainer
   extends ItemsContainer,
     ContentsContainer,
     FilesContainer,
diff --git a/src/apps/sync-engine/dependency-injection/DependencyContainerFactory.ts b/src/apps/sync-engine/dependency-injection/SyncEngineDependencyContainerFactory.ts
similarity index 62%
rename from src/apps/sync-engine/dependency-injection/DependencyContainerFactory.ts
rename to src/apps/sync-engine/dependency-injection/SyncEngineDependencyContainerFactory.ts
index 657e3e1c2..35c25a954 100644
--- a/src/apps/sync-engine/dependency-injection/DependencyContainerFactory.ts
+++ b/src/apps/sync-engine/dependency-injection/SyncEngineDependencyContainerFactory.ts
@@ -1,6 +1,6 @@
-import { DomainEventSubscribers } from '../../../context/virtual-drive/shared/infrastructure/DomainEventSubscribers';
+import { SyncEngineDomainEventSubscribers } from './SyncEngineDomainEventSubscribers';
 import { getUser } from '../../main/auth/service';
-import { DependencyContainer } from './DependencyContainer';
+import { SyncEngineDependencyContainer } from './SyncEngineDependencyContainer';
 import { buildBoundaryBridgeContainer } from './boundaryBridge/build';
 import { DependencyInjectionEventBus } from './common/eventBus';
 import { DependencyInjectionVirtualDrive } from './common/virtualDrive';
@@ -10,25 +10,27 @@ import { buildFoldersContainer } from './folders/builder';
 import { buildItemsContainer } from './items/builder';
 import { buildSharedContainer } from './shared/builder';
 
-export class DependencyContainerFactory {
-  private static _container: DependencyContainer | undefined;
+export class SyncEngineDependencyContainerFactory {
+  private static _container: SyncEngineDependencyContainer | undefined;
 
-  static readonly subscribers: Array<keyof DependencyContainer> = [
+  static readonly subscribers: Array<keyof SyncEngineDependencyContainer> = [
     'createFilePlaceholderOnDeletionFailed',
     'synchronizeOfflineModificationsOnFolderCreated',
   ];
 
   eventSubscribers(
-    key: keyof DependencyContainer
-  ): DependencyContainer[keyof DependencyContainer] | undefined {
-    if (!DependencyContainerFactory._container) return undefined;
+    key: keyof SyncEngineDependencyContainer
+  ):
+    | SyncEngineDependencyContainer[keyof SyncEngineDependencyContainer]
+    | undefined {
+    if (!SyncEngineDependencyContainerFactory._container) return undefined;
 
-    return DependencyContainerFactory._container[key];
+    return SyncEngineDependencyContainerFactory._container[key];
   }
 
-  async build(): Promise<DependencyContainer> {
-    if (DependencyContainerFactory._container !== undefined) {
-      return DependencyContainerFactory._container;
+  async build(): Promise<SyncEngineDependencyContainer> {
+    if (SyncEngineDependencyContainerFactory._container !== undefined) {
+      return SyncEngineDependencyContainerFactory._container;
     }
     const user = getUser();
 
@@ -63,8 +65,8 @@ export class DependencyContainerFactory {
       virtualDrive,
     };
 
-    bus.addSubscribers(DomainEventSubscribers.from(container));
-    DependencyContainerFactory._container = container;
+    bus.addSubscribers(SyncEngineDomainEventSubscribers.from(container));
+    SyncEngineDependencyContainerFactory._container = container;
 
     return container;
   }
diff --git a/src/apps/sync-engine/dependency-injection/SyncEngineDomainEventSubscribers.ts b/src/apps/sync-engine/dependency-injection/SyncEngineDomainEventSubscribers.ts
new file mode 100644
index 000000000..9e2728461
--- /dev/null
+++ b/src/apps/sync-engine/dependency-injection/SyncEngineDomainEventSubscribers.ts
@@ -0,0 +1,20 @@
+import { DomainEventSubscriber } from '../../../context/shared/domain/DomainEventSubscriber';
+import { DomainEvent } from '../../../context/shared/domain/DomainEvent';
+import { SyncEngineDependencyContainerFactory } from './SyncEngineDependencyContainerFactory';
+import { SyncEngineDependencyContainer } from './SyncEngineDependencyContainer';
+
+export class SyncEngineDomainEventSubscribers {
+  constructor(public items: Array<DomainEventSubscriber<DomainEvent>>) {}
+
+  static from(
+    container: SyncEngineDependencyContainer
+  ): SyncEngineDomainEventSubscribers {
+    const subscribers = SyncEngineDependencyContainerFactory.subscribers.map(
+      (subscriber) => {
+        return container[subscriber];
+      }
+    ) as unknown as Array<DomainEventSubscriber<DomainEvent>>;
+
+    return new SyncEngineDomainEventSubscribers(subscribers);
+  }
+}
diff --git a/src/apps/sync-engine/index.ts b/src/apps/sync-engine/index.ts
index c5ea70358..888c0922f 100644
--- a/src/apps/sync-engine/index.ts
+++ b/src/apps/sync-engine/index.ts
@@ -1,6 +1,6 @@
 import Logger from 'electron-log';
 import { ipcRenderer } from 'electron';
-import { DependencyContainerFactory } from './dependency-injection/DependencyContainerFactory';
+import { SyncEngineDependencyContainerFactory } from './dependency-injection/SyncEngineDependencyContainerFactory';
 import packageJson from '../../../package.json';
 import { BindingsManager } from './BindingManager';
 import fs from 'fs/promises';
@@ -24,7 +24,7 @@ async function setUp() {
 
   await ensureTheFolderExist(virtualDrivePath);
 
-  const factory = new DependencyContainerFactory();
+  const factory = new SyncEngineDependencyContainerFactory();
   const container = await factory.build();
 
   const bindings = new BindingsManager(container, {
diff --git a/src/context/offline-drive/boundaryBridge/application/OfflineFileAndContentsCreator.ts b/src/context/offline-drive/boundaryBridge/application/OfflineFileAndContentsCreator.ts
new file mode 100644
index 000000000..7cacb42ab
--- /dev/null
+++ b/src/context/offline-drive/boundaryBridge/application/OfflineFileAndContentsCreator.ts
@@ -0,0 +1,15 @@
+import { OfflineContentsCreator } from '../../contents/application/OfflineContentsCreator';
+import { OfflineFileCreator } from '../../files/application/OfflineFileCreator';
+
+export class OfflineFileAndContentsCreator {
+  constructor(
+    private readonly offlineFileCreator: OfflineFileCreator,
+    private readonly offlineContentsCreator: OfflineContentsCreator
+  ) {}
+
+  async run(path: string): Promise<void> {
+    const file = await this.offlineFileCreator.run(path);
+
+    await this.offlineContentsCreator.run(file.id);
+  }
+}
diff --git a/src/context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever.ts b/src/context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever.ts
index 4f178179f..32021652b 100644
--- a/src/context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever.ts
+++ b/src/context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever.ts
@@ -1,15 +1,10 @@
 import { OfflineContentsPathCalculator } from '../../contents/application/OfflineContentsPathCalculator';
-import { OfflineFileFinder } from '../../files/application/OfflineFileFinder';
+import { OfflineFile } from '../../files/domain/OfflineFile';
 
 export class OfflineFilePathRetriever {
-  constructor(
-    private readonly finder: OfflineFileFinder,
-    private readonly pathCalculator: OfflineContentsPathCalculator
-  ) {}
-
-  async run(path: string): Promise<string> {
-    const file = await this.finder.run({ path });
+  constructor(private readonly pathCalculator: OfflineContentsPathCalculator) {}
 
+  async run(file: OfflineFile): Promise<string> {
     return await this.pathCalculator.run(file.id);
   }
 }
diff --git a/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts b/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
index 04583401b..a250e59ef 100644
--- a/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
+++ b/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
@@ -1,15 +1,27 @@
+import { EventBus } from '../../../virtual-drive/shared/domain/EventBus';
 import { OfflineContentsUploader } from '../../contents/application/OfflineContentsUploader';
+import { OfflineContentsUploadedDomainEvent } from '../../contents/domain/events/OfflineContentsUploadedDomainEvent';
+import { OfflineFile } from '../../files/domain/OfflineFile';
 import { OfflineFilePathRetriever } from './OfflineFilePathRetriever';
 
 export class OfflineFileUploader {
   constructor(
     private readonly offlineFilePathRetriever: OfflineFilePathRetriever,
-    private readonly contentsUploader: OfflineContentsUploader
+    private readonly contentsUploader: OfflineContentsUploader,
+    private readonly eventBus: EventBus
   ) {}
 
-  async run(path: string): Promise<void> {
-    const absolutePath = await this.offlineFilePathRetriever.run(path);
+  async run(file: OfflineFile): Promise<void> {
+    const absolutePath = await this.offlineFilePathRetriever.run(file);
 
-    await this.contentsUploader.run(absolutePath);
+    const contentsId = await this.contentsUploader.run(absolutePath);
+
+    const uploadedEvent = new OfflineContentsUploadedDomainEvent({
+      aggregateId: contentsId,
+      size: file.size,
+      path: file.path,
+    });
+
+    await this.eventBus.publish([uploadedEvent]);
   }
 }
diff --git a/src/context/offline-drive/contents/application/OfflineContentsAppended.ts b/src/context/offline-drive/contents/application/OfflineContentsAppended.ts
index 0c4b82286..2ceadd746 100644
--- a/src/context/offline-drive/contents/application/OfflineContentsAppended.ts
+++ b/src/context/offline-drive/contents/application/OfflineContentsAppended.ts
@@ -2,7 +2,7 @@ import { OfflineFileFinder } from '../../files/application/OfflineFileFinder';
 import { OfflineFileSizeIncreaser } from '../../files/application/OfflineFileSizeIncreaser';
 import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
 
-export class OfflineContentsAppended {
+export class OfflineContentsAppender {
   constructor(
     private readonly offlineFileFinder: OfflineFileFinder,
     private readonly offlineFileSizeIncreaser: OfflineFileSizeIncreaser,
diff --git a/src/context/offline-drive/contents/application/OfflineContentsCreator.ts b/src/context/offline-drive/contents/application/OfflineContentsCreator.ts
new file mode 100644
index 000000000..764bcfef3
--- /dev/null
+++ b/src/context/offline-drive/contents/application/OfflineContentsCreator.ts
@@ -0,0 +1,9 @@
+import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
+
+export class OfflineContentsCreator {
+  constructor(private readonly repository: OfflineContentsRepository) {}
+
+  async run(name: string): Promise<void> {
+    await this.repository.createEmptyFile(name);
+  }
+}
diff --git a/src/context/offline-drive/contents/application/OfflineContentsUploader.ts b/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
index 0435dc276..1ab16c824 100644
--- a/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
+++ b/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
@@ -1,58 +1,41 @@
-import { EventBus } from '../../../virtual-drive/shared/domain/EventBus';
-import { OfflineContentsManagersFactory } from '../domain/OfflineContentsManagersFactory';
+import {
+  OfflineContentUploader,
+  OfflineContentsManagersFactory,
+} from '../domain/OfflineContentsManagersFactory';
 import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
-import { OfflineContentsUploadedDomainEvent } from '../domain/events/OfflineContentsUploadedDomainEvent';
+import Logger from 'electron-log';
 
 export class OfflineContentsUploader {
   constructor(
     private readonly contentsManagersFactory: OfflineContentsManagersFactory,
-    private readonly repository: OfflineContentsRepository,
-    private readonly eventBus: EventBus
+    private readonly repository: OfflineContentsRepository
   ) {}
 
-  // private registerEvents(
-  //   uploader: ContentFileUploader,
-  //   localFileContents: LocalFileContents
-  // ) {
-  //   uploader.on('start', () => {
-  //     this.ipc.send('FILE_UPLOADING', {
-  //       name: localFileContents.name,
-  //       extension: localFileContents.extension,
-  //       nameWithExtension: localFileContents.nameWithExtension,
-  //       size: localFileContents.size,
-  //       processInfo: { elapsedTime: uploader.elapsedTime() },
-  //     });
-  //   });
+  private registerEvents(uploader: OfflineContentUploader) {
+    uploader.on('start', () => {
+      Logger.debug('FILE_UPLOADING', {
+        processInfo: { elapsedTime: uploader.elapsedTime() },
+      });
+    });
 
-  //   uploader.on('progress', (progress: number) => {
-  //     this.ipc.send('FILE_UPLOADING', {
-  //       name: localFileContents.name,
-  //       extension: localFileContents.extension,
-  //       nameWithExtension: localFileContents.nameWithExtension,
-  //       size: localFileContents.size,
-  //       processInfo: { elapsedTime: uploader.elapsedTime(), progress },
-  //     });
-  //   });
+    uploader.on('progress', (progress: number) => {
+      Logger.debug('FILE_UPLOADING', {
+        processInfo: { elapsedTime: uploader.elapsedTime(), progress },
+      });
+    });
 
-  //   uploader.on('error', (error: Error) => {
-  //     this.ipc.send('FILE_UPLOAD_ERROR', {
-  //       name: localFileContents.name,
-  //       extension: localFileContents.extension,
-  //       nameWithExtension: localFileContents.nameWithExtension,
-  //       error: error.message,
-  //     });
-  //   });
+    uploader.on('error', (error: Error) => {
+      Logger.debug('FILE_UPLOAD_ERROR', {
+        error: error.message,
+      });
+    });
 
-  //   uploader.on('finish', () => {
-  //     this.ipc.send('FILE_UPLOADED', {
-  //       name: localFileContents.name,
-  //       extension: localFileContents.extension,
-  //       nameWithExtension: localFileContents.nameWithExtension,
-  //       size: localFileContents.size,
-  //       processInfo: { elapsedTime: uploader.elapsedTime() },
-  //     });
-  //   });
-  // }
+    uploader.on('finish', () => {
+      Logger.debug('FILE_UPLOADED', {
+        processInfo: { elapsedTime: uploader.elapsedTime() },
+      });
+    });
+  }
 
   async run(absolutePath: string): Promise<string> {
     const { contents, abortSignal, size } = await this.repository.provide(
@@ -61,17 +44,11 @@ export class OfflineContentsUploader {
 
     const uploader = this.contentsManagersFactory.uploader(size, abortSignal);
 
-    // this.registerEvents(uploader, contents);
+    this.registerEvents(uploader);
 
     const contentsId = await uploader.upload(contents, size);
 
-    const uploadedEvent = new OfflineContentsUploadedDomainEvent({
-      aggregateId: contentsId,
-      size,
-      absolutePath,
-    });
-
-    await this.eventBus.publish([uploadedEvent]);
+    Logger.debug('FILE UPLOADED WITH ID: ', contentsId);
 
     return contentsId;
   }
diff --git a/src/context/offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent.ts b/src/context/offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent.ts
index 38c751b65..9b9bd1ca6 100644
--- a/src/context/offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent.ts
+++ b/src/context/offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent.ts
@@ -4,16 +4,16 @@ export class OfflineContentsUploadedDomainEvent extends DomainEvent {
   static readonly EVENT_NAME = 'offline.contents.uploaded';
 
   readonly size: number;
-  readonly absolutePath: string;
+  readonly path: string;
 
   constructor({
     aggregateId,
     size,
-    absolutePath,
+    path,
   }: {
     aggregateId: string;
     size: number;
-    absolutePath: string;
+    path: string;
   }) {
     super({
       aggregateId,
@@ -21,14 +21,14 @@ export class OfflineContentsUploadedDomainEvent extends DomainEvent {
     });
 
     this.size = size;
-    this.absolutePath = absolutePath;
+    this.path = path;
   }
 
   toPrimitives() {
     return {
       aggregateId: this.aggregateId,
       size: this.size,
-      absolutePath: this.absolutePath,
+      path: this.path,
     };
   }
 }
diff --git a/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts b/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
index ba0c67846..9e6d24b8b 100644
--- a/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
+++ b/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
@@ -1,4 +1,5 @@
-import fs from 'fs';
+import fs, { createReadStream, watch } from 'fs';
+import { stat as statPromises } from 'fs/promises';
 import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
 import { OfflineFileAttributes } from '../../files/domain/OfflineFile';
 import { LocalFileContentsDirectoryProvider } from '../../../virtual-drive/shared/domain/LocalFileContentsDirectoryProvider';
@@ -26,6 +27,17 @@ export class NodeFSOfflineContentsRepository
     return path.join(folder, id);
   }
 
+  private createAbortableStream(filePath: string): {
+    readable: Readable;
+    controller: AbortController;
+  } {
+    const readStream = createReadStream(filePath);
+
+    const controller = new AbortController();
+
+    return { readable: readStream, controller };
+  }
+
   async init(): Promise<void> {
     const folder = await this.folderPath();
 
@@ -93,7 +105,35 @@ export class NodeFSOfflineContentsRepository
     return this.filePath(id);
   }
 
-  provide: (
-    path: string
-  ) => Promise<{ contents: Readable; size: number; abortSignal: AbortSignal }>;
+  async provide(absoluteFilePath: string) {
+    const { readable, controller } =
+      this.createAbortableStream(absoluteFilePath);
+
+    const { size } = await statPromises(absoluteFilePath);
+
+    const absoluteFolderPath = path.dirname(absoluteFilePath);
+    const nameWithExtension = path.basename(absoluteFilePath);
+
+    const watcher = watch(absoluteFolderPath, (_, filename) => {
+      if (filename !== nameWithExtension) {
+        return;
+      }
+      Logger.warn(
+        filename,
+        ' has been changed during read, it will be aborted'
+      );
+
+      controller.abort();
+    });
+
+    readable.on('end', () => {
+      watcher.close();
+    });
+
+    return {
+      contents: readable,
+      size,
+      abortSignal: controller.signal,
+    };
+  }
 }
diff --git a/src/context/offline-drive/boundaryBridge/application/OfflineFileCreator.ts b/src/context/offline-drive/files/application/OfflineFileCreator.ts
similarity index 54%
rename from src/context/offline-drive/boundaryBridge/application/OfflineFileCreator.ts
rename to src/context/offline-drive/files/application/OfflineFileCreator.ts
index d20f2e08c..042e3f901 100644
--- a/src/context/offline-drive/boundaryBridge/application/OfflineFileCreator.ts
+++ b/src/context/offline-drive/files/application/OfflineFileCreator.ts
@@ -1,19 +1,17 @@
 import { FilePath } from '../../../virtual-drive/files/domain/FilePath';
 import { FileSize } from '../../../virtual-drive/files/domain/FileSize';
 import { EventBus } from '../../../virtual-drive/shared/domain/EventBus';
-import { OfflineFile } from '../../files/domain/OfflineFile';
-import { OfflineContentsRepository } from '../../contents/domain/OfflineContentsRepository';
-import { OfflineFileRepository } from '../../files/domain/OfflineFileRepository';
+import { OfflineFile } from '../domain/OfflineFile';
+import { OfflineFileRepository } from '../domain/OfflineFileRepository';
 import * as uuid from 'uuid';
 
 export class OfflineFileCreator {
   constructor(
-    private readonly fileRepository: OfflineFileRepository,
-    private readonly contentsRepository: OfflineContentsRepository,
+    private readonly repository: OfflineFileRepository,
     private readonly eventBus: EventBus
   ) {}
 
-  async run(path: string): Promise<void> {
+  async run(path: string): Promise<OfflineFile> {
     const id = uuid.v4();
     const createdAt = Date.now();
     const filePath = new FilePath(path);
@@ -21,10 +19,10 @@ export class OfflineFileCreator {
 
     const file = OfflineFile.create(id, createdAt, filePath, size);
 
-    await this.contentsRepository.createEmptyFile(file.id);
+    await this.eventBus.publish(file.pullDomainEvents());
 
-    await this.fileRepository.save(file);
+    await this.repository.save(file);
 
-    await this.eventBus.publish(file.pullDomainEvents());
+    return file;
   }
 }
diff --git a/src/context/offline-drive/files/application/OfflineFileFinder.ts b/src/context/offline-drive/files/application/OfflineFileFinder.ts
index e58f3fc48..773249376 100644
--- a/src/context/offline-drive/files/application/OfflineFileFinder.ts
+++ b/src/context/offline-drive/files/application/OfflineFileFinder.ts
@@ -5,7 +5,7 @@ export class OfflineFileFinder {
   constructor(private readonly searcher: OfflineFileSearcher) {}
 
   async run(partial: Partial<OfflineFileAttributes>): Promise<OfflineFile> {
-    const file = await this.searcher.execute(partial);
+    const file = await this.searcher.run(partial);
 
     if (!file) {
       throw new Error('Offline file not founded');
diff --git a/src/context/offline-drive/files/application/OfflineFileSearcher.ts b/src/context/offline-drive/files/application/OfflineFileSearcher.ts
index 84d74810e..33d67afd8 100644
--- a/src/context/offline-drive/files/application/OfflineFileSearcher.ts
+++ b/src/context/offline-drive/files/application/OfflineFileSearcher.ts
@@ -4,7 +4,7 @@ import { OfflineFileRepository } from '../domain/OfflineFileRepository';
 export class OfflineFileSearcher {
   constructor(private readonly repository: OfflineFileRepository) {}
 
-  async execute(
+  async run(
     partial: Partial<OfflineFileAttributes>
   ): Promise<OfflineFile | undefined> {
     return await this.repository.searchByPartial(partial);
diff --git a/src/context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded.ts b/src/context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded.ts
index 16fb67357..f86c16e77 100644
--- a/src/context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded.ts
+++ b/src/context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded.ts
@@ -12,6 +12,6 @@ export class MoveOfflineContentsOnContentsUploaded
     return [OfflineContentsUploadedDomainEvent];
   }
   async on(domainEvent: OfflineContentsUploadedDomainEvent): Promise<void> {
-    await this.mover.run(domainEvent.absolutePath, domainEvent.aggregateId);
+    await this.mover.run(domainEvent.path, domainEvent.aggregateId);
   }
 }
diff --git a/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts b/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts
index 3110f85ec..b347ca8cc 100644
--- a/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts
+++ b/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts
@@ -1,24 +1,18 @@
 import { OfflineContentsUploadedDomainEvent } from '../../../offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent';
 import { DomainEventClass } from '../../../shared/domain/DomainEvent';
 import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
-import { AbsolutePathToRelativeConverter } from '../../shared/application/AbsolutePathToRelativeConverter';
 import { FileCreator } from './FileCreator';
 
 export class CreateFileOnOfflineFileUploaded
   implements DomainEventSubscriber<OfflineContentsUploadedDomainEvent>
 {
-  constructor(
-    private readonly creator: FileCreator,
-    private readonly converter: AbsolutePathToRelativeConverter
-  ) {}
+  constructor(private readonly creator: FileCreator) {}
 
   subscribedTo(): DomainEventClass[] {
     return [OfflineContentsUploadedDomainEvent];
   }
 
   async on(event: OfflineContentsUploadedDomainEvent): Promise<void> {
-    const filePath = this.converter.run(event.absolutePath);
-
-    await this.creator.run(filePath, event.aggregateId, event.size);
+    await this.creator.run(event.path, event.aggregateId, event.size);
   }
 }
diff --git a/src/context/virtual-drive/shared/domain/EventBus.ts b/src/context/virtual-drive/shared/domain/EventBus.ts
index 9c692a629..995c68962 100644
--- a/src/context/virtual-drive/shared/domain/EventBus.ts
+++ b/src/context/virtual-drive/shared/domain/EventBus.ts
@@ -1,7 +1,7 @@
-import { DomainEventSubscribers } from '../infrastructure/DomainEventSubscribers';
+import { SyncEngineDomainEventSubscribers } from '../../../../apps/sync-engine/dependency-injection/SyncEngineDomainEventSubscribers';
 import { DomainEvent } from '../../../shared/domain/DomainEvent';
 
 export interface EventBus {
   publish(events: Array<DomainEvent>): Promise<void>;
-  addSubscribers(subscribers: DomainEventSubscribers): void;
+  addSubscribers(subscribers: SyncEngineDomainEventSubscribers): void;
 }
diff --git a/src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers.ts b/src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers.ts
deleted file mode 100644
index 237aae79f..000000000
--- a/src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
-import { DomainEvent } from '../../../shared/domain/DomainEvent';
-import { DependencyContainer } from '../../../../apps/sync-engine/dependency-injection/DependencyContainer';
-import { DependencyContainerFactory } from '../../../../apps/sync-engine/dependency-injection/DependencyContainerFactory';
-
-export class DomainEventSubscribers {
-  constructor(public items: Array<DomainEventSubscriber<DomainEvent>>) {}
-
-  static from(container: DependencyContainer): DomainEventSubscribers {
-    const subscribers = DependencyContainerFactory.subscribers.map(
-      (subscriber) => {
-        return container[subscriber];
-      }
-    ) as unknown as Array<DomainEventSubscriber<DomainEvent>>;
-
-    return new DomainEventSubscribers(subscribers);
-  }
-}
diff --git a/src/context/virtual-drive/shared/infrastructure/EventRecorder.ts b/src/context/virtual-drive/shared/infrastructure/EventRecorder.ts
index 4477b2dfc..94ed9cb4f 100644
--- a/src/context/virtual-drive/shared/infrastructure/EventRecorder.ts
+++ b/src/context/virtual-drive/shared/infrastructure/EventRecorder.ts
@@ -1,7 +1,7 @@
 import { DomainEvent } from '../../../shared/domain/DomainEvent';
 import { EventBus } from '../domain/EventBus';
 import { EventRepository } from '../domain/EventRepository';
-import { DomainEventSubscribers } from './DomainEventSubscribers';
+import { SyncEngineDomainEventSubscribers } from '../../../../apps/sync-engine/dependency-injection/SyncEngineDomainEventSubscribers';
 
 export class EventRecorder implements EventBus {
   constructor(
@@ -16,7 +16,7 @@ export class EventRecorder implements EventBus {
     await this.bus.publish(events);
   }
 
-  addSubscribers(subscribers: DomainEventSubscribers): void {
+  addSubscribers(subscribers: SyncEngineDomainEventSubscribers): void {
     this.bus.addSubscribers(subscribers);
   }
 }
diff --git a/src/context/virtual-drive/shared/infrastructure/NodeJsEventBus.ts b/src/context/virtual-drive/shared/infrastructure/NodeJsEventBus.ts
index 7f5fa3005..87b44c4a4 100644
--- a/src/context/virtual-drive/shared/infrastructure/NodeJsEventBus.ts
+++ b/src/context/virtual-drive/shared/infrastructure/NodeJsEventBus.ts
@@ -1,7 +1,7 @@
 import EventEmitter from 'events';
 import { DomainEvent } from '../../../shared/domain/DomainEvent';
 import { EventBus } from '../domain/EventBus';
-import { DomainEventSubscribers } from './DomainEventSubscribers';
+import { SyncEngineDomainEventSubscribers } from '../../../../apps/sync-engine/dependency-injection/SyncEngineDomainEventSubscribers';
 
 export class NodeJsEventBus extends EventEmitter implements EventBus {
   async publish(events: Array<DomainEvent>): Promise<void> {
@@ -10,7 +10,7 @@ export class NodeJsEventBus extends EventEmitter implements EventBus {
     });
   }
 
-  addSubscribers(subscribers: DomainEventSubscribers): void {
+  addSubscribers(subscribers: SyncEngineDomainEventSubscribers): void {
     subscribers.items.forEach((subscriber) => {
       subscriber.subscribedTo().forEach((event) => {
         this.on(`${event.EVENT_NAME}`, subscriber.on.bind(subscriber));
diff --git a/tests/context/virtual-drive/shared/__mock__/EventBusMock.ts b/tests/context/virtual-drive/shared/__mock__/EventBusMock.ts
index f7fcbeb68..f92303cfe 100644
--- a/tests/context/virtual-drive/shared/__mock__/EventBusMock.ts
+++ b/tests/context/virtual-drive/shared/__mock__/EventBusMock.ts
@@ -1,6 +1,6 @@
 import { DomainEvent } from '../../../../../src/context/shared/domain/DomainEvent';
 import { EventBus } from '../../../../../src/context/virtual-drive/shared/domain/EventBus';
-import { DomainEventSubscribers } from '../../../../../src/context/virtual-drive/shared/infrastructure/DomainEventSubscribers';
+import { SyncEngineDomainEventSubscribers } from '../../../../../src/apps/sync-engine/dependency-injection/SyncEngineDomainEventSubscribers';
 
 export class EventBusMock implements EventBus {
   public publishMock = jest.fn();
@@ -9,7 +9,7 @@ export class EventBusMock implements EventBus {
     this.publishMock(events);
   }
 
-  addSubscribers(_subscribers: DomainEventSubscribers): void {
+  addSubscribers(_subscribers: SyncEngineDomainEventSubscribers): void {
     //
   }
 

From eebb7b65c5b1852189b34ad9ba2b4343b77a65a8 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 3 Jan 2024 10:52:05 +0100
Subject: [PATCH 100/188] chore: reuse login in callbacks

---
 src/apps/fuse/FuseApp.ts                      | 54 +++++++++---------
 src/apps/fuse/callbacks/Callback.ts           |  3 -
 .../{CreateFile.ts => CreateCallback.ts}      | 18 +++---
 src/apps/fuse/callbacks/FuseCallback.ts       | 56 +++++++++++++++++++
 src/apps/fuse/callbacks/FuseCodes.ts          | 19 +++++++
 src/apps/fuse/callbacks/FuseErrors.ts         | 43 ++++++++++++++
 ...Attributes.ts => GetAttributesCallback.ts} | 30 ++++++----
 src/apps/fuse/callbacks/GetXAttribute.ts      | 18 ------
 .../fuse/callbacks/GetXAttributeCallback.ts   | 12 ++++
 src/apps/fuse/callbacks/ListXAttributes.ts    |  9 ---
 .../fuse/callbacks/ListXAttributesCallback.ts |  9 +++
 ...eateFolder.ts => MakeDirectoryCallback.ts} | 12 ++--
 .../callbacks/{Open.ts => OpenCallback.ts}    | 34 +++++++----
 .../callbacks/{Read.ts => ReadCallback.ts}    | 11 ++--
 .../{Readdir.ts => ReaddirCallback.ts}        | 23 ++++----
 src/apps/fuse/callbacks/ReleaseCallback.ts    | 30 +++++++---
 ...nameAndMove.ts => RenameOrMoveCallback.ts} | 24 ++++----
 src/apps/fuse/callbacks/TrashFile.ts          | 27 ---------
 src/apps/fuse/callbacks/TrashFileCallback.ts  | 29 ++++++++++
 src/apps/fuse/callbacks/TrashFolder.ts        | 27 ---------
 .../fuse/callbacks/TrashFolderCallback.ts     | 35 ++++++++++++
 src/apps/fuse/callbacks/WriteCallback.ts      | 17 +++---
 22 files changed, 348 insertions(+), 192 deletions(-)
 delete mode 100644 src/apps/fuse/callbacks/Callback.ts
 rename src/apps/fuse/callbacks/{CreateFile.ts => CreateCallback.ts} (57%)
 create mode 100644 src/apps/fuse/callbacks/FuseCallback.ts
 create mode 100644 src/apps/fuse/callbacks/FuseCodes.ts
 create mode 100644 src/apps/fuse/callbacks/FuseErrors.ts
 rename src/apps/fuse/callbacks/{GetAttributes.ts => GetAttributesCallback.ts} (56%)
 delete mode 100644 src/apps/fuse/callbacks/GetXAttribute.ts
 create mode 100644 src/apps/fuse/callbacks/GetXAttributeCallback.ts
 delete mode 100644 src/apps/fuse/callbacks/ListXAttributes.ts
 create mode 100644 src/apps/fuse/callbacks/ListXAttributesCallback.ts
 rename src/apps/fuse/callbacks/{CreateFolder.ts => MakeDirectoryCallback.ts} (60%)
 rename src/apps/fuse/callbacks/{Open.ts => OpenCallback.ts} (53%)
 rename src/apps/fuse/callbacks/{Read.ts => ReadCallback.ts} (73%)
 rename src/apps/fuse/callbacks/{Readdir.ts => ReaddirCallback.ts} (54%)
 rename src/apps/fuse/callbacks/{RenameAndMove.ts => RenameOrMoveCallback.ts} (66%)
 delete mode 100644 src/apps/fuse/callbacks/TrashFile.ts
 create mode 100644 src/apps/fuse/callbacks/TrashFileCallback.ts
 delete mode 100644 src/apps/fuse/callbacks/TrashFolder.ts
 create mode 100644 src/apps/fuse/callbacks/TrashFolderCallback.ts

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index d6ab59820..99efc9c2b 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -1,16 +1,16 @@
 import _path from 'path';
 import Logger from 'electron-log';
-import { Readdir } from './callbacks/Readdir';
-import { GetAttributes } from './callbacks/GetAttributes';
-import { Open } from './callbacks/Open';
-import { Read } from './callbacks/Read';
-import { RenameOrMove } from './callbacks/RenameAndMove';
-import { ListXAttributes } from './callbacks/ListXAttributes';
-import { GetXAttribute } from './callbacks/GetXAttribute';
-import { CreateFile } from './callbacks/CreateFile';
-import { CreateFolder } from './callbacks/CreateFolder';
-import { TrashFile } from './callbacks/TrashFile';
-import { TrashFolder } from './callbacks/TrashFolder';
+import { ReaddirCallback } from './callbacks/ReaddirCallback';
+import { GetAttributesCallback } from './callbacks/GetAttributesCallback';
+import { OpenCallback } from './callbacks/OpenCallback';
+import { ReadCallback } from './callbacks/ReadCallback';
+import { RenameOrMoveCallback } from './callbacks/RenameOrMoveCallback';
+import { ListXAttributesCallback } from './callbacks/ListXAttributesCallback';
+import { GetXAttributeCallback } from './callbacks/GetXAttributeCallback';
+import { CreateCallback } from './callbacks/CreateCallback';
+import { MakeDirectoryCallback } from './callbacks/MakeDirectoryCallback';
+import { TrashFileCallback } from './callbacks/TrashFileCallback';
+import { TrashFolderCallback } from './callbacks/TrashFolderCallback';
 import { WriteCallback } from './callbacks/WriteCallback';
 import { ReleaseCallback } from './callbacks/ReleaseCallback';
 import { FuseDependencyContainer } from './dependency-injection/FuseDependencyContainer';
@@ -30,24 +30,28 @@ export class FuseApp {
   ) {}
 
   private getOpt() {
-    const listXAttributes = new ListXAttributes();
-    const getXAttribute = new GetXAttribute();
-    const readdir = new Readdir(this.fuseContainer.virtualDriveContainer);
-    const getattr = new GetAttributes(
+    const listXAttributes = new ListXAttributesCallback();
+    const getXAttribute = new GetXAttributeCallback();
+    const readdir = new ReaddirCallback(
+      this.fuseContainer.virtualDriveContainer
+    );
+    const getattr = new GetAttributesCallback(
       this.fuseContainer.virtualDriveContainer,
       this.fuseContainer.offlineDriveContainer
     );
-    const open = new Open(this.fuseContainer.virtualDriveContainer);
-    const read = new Read(this.fuseContainer.virtualDriveContainer);
-    const renameOrMove = new RenameOrMove(
+    const open = new OpenCallback(this.fuseContainer.virtualDriveContainer);
+    const read = new ReadCallback(this.fuseContainer.virtualDriveContainer);
+    const renameOrMove = new RenameOrMoveCallback(
+      this.fuseContainer.virtualDriveContainer
+    );
+    const create = new CreateCallback(this.fuseContainer.offlineDriveContainer);
+    const makeDirectory = new MakeDirectoryCallback(
       this.fuseContainer.virtualDriveContainer
     );
-    const createFile = new CreateFile(this.fuseContainer.offlineDriveContainer);
-    const createFolder = new CreateFolder(
+    const trashFile = new TrashFileCallback(
       this.fuseContainer.virtualDriveContainer
     );
-    const trashFile = new TrashFile(this.fuseContainer.virtualDriveContainer);
-    const trashFolder = new TrashFolder(
+    const trashFolder = new TrashFolderCallback(
       this.fuseContainer.virtualDriveContainer
     );
     const write = new WriteCallback(this.fuseContainer.offlineDriveContainer);
@@ -57,15 +61,15 @@ export class FuseApp {
 
     return {
       listxattr: listXAttributes.execute.bind(listXAttributes),
-      getxattr: getXAttribute.export.bind(getXAttribute),
+      getxattr: getXAttribute.execute.bind(getXAttribute),
       getattr: getattr.execute.bind(getattr),
       readdir: readdir.execute.bind(readdir),
       open: open.execute.bind(open),
       read: read.execute.bind(read),
       rename: renameOrMove.execute.bind(renameOrMove),
-      create: createFile.execute.bind(createFile),
+      create: create.execute.bind(create),
       write: write.execute.bind(write),
-      mkdir: createFolder.execute.bind(createFolder),
+      mkdir: makeDirectory.execute.bind(makeDirectory),
       release: release.execute.bind(release),
       unlink: trashFile.execute.bind(trashFile),
       rmdir: trashFolder.execute.bind(trashFolder),
diff --git a/src/apps/fuse/callbacks/Callback.ts b/src/apps/fuse/callbacks/Callback.ts
deleted file mode 100644
index 7fa018ed3..000000000
--- a/src/apps/fuse/callbacks/Callback.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export type Callback = (code: number, params?: any) => void;
-
-export type TypedCallback<T> = (code: number, params?: T) => void;
diff --git a/src/apps/fuse/callbacks/CreateFile.ts b/src/apps/fuse/callbacks/CreateCallback.ts
similarity index 57%
rename from src/apps/fuse/callbacks/CreateFile.ts
rename to src/apps/fuse/callbacks/CreateCallback.ts
index ddf89ec9f..5f364855d 100644
--- a/src/apps/fuse/callbacks/CreateFile.ts
+++ b/src/apps/fuse/callbacks/CreateCallback.ts
@@ -1,21 +1,17 @@
 import Logger from 'electron-log';
-import { TypedCallback } from './Callback';
 import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
+import { NotifyFuseCallback } from './FuseCallback';
 
-type CreateCallback = TypedCallback<never>;
-
-export class CreateFile {
-  constructor(private readonly container: OfflineDriveDependencyContainer) {}
+export class CreateCallback extends NotifyFuseCallback {
+  constructor(private readonly container: OfflineDriveDependencyContainer) {
+    super();
+  }
 
-  async execute(
-    path: string,
-    _mode: number,
-    cb: CreateCallback
-  ): Promise<void> {
+  async execute(path: string, _mode: number) {
     Logger.debug(`CREATE ${path}`);
 
     await this.container.offlineFileAndContentsCreator.run(path);
 
-    cb(0);
+    return this.right();
   }
 }
diff --git a/src/apps/fuse/callbacks/FuseCallback.ts b/src/apps/fuse/callbacks/FuseCallback.ts
new file mode 100644
index 000000000..6f5981ce2
--- /dev/null
+++ b/src/apps/fuse/callbacks/FuseCallback.ts
@@ -0,0 +1,56 @@
+import { Either, right, left } from '../../../context/shared/domain/Either';
+import { FuseError } from './FuseErrors';
+import Logger from 'electron-log';
+
+export type Callback = (code: number) => void;
+
+export type CallbackWithData<T> = (code: number, params?: T) => void;
+
+export abstract class FuseCallback<T> {
+  protected static readonly OK = 0;
+
+  protected right(value: T): Either<FuseError, T> {
+    return right(value);
+  }
+
+  protected left(error: FuseError): Either<FuseError, T> {
+    Logger.error('[FUSE CALLBACK ERROR] ', error.message, error.description);
+    return left(error);
+  }
+
+  async handle(...params: any[]): Promise<void> {
+    const callback = params.pop() as CallbackWithData<T>;
+
+    const result = await this.execute(params);
+
+    if (result.isLeft()) {
+      const error = result.getLeft();
+      return callback(error.code);
+    }
+
+    const data = result.getRight();
+
+    callback(FuseCallback.OK, data);
+  }
+
+  abstract execute(...params: any[]): Promise<Either<FuseError, T>>;
+}
+
+export abstract class NotifyFuseCallback extends FuseCallback<undefined> {
+  protected right(): Either<FuseError, undefined> {
+    return right(undefined);
+  }
+
+  async handle(...params: any[]): Promise<void> {
+    const callback = params.pop() as Callback;
+
+    const result = await this.execute(params);
+
+    if (result.isLeft()) {
+      const error = result.getLeft();
+      return callback(error.code);
+    }
+
+    callback(NotifyFuseCallback.OK);
+  }
+}
diff --git a/src/apps/fuse/callbacks/FuseCodes.ts b/src/apps/fuse/callbacks/FuseCodes.ts
new file mode 100644
index 000000000..83b16562c
--- /dev/null
+++ b/src/apps/fuse/callbacks/FuseCodes.ts
@@ -0,0 +1,19 @@
+export enum FuseCodes {
+  // Operation not supported (Functionality not implemented)
+  ENOSYS = 38,
+
+  // No such file or directory
+  ENOENT = 2,
+
+  // File or directory already exists
+  EEXIST = 17,
+
+  // Input/output error
+  EIO = 5,
+
+  // Invalid argument
+  EINVAL = 22,
+
+  // Permission denied
+  EACCES = 13,
+}
diff --git a/src/apps/fuse/callbacks/FuseErrors.ts b/src/apps/fuse/callbacks/FuseErrors.ts
new file mode 100644
index 000000000..2e602d843
--- /dev/null
+++ b/src/apps/fuse/callbacks/FuseErrors.ts
@@ -0,0 +1,43 @@
+import { FuseCodes } from './FuseCodes';
+
+export class FuseError extends Error {
+  public readonly code: number;
+  public readonly description: string;
+
+  constructor(code: FuseCodes, message: string, description: string) {
+    super(message);
+
+    this.code = code;
+    this.description = description;
+  }
+}
+
+export class NoSuchFileOrDirectoryError extends FuseError {
+  constructor(description: string) {
+    super(FuseCodes.ENOENT, 'No such file or directory', description);
+  }
+}
+
+export class FileOrDirectoryAlreadyExistsError extends FuseError {
+  constructor(description: string) {
+    super(FuseCodes.ENOENT, 'File or directory already exists', description);
+  }
+}
+
+export class IOError extends FuseError {
+  constructor(description: string) {
+    super(FuseCodes.ENOENT, 'Input/output error', description);
+  }
+}
+
+export class InvalidArgumentError extends FuseError {
+  constructor(description: string) {
+    super(FuseCodes.ENOENT, 'Invalid argument', description);
+  }
+}
+
+export class PermissionDeniedError extends FuseError {
+  constructor(description: string) {
+    super(FuseCodes.ENOENT, 'Permission denied', description);
+  }
+}
diff --git a/src/apps/fuse/callbacks/GetAttributes.ts b/src/apps/fuse/callbacks/GetAttributesCallback.ts
similarity index 56%
rename from src/apps/fuse/callbacks/GetAttributes.ts
rename to src/apps/fuse/callbacks/GetAttributesCallback.ts
index 203f95aa6..fb36e54c6 100644
--- a/src/apps/fuse/callbacks/GetAttributes.ts
+++ b/src/apps/fuse/callbacks/GetAttributesCallback.ts
@@ -1,28 +1,30 @@
+import Logger from 'electron-log';
 import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
-import { Callback } from './Callback';
-import Logger from 'electron-log';
+import { FuseCallback } from './FuseCallback';
+import { NoSuchFileOrDirectoryError } from './FuseErrors';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fuse = require('@gcas/fuse');
+type GetAttributesCallbackData = { mode: number; size: number };
 
-export class GetAttributes {
+export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackData> {
   constructor(
     private readonly virtualDriveContainer: VirtualDriveDependencyContainer,
     private readonly offlineDriveContainer: OfflineDriveDependencyContainer
-  ) {}
+  ) {
+    super();
+  }
 
-  async execute(path: string, cb: Callback): Promise<void> {
+  async execute(path: string) {
     Logger.debug('GET ATTRIBUTES OF ', path);
 
     if (path === '/') {
-      return cb(0, { mode: 16877, size: 0 });
+      return this.right({ mode: 16877, size: 0 });
     }
 
     const file = await this.virtualDriveContainer.filesSearcher.run({ path });
 
     if (file) {
-      return cb(0, { mode: 33188, size: file.size });
+      return this.right({ mode: 33188, size: file.size });
     }
 
     const folder = await this.virtualDriveContainer.folderSearcher.run({
@@ -30,16 +32,20 @@ export class GetAttributes {
     });
 
     if (folder) {
-      return cb(0, { mode: 16877, size: 0 });
+      return this.right({ mode: 16877, size: 0 });
     }
 
     const offlineFile =
       await this.offlineDriveContainer.offlineFileSearcher.run({ path });
 
     if (offlineFile) {
-      return cb(0, { mode: 33188, size: offlineFile.size });
+      return this.right({ mode: 33188, size: offlineFile.size });
     }
 
-    cb(fuse.ENOENT);
+    return this.left(
+      new NoSuchFileOrDirectoryError(
+        `${path} not founded on when it's attributes`
+      )
+    );
   }
 }
diff --git a/src/apps/fuse/callbacks/GetXAttribute.ts b/src/apps/fuse/callbacks/GetXAttribute.ts
deleted file mode 100644
index 4867f1854..000000000
--- a/src/apps/fuse/callbacks/GetXAttribute.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import Logger from 'electron-log';
-import { TypedCallback } from './Callback';
-
-type GetXAttributeCallback = TypedCallback<Buffer>;
-
-export class GetXAttribute {
-  async export(
-    path: string,
-    name: string,
-    size: string,
-    cb: GetXAttributeCallback
-  ): Promise<void> {
-    Logger.debug('GETXATTR', path, name, size);
-
-    const buff = Buffer.from('in sync');
-    cb(0, buff);
-  }
-}
diff --git a/src/apps/fuse/callbacks/GetXAttributeCallback.ts b/src/apps/fuse/callbacks/GetXAttributeCallback.ts
new file mode 100644
index 000000000..a545f6ba8
--- /dev/null
+++ b/src/apps/fuse/callbacks/GetXAttributeCallback.ts
@@ -0,0 +1,12 @@
+import Logger from 'electron-log';
+import { FuseCallback } from './FuseCallback';
+
+export class GetXAttributeCallback extends FuseCallback<Buffer> {
+  async execute(path: string, name: string, size: string) {
+    Logger.debug('GETXATTR', path, name, size);
+
+    const buff = Buffer.from('in sync');
+
+    return this.right(buff);
+  }
+}
diff --git a/src/apps/fuse/callbacks/ListXAttributes.ts b/src/apps/fuse/callbacks/ListXAttributes.ts
deleted file mode 100644
index 69a7f33bc..000000000
--- a/src/apps/fuse/callbacks/ListXAttributes.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { TypedCallback } from './Callback';
-
-type ListXAttributesCallback = TypedCallback<Array<string>>;
-
-export class ListXAttributes {
-  async execute(_path: string, cb: ListXAttributesCallback): Promise<void> {
-    cb(0, []);
-  }
-}
diff --git a/src/apps/fuse/callbacks/ListXAttributesCallback.ts b/src/apps/fuse/callbacks/ListXAttributesCallback.ts
new file mode 100644
index 000000000..c815806c0
--- /dev/null
+++ b/src/apps/fuse/callbacks/ListXAttributesCallback.ts
@@ -0,0 +1,9 @@
+import { FuseCallback } from './FuseCallback';
+
+type ListXAttributesCallbackData = Array<string>;
+
+export class ListXAttributesCallback extends FuseCallback<ListXAttributesCallbackData> {
+  async execute(_path: string) {
+    return this.right([]);
+  }
+}
diff --git a/src/apps/fuse/callbacks/CreateFolder.ts b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
similarity index 60%
rename from src/apps/fuse/callbacks/CreateFolder.ts
rename to src/apps/fuse/callbacks/MakeDirectoryCallback.ts
index 6bd972818..fb0b340c9 100644
--- a/src/apps/fuse/callbacks/CreateFolder.ts
+++ b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
@@ -1,14 +1,16 @@
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
-import { Callback } from './Callback';
+import { NotifyFuseCallback } from './FuseCallback';
 
-export class CreateFolder {
-  constructor(private readonly container: VirtualDriveDependencyContainer) {}
+export class MakeDirectoryCallback extends NotifyFuseCallback {
+  constructor(private readonly container: VirtualDriveDependencyContainer) {
+    super();
+  }
 
-  async execute(path: string, _mode: number, cb: Callback): Promise<void> {
+  async execute(path: string, _mode: number) {
     const offlineFolder = this.container.offline.offlineFolderCreator.run(path);
 
     await this.container.folderCreator.run(offlineFolder);
 
-    cb(0);
+    return this.right();
   }
 }
diff --git a/src/apps/fuse/callbacks/Open.ts b/src/apps/fuse/callbacks/OpenCallback.ts
similarity index 53%
rename from src/apps/fuse/callbacks/Open.ts
rename to src/apps/fuse/callbacks/OpenCallback.ts
index 64cd63422..fe39aa07a 100644
--- a/src/apps/fuse/callbacks/Open.ts
+++ b/src/apps/fuse/callbacks/OpenCallback.ts
@@ -1,19 +1,23 @@
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
-import { Callback } from './Callback';
 import Logger from 'electron-log';
+import { FuseCallback } from './FuseCallback';
+import { IOError, NoSuchFileOrDirectoryError } from './FuseErrors';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fuse = require('@gcas/fuse');
-
-export class Open {
-  constructor(private readonly container: VirtualDriveDependencyContainer) {}
+export class OpenCallback extends FuseCallback<number> {
+  constructor(private readonly container: VirtualDriveDependencyContainer) {
+    super();
+  }
 
-  async execute(path: string, _flags: Array<any>, cb: Callback): Promise<void> {
+  async execute(path: string, _flags: Array<any>) {
     Logger.debug('OPEN ', path);
     const file = await this.container.filesSearcher.run({ path });
 
     if (!file) {
-      return cb(fuse.ENOENT);
+      return this.left(
+        new NoSuchFileOrDirectoryError(
+          `${path} not founded on when trying to open it`
+        )
+      );
     }
 
     const alreadyDownloaded = await this.container.localContentChecker.run(
@@ -22,18 +26,24 @@ export class Open {
 
     if (alreadyDownloaded) {
       Logger.debug('[FUSE] File contents already in local');
-      cb(0, file.id);
-      return;
+      return this.right(file.id);
     }
 
     try {
       Logger.debug('[FUSE] File contents not in local');
       await this.container.downloadContentsToPlainFile.run(file);
 
-      cb(0, file.id);
+      return this.right(file.id);
     } catch (err: unknown) {
       Logger.error('[FUSE] Error downloading file: ', err);
-      cb(fuse.EIO);
+
+      if (err instanceof Error) {
+        return this.left(new IOError(`${err.message} when opening ${path}`));
+      }
+
+      return this.left(
+        new IOError(`unknown error when opening ${path}: ${err}`)
+      );
     }
   }
 }
diff --git a/src/apps/fuse/callbacks/Read.ts b/src/apps/fuse/callbacks/ReadCallback.ts
similarity index 73%
rename from src/apps/fuse/callbacks/Read.ts
rename to src/apps/fuse/callbacks/ReadCallback.ts
index 8f4a6c6d5..f1a18352b 100644
--- a/src/apps/fuse/callbacks/Read.ts
+++ b/src/apps/fuse/callbacks/ReadCallback.ts
@@ -5,7 +5,7 @@ import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fuse = require('@gcas/fuse');
 
-export class Read {
+export class ReadCallback {
   constructor(private readonly container: VirtualDriveDependencyContainer) {}
 
   async execute(
@@ -31,21 +31,18 @@ export class Read {
 
     fs.readFile(filePath, (err, data) => {
       if (err) {
-        console.error(`Error reading file: ${err}`);
-        cb(fuse.ENOENT); // Indicate an error code, e.g., if the file doesn't exist
+        Logger.error(`Error reading file: ${err}`);
+        cb(fuse.ENOENT);
         return;
       }
 
-      // Convert the data to a Buffer
       const dataBuffer = Buffer.from(data);
 
-      // Determine the number of bytes to read based on the length and position
       const bytesRead = Math.min(dataBuffer.length - pos, len);
 
-      // Copy the data to the provided buffer
       dataBuffer.copy(buf, 0, pos, pos + bytesRead);
 
-      cb(bytesRead); // Indicate the number of bytes read}
+      cb(bytesRead); // Indicate the number of bytes read ????????????
     });
   }
 }
diff --git a/src/apps/fuse/callbacks/Readdir.ts b/src/apps/fuse/callbacks/ReaddirCallback.ts
similarity index 54%
rename from src/apps/fuse/callbacks/Readdir.ts
rename to src/apps/fuse/callbacks/ReaddirCallback.ts
index fd289df1b..479f71aa8 100644
--- a/src/apps/fuse/callbacks/Readdir.ts
+++ b/src/apps/fuse/callbacks/ReaddirCallback.ts
@@ -1,13 +1,13 @@
-import Logger from 'electron-log';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
-import { TypedCallback } from './Callback';
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fuse = require('@gcas/fuse');
+import { FuseCallback } from './FuseCallback';
+import { NoSuchFileOrDirectoryError } from './FuseErrors';
 
-export class Readdir {
-  constructor(private readonly container: VirtualDriveDependencyContainer) {}
+export class ReaddirCallback extends FuseCallback<Array<string>> {
+  constructor(private readonly container: VirtualDriveDependencyContainer) {
+    super();
+  }
 
-  async execute(path: string, cb: TypedCallback<Array<string>>): Promise<void> {
+  async execute(path: string) {
     try {
       const files = await this.container.filesByFolderPathNameLister.run(path);
 
@@ -19,10 +19,13 @@ export class Readdir {
 
       const foldersNames = folders.map((folder) => folder.name);
 
-      cb(0, ['.', '..', ...fileNames, ...foldersNames]);
+      return this.right(['.', '..', ...fileNames, ...foldersNames]);
     } catch (error) {
-      Logger.error('FUSE READDIR ', error);
-      cb(fuse.ENOENT);
+      return this.left(
+        new NoSuchFileOrDirectoryError(
+          'Could not retrieve the files and folder of the system'
+        )
+      );
     }
   }
 }
diff --git a/src/apps/fuse/callbacks/ReleaseCallback.ts b/src/apps/fuse/callbacks/ReleaseCallback.ts
index 70875643c..ec648aff6 100644
--- a/src/apps/fuse/callbacks/ReleaseCallback.ts
+++ b/src/apps/fuse/callbacks/ReleaseCallback.ts
@@ -1,18 +1,34 @@
 import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
-import { Callback } from './Callback';
+import { NotifyFuseCallback } from './FuseCallback';
+import { IOError } from './FuseErrors';
 
-export class ReleaseCallback {
-  constructor(private readonly container: OfflineDriveDependencyContainer) {}
+export class ReleaseCallback extends NotifyFuseCallback {
+  constructor(private readonly container: OfflineDriveDependencyContainer) {
+    super();
+  }
 
-  async execute(path: string, _fd: number, cb: Callback): Promise<void> {
+  async execute(path: string, fd: number) {
     const file = await this.container.offlineFileSearcher.run({ path });
 
     if (!file) {
-      return cb(0);
+      return this.right();
     }
 
-    await this.container.offlineFileUploader.run(file);
+    try {
+      await this.container.offlineFileUploader.run(file);
+      return this.right();
+    } catch (err: unknown) {
+      if (err instanceof Error) {
+        return this.left(
+          new IOError(
+            `${err.message} when uploading ${path} and with flag: ${fd}`
+          )
+        );
+      }
 
-    cb(0);
+      return this.left(
+        new IOError(`Error when uploading ${path} with flag ${fd}: ${err}`)
+      );
+    }
   }
 }
diff --git a/src/apps/fuse/callbacks/RenameAndMove.ts b/src/apps/fuse/callbacks/RenameOrMoveCallback.ts
similarity index 66%
rename from src/apps/fuse/callbacks/RenameAndMove.ts
rename to src/apps/fuse/callbacks/RenameOrMoveCallback.ts
index e4b7c970c..f37a4af68 100644
--- a/src/apps/fuse/callbacks/RenameAndMove.ts
+++ b/src/apps/fuse/callbacks/RenameOrMoveCallback.ts
@@ -1,13 +1,13 @@
 import { File } from '../../../context/virtual-drive/files/domain/File';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { Folder } from '../../../context/virtual-drive/folders/domain/Folder';
-import { Callback } from './Callback';
+import { NotifyFuseCallback } from './FuseCallback';
+import { NoSuchFileOrDirectoryError } from './FuseErrors';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fuse = require('@gcas/fuse');
-
-export class RenameOrMove {
-  constructor(private readonly container: VirtualDriveDependencyContainer) {}
+export class RenameOrMoveCallback extends NotifyFuseCallback {
+  constructor(private readonly container: VirtualDriveDependencyContainer) {
+    super();
+  }
 
   private async findFile(path: string): Promise<File | undefined> {
     const file = await this.container.filesSearcher.run({ path });
@@ -21,21 +21,25 @@ export class RenameOrMove {
     return folder;
   }
 
-  async execute(src: string, dest: string, cb: Callback) {
+  async execute(src: string, dest: string) {
     const file = await this.findFile(src);
 
     if (file) {
       await this.container.filePathUpdater.run(file.contentsId, dest);
-      return cb(0);
+      return this.right();
     }
 
     const folder = await this.findFolder(src);
 
     if (folder) {
       await this.container.folderPathUpdater.run(folder.uuid, dest);
-      return cb(0);
+      return this.right();
     }
 
-    return cb(fuse.ENOENT);
+    return this.left(
+      new NoSuchFileOrDirectoryError(
+        `File or folder not found when trying to change a path, src: ${src}, dest: ${dest}`
+      )
+    );
   }
 }
diff --git a/src/apps/fuse/callbacks/TrashFile.ts b/src/apps/fuse/callbacks/TrashFile.ts
deleted file mode 100644
index 863444d8c..000000000
--- a/src/apps/fuse/callbacks/TrashFile.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
-import { Callback } from './Callback';
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fuse = require('@gcas/fuse');
-
-export class TrashFile {
-  constructor(private readonly container: VirtualDriveDependencyContainer) {}
-
-  async execute(path: string, cb: Callback): Promise<void> {
-    try {
-      const file = await this.container.filesSearcher.run({ path });
-
-      if (!file) {
-        cb(fuse.ENOENT);
-        return;
-      }
-
-      await this.container.fileDeleter.run(file.contentsId);
-
-      cb(0);
-    } catch {
-      cb(fuse.EIO);
-      return;
-    }
-  }
-}
diff --git a/src/apps/fuse/callbacks/TrashFileCallback.ts b/src/apps/fuse/callbacks/TrashFileCallback.ts
new file mode 100644
index 000000000..b9ed7307b
--- /dev/null
+++ b/src/apps/fuse/callbacks/TrashFileCallback.ts
@@ -0,0 +1,29 @@
+import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
+import { NotifyFuseCallback } from './FuseCallback';
+import { IOError, NoSuchFileOrDirectoryError } from './FuseErrors';
+
+export class TrashFileCallback extends NotifyFuseCallback {
+  constructor(private readonly container: VirtualDriveDependencyContainer) {
+    super();
+  }
+
+  async execute(path: string) {
+    const file = await this.container.filesSearcher.run({ path });
+
+    if (!file) {
+      return this.left(
+        new NoSuchFileOrDirectoryError(
+          `${path} not founded when trying to trash it`
+        )
+      );
+    }
+
+    try {
+      await this.container.fileDeleter.run(file.contentsId);
+
+      return this.right();
+    } catch {
+      return this.left(new IOError(`trying to trash ${path}`));
+    }
+  }
+}
diff --git a/src/apps/fuse/callbacks/TrashFolder.ts b/src/apps/fuse/callbacks/TrashFolder.ts
deleted file mode 100644
index 8b6576d6a..000000000
--- a/src/apps/fuse/callbacks/TrashFolder.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
-import { Callback } from './Callback';
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const fuse = require('@gcas/fuse');
-
-export class TrashFolder {
-  constructor(private readonly container: VirtualDriveDependencyContainer) {}
-
-  async execute(path: string, cb: Callback): Promise<void> {
-    try {
-      const folder = await this.container.folderSearcher.run({ path });
-
-      if (!folder) {
-        cb(fuse.ENOENT);
-        return;
-      }
-
-      await this.container.folderDeleter.run(folder.uuid);
-
-      cb(0);
-    } catch {
-      cb(fuse.EIO);
-      return;
-    }
-  }
-}
diff --git a/src/apps/fuse/callbacks/TrashFolderCallback.ts b/src/apps/fuse/callbacks/TrashFolderCallback.ts
new file mode 100644
index 000000000..975b9f0a6
--- /dev/null
+++ b/src/apps/fuse/callbacks/TrashFolderCallback.ts
@@ -0,0 +1,35 @@
+import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
+import { NotifyFuseCallback } from './FuseCallback';
+import { IOError, NoSuchFileOrDirectoryError } from './FuseErrors';
+
+export class TrashFolderCallback extends NotifyFuseCallback {
+  constructor(private readonly container: VirtualDriveDependencyContainer) {
+    super();
+  }
+
+  async execute(path: string) {
+    const folder = await this.container.folderSearcher.run({ path });
+
+    if (!folder) {
+      return this.left(
+        new NoSuchFileOrDirectoryError(
+          `folder not found when trying to delete it ${path}`
+        )
+      );
+    }
+
+    try {
+      await this.container.folderDeleter.run(folder.uuid);
+
+      return this.right();
+    } catch (err: unknown) {
+      if (err instanceof Error) {
+        return this.left(new IOError(`${err.message} when trashing ${path}`));
+      }
+
+      return this.left(
+        new IOError(`error when trying to trash the folder ${path}: ${err}`)
+      );
+    }
+  }
+}
diff --git a/src/apps/fuse/callbacks/WriteCallback.ts b/src/apps/fuse/callbacks/WriteCallback.ts
index 82e7a02c6..adeb532c6 100644
--- a/src/apps/fuse/callbacks/WriteCallback.ts
+++ b/src/apps/fuse/callbacks/WriteCallback.ts
@@ -1,21 +1,20 @@
 import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
-import { TypedCallback } from './Callback';
+import { FuseCallback } from './FuseCallback';
 
-type WriteFileCallback = TypedCallback<number>;
-
-export class WriteCallback {
-  constructor(private readonly container: OfflineDriveDependencyContainer) {}
+export class WriteCallback extends FuseCallback<number> {
+  constructor(private readonly container: OfflineDriveDependencyContainer) {
+    super();
+  }
 
   async execute(
     path: string,
     _fd: string,
     buffer: Buffer,
     len: number,
-    pos: number,
-    cb: WriteFileCallback
-  ): Promise<void> {
+    pos: number
+  ) {
     await this.container.offlineContentsAppender.run(path, buffer, len, pos);
 
-    cb(len);
+    return this.right(len);
   }
 }

From 8fcce852744966cef53a9fc35a9523a63bb51408 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 3 Jan 2024 12:26:52 +0100
Subject: [PATCH 101/188] chore: unify loggin on callbacks

---
 src/apps/fuse/FuseApp.ts                      | 24 +++++++++----------
 src/apps/fuse/callbacks/FuseCallback.ts       | 16 ++++++++++---
 src/apps/fuse/callbacks/FuseCodes.ts          | 15 +++++++-----
 .../fuse/callbacks/GetAttributesCallback.ts   |  7 ++----
 .../fuse/callbacks/MakeDirectoryCallback.ts   |  2 +-
 src/apps/fuse/callbacks/OpenCallback.ts       |  3 +--
 src/apps/fuse/callbacks/ReaddirCallback.ts    |  2 +-
 src/apps/fuse/callbacks/ReleaseCallback.ts    |  2 +-
 .../fuse/callbacks/RenameOrMoveCallback.ts    |  2 +-
 src/apps/fuse/callbacks/TrashFileCallback.ts  |  2 +-
 .../fuse/callbacks/TrashFolderCallback.ts     |  2 +-
 src/apps/fuse/callbacks/WriteCallback.ts      |  2 +-
 12 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index 99efc9c2b..616dda975 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -30,8 +30,8 @@ export class FuseApp {
   ) {}
 
   private getOpt() {
-    const listXAttributes = new ListXAttributesCallback();
-    const getXAttribute = new GetXAttributeCallback();
+    const listXAttributes = new ListXAttributesCallback('ListXAttributes');
+    const getXAttribute = new GetXAttributeCallback('GetXAttribute');
     const readdir = new ReaddirCallback(
       this.fuseContainer.virtualDriveContainer
     );
@@ -62,17 +62,17 @@ export class FuseApp {
     return {
       listxattr: listXAttributes.execute.bind(listXAttributes),
       getxattr: getXAttribute.execute.bind(getXAttribute),
-      getattr: getattr.execute.bind(getattr),
-      readdir: readdir.execute.bind(readdir),
-      open: open.execute.bind(open),
+      getattr: getattr.handle.bind(getattr),
+      readdir: readdir.handle.bind(readdir),
+      open: open.handle.bind(open),
       read: read.execute.bind(read),
-      rename: renameOrMove.execute.bind(renameOrMove),
-      create: create.execute.bind(create),
-      write: write.execute.bind(write),
-      mkdir: makeDirectory.execute.bind(makeDirectory),
-      release: release.execute.bind(release),
-      unlink: trashFile.execute.bind(trashFile),
-      rmdir: trashFolder.execute.bind(trashFolder),
+      rename: renameOrMove.handle.bind(renameOrMove),
+      create: create.handle.bind(create),
+      write: write.handle.bind(write),
+      mkdir: makeDirectory.handle.bind(makeDirectory),
+      release: release.handle.bind(release),
+      unlink: trashFile.handle.bind(trashFile),
+      rmdir: trashFolder.handle.bind(trashFolder),
     };
   }
 
diff --git a/src/apps/fuse/callbacks/FuseCallback.ts b/src/apps/fuse/callbacks/FuseCallback.ts
index 6f5981ce2..6ad0d53e4 100644
--- a/src/apps/fuse/callbacks/FuseCallback.ts
+++ b/src/apps/fuse/callbacks/FuseCallback.ts
@@ -1,4 +1,5 @@
 import { Either, right, left } from '../../../context/shared/domain/Either';
+import { Stopwatch } from '../../shared/types/Stopwatch';
 import { FuseError } from './FuseErrors';
 import Logger from 'electron-log';
 
@@ -9,19 +10,25 @@ export type CallbackWithData<T> = (code: number, params?: T) => void;
 export abstract class FuseCallback<T> {
   protected static readonly OK = 0;
 
+  constructor(private readonly name: string) {}
+
   protected right(value: T): Either<FuseError, T> {
     return right(value);
   }
 
   protected left(error: FuseError): Either<FuseError, T> {
-    Logger.error('[FUSE CALLBACK ERROR] ', error.message, error.description);
+    Logger.error(`[${this.name}] `, error.message, error.description);
     return left(error);
   }
 
   async handle(...params: any[]): Promise<void> {
+    const stopwatch = new Stopwatch();
+    stopwatch.start();
+
     const callback = params.pop() as CallbackWithData<T>;
+    Logger.info(`${this.name}: `, ...params);
 
-    const result = await this.execute(params);
+    const result = await this.execute(...params);
 
     if (result.isLeft()) {
       const error = result.getLeft();
@@ -30,6 +37,9 @@ export abstract class FuseCallback<T> {
 
     const data = result.getRight();
 
+    const elapsedTime = stopwatch.elapsedTime();
+    Logger.info(`Elapsed time for ${this.name}: `, elapsedTime);
+
     callback(FuseCallback.OK, data);
   }
 
@@ -44,7 +54,7 @@ export abstract class NotifyFuseCallback extends FuseCallback<undefined> {
   async handle(...params: any[]): Promise<void> {
     const callback = params.pop() as Callback;
 
-    const result = await this.execute(params);
+    const result = await this.execute(...params);
 
     if (result.isLeft()) {
       const error = result.getLeft();
diff --git a/src/apps/fuse/callbacks/FuseCodes.ts b/src/apps/fuse/callbacks/FuseCodes.ts
index 83b16562c..e02080b8b 100644
--- a/src/apps/fuse/callbacks/FuseCodes.ts
+++ b/src/apps/fuse/callbacks/FuseCodes.ts
@@ -1,19 +1,22 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const fuse = require('@gcas/fuse');
+
 export enum FuseCodes {
   // Operation not supported (Functionality not implemented)
-  ENOSYS = 38,
+  ENOSYS = fuse.ENOSYS,
 
   // No such file or directory
-  ENOENT = 2,
+  ENOENT = fuse.ENOENT,
 
   // File or directory already exists
-  EEXIST = 17,
+  EEXIST = fuse.EEXIST,
 
   // Input/output error
-  EIO = 5,
+  EIO = fuse.EIO,
 
   // Invalid argument
-  EINVAL = 22,
+  EINVAL = fuse.EINVAL,
 
   // Permission denied
-  EACCES = 13,
+  EACCES = fuse.EACCES,
 }
diff --git a/src/apps/fuse/callbacks/GetAttributesCallback.ts b/src/apps/fuse/callbacks/GetAttributesCallback.ts
index fb36e54c6..c1caf6fcf 100644
--- a/src/apps/fuse/callbacks/GetAttributesCallback.ts
+++ b/src/apps/fuse/callbacks/GetAttributesCallback.ts
@@ -1,4 +1,3 @@
-import Logger from 'electron-log';
 import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { FuseCallback } from './FuseCallback';
@@ -11,12 +10,10 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
     private readonly virtualDriveContainer: VirtualDriveDependencyContainer,
     private readonly offlineDriveContainer: OfflineDriveDependencyContainer
   ) {
-    super();
+    super('Get Attributes');
   }
 
   async execute(path: string) {
-    Logger.debug('GET ATTRIBUTES OF ', path);
-
     if (path === '/') {
       return this.right({ mode: 16877, size: 0 });
     }
@@ -44,7 +41,7 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
 
     return this.left(
       new NoSuchFileOrDirectoryError(
-        `${path} not founded on when it's attributes`
+        `${path} not founded on when retrieving it's attributes`
       )
     );
   }
diff --git a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
index fb0b340c9..83d58bc4c 100644
--- a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
+++ b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
@@ -3,7 +3,7 @@ import { NotifyFuseCallback } from './FuseCallback';
 
 export class MakeDirectoryCallback extends NotifyFuseCallback {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
-    super();
+    super('Make Directory');
   }
 
   async execute(path: string, _mode: number) {
diff --git a/src/apps/fuse/callbacks/OpenCallback.ts b/src/apps/fuse/callbacks/OpenCallback.ts
index fe39aa07a..2b0517761 100644
--- a/src/apps/fuse/callbacks/OpenCallback.ts
+++ b/src/apps/fuse/callbacks/OpenCallback.ts
@@ -5,11 +5,10 @@ import { IOError, NoSuchFileOrDirectoryError } from './FuseErrors';
 
 export class OpenCallback extends FuseCallback<number> {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
-    super();
+    super('Open');
   }
 
   async execute(path: string, _flags: Array<any>) {
-    Logger.debug('OPEN ', path);
     const file = await this.container.filesSearcher.run({ path });
 
     if (!file) {
diff --git a/src/apps/fuse/callbacks/ReaddirCallback.ts b/src/apps/fuse/callbacks/ReaddirCallback.ts
index 479f71aa8..e950a69eb 100644
--- a/src/apps/fuse/callbacks/ReaddirCallback.ts
+++ b/src/apps/fuse/callbacks/ReaddirCallback.ts
@@ -4,7 +4,7 @@ import { NoSuchFileOrDirectoryError } from './FuseErrors';
 
 export class ReaddirCallback extends FuseCallback<Array<string>> {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
-    super();
+    super('Read Directory');
   }
 
   async execute(path: string) {
diff --git a/src/apps/fuse/callbacks/ReleaseCallback.ts b/src/apps/fuse/callbacks/ReleaseCallback.ts
index ec648aff6..5349e0537 100644
--- a/src/apps/fuse/callbacks/ReleaseCallback.ts
+++ b/src/apps/fuse/callbacks/ReleaseCallback.ts
@@ -4,7 +4,7 @@ import { IOError } from './FuseErrors';
 
 export class ReleaseCallback extends NotifyFuseCallback {
   constructor(private readonly container: OfflineDriveDependencyContainer) {
-    super();
+    super('Release');
   }
 
   async execute(path: string, fd: number) {
diff --git a/src/apps/fuse/callbacks/RenameOrMoveCallback.ts b/src/apps/fuse/callbacks/RenameOrMoveCallback.ts
index f37a4af68..999ef81b7 100644
--- a/src/apps/fuse/callbacks/RenameOrMoveCallback.ts
+++ b/src/apps/fuse/callbacks/RenameOrMoveCallback.ts
@@ -6,7 +6,7 @@ import { NoSuchFileOrDirectoryError } from './FuseErrors';
 
 export class RenameOrMoveCallback extends NotifyFuseCallback {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
-    super();
+    super('Rename Or Move');
   }
 
   private async findFile(path: string): Promise<File | undefined> {
diff --git a/src/apps/fuse/callbacks/TrashFileCallback.ts b/src/apps/fuse/callbacks/TrashFileCallback.ts
index b9ed7307b..f7aef7a7d 100644
--- a/src/apps/fuse/callbacks/TrashFileCallback.ts
+++ b/src/apps/fuse/callbacks/TrashFileCallback.ts
@@ -4,7 +4,7 @@ import { IOError, NoSuchFileOrDirectoryError } from './FuseErrors';
 
 export class TrashFileCallback extends NotifyFuseCallback {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
-    super();
+    super('Trash file');
   }
 
   async execute(path: string) {
diff --git a/src/apps/fuse/callbacks/TrashFolderCallback.ts b/src/apps/fuse/callbacks/TrashFolderCallback.ts
index 975b9f0a6..49e3a285f 100644
--- a/src/apps/fuse/callbacks/TrashFolderCallback.ts
+++ b/src/apps/fuse/callbacks/TrashFolderCallback.ts
@@ -4,7 +4,7 @@ import { IOError, NoSuchFileOrDirectoryError } from './FuseErrors';
 
 export class TrashFolderCallback extends NotifyFuseCallback {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
-    super();
+    super('Trash Folder');
   }
 
   async execute(path: string) {
diff --git a/src/apps/fuse/callbacks/WriteCallback.ts b/src/apps/fuse/callbacks/WriteCallback.ts
index adeb532c6..f4987c330 100644
--- a/src/apps/fuse/callbacks/WriteCallback.ts
+++ b/src/apps/fuse/callbacks/WriteCallback.ts
@@ -3,7 +3,7 @@ import { FuseCallback } from './FuseCallback';
 
 export class WriteCallback extends FuseCallback<number> {
   constructor(private readonly container: OfflineDriveDependencyContainer) {
-    super();
+    super('Write');
   }
 
   async execute(

From f39880ac25f5e69815be5e710805e05b1aa874fb Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 3 Jan 2024 12:41:11 +0100
Subject: [PATCH 102/188] chore: improve logs legibility

---
 src/apps/fuse/callbacks/FuseCallback.ts                   | 7 +++----
 src/apps/fuse/callbacks/FuseErrors.ts                     | 8 ++++----
 src/apps/fuse/callbacks/GetAttributesCallback.ts          | 2 +-
 .../virtual-drive/files/application/FileDeleter.ts        | 2 ++
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/apps/fuse/callbacks/FuseCallback.ts b/src/apps/fuse/callbacks/FuseCallback.ts
index 6ad0d53e4..1d49d87f1 100644
--- a/src/apps/fuse/callbacks/FuseCallback.ts
+++ b/src/apps/fuse/callbacks/FuseCallback.ts
@@ -17,7 +17,7 @@ export abstract class FuseCallback<T> {
   }
 
   protected left(error: FuseError): Either<FuseError, T> {
-    Logger.error(`[${this.name}] `, error.message, error.description);
+    Logger.error(`${this.name} Error: ${error.message}.`, error.description);
     return left(error);
   }
 
@@ -26,7 +26,7 @@ export abstract class FuseCallback<T> {
     stopwatch.start();
 
     const callback = params.pop() as CallbackWithData<T>;
-    Logger.info(`${this.name}: `, ...params);
+    // Logger.info(`${this.name}: `, ...params);
 
     const result = await this.execute(...params);
 
@@ -37,8 +37,7 @@ export abstract class FuseCallback<T> {
 
     const data = result.getRight();
 
-    const elapsedTime = stopwatch.elapsedTime();
-    Logger.info(`Elapsed time for ${this.name}: `, elapsedTime);
+    // Logger.info(`Elapsed time for ${this.name}: `, stopwatch.elapsedTime());
 
     callback(FuseCallback.OK, data);
   }
diff --git a/src/apps/fuse/callbacks/FuseErrors.ts b/src/apps/fuse/callbacks/FuseErrors.ts
index 2e602d843..7e4a0d2de 100644
--- a/src/apps/fuse/callbacks/FuseErrors.ts
+++ b/src/apps/fuse/callbacks/FuseErrors.ts
@@ -20,24 +20,24 @@ export class NoSuchFileOrDirectoryError extends FuseError {
 
 export class FileOrDirectoryAlreadyExistsError extends FuseError {
   constructor(description: string) {
-    super(FuseCodes.ENOENT, 'File or directory already exists', description);
+    super(FuseCodes.EEXIST, 'File or directory already exists', description);
   }
 }
 
 export class IOError extends FuseError {
   constructor(description: string) {
-    super(FuseCodes.ENOENT, 'Input/output error', description);
+    super(FuseCodes.EIO, 'Input/output error', description);
   }
 }
 
 export class InvalidArgumentError extends FuseError {
   constructor(description: string) {
-    super(FuseCodes.ENOENT, 'Invalid argument', description);
+    super(FuseCodes.EINVAL, 'Invalid argument', description);
   }
 }
 
 export class PermissionDeniedError extends FuseError {
   constructor(description: string) {
-    super(FuseCodes.ENOENT, 'Permission denied', description);
+    super(FuseCodes.EACCES, 'Permission denied', description);
   }
 }
diff --git a/src/apps/fuse/callbacks/GetAttributesCallback.ts b/src/apps/fuse/callbacks/GetAttributesCallback.ts
index c1caf6fcf..af930161a 100644
--- a/src/apps/fuse/callbacks/GetAttributesCallback.ts
+++ b/src/apps/fuse/callbacks/GetAttributesCallback.ts
@@ -41,7 +41,7 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
 
     return this.left(
       new NoSuchFileOrDirectoryError(
-        `${path} not founded on when retrieving it's attributes`
+        `"${path}" not founded on when retrieving it's attributes`
       )
     );
   }
diff --git a/src/context/virtual-drive/files/application/FileDeleter.ts b/src/context/virtual-drive/files/application/FileDeleter.ts
index 9e2159041..16e83bc6b 100644
--- a/src/context/virtual-drive/files/application/FileDeleter.ts
+++ b/src/context/virtual-drive/files/application/FileDeleter.ts
@@ -80,6 +80,8 @@ export class FileDeleter {
       // });
 
       this.local.createPlaceHolder(file);
+
+      throw error;
     }
   }
 }

From c4b40ed1f1d8e5f11eb4419b6353ac69dd3b1952 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 3 Jan 2024 13:10:53 +0100
Subject: [PATCH 103/188] chore: small fixes

---
 src/apps/fuse/FuseApp.ts                             |  2 +-
 src/apps/fuse/callbacks/CreateCallback.ts            |  5 +----
 src/apps/fuse/callbacks/WriteCallback.ts             | 12 +++++-------
 .../application/OfflineFileUploader.ts               |  4 ++--
 .../NodeFSOfflineContentsRepository.ts               |  2 --
 src/context/virtual-drive/files/domain/File.ts       |  1 +
 .../virtual-drive/files/domain/OfflineFile.ts        |  1 +
 7 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index 616dda975..adf7632f2 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -68,7 +68,7 @@ export class FuseApp {
       read: read.execute.bind(read),
       rename: renameOrMove.handle.bind(renameOrMove),
       create: create.handle.bind(create),
-      write: write.handle.bind(write),
+      write: write.execute.bind(write),
       mkdir: makeDirectory.handle.bind(makeDirectory),
       release: release.handle.bind(release),
       unlink: trashFile.handle.bind(trashFile),
diff --git a/src/apps/fuse/callbacks/CreateCallback.ts b/src/apps/fuse/callbacks/CreateCallback.ts
index 5f364855d..773a432ad 100644
--- a/src/apps/fuse/callbacks/CreateCallback.ts
+++ b/src/apps/fuse/callbacks/CreateCallback.ts
@@ -1,15 +1,12 @@
-import Logger from 'electron-log';
 import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
 import { NotifyFuseCallback } from './FuseCallback';
 
 export class CreateCallback extends NotifyFuseCallback {
   constructor(private readonly container: OfflineDriveDependencyContainer) {
-    super();
+    super('Create');
   }
 
   async execute(path: string, _mode: number) {
-    Logger.debug(`CREATE ${path}`);
-
     await this.container.offlineFileAndContentsCreator.run(path);
 
     return this.right();
diff --git a/src/apps/fuse/callbacks/WriteCallback.ts b/src/apps/fuse/callbacks/WriteCallback.ts
index f4987c330..0e35bb90a 100644
--- a/src/apps/fuse/callbacks/WriteCallback.ts
+++ b/src/apps/fuse/callbacks/WriteCallback.ts
@@ -1,20 +1,18 @@
 import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
-import { FuseCallback } from './FuseCallback';
 
-export class WriteCallback extends FuseCallback<number> {
-  constructor(private readonly container: OfflineDriveDependencyContainer) {
-    super('Write');
-  }
+export class WriteCallback {
+  constructor(private readonly container: OfflineDriveDependencyContainer) {}
 
   async execute(
     path: string,
     _fd: string,
     buffer: Buffer,
     len: number,
-    pos: number
+    pos: number,
+    cb: (a: number) => void
   ) {
     await this.container.offlineContentsAppender.run(path, buffer, len, pos);
 
-    return this.right(len);
+    return cb(len);
   }
 }
diff --git a/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts b/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
index a250e59ef..8be340f6d 100644
--- a/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
+++ b/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
@@ -16,12 +16,12 @@ export class OfflineFileUploader {
 
     const contentsId = await this.contentsUploader.run(absolutePath);
 
-    const uploadedEvent = new OfflineContentsUploadedDomainEvent({
+    const contentsUploadedEvent = new OfflineContentsUploadedDomainEvent({
       aggregateId: contentsId,
       size: file.size,
       path: file.path,
     });
 
-    await this.eventBus.publish([uploadedEvent]);
+    await this.eventBus.publish([contentsUploadedEvent]);
   }
 }
diff --git a/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts b/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
index 9e6d24b8b..1c207c107 100644
--- a/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
+++ b/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
@@ -87,8 +87,6 @@ export class NodeFSOfflineContentsRepository
   async createEmptyFile(id: string): Promise<void> {
     const file = await this.filePath(id);
 
-    Logger.debug('Creating an empty file on ', file);
-
     return new Promise((resolve) => {
       fs.writeFile(file, '', (err) => {
         if (err) {
diff --git a/src/context/virtual-drive/files/domain/File.ts b/src/context/virtual-drive/files/domain/File.ts
index 194e3fbbc..c652ab219 100644
--- a/src/context/virtual-drive/files/domain/File.ts
+++ b/src/context/virtual-drive/files/domain/File.ts
@@ -114,6 +114,7 @@ export class File extends AggregateRoot {
         aggregateId: file.contentsId,
         size: file.size,
         type: file.type,
+        path: file.path,
       })
     );
 
diff --git a/src/context/virtual-drive/files/domain/OfflineFile.ts b/src/context/virtual-drive/files/domain/OfflineFile.ts
index 4aeeaca82..f789359c7 100644
--- a/src/context/virtual-drive/files/domain/OfflineFile.ts
+++ b/src/context/virtual-drive/files/domain/OfflineFile.ts
@@ -81,6 +81,7 @@ export class OfflineFile extends AggregateRoot {
         aggregateId: contentsId,
         size: file.size,
         type: path.extension(),
+        path: file.path,
       })
     );
 

From 74fdeba94a3ddbd23d8062282362531212bb5fee Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 3 Jan 2024 17:13:17 +0100
Subject: [PATCH 104/188] feat: clear after logout

---
 src/apps/fuse/FuseApp.ts                      |  5 +++-
 .../OfflineDriveDependencyContainerFactory.ts |  5 ++--
 .../OfflineFiles/OfflineFilesContainer.ts     |  2 ++
 .../offline/OfflineFiles/builder.ts           | 10 +++++++
 .../VirtualDriveDependencyContainerFactory.ts |  1 +
 .../contents/ContentsContainer.ts             |  4 +++
 .../virtual-drive/contents/builder.ts         | 14 ++++++++++
 src/apps/fuse/index.ts                        |  4 +--
 .../application/OfflineFileUploader.ts        |  1 +
 .../OfflineContentsUploadedDomainEvent.ts     |  5 ++++
 .../application/AllLocalContentsDeleter.ts    | 22 +++++++++++++++
 .../application/LocalContentChecker.ts        |  5 +++-
 .../application/LocalContentsDeleter.ts       |  4 ++-
 .../application/LocalContentsMover.ts         |  9 +++---
 .../MoveOfflineContentsOnContentsUploaded.ts  |  5 +++-
 .../contents/domain/LocalFileSystem.ts        |  7 +++--
 .../infrastructure/FSLocalFileSystem.ts       | 28 +++++++++++++++----
 17 files changed, 111 insertions(+), 20 deletions(-)
 create mode 100644 src/context/virtual-drive/contents/application/AllLocalContentsDeleter.ts

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index adf7632f2..94c3513f1 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -1,4 +1,3 @@
-import _path from 'path';
 import Logger from 'electron-log';
 import { ReaddirCallback } from './callbacks/ReaddirCallback';
 import { GetAttributesCallback } from './callbacks/GetAttributesCallback';
@@ -99,4 +98,8 @@ export class FuseApp {
       }
     });
   }
+
+  async clearCache(): Promise<void> {
+    await this.fuseContainer.virtualDriveContainer.allLocalContentsDeleter.run();
+  }
 }
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainerFactory.ts b/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainerFactory.ts
index 9beccb69e..85664d0a8 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainerFactory.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineDriveDependencyContainerFactory.ts
@@ -6,8 +6,9 @@ import { buildOfflineFilesContainer } from './OfflineFiles/builder';
 export class OfflineDriveDependencyContainerFactory {
   private static _container: OfflineDriveDependencyContainer | undefined;
 
-  static readonly subscribers: Array<keyof OfflineDriveDependencyContainer> =
-    [];
+  static readonly subscribers: Array<keyof OfflineDriveDependencyContainer> = [
+    'clearOfflineFileOnFileCreated',
+  ];
 
   eventSubscribers(
     key: keyof OfflineDriveDependencyContainer
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts b/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts
index 23411f4c6..5b9932a62 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineFiles/OfflineFilesContainer.ts
@@ -1,3 +1,4 @@
+import { ClearOfflineFileOnFileCreated } from '../../../../../context/offline-drive/files/application/ClearOfflineFileOnFileCreated';
 import { OfflineFileCreator } from '../../../../../context/offline-drive/files/application/OfflineFileCreator';
 import { OfflineFileFinder } from '../../../../../context/offline-drive/files/application/OfflineFileFinder';
 import { OfflineFileSearcher } from '../../../../../context/offline-drive/files/application/OfflineFileSearcher';
@@ -8,4 +9,5 @@ export interface OfflineFilesContainer {
   offlineFileSearcher: OfflineFileSearcher;
   offlineFileFinder: OfflineFileFinder;
   offlineFileSizeIncreaser: OfflineFileSizeIncreaser;
+  clearOfflineFileOnFileCreated: ClearOfflineFileOnFileCreated;
 }
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts b/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts
index 6ae26efe9..c408e5781 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineFiles/builder.ts
@@ -5,6 +5,8 @@ import { OfflineFileFinder } from '../../../../../context/offline-drive/files/ap
 import { OfflineFileSizeIncreaser } from '../../../../../context/offline-drive/files/application/OfflineFileSizeIncreaser';
 import { OfflineFileCreator } from '../../../../../context/offline-drive/files/application/OfflineFileCreator';
 import { DependencyInjectionEventBus } from '../../common/eventBus';
+import { ClearOfflineFileOnFileCreated } from '../../../../../context/offline-drive/files/application/ClearOfflineFileOnFileCreated';
+import { OfflineFileDeleter } from '../../../../../context/offline-drive/files/application/OfflineFileDeleter';
 
 export async function buildOfflineFilesContainer(): Promise<OfflineFilesContainer> {
   const { bus: eventBus } = DependencyInjectionEventBus;
@@ -19,10 +21,18 @@ export async function buildOfflineFilesContainer(): Promise<OfflineFilesContaine
 
   const offlineFileCreator = new OfflineFileCreator(repository, eventBus);
 
+  const offlineFileDeleter = new OfflineFileDeleter(repository);
+
+  // Event Listeners
+  const clearOfflineFileOnFileCreated = new ClearOfflineFileOnFileCreated(
+    offlineFileDeleter
+  );
+
   return {
     offlineFileCreator,
     offlineFileSearcher,
     offlineFileFinder,
     offlineFileSizeIncreaser,
+    clearOfflineFileOnFileCreated,
   };
 }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/VirtualDriveDependencyContainerFactory.ts b/src/apps/fuse/dependency-injection/virtual-drive/VirtualDriveDependencyContainerFactory.ts
index 5aaf0377a..f5d80c3ac 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/VirtualDriveDependencyContainerFactory.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/VirtualDriveDependencyContainerFactory.ts
@@ -10,6 +10,7 @@ export class VirtualDriveDependencyContainerFactory {
 
   static readonly subscribers: Array<keyof VirtualDriveDependencyContainer> = [
     'createFileOnOfflineFileUploaded',
+    'moveOfflineContentsOnContentsUploaded',
   ];
 
   eventSubscribers(
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/contents/ContentsContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/contents/ContentsContainer.ts
index 2582bb43a..ddd88c900 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/contents/ContentsContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/contents/ContentsContainer.ts
@@ -1,9 +1,13 @@
+import { AllLocalContentsDeleter } from '../../../../../context/virtual-drive/contents/application/AllLocalContentsDeleter';
 import { DownloadContentsToPlainFile } from '../../../../../context/virtual-drive/contents/application/DownloadContentsToPlainFile';
 import { LocalContentChecker } from '../../../../../context/virtual-drive/contents/application/LocalContentChecker';
+import { MoveOfflineContentsOnContentsUploaded } from '../../../../../context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded';
 import { RetryContentsUploader } from '../../../../../context/virtual-drive/contents/application/RetryContentsUploader';
 
 export interface ContentsContainer {
   retryContentsUploader: RetryContentsUploader;
   downloadContentsToPlainFile: DownloadContentsToPlainFile;
   localContentChecker: LocalContentChecker;
+  moveOfflineContentsOnContentsUploaded: MoveOfflineContentsOnContentsUploaded;
+  allLocalContentsDeleter: AllLocalContentsDeleter;
 }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
index 5008e08ab..d3ef60cd0 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
@@ -12,6 +12,9 @@ import { DependencyInjectionMnemonicProvider } from '../../common/mnemonic';
 import { DependencyInjectionUserProvider } from '../../common/user';
 import { SharedContainer } from '../shared/SharedContainer';
 import { ContentsContainer } from './ContentsContainer';
+import { MoveOfflineContentsOnContentsUploaded } from '../../../../../context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded';
+import { LocalContentsMover } from '../../../../../context/virtual-drive/contents/application/LocalContentsMover';
+import { AllLocalContentsDeleter } from '../../../../../context/virtual-drive/contents/application/AllLocalContentsDeleter';
 
 export async function buildContentsContainer(
   sharedContainer: SharedContainer
@@ -55,9 +58,20 @@ export async function buildContentsContainer(
 
   const retryContentsUploader = new RetryContentsUploader(contentsUploader);
 
+  const localContentsMover = new LocalContentsMover(localFS);
+
+  const allLocalContentsDeleter = new AllLocalContentsDeleter(localFS);
+
+  // Event subscribers
+
+  const moveOfflineContentsOnContentsUploaded =
+    new MoveOfflineContentsOnContentsUploaded(localContentsMover);
+
   return {
     downloadContentsToPlainFile,
     localContentChecker,
     retryContentsUploader,
+    allLocalContentsDeleter,
+    moveOfflineContentsOnContentsUploaded,
   };
 }
diff --git a/src/apps/fuse/index.ts b/src/apps/fuse/index.ts
index 92a97bbb3..716e66f54 100644
--- a/src/apps/fuse/index.ts
+++ b/src/apps/fuse/index.ts
@@ -1,6 +1,5 @@
 import Logger from 'electron-log';
 
-import _path from 'path';
 import { app } from 'electron';
 import { getRootVirtualDrive } from '../main/virutal-root-folder/service';
 import eventBus from '../main/event-bus';
@@ -41,7 +40,8 @@ export async function stopSyncEngineWatcher() {
 }
 
 async function stopAndClearSyncEngineWatcher() {
-  stopSyncEngineWatcher();
+  await fuseApp.clearCache();
+  await fuseApp.stop();
 }
 
 export function updateSyncEngine() {
diff --git a/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts b/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
index 8be340f6d..151ff2187 100644
--- a/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
+++ b/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
@@ -20,6 +20,7 @@ export class OfflineFileUploader {
       aggregateId: contentsId,
       size: file.size,
       path: file.path,
+      offlineContentsPath: absolutePath,
     });
 
     await this.eventBus.publish([contentsUploadedEvent]);
diff --git a/src/context/offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent.ts b/src/context/offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent.ts
index 9b9bd1ca6..ded93beb3 100644
--- a/src/context/offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent.ts
+++ b/src/context/offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent.ts
@@ -5,15 +5,18 @@ export class OfflineContentsUploadedDomainEvent extends DomainEvent {
 
   readonly size: number;
   readonly path: string;
+  readonly offlineContentsPath: string;
 
   constructor({
     aggregateId,
     size,
     path,
+    offlineContentsPath,
   }: {
     aggregateId: string;
     size: number;
     path: string;
+    offlineContentsPath: string;
   }) {
     super({
       aggregateId,
@@ -22,6 +25,7 @@ export class OfflineContentsUploadedDomainEvent extends DomainEvent {
 
     this.size = size;
     this.path = path;
+    this.offlineContentsPath = offlineContentsPath;
   }
 
   toPrimitives() {
@@ -29,6 +33,7 @@ export class OfflineContentsUploadedDomainEvent extends DomainEvent {
       aggregateId: this.aggregateId,
       size: this.size,
       path: this.path,
+      offlineContentsPath: this.offlineContentsPath,
     };
   }
 }
diff --git a/src/context/virtual-drive/contents/application/AllLocalContentsDeleter.ts b/src/context/virtual-drive/contents/application/AllLocalContentsDeleter.ts
new file mode 100644
index 000000000..867225b8a
--- /dev/null
+++ b/src/context/virtual-drive/contents/application/AllLocalContentsDeleter.ts
@@ -0,0 +1,22 @@
+import { LocalFileSystem } from '../domain/LocalFileSystem';
+import Logger from 'electron-log';
+
+export class AllLocalContentsDeleter {
+  constructor(private readonly localFileSystem: LocalFileSystem) {}
+
+  async run(): Promise<void> {
+    const contentsIds = await this.localFileSystem.listExistentFiles();
+
+    const deletion = contentsIds.map((contentsId) =>
+      this.localFileSystem.remove(contentsId)
+    );
+
+    const result = await Promise.allSettled(deletion);
+
+    const fulfilled = result.filter(({ status }) => status === 'fulfilled');
+
+    Logger.info(
+      `Deleted ${fulfilled.length} of ${contentsIds.length} file contents from local cache`
+    );
+  }
+}
diff --git a/src/context/virtual-drive/contents/application/LocalContentChecker.ts b/src/context/virtual-drive/contents/application/LocalContentChecker.ts
index 0977d2cc8..5563c8a10 100644
--- a/src/context/virtual-drive/contents/application/LocalContentChecker.ts
+++ b/src/context/virtual-drive/contents/application/LocalContentChecker.ts
@@ -1,10 +1,13 @@
 import { File } from '../../files/domain/File';
+import { ContentsId } from '../domain/ContentsId';
 import { LocalFileSystem } from '../domain/LocalFileSystem';
 
 export class LocalContentChecker {
   constructor(private readonly local: LocalFileSystem) {}
 
   run(file: File): Promise<boolean> {
-    return this.local.exists(file.contentsId);
+    const contentsId = new ContentsId(file.contentsId);
+
+    return this.local.exists(contentsId);
   }
 }
diff --git a/src/context/virtual-drive/contents/application/LocalContentsDeleter.ts b/src/context/virtual-drive/contents/application/LocalContentsDeleter.ts
index 67c8d37b4..1c37e4efd 100644
--- a/src/context/virtual-drive/contents/application/LocalContentsDeleter.ts
+++ b/src/context/virtual-drive/contents/application/LocalContentsDeleter.ts
@@ -1,4 +1,5 @@
 import { File } from '../../files/domain/File';
+import { ContentsId } from '../domain/ContentsId';
 import { LocalFileSystem } from '../domain/LocalFileSystem';
 import Logger from 'electron-log';
 
@@ -7,7 +8,8 @@ export class LocalContentsDeleter {
 
   async run(file: File): Promise<void> {
     try {
-      await this.local.remove(file.contentsId);
+      const contentsId = new ContentsId(file.contentsId);
+      await this.local.remove(contentsId);
     } catch (err) {
       Logger.error(err);
     }
diff --git a/src/context/virtual-drive/contents/application/LocalContentsMover.ts b/src/context/virtual-drive/contents/application/LocalContentsMover.ts
index debb1f1b9..b78d9febe 100644
--- a/src/context/virtual-drive/contents/application/LocalContentsMover.ts
+++ b/src/context/virtual-drive/contents/application/LocalContentsMover.ts
@@ -1,18 +1,19 @@
 import { ContentsId } from '../domain/ContentsId';
 import { LocalFileSystem } from '../domain/LocalFileSystem';
+import Logger from 'electron-log';
 
 export class LocalContentsMover {
   constructor(private readonly fileSystem: LocalFileSystem) {}
 
-  async run(contentsId: string, src: string): Promise<void> {
+  async run(contentsId: ContentsId, src: string): Promise<void> {
+    Logger.debug('LocalContentsMover contentsId', contentsId, 'src', src);
+
     const exists = await this.fileSystem.exists(contentsId);
 
     if (exists) {
       this.fileSystem.remove(contentsId);
     }
 
-    const id = new ContentsId(contentsId);
-
-    await this.fileSystem.add(id, src);
+    await this.fileSystem.add(contentsId, src);
   }
 }
diff --git a/src/context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded.ts b/src/context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded.ts
index f86c16e77..e8f43c183 100644
--- a/src/context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded.ts
+++ b/src/context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded.ts
@@ -1,6 +1,7 @@
 import { OfflineContentsUploadedDomainEvent } from '../../../offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent';
 import { DomainEventClass } from '../../../shared/domain/DomainEvent';
 import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
+import { ContentsId } from '../domain/ContentsId';
 import { LocalContentsMover } from './LocalContentsMover';
 
 export class MoveOfflineContentsOnContentsUploaded
@@ -12,6 +13,8 @@ export class MoveOfflineContentsOnContentsUploaded
     return [OfflineContentsUploadedDomainEvent];
   }
   async on(domainEvent: OfflineContentsUploadedDomainEvent): Promise<void> {
-    await this.mover.run(domainEvent.path, domainEvent.aggregateId);
+    const contentsId = new ContentsId(domainEvent.aggregateId);
+
+    await this.mover.run(contentsId, domainEvent.offlineContentsPath);
   }
 }
diff --git a/src/context/virtual-drive/contents/domain/LocalFileSystem.ts b/src/context/virtual-drive/contents/domain/LocalFileSystem.ts
index 614e3f4a7..4fc8ece13 100644
--- a/src/context/virtual-drive/contents/domain/LocalFileSystem.ts
+++ b/src/context/virtual-drive/contents/domain/LocalFileSystem.ts
@@ -1,15 +1,16 @@
 import { ContentsId } from './ContentsId';
 import { LocalFileContents } from './LocalFileContents';
-import { RemoteFileContents } from './RemoteFileContents';
 
 type ResultFilePath = string;
 
 export interface LocalFileSystem {
   write(contents: LocalFileContents, name?: string): Promise<ResultFilePath>;
 
-  remove(contentsId: RemoteFileContents['id']): Promise<void>;
+  remove(contentsId: ContentsId): Promise<void>;
 
-  exists(contentsId: RemoteFileContents['id']): Promise<boolean>;
+  exists(contentsId: ContentsId): Promise<boolean>;
 
   add(contentsId: ContentsId, source: string): Promise<void>;
+
+  listExistentFiles(): Promise<Array<ContentsId>>;
 }
diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
index 314b219dd..6eb3608fc 100644
--- a/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
@@ -33,18 +33,17 @@ export class FSLocalFileSystem implements LocalFileSystem {
     return filePath;
   }
 
-  async remove(relativePath: string): Promise<void> {
+  async remove(contentsId: ContentsId): Promise<void> {
     const folder = await this.baseFolder();
 
-    const absolutePath = path.join(folder, relativePath);
-    Logger.debug(' delete path,', absolutePath);
+    const absolutePath = path.join(folder, contentsId.value);
     return fs.rm(absolutePath);
   }
 
-  async exists(relativePath: string): Promise<boolean> {
+  async exists(contentsId: ContentsId): Promise<boolean> {
     const folder = await this.baseFolder();
 
-    const absolutePath = path.join(folder, relativePath);
+    const absolutePath = path.join(folder, contentsId.value);
 
     try {
       await fs.stat(absolutePath);
@@ -61,4 +60,23 @@ export class FSLocalFileSystem implements LocalFileSystem {
 
     await fs.rename(source, destination);
   }
+
+  async listExistentFiles(): Promise<Array<ContentsId>> {
+    const folder = await this.baseFolder();
+
+    const names = await fs.readdir(folder);
+
+    return Promise.all(
+      names
+        .filter(async (name) => {
+          const fullPath = path.join(folder, name);
+          const stat = await fs.stat(fullPath);
+
+          return stat.isFile();
+        })
+        .map(async (name) => {
+          return new ContentsId(name);
+        })
+    );
+  }
 }

From c322e4aeaf5d8c03d73e3e8846602473fa28ceac Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 4 Jan 2024 12:20:53 +0100
Subject: [PATCH 105/188] chore: read changes

---
 src/apps/fuse/callbacks/OpenCallback.ts               |  6 +++---
 src/apps/fuse/callbacks/ReadCallback.ts               | 11 +++++++----
 .../contents/infrastructure/FSLocalFileSystem.ts      |  1 -
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/apps/fuse/callbacks/OpenCallback.ts b/src/apps/fuse/callbacks/OpenCallback.ts
index 2b0517761..eb51e7a9a 100644
--- a/src/apps/fuse/callbacks/OpenCallback.ts
+++ b/src/apps/fuse/callbacks/OpenCallback.ts
@@ -24,17 +24,17 @@ export class OpenCallback extends FuseCallback<number> {
     );
 
     if (alreadyDownloaded) {
-      Logger.debug('[FUSE] File contents already in local');
+      Logger.debug(`"${file.nameWithExtension}" contents are already in local`);
       return this.right(file.id);
     }
 
     try {
-      Logger.debug('[FUSE] File contents not in local');
+      Logger.debug(`"${file.nameWithExtension}" contents are not in local`);
       await this.container.downloadContentsToPlainFile.run(file);
 
       return this.right(file.id);
     } catch (err: unknown) {
-      Logger.error('[FUSE] Error downloading file: ', err);
+      Logger.error('Error downloading file: ', err);
 
       if (err instanceof Error) {
         return this.left(new IOError(`${err.message} when opening ${path}`));
diff --git a/src/apps/fuse/callbacks/ReadCallback.ts b/src/apps/fuse/callbacks/ReadCallback.ts
index f1a18352b..9cafc0d6d 100644
--- a/src/apps/fuse/callbacks/ReadCallback.ts
+++ b/src/apps/fuse/callbacks/ReadCallback.ts
@@ -29,6 +29,8 @@ export class ReadCallback {
       file.contentsId
     );
 
+    Logger.debug('READING FILE FROM ', filePath);
+
     fs.readFile(filePath, (err, data) => {
       if (err) {
         Logger.error(`Error reading file: ${err}`);
@@ -36,13 +38,14 @@ export class ReadCallback {
         return;
       }
 
-      const dataBuffer = Buffer.from(data);
+      if (pos >= data.length) return cb(0);
 
-      const bytesRead = Math.min(dataBuffer.length - pos, len);
+      // const bytesRead = Math.min(buffer.length - pos, len);
+      const part = data.slice(pos, pos + len);
 
-      dataBuffer.copy(buf, 0, pos, pos + bytesRead);
+      part.copy(buf);
 
-      cb(bytesRead); // Indicate the number of bytes read ????????????
+      cb(part.length); // Indicate the number of bytes read ????????????
     });
   }
 }
diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
index 6eb3608fc..24ff100f2 100644
--- a/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
@@ -5,7 +5,6 @@ import { LocalFileContentsDirectoryProvider } from '../../shared/domain/LocalFil
 import { LocalFileSystem } from '../domain/LocalFileSystem';
 import path from 'path';
 import fs from 'fs/promises';
-import Logger from 'electron-log';
 import { ContentsId } from '../domain/ContentsId';
 
 export class FSLocalFileSystem implements LocalFileSystem {

From bcded790b5b5684f2f95c4b76d2fe5f0477f6a34 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 4 Jan 2024 12:24:41 +0100
Subject: [PATCH 106/188] fix: typo

---
 src/context/virtual-drive/items/domain/FolderNode.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/context/virtual-drive/items/domain/FolderNode.ts b/src/context/virtual-drive/items/domain/FolderNode.ts
index 0efeaf2c7..f14c98718 100644
--- a/src/context/virtual-drive/items/domain/FolderNode.ts
+++ b/src/context/virtual-drive/items/domain/FolderNode.ts
@@ -4,7 +4,7 @@ import { Node } from './Node';
 export class FolderNode {
   private constructor(
     public readonly folder: Folder,
-    private childern: Map<string, Node>
+    private children: Map<string, Node>
   ) {}
 
   static from(folder: Folder): FolderNode {
@@ -16,11 +16,11 @@ export class FolderNode {
   }
 
   addChild(node: Node): void {
-    if (this.childern.has(node.id)) {
+    if (this.children.has(node.id)) {
       throw new Error('Child already exists');
     }
 
-    this.childern.set(node.id, node);
+    this.children.set(node.id, node);
   }
 
   public isFile(): this is FileNode {

From 0734a2c15e2e3ac6a15b583273b095c30eba6ffc Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 10 Jan 2024 12:51:07 +0100
Subject: [PATCH 107/188] fix: delete unused variable

---
 .../virtual-drive/shared/application/PlatformPathConverter.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/context/virtual-drive/shared/application/PlatformPathConverter.ts b/src/context/virtual-drive/shared/application/PlatformPathConverter.ts
index fb1133e1f..1398bf62e 100644
--- a/src/context/virtual-drive/shared/application/PlatformPathConverter.ts
+++ b/src/context/virtual-drive/shared/application/PlatformPathConverter.ts
@@ -21,7 +21,7 @@ export class PlatformPathConverter {
 
   static getFatherPathPosix(posixPath: string): string {
     const pathArray = posixPath.split('/');
-    const folderToCreate = pathArray.pop();
+    pathArray.pop();
     const parentPath = pathArray.join('/');
     return this.winToPosix(parentPath);
   }

From f5d254c1c541c42290abb5aa2453a28cebd1b04e Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 10 Jan 2024 15:14:31 +0100
Subject: [PATCH 108/188] feat: extract ipc notification

---
 .../virtual-drive/folders/builder.ts          |  9 +++++++--
 .../folders/application/FolderCreator.ts      | 12 +++++------
 .../folders/application/FolderRenamer.ts      |  6 +++++-
 .../folders/domain/FolderSyncNotifier.ts      |  7 +++++++
 .../MainProcessFolderSyncNotifier.ts          | 20 +++++++++++++++++++
 .../files/application/FileCreator.test.ts     | 12 ++++-------
 .../files/application/FileDeleter.test.ts     |  9 ++++-----
 .../files/application/FilePathUpdater.test.ts |  4 ----
 .../folders/application/FolderCreator.test.ts |  2 +-
 .../SynchronizeOfflineModifications.test.ts   |  4 ++--
 10 files changed, 55 insertions(+), 30 deletions(-)
 create mode 100644 src/context/virtual-drive/folders/domain/FolderSyncNotifier.ts
 create mode 100644 src/context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier.ts

diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
index 0ed97feef..04ddcdfe3 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
@@ -14,6 +14,7 @@ import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/folder
 import { HttpRemoteFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
 import { InMemoryFolderRepository } from '../../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
 import { InMemoryOfflineFolderRepository } from '../../../../../context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository';
+import { MainProcessFolderSyncNotifier } from '../../../../../context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier';
 import { DependencyInjectionHttpClientsProvider } from '../../common/clients';
 import { DependencyInjectionEventBus } from '../../common/eventBus';
 
@@ -25,6 +26,8 @@ export async function buildFoldersContainer(
   const repository = new InMemoryFolderRepository();
   const clients = DependencyInjectionHttpClientsProvider.get();
 
+  const notifier = new MainProcessFolderSyncNotifier();
+
   const remoteFileSystem = new HttpRemoteFileSystem(
     clients.drive,
     clients.newDrive
@@ -58,7 +61,8 @@ export async function buildFoldersContainer(
   const folderRenamer = new FolderRenamer(
     repository,
     remoteFileSystem,
-    eventBus
+    eventBus,
+    notifier
   );
 
   const folderPathUpdater = new FolderPathUpdater(
@@ -74,7 +78,8 @@ export async function buildFoldersContainer(
   const folderCreator = new FolderCreator(
     repository,
     remoteFileSystem,
-    eventBus
+    eventBus,
+    notifier
   );
 
   const offlineFolderCreator = new OfflineFolderCreator(
diff --git a/src/context/virtual-drive/folders/application/FolderCreator.ts b/src/context/virtual-drive/folders/application/FolderCreator.ts
index 352466509..05459badd 100644
--- a/src/context/virtual-drive/folders/application/FolderCreator.ts
+++ b/src/context/virtual-drive/folders/application/FolderCreator.ts
@@ -1,6 +1,7 @@
 import { EventBus } from '../../shared/domain/EventBus';
 import { Folder } from '../domain/Folder';
 import { FolderRepository } from '../domain/FolderRepository';
+import { FolderSyncNotifier } from '../domain/FolderSyncNotifier';
 import { OfflineFolder } from '../domain/OfflineFolder';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 
@@ -8,13 +9,12 @@ export class FolderCreator {
   constructor(
     private readonly repository: FolderRepository,
     private readonly remote: RemoteFileSystem,
-    private readonly eventBus: EventBus
+    private readonly eventBus: EventBus,
+    private readonly notifier: FolderSyncNotifier
   ) {}
 
   async run(offlineFolder: OfflineFolder): Promise<Folder> {
-    // this.ipc.send('FOLDER_CREATING', {
-    //   name: offlineFolder.name,
-    // });
+    this.notifier.created(offlineFolder.name);
 
     const attributes = await this.remote.persist(offlineFolder);
 
@@ -25,9 +25,7 @@ export class FolderCreator {
     const events = folder.pullDomainEvents();
     this.eventBus.publish(events);
 
-    // this.ipc.send('FOLDER_CREATED', {
-    //   name: offlineFolder.name,
-    // });
+    this.notifier.created(offlineFolder.name);
 
     return folder;
   }
diff --git a/src/context/virtual-drive/folders/application/FolderRenamer.ts b/src/context/virtual-drive/folders/application/FolderRenamer.ts
index 330e742ab..97a994116 100644
--- a/src/context/virtual-drive/folders/application/FolderRenamer.ts
+++ b/src/context/virtual-drive/folders/application/FolderRenamer.ts
@@ -4,15 +4,18 @@ import { FolderRepository } from '../domain/FolderRepository';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 import { EventBus } from '../../shared/domain/EventBus';
 import { FolderRenameStartedDomainEvent } from '../domain/events/FolderRenameStartedDomainEvent';
+import { FolderSyncNotifier } from '../domain/FolderSyncNotifier';
 
 export class FolderRenamer {
   constructor(
     private readonly repository: FolderRepository,
     private readonly remote: RemoteFileSystem,
-    private readonly eventBus: EventBus
+    private readonly eventBus: EventBus,
+    private readonly notifier: FolderSyncNotifier
   ) {}
 
   async run(folder: Folder, destination: FolderPath) {
+    this.notifier.rename(folder.name, destination.name());
     this.eventBus.publish([
       new FolderRenameStartedDomainEvent({
         aggregateId: folder.uuid,
@@ -27,5 +30,6 @@ export class FolderRenamer {
     await this.repository.update(folder);
 
     this.eventBus.publish(folder.pullDomainEvents());
+    this.notifier.renamed(folder.name, destination.name());
   }
 }
diff --git a/src/context/virtual-drive/folders/domain/FolderSyncNotifier.ts b/src/context/virtual-drive/folders/domain/FolderSyncNotifier.ts
new file mode 100644
index 000000000..b47294082
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/FolderSyncNotifier.ts
@@ -0,0 +1,7 @@
+export interface FolderSyncNotifier {
+  creating(name: string): void;
+  created(name: string): void;
+  rename(name: string, newName: string): void;
+  renamed(name: string, newName: string): void;
+  error(): void;
+}
diff --git a/src/context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier.ts b/src/context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier.ts
new file mode 100644
index 000000000..97a4cea3f
--- /dev/null
+++ b/src/context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier.ts
@@ -0,0 +1,20 @@
+import { setTrayStatus } from '../../../../apps/main/tray/tray';
+import { FolderSyncNotifier } from '../domain/FolderSyncNotifier';
+
+export class MainProcessFolderSyncNotifier implements FolderSyncNotifier {
+  rename(name: string, newName: string): void {
+    setTrayStatus('SYNCING');
+  }
+  renamed(name: string, newName: string): void {
+    setTrayStatus('IDLE');
+  }
+  creating(name: string): void {
+    setTrayStatus('SYNCING');
+  }
+  created(name: string): void {
+    setTrayStatus('IDLE');
+  }
+  error(): void {
+    throw new Error('Method not implemented.');
+  }
+}
diff --git a/tests/context/virtual-drive/files/application/FileCreator.test.ts b/tests/context/virtual-drive/files/application/FileCreator.test.ts
index 92b3ccbc0..b7297765e 100644
--- a/tests/context/virtual-drive/files/application/FileCreator.test.ts
+++ b/tests/context/virtual-drive/files/application/FileCreator.test.ts
@@ -4,7 +4,6 @@ import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/
 import { File } from '../../../../../src/context/virtual-drive/files/domain/File';
 import { FileContentsMother } from '../../contents/domain/FileContentsMother';
 import { EventBusMock } from '../../shared/__mock__/EventBusMock';
-import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
 import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
 import { RemoteFileSystemMock } from '../__mocks__/RemoteFileSystemMock';
 import { FileMother } from '../domain/FileMother';
@@ -19,8 +18,6 @@ describe('File Creator', () => {
 
   let SUT: FileCreator;
 
-  const ipc = new IpcRendererSyncEngineMock();
-
   beforeEach(() => {
     remoteFileSystemMock = new RemoteFileSystemMock();
     fileRepository = new FileRepositoryMock();
@@ -33,8 +30,7 @@ describe('File Creator', () => {
       fileRepository,
       folderFinder,
       fileDeleter,
-      eventBus,
-      ipc
+      eventBus
     );
   });
 
@@ -53,7 +49,7 @@ describe('File Creator', () => {
 
     remoteFileSystemMock.persistMock.mockResolvedValueOnce(fileAttributes);
 
-    await SUT.run(path, contents);
+    await SUT.run(path.value, contents.id, contents.size);
 
     expect(fileRepository.addMock).toBeCalledWith(
       expect.objectContaining(File.from(fileAttributes))
@@ -74,7 +70,7 @@ describe('File Creator', () => {
 
     remoteFileSystemMock.persistMock.mockResolvedValueOnce(fileAttributes);
 
-    await SUT.run(path, contents);
+    await SUT.run(path.value, contents.id, contents.size);
 
     expect(eventBus.publishMock.mock.calls[0][0][0].eventName).toBe(
       'file.created'
@@ -107,7 +103,7 @@ describe('File Creator', () => {
       // returns Promise<void>
     });
 
-    await SUT.run(path, contents);
+    await SUT.run(path.value, contents.id, contents.size);
 
     expect(deleterSpy).toBeCalledWith(existingFile.contentsId);
 
diff --git a/tests/context/virtual-drive/files/application/FileDeleter.test.ts b/tests/context/virtual-drive/files/application/FileDeleter.test.ts
index f0119a682..5081d6ffa 100644
--- a/tests/context/virtual-drive/files/application/FileDeleter.test.ts
+++ b/tests/context/virtual-drive/files/application/FileDeleter.test.ts
@@ -12,7 +12,7 @@ describe('File Deleter', () => {
   let repository: FileRepositoryMock;
   let allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
   let remoteFileSystemMock: RemoteFileSystemMock;
-  let localFilseSystemMock: LocalFileSystemMock;
+  let localFilesSystemMock: LocalFileSystemMock;
   let ipc: IpcRendererSyncEngineMock;
 
   let SUT: FileDeleter;
@@ -23,16 +23,15 @@ describe('File Deleter', () => {
     allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
       folderRepository
     );
-    localFilseSystemMock = new LocalFileSystemMock();
+    localFilesSystemMock = new LocalFileSystemMock();
     remoteFileSystemMock = new RemoteFileSystemMock();
     ipc = new IpcRendererSyncEngineMock();
 
     SUT = new FileDeleter(
       remoteFileSystemMock,
-      localFilseSystemMock,
+      localFilesSystemMock,
       repository,
-      allParentFoldersStatusIsExists,
-      ipc
+      allParentFoldersStatusIsExists
     );
   });
 
diff --git a/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts b/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
index 8074fd60a..9f8b74125 100644
--- a/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
+++ b/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
@@ -5,7 +5,6 @@ import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/a
 import { FolderFinderMock } from '../../folders/__mocks__/FolderFinderMock';
 import { FolderMother } from '../../folders/domain/FolderMother';
 import { EventBusMock } from '../../shared/__mock__/EventBusMock';
-import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
 import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
 import { LocalFileSystemMock } from '../__mocks__/LocalFileSystemMock';
 import { RemoteFileSystemMock } from '../__mocks__/RemoteFileSystemMock';
@@ -15,7 +14,6 @@ describe('File path updater', () => {
   let repository: FileRepositoryMock;
   let fileFinderByContentsId: FileFinderByContentsId;
   let folderFinder: FolderFinderMock;
-  let ipcRendererMock: IpcRendererSyncEngineMock;
   let localFileSystem: LocalFileSystemMock;
   let eventBus: EventBusMock;
   let remoteFileSystemMock: RemoteFileSystemMock;
@@ -25,7 +23,6 @@ describe('File path updater', () => {
     repository = new FileRepositoryMock();
     folderFinder = new FolderFinderMock();
     fileFinderByContentsId = new FileFinderByContentsId(repository);
-    ipcRendererMock = new IpcRendererSyncEngineMock();
     eventBus = new EventBusMock();
     remoteFileSystemMock = new RemoteFileSystemMock();
     localFileSystem = new LocalFileSystemMock();
@@ -36,7 +33,6 @@ describe('File path updater', () => {
       repository,
       fileFinderByContentsId,
       folderFinder as unknown as FolderFinder,
-      ipcRendererMock,
       eventBus
     );
   });
diff --git a/tests/context/virtual-drive/folders/application/FolderCreator.test.ts b/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
index d216e8f6e..abcd5f126 100644
--- a/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
+++ b/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
@@ -22,7 +22,7 @@ describe('Folder Creator', () => {
 
     eventBus = new EventBusMock();
 
-    SUT = new FolderCreator(repository, remote, syncEngineIpc, eventBus);
+    SUT = new FolderCreator(repository, remote, eventBus);
   });
 
   it('creates on a folder from a offline folder', async () => {
diff --git a/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts b/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
index 1a5c20b3f..bc34ee291 100644
--- a/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
+++ b/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
@@ -4,8 +4,8 @@ import { FolderPath } from '../../../../../src/context/virtual-drive/folders/dom
 import { FolderUuid } from '../../../../../src/context/virtual-drive/folders/domain/FolderUuid';
 import { FolderRenamedDomainEvent } from '../../../../../src/context/virtual-drive/folders/domain/events/FolderRenamedDomainEvent';
 import { InMemoryOfflineFolderRepository } from '../../../../../src/context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository';
+import { EventBusMock } from '../../shared/__mock__/EventBusMock';
 import { EventRepositoryMock } from '../../shared/__mock__/EventRepositoryMock';
-import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
 import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
 import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
 import { FolderMother } from '../domain/FolderMother';
@@ -27,7 +27,7 @@ describe('Synchronize Offline Modifications', () => {
     renamer = new FolderRenamer(
       repository,
       folderRemoteFileSystemMock,
-      new IpcRendererSyncEngineMock()
+      new EventBusMock()
     );
     eventRepositoryMock = new EventRepositoryMock();
 

From db2a71e08bad943b5110e0276dd417de2594f2b8 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 10 Jan 2024 15:50:03 +0100
Subject: [PATCH 109/188] feat: extract notify contents

---
 .../virtual-drive/contents/builder.ts         |  6 +-
 .../contents/application/ContentsUploader.ts  | 90 +++++++++---------
 .../domain/ContentsActionsNotifier.ts         | 24 +++++
 .../MainProcessContentsActionNotifier.ts      | 93 +++++++++++++++++++
 4 files changed, 167 insertions(+), 46 deletions(-)
 create mode 100644 src/context/virtual-drive/contents/domain/ContentsActionsNotifier.ts
 create mode 100644 src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts

diff --git a/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
index d3ef60cd0..f05eebf1e 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
@@ -15,6 +15,7 @@ import { ContentsContainer } from './ContentsContainer';
 import { MoveOfflineContentsOnContentsUploaded } from '../../../../../context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded';
 import { LocalContentsMover } from '../../../../../context/virtual-drive/contents/application/LocalContentsMover';
 import { AllLocalContentsDeleter } from '../../../../../context/virtual-drive/contents/application/AllLocalContentsDeleter';
+import { MainProcessContentsActionNotifier } from '../../../../../context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier';
 
 export async function buildContentsContainer(
   sharedContainer: SharedContainer
@@ -23,6 +24,8 @@ export async function buildContentsContainer(
   const mnemonic = DependencyInjectionMnemonicProvider.get();
   const { bus: eventBus } = DependencyInjectionEventBus;
 
+  const contentsActionNotifier = new MainProcessContentsActionNotifier();
+
   const environment = new Environment({
     bridgeUrl: process.env.BRIDGE_URL,
     bridgeUser: user.bridgeUser,
@@ -53,7 +56,8 @@ export async function buildContentsContainer(
     contentsManagerFactory,
     new FSLocalFileProvider(),
     sharedContainer.relativePathToAbsoluteConverter,
-    eventBus
+    eventBus,
+    contentsActionNotifier
   );
 
   const retryContentsUploader = new RetryContentsUploader(contentsUploader);
diff --git a/src/context/virtual-drive/contents/application/ContentsUploader.ts b/src/context/virtual-drive/contents/application/ContentsUploader.ts
index 53c519671..e253b66a5 100644
--- a/src/context/virtual-drive/contents/application/ContentsUploader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsUploader.ts
@@ -1,61 +1,61 @@
-import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
-import { LocalContentsProvider } from '../domain/LocalFileProvider';
-import { RemoteFileContents } from '../domain/RemoteFileContents';
 import { PlatformPathConverter } from '../../shared/application/PlatformPathConverter';
 import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
 import { EventBus } from '../../shared/domain/EventBus';
+import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
+import { ContentsActionNotifier } from '../domain/ContentsActionsNotifier';
+import { LocalFileContents } from '../domain/LocalFileContents';
+import { LocalContentsProvider } from '../domain/LocalFileProvider';
+import { RemoteFileContents } from '../domain/RemoteFileContents';
+import { ContentFileUploader } from '../domain/contentHandlers/ContentFileUploader';
 
 export class ContentsUploader {
   constructor(
     private readonly remoteContentsManagersFactory: ContentsManagersFactory,
     private readonly contentProvider: LocalContentsProvider,
     private readonly relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter,
-    private readonly eventBus: EventBus
+    private readonly eventBus: EventBus,
+    private readonly notifier: ContentsActionNotifier
   ) {}
 
-  // private registerEvents(
-  //   uploader: ContentFileUploader,
-  //   localFileContents: LocalFileContents
-  // ) {
-  //   uploader.on('start', () => {
-  //     this.ipc.send('FILE_UPLOADING', {
-  //       name: localFileContents.name,
-  //       extension: localFileContents.extension,
-  //       nameWithExtension: localFileContents.nameWithExtension,
-  //       size: localFileContents.size,
-  //       processInfo: { elapsedTime: uploader.elapsedTime() },
-  //     });
-  //   });
+  private registerEvents(
+    uploader: ContentFileUploader,
+    localFileContents: LocalFileContents
+  ) {
+    uploader.on('start', () => {
+      this.notifier.uploadStarted(
+        localFileContents.name,
+        localFileContents.extension,
+        localFileContents.size,
+        { elapsedTime: uploader.elapsedTime() }
+      );
+    });
 
-  //   uploader.on('progress', (progress: number) => {
-  //     this.ipc.send('FILE_UPLOADING', {
-  //       name: localFileContents.name,
-  //       extension: localFileContents.extension,
-  //       nameWithExtension: localFileContents.nameWithExtension,
-  //       size: localFileContents.size,
-  //       processInfo: { elapsedTime: uploader.elapsedTime(), progress },
-  //     });
-  //   });
+    uploader.on('progress', (progress: number) => {
+      this.notifier.uploadProgress(
+        localFileContents.name,
+        localFileContents.extension,
+        localFileContents.size,
+        { elapsedTime: uploader.elapsedTime(), progress }
+      );
+    });
 
-  //   uploader.on('error', (error: Error) => {
-  //     this.ipc.send('FILE_UPLOAD_ERROR', {
-  //       name: localFileContents.name,
-  //       extension: localFileContents.extension,
-  //       nameWithExtension: localFileContents.nameWithExtension,
-  //       error: error.message,
-  //     });
-  //   });
+    uploader.on('error', (error: Error) => {
+      this.notifier.uploadError(
+        localFileContents.name,
+        localFileContents.extension,
+        error.message
+      );
+    });
 
-  //   uploader.on('finish', () => {
-  //     this.ipc.send('FILE_UPLOADED', {
-  //       name: localFileContents.name,
-  //       extension: localFileContents.extension,
-  //       nameWithExtension: localFileContents.nameWithExtension,
-  //       size: localFileContents.size,
-  //       processInfo: { elapsedTime: uploader.elapsedTime() },
-  //     });
-  //   });
-  // }
+    uploader.on('finish', () => {
+      this.notifier.uploadCompleted(
+        localFileContents.name,
+        localFileContents.extension,
+        localFileContents.size,
+        { elapsedTime: uploader.elapsedTime() }
+      );
+    });
+  }
 
   async run(posixRelativePath: string): Promise<RemoteFileContents> {
     const win32RelativePath =
@@ -73,7 +73,7 @@ export class ContentsUploader {
       abortSignal
     );
 
-    // this.registerEvents(uploader, contents);
+    this.registerEvents(uploader, contents);
 
     const contentsId = await uploader.upload(contents.stream, contents.size);
 
diff --git a/src/context/virtual-drive/contents/domain/ContentsActionsNotifier.ts b/src/context/virtual-drive/contents/domain/ContentsActionsNotifier.ts
new file mode 100644
index 000000000..280e2d302
--- /dev/null
+++ b/src/context/virtual-drive/contents/domain/ContentsActionsNotifier.ts
@@ -0,0 +1,24 @@
+export interface ContentsActionNotifier {
+  uploadStarted(
+    name: string,
+    extension: string,
+    size: number,
+    processInfo: { elapsedTime: number }
+  ): void;
+
+  uploadProgress(
+    name: string,
+    extension: string,
+    size: number,
+    processInfo: { elapsedTime: number; progress: number }
+  ): void;
+
+  uploadError(name: string, extension: string, error: string): void;
+
+  uploadCompleted(
+    name: string,
+    extension: string,
+    size: number,
+    processInfo: { elapsedTime: number }
+  ): void;
+}
diff --git a/src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts b/src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts
new file mode 100644
index 000000000..5a73d99cf
--- /dev/null
+++ b/src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts
@@ -0,0 +1,93 @@
+import {
+  trackError,
+  trackEvent,
+} from '../../../../apps/main/analytics/service';
+import { setTrayStatus } from '../../../../apps/main/tray/tray';
+import { broadcastToWindows } from '../../../../apps/main/windows';
+import { ContentsActionNotifier } from '../domain/ContentsActionsNotifier';
+
+export class MainProcessContentsActionNotifier
+  implements ContentsActionNotifier
+{
+  private nameWithExtension(name: string, type: string): string {
+    return `${name}.${type}`;
+  }
+
+  uploadStarted(name: string, extension: string, size: number): void {
+    trackEvent('Upload Started', {
+      file_name: name,
+      file_extension: extension,
+      file_size: size,
+      elapsedTimeMs: 0,
+    });
+
+    const nameWithExtension = this.nameWithExtension(name, extension);
+
+    broadcastToWindows('sync-info-update', {
+      action: 'UPLOADING',
+      name: nameWithExtension,
+      progress: 0,
+    });
+  }
+
+  uploadProgress(
+    name: string,
+    extension: string,
+    size: number,
+    processInfo: { elapsedTime: number; progress: number }
+  ): void {
+    const nameWithExtension = this.nameWithExtension(name, extension);
+
+    trackEvent('Upload Started', {
+      file_name: name,
+      file_extension: extension,
+      file_size: size,
+      elapsedTimeMs: processInfo.elapsedTime,
+    });
+
+    broadcastToWindows('sync-info-update', {
+      action: 'UPLOADING',
+      name: nameWithExtension,
+      progress: processInfo.progress,
+    });
+  }
+
+  uploadError(name: string, extension: string, error: string): void {
+    const nameWithExtension = this.nameWithExtension(name, extension);
+
+    broadcastToWindows('sync-info-update', {
+      action: 'UPLOAD_ERROR',
+      name: nameWithExtension,
+    });
+
+    trackError('Upload Error', new Error(error), {
+      itemType: 'File',
+      root: '',
+      from: name,
+      action: 'Upload',
+    });
+  }
+
+  uploadCompleted(
+    name: string,
+    extension: string,
+    size: number,
+    processInfo: { elapsedTime: number }
+  ): void {
+    const nameWithExtension = this.nameWithExtension(name, extension);
+
+    setTrayStatus('IDLE');
+
+    trackEvent('Upload Completed', {
+      file_name: name,
+      file_extension: extension,
+      file_size: size,
+      elapsedTimeMs: processInfo.elapsedTime,
+    });
+
+    broadcastToWindows('sync-info-update', {
+      action: 'UPLOADED',
+      name: nameWithExtension,
+    });
+  }
+}

From b0cee45af963af7df77ba1012e6ef95dfd8e9006 Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Wed, 10 Jan 2024 16:00:00 +0100
Subject: [PATCH 110/188] [PB-1352]: fixed address typo

---
 src/apps/renderer/localize/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/renderer/localize/locales/en.json b/src/apps/renderer/localize/locales/en.json
index 95b1a0527..a84d3f135 100644
--- a/src/apps/renderer/localize/locales/en.json
+++ b/src/apps/renderer/localize/locales/en.json
@@ -1,7 +1,7 @@
 {
   "login": {
     "email": {
-      "section": "Email adress"
+      "section": "Email address"
     },
     "password": {
       "section": "Password",

From 0a861c8a578152d095a3926547da7e7a2a129642 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 10 Jan 2024 16:01:06 +0100
Subject: [PATCH 111/188] chore: rename typos

---
 src/apps/fuse/index.ts                               |  4 ++--
 .../HidratationApi.ts                                | 12 +++++-------
 .../controllers/contents.ts                          |  0
 .../dependency-injection/DependencyContainer.ts      |  0
 .../DependencyContainerFactory.ts                    |  0
 .../dependency-injection/common/clients.ts           |  0
 .../dependency-injection/common/crypt.ts             |  0
 .../dependency-injection/common/eventBus.ts          |  0
 .../dependency-injection/common/eventRepository.ts   |  0
 .../common/localRootFolderPath.ts                    |  0
 .../dependency-injection/common/mnemonic.ts          |  0
 .../dependency-injection/common/sdk.ts               |  0
 .../dependency-injection/common/traverser.ts         |  0
 .../dependency-injection/common/user.ts              |  0
 .../dependency-injection/common/virtualDrive.ts      |  0
 .../contents/ContentsContainer.ts                    |  0
 .../dependency-injection/contents/builder.ts         |  0
 .../dependency-injection/files/FilesContainer.ts     |  0
 .../dependency-injection/files/builder.ts            |  0
 .../dependency-injection/folders/FoldersContainer.ts |  0
 .../dependency-injection/folders/builder.ts          |  0
 .../dependency-injection/tree/TreeContainer.ts       |  0
 .../dependency-injection/tree/builder.ts             |  0
 .../routes/contents.ts                               |  0
 24 files changed, 7 insertions(+), 9 deletions(-)
 rename src/apps/{hydratation-api => hydration-api}/HidratationApi.ts (79%)
 rename src/apps/{hydratation-api => hydration-api}/controllers/contents.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/DependencyContainer.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/DependencyContainerFactory.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/common/clients.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/common/crypt.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/common/eventBus.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/common/eventRepository.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/common/localRootFolderPath.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/common/mnemonic.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/common/sdk.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/common/traverser.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/common/user.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/common/virtualDrive.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/contents/ContentsContainer.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/contents/builder.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/files/FilesContainer.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/files/builder.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/folders/FoldersContainer.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/folders/builder.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/tree/TreeContainer.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/dependency-injection/tree/builder.ts (100%)
 rename src/apps/{hydratation-api => hydration-api}/routes/contents.ts (100%)

diff --git a/src/apps/fuse/index.ts b/src/apps/fuse/index.ts
index 716e66f54..a10019686 100644
--- a/src/apps/fuse/index.ts
+++ b/src/apps/fuse/index.ts
@@ -5,13 +5,13 @@ import { getRootVirtualDrive } from '../main/virutal-root-folder/service';
 import eventBus from '../main/event-bus';
 import { FuseApp } from './FuseApp';
 import path from 'path';
-import { HidratationApi } from '../hydratation-api/HidratationApi';
+import { HydrationApi } from '../hydratation-api/HidratationApi';
 import { FuseDependencyContainerFactory } from './dependency-injection/FuseDependencyContainerFactory';
 
 let fuseApp: FuseApp;
 
 async function spawnSyncEngineWorker() {
-  const api = new HidratationApi();
+  const api = new HydrationApi();
 
   await api.start({
     debug: false,
diff --git a/src/apps/hydratation-api/HidratationApi.ts b/src/apps/hydration-api/HidratationApi.ts
similarity index 79%
rename from src/apps/hydratation-api/HidratationApi.ts
rename to src/apps/hydration-api/HidratationApi.ts
index 4305abe67..746b09297 100644
--- a/src/apps/hydratation-api/HidratationApi.ts
+++ b/src/apps/hydration-api/HidratationApi.ts
@@ -4,11 +4,11 @@ import Logger from 'electron-log';
 import { buildContentsRouter } from './routes/contents';
 import { DependencyContainerFactory } from './dependency-injection/DependencyContainerFactory';
 
-export interface HidratationApiOptions {
+export interface HydrationApiOptions {
   debug: boolean;
 }
 
-export class HidratationApi {
+export class HydrationApi {
   private static readonly PORT = 4567;
   private readonly app;
 
@@ -27,7 +27,7 @@ export class HidratationApi {
     return routers;
   }
 
-  async start(options: HidratationApiOptions): Promise<void> {
+  async start(options: HydrationApiOptions): Promise<void> {
     const routers = await this.buildRouters();
 
     if (options.debug) {
@@ -44,10 +44,8 @@ export class HidratationApi {
     });
 
     return new Promise((resolve) => {
-      this.app.listen(HidratationApi.PORT, () => {
-        Logger.info(
-          `Hidratation Api is running on port ${HidratationApi.PORT}`
-        );
+      this.app.listen(HydrationApi.PORT, () => {
+        Logger.info(`Hidratation Api is running on port ${HydrationApi.PORT}`);
         resolve();
       });
     });
diff --git a/src/apps/hydratation-api/controllers/contents.ts b/src/apps/hydration-api/controllers/contents.ts
similarity index 100%
rename from src/apps/hydratation-api/controllers/contents.ts
rename to src/apps/hydration-api/controllers/contents.ts
diff --git a/src/apps/hydratation-api/dependency-injection/DependencyContainer.ts b/src/apps/hydration-api/dependency-injection/DependencyContainer.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/DependencyContainer.ts
rename to src/apps/hydration-api/dependency-injection/DependencyContainer.ts
diff --git a/src/apps/hydratation-api/dependency-injection/DependencyContainerFactory.ts b/src/apps/hydration-api/dependency-injection/DependencyContainerFactory.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/DependencyContainerFactory.ts
rename to src/apps/hydration-api/dependency-injection/DependencyContainerFactory.ts
diff --git a/src/apps/hydratation-api/dependency-injection/common/clients.ts b/src/apps/hydration-api/dependency-injection/common/clients.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/common/clients.ts
rename to src/apps/hydration-api/dependency-injection/common/clients.ts
diff --git a/src/apps/hydratation-api/dependency-injection/common/crypt.ts b/src/apps/hydration-api/dependency-injection/common/crypt.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/common/crypt.ts
rename to src/apps/hydration-api/dependency-injection/common/crypt.ts
diff --git a/src/apps/hydratation-api/dependency-injection/common/eventBus.ts b/src/apps/hydration-api/dependency-injection/common/eventBus.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/common/eventBus.ts
rename to src/apps/hydration-api/dependency-injection/common/eventBus.ts
diff --git a/src/apps/hydratation-api/dependency-injection/common/eventRepository.ts b/src/apps/hydration-api/dependency-injection/common/eventRepository.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/common/eventRepository.ts
rename to src/apps/hydration-api/dependency-injection/common/eventRepository.ts
diff --git a/src/apps/hydratation-api/dependency-injection/common/localRootFolderPath.ts b/src/apps/hydration-api/dependency-injection/common/localRootFolderPath.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/common/localRootFolderPath.ts
rename to src/apps/hydration-api/dependency-injection/common/localRootFolderPath.ts
diff --git a/src/apps/hydratation-api/dependency-injection/common/mnemonic.ts b/src/apps/hydration-api/dependency-injection/common/mnemonic.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/common/mnemonic.ts
rename to src/apps/hydration-api/dependency-injection/common/mnemonic.ts
diff --git a/src/apps/hydratation-api/dependency-injection/common/sdk.ts b/src/apps/hydration-api/dependency-injection/common/sdk.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/common/sdk.ts
rename to src/apps/hydration-api/dependency-injection/common/sdk.ts
diff --git a/src/apps/hydratation-api/dependency-injection/common/traverser.ts b/src/apps/hydration-api/dependency-injection/common/traverser.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/common/traverser.ts
rename to src/apps/hydration-api/dependency-injection/common/traverser.ts
diff --git a/src/apps/hydratation-api/dependency-injection/common/user.ts b/src/apps/hydration-api/dependency-injection/common/user.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/common/user.ts
rename to src/apps/hydration-api/dependency-injection/common/user.ts
diff --git a/src/apps/hydratation-api/dependency-injection/common/virtualDrive.ts b/src/apps/hydration-api/dependency-injection/common/virtualDrive.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/common/virtualDrive.ts
rename to src/apps/hydration-api/dependency-injection/common/virtualDrive.ts
diff --git a/src/apps/hydratation-api/dependency-injection/contents/ContentsContainer.ts b/src/apps/hydration-api/dependency-injection/contents/ContentsContainer.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/contents/ContentsContainer.ts
rename to src/apps/hydration-api/dependency-injection/contents/ContentsContainer.ts
diff --git a/src/apps/hydratation-api/dependency-injection/contents/builder.ts b/src/apps/hydration-api/dependency-injection/contents/builder.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/contents/builder.ts
rename to src/apps/hydration-api/dependency-injection/contents/builder.ts
diff --git a/src/apps/hydratation-api/dependency-injection/files/FilesContainer.ts b/src/apps/hydration-api/dependency-injection/files/FilesContainer.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/files/FilesContainer.ts
rename to src/apps/hydration-api/dependency-injection/files/FilesContainer.ts
diff --git a/src/apps/hydratation-api/dependency-injection/files/builder.ts b/src/apps/hydration-api/dependency-injection/files/builder.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/files/builder.ts
rename to src/apps/hydration-api/dependency-injection/files/builder.ts
diff --git a/src/apps/hydratation-api/dependency-injection/folders/FoldersContainer.ts b/src/apps/hydration-api/dependency-injection/folders/FoldersContainer.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/folders/FoldersContainer.ts
rename to src/apps/hydration-api/dependency-injection/folders/FoldersContainer.ts
diff --git a/src/apps/hydratation-api/dependency-injection/folders/builder.ts b/src/apps/hydration-api/dependency-injection/folders/builder.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/folders/builder.ts
rename to src/apps/hydration-api/dependency-injection/folders/builder.ts
diff --git a/src/apps/hydratation-api/dependency-injection/tree/TreeContainer.ts b/src/apps/hydration-api/dependency-injection/tree/TreeContainer.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/tree/TreeContainer.ts
rename to src/apps/hydration-api/dependency-injection/tree/TreeContainer.ts
diff --git a/src/apps/hydratation-api/dependency-injection/tree/builder.ts b/src/apps/hydration-api/dependency-injection/tree/builder.ts
similarity index 100%
rename from src/apps/hydratation-api/dependency-injection/tree/builder.ts
rename to src/apps/hydration-api/dependency-injection/tree/builder.ts
diff --git a/src/apps/hydratation-api/routes/contents.ts b/src/apps/hydration-api/routes/contents.ts
similarity index 100%
rename from src/apps/hydratation-api/routes/contents.ts
rename to src/apps/hydration-api/routes/contents.ts

From 69074d8c8e22f9907a3a47b1a068ecfa2ea6d3de Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Wed, 10 Jan 2024 16:01:22 +0100
Subject: [PATCH 112/188] [PB-1353]: fixed Log in typo

---
 src/apps/renderer/localize/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/renderer/localize/locales/en.json b/src/apps/renderer/localize/locales/en.json
index a84d3f135..466044150 100644
--- a/src/apps/renderer/localize/locales/en.json
+++ b/src/apps/renderer/localize/locales/en.json
@@ -11,7 +11,7 @@
       "show": "Show"
     },
     "action": {
-      "login": "Login",
+      "login": "Log in",
       "is-logging-in": "Logging you in..."
     },
     "create-account": "Create account",

From 9509b66f72c0f2b86f57add71299c6fc9064cb00 Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Wed, 10 Jan 2024 16:00:00 +0100
Subject: [PATCH 113/188] [PB-1352]: fixed address typo

---
 src/apps/renderer/localize/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/renderer/localize/locales/en.json b/src/apps/renderer/localize/locales/en.json
index 7eec344ee..b5487f79c 100644
--- a/src/apps/renderer/localize/locales/en.json
+++ b/src/apps/renderer/localize/locales/en.json
@@ -1,7 +1,7 @@
 {
   "login": {
     "email": {
-      "section": "Email adress"
+      "section": "Email address"
     },
     "password": {
       "section": "Password",

From 5c5393269f0330ddad7764deb968c50d6d0a7917 Mon Sep 17 00:00:00 2001
From: larry-internxt <larry@internxt.com>
Date: Wed, 10 Jan 2024 16:01:22 +0100
Subject: [PATCH 114/188] fix: typo

---
 src/apps/renderer/localize/locales/en.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/apps/renderer/localize/locales/en.json b/src/apps/renderer/localize/locales/en.json
index b5487f79c..080cebafd 100644
--- a/src/apps/renderer/localize/locales/en.json
+++ b/src/apps/renderer/localize/locales/en.json
@@ -11,8 +11,8 @@
       "show": "Show"
     },
     "action": {
-      "login": "Login",
-      "is-logging-in": "Loggin in..."
+      "login": "Log in",
+      "is-logging-in": "Logging you in..."
     },
     "create-account": "Create account",
     "2fa": {

From b6663d86e7769375d7771882be41d4772b39ad3f Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 11 Jan 2024 10:29:41 +0100
Subject: [PATCH 115/188] chore: update deps in test

---
 src/apps/fuse/callbacks/ReadCallback.ts       |  2 +-
 .../offlineContentsContainerBuilder.ts        |  5 +-
 .../virtual-drive/files/builder.ts            |  9 +-
 .../virtual-drive/folders/builder.ts          |  1 +
 .../virtual-drive/tree/TreeContainer.ts       |  2 +-
 src/apps/fuse/index.ts                        |  2 +-
 .../{HidratationApi.ts => HydrationApi.ts}    |  0
 .../main/background-processes/sync-engine.ts  |  8 +-
 .../dependency-injection/contents/builder.ts  |  8 +-
 .../dependency-injection/files/builder.ts     |  8 +-
 .../dependency-injection/folders/builder.ts   | 12 ++-
 src/context/shared/domain/Notifier.ts         |  5 +
 .../application/ContentsDownloader.ts         |  4 +-
 .../MainProcessContentsActionNotifier.ts      |  6 +-
 .../files/application/FileCreator.ts          | 23 ++---
 .../files/application/FileDeleter.ts          | 42 ++-------
 .../application/FilesPlaceholderUpdater.ts    |  1 +
 .../files/domain/FileSyncNotifier.ts          | 11 +++
 .../MainProcessFileSyncNotifier.ts            | 92 +++++++++++++++++++
 .../infrastructure/NodeWinLocalFileSystem.ts  |  1 +
 .../folders/domain/FolderSyncNotifier.ts      | 10 +-
 .../MainProcessFolderSyncNotifier.ts          | 10 +-
 .../infrastructure/NodeWinLocalFileSystem.ts  |  1 +
 .../application/FileCreatorFromServerFile.ts  |  1 +
 .../contents/__mocks__/LocalFileWriterMock.ts | 21 ++++-
 .../application/ContentsDownloader._test.ts   |  8 +-
 .../files/__mocks__/FileDeleterFactory.ts     |  2 +-
 .../files/__mocks__/FileSyncNotifierMock.ts   | 29 ++++++
 .../files/application/FileCreator.test.ts     |  8 +-
 .../files/application/FileDeleter.test.ts     |  9 +-
 .../__mocks__/FolderSyncManagerMock.ts        | 25 +++++
 .../folders/application/FolderCreator.test.ts |  6 +-
 .../SynchronizeOfflineModifications.test.ts   |  7 +-
 33 files changed, 278 insertions(+), 101 deletions(-)
 rename src/apps/hydration-api/{HidratationApi.ts => HydrationApi.ts} (100%)
 create mode 100644 src/context/shared/domain/Notifier.ts
 create mode 100644 src/context/virtual-drive/files/domain/FileSyncNotifier.ts
 create mode 100644 src/context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier.ts
 create mode 100644 tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts
 create mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts

diff --git a/src/apps/fuse/callbacks/ReadCallback.ts b/src/apps/fuse/callbacks/ReadCallback.ts
index 9cafc0d6d..1f7c7cb0c 100644
--- a/src/apps/fuse/callbacks/ReadCallback.ts
+++ b/src/apps/fuse/callbacks/ReadCallback.ts
@@ -10,7 +10,7 @@ export class ReadCallback {
 
   async execute(
     path: string,
-    fd: any,
+    _fd: any,
     buf: Buffer,
     len: number,
     pos: number,
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts b/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
index 3d35aabb5..2d00a5949 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
@@ -5,7 +5,6 @@ import { OfflineContentsUploader } from '../../../../../context/offline-drive/co
 import { EnvironmentOfflineContentsManagersFactory } from '../../../../../context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
 import { NodeFSOfflineContentsRepository } from '../../../../../context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository';
 import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
-import { DependencyInjectionEventBus } from '../../common/eventBus';
 import { DependencyInjectionInxtEnvironment } from '../../common/inxt-environment';
 import { DependencyInjectionUserProvider } from '../../common/user';
 import { OfflineFilesContainer } from '../OfflineFiles/OfflineFilesContainer';
@@ -16,7 +15,6 @@ export async function buildOfflineContentsContainer(
 ): Promise<OfflineContentsDependencyContainer> {
   const environment = DependencyInjectionInxtEnvironment.get();
   const user = DependencyInjectionUserProvider.get();
-  const { bus: eventBus } = DependencyInjectionEventBus;
 
   const localFileContentsDirectoryProvider =
     new FuseAppDataLocalFileContentsDirectoryProvider();
@@ -42,8 +40,7 @@ export async function buildOfflineContentsContainer(
 
   const offlineContentsUploader = new OfflineContentsUploader(
     environmentOfflineContentsManagersFactory,
-    repository,
-    eventBus
+    repository
   );
 
   const offlineContentsCreator = new OfflineContentsCreator(repository);
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
index 6f5b69780..f069c8d99 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
@@ -11,6 +11,7 @@ import { SameFileWasMoved } from '../../../../../context/virtual-drive/files/app
 import { File } from '../../../../../context/virtual-drive/files/domain/File';
 import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/files/infrastructure/FuseLocalFileSystem';
 import { InMemoryFileRepository } from '../../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
+import { MainProcessFileSyncNotifier } from '../../../../../context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier';
 import { SDKRemoteFileSystem } from '../../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
 import { DependencyInjectionEventBus } from '../../common/eventBus';
 import { DependencyInjectionEventRepository } from '../../common/eventRepository';
@@ -35,6 +36,8 @@ export async function buildFilesContainer(
 
   await repositoryPopulator.run(initialFiles);
 
+  const notifier = new MainProcessFileSyncNotifier();
+
   const filesByFolderPathNameLister = new FilesByFolderPathSearcher(
     repository,
     folderContainer.folderFinder
@@ -68,7 +71,8 @@ export async function buildFilesContainer(
     remoteFileSystem,
     localFileSystem,
     repository,
-    folderContainer.allParentFoldersStatusIsExists
+    folderContainer.allParentFoldersStatusIsExists,
+    notifier
   );
 
   const fileCreator = new FileCreator(
@@ -76,7 +80,8 @@ export async function buildFilesContainer(
     repository,
     folderContainer.folderFinder,
     fileDeleter,
-    eventBus
+    eventBus,
+    notifier
   );
 
   const createFileOnOfflineFileUploaded = new CreateFileOnOfflineFileUploaded(
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
index 04ddcdfe3..950614c87 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
@@ -29,6 +29,7 @@ export async function buildFoldersContainer(
   const notifier = new MainProcessFolderSyncNotifier();
 
   const remoteFileSystem = new HttpRemoteFileSystem(
+    // @ts-ignore
     clients.drive,
     clients.newDrive
   );
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/tree/TreeContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/tree/TreeContainer.ts
index 599d00b4e..6f4f3e7dc 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/tree/TreeContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/tree/TreeContainer.ts
@@ -1,4 +1,4 @@
-import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
+import { TreeBuilder } from '../../../../../context/virtual-drive/items/application/TreeBuilder';
 
 export interface TreeContainer {
   existingNodesTreeBuilder: TreeBuilder;
diff --git a/src/apps/fuse/index.ts b/src/apps/fuse/index.ts
index a10019686..df66a730c 100644
--- a/src/apps/fuse/index.ts
+++ b/src/apps/fuse/index.ts
@@ -5,8 +5,8 @@ import { getRootVirtualDrive } from '../main/virutal-root-folder/service';
 import eventBus from '../main/event-bus';
 import { FuseApp } from './FuseApp';
 import path from 'path';
-import { HydrationApi } from '../hydratation-api/HidratationApi';
 import { FuseDependencyContainerFactory } from './dependency-injection/FuseDependencyContainerFactory';
+import { HydrationApi } from '../hydration-api/HydrationApi';
 
 let fuseApp: FuseApp;
 
diff --git a/src/apps/hydration-api/HidratationApi.ts b/src/apps/hydration-api/HydrationApi.ts
similarity index 100%
rename from src/apps/hydration-api/HidratationApi.ts
rename to src/apps/hydration-api/HydrationApi.ts
diff --git a/src/apps/main/background-processes/sync-engine.ts b/src/apps/main/background-processes/sync-engine.ts
index e7944fa6e..894893fa4 100644
--- a/src/apps/main/background-processes/sync-engine.ts
+++ b/src/apps/main/background-processes/sync-engine.ts
@@ -167,6 +167,8 @@ export function updateSyncEngine() {
   }
 }
 
-// eventBus.on('USER_LOGGED_OUT', stopAndClearSyncEngineWatcher);
-// eventBus.on('USER_WAS_UNAUTHORIZED', stopAndClearSyncEngineWatcher);
-// eventBus.on('INITIAL_SYNC_READY', spawnSyncEngineWorker);
+if (process.platform === 'win32') {
+  eventBus.on('USER_LOGGED_OUT', stopAndClearSyncEngineWatcher);
+  eventBus.on('USER_WAS_UNAUTHORIZED', stopAndClearSyncEngineWatcher);
+  eventBus.on('INITIAL_SYNC_READY', spawnSyncEngineWorker);
+}
diff --git a/src/apps/sync-engine/dependency-injection/contents/builder.ts b/src/apps/sync-engine/dependency-injection/contents/builder.ts
index a259910d7..4b4e86074 100644
--- a/src/apps/sync-engine/dependency-injection/contents/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/contents/builder.ts
@@ -14,6 +14,7 @@ import { FSLocalFileProvider } from '../../../../context/virtual-drive/contents/
 import { FSLocalFileSystem } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileSystem';
 import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
 import { IPCLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/IPCLocalFileContentsDirectoryProvider';
+import { MainProcessContentsActionNotifier } from '../../../../context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier';
 
 export async function buildContentsContainer(
   sharedContainer: SharedContainer
@@ -30,6 +31,8 @@ export async function buildContentsContainer(
     encryptionKey: mnemonic,
   });
 
+  const notifier = new MainProcessContentsActionNotifier();
+
   const contentsManagerFactory =
     new EnvironmentRemoteFileContentsManagersFactory(environment, user.bucket);
 
@@ -37,8 +40,9 @@ export async function buildContentsContainer(
   const contentsUploader = new ContentsUploader(
     contentsManagerFactory,
     contentsProvider,
-    ipcRendererSyncEngine,
-    sharedContainer.relativePathToAbsoluteConverter
+    sharedContainer.relativePathToAbsoluteConverter,
+    eventBus,
+    notifier
   );
 
   const retryContentsUploader = new RetryContentsUploader(contentsUploader);
diff --git a/src/apps/sync-engine/dependency-injection/files/builder.ts b/src/apps/sync-engine/dependency-injection/files/builder.ts
index 94969cb85..c81a212b3 100644
--- a/src/apps/sync-engine/dependency-injection/files/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/files/builder.ts
@@ -1,5 +1,4 @@
 import crypt from '../../../../context/shared/infrastructure/crypt';
-import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
 import { DependencyInjectionEventBus } from '../common/eventBus';
 import { DependencyInjectionEventRepository } from '../common/eventRepository';
 import { DependencyInjectionUserProvider } from '../common/user';
@@ -23,6 +22,7 @@ import { InMemoryFileRepository } from '../../../../context/virtual-drive/files/
 import { SDKRemoteFileSystem } from '../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
 import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem';
 import { LocalFileIdProvider } from '../../../../context/virtual-drive/shared/application/LocalFileIdProvider';
+import { MainProcessFileSyncNotifier } from '../../../../context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier';
 
 export async function buildFilesContainer(
   folderContainer: FoldersContainer,
@@ -42,6 +42,7 @@ export async function buildFilesContainer(
     virtualDrive,
     sharedContainer.relativePathToAbsoluteConverter
   );
+  const notifier = new MainProcessFileSyncNotifier();
 
   const repository = new InMemoryFileRepository();
 
@@ -52,7 +53,7 @@ export async function buildFilesContainer(
     localFileSystem,
     repository,
     folderContainer.allParentFoldersStatusIsExists,
-    ipcRendererSyncEngine
+    notifier
   );
 
   const sameFileWasMoved = new SameFileWasMoved(
@@ -67,7 +68,6 @@ export async function buildFilesContainer(
     repository,
     fileFinderByContentsId,
     folderContainer.folderFinder,
-    ipcRendererSyncEngine,
     eventBus
   );
 
@@ -77,7 +77,7 @@ export async function buildFilesContainer(
     folderContainer.folderFinder,
     fileDeleter,
     eventBus,
-    ipcRendererSyncEngine
+    notifier
   );
 
   const filePlaceholderCreatorFromContentsId =
diff --git a/src/apps/sync-engine/dependency-injection/folders/builder.ts b/src/apps/sync-engine/dependency-injection/folders/builder.ts
index b40d16044..dab3e0171 100644
--- a/src/apps/sync-engine/dependency-injection/folders/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/folders/builder.ts
@@ -20,13 +20,13 @@ import { FolderPlaceholderUpdater } from '../../../../context/virtual-drive/fold
 import { HttpRemoteFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
 import { InMemoryFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
 import { InMemoryOfflineFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository';
-import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
 import { DependencyInjectionHttpClientsProvider } from '../common/clients';
 import { DependencyInjectionEventBus } from '../common/eventBus';
 import { DependencyInjectionEventRepository } from '../common/eventRepository';
 import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
 import { SharedContainer } from '../shared/SharedContainer';
 import { FoldersContainer } from './FoldersContainer';
+import { MainProcessFolderSyncNotifier } from '../../../../context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier';
 
 export async function buildFoldersContainer(
   shredContainer: SharedContainer
@@ -38,8 +38,11 @@ export async function buildFoldersContainer(
 
   const repository = new InMemoryFolderRepository();
 
+  const notifier = new MainProcessFolderSyncNotifier();
+
   const localFileSystem = new NodeWinLocalFileSystem(virtualDrive);
   const remoteFileSystem = new HttpRemoteFileSystem(
+    //  @ts-ignore
     clients.drive,
     clients.newDrive
   );
@@ -60,8 +63,8 @@ export async function buildFoldersContainer(
   const folderCreator = new FolderCreator(
     repository,
     remoteFileSystem,
-    ipcRendererSyncEngine,
-    eventBus
+    eventBus,
+    notifier
   );
 
   const folderMover = new FolderMover(
@@ -72,7 +75,8 @@ export async function buildFoldersContainer(
   const folderRenamer = new FolderRenamer(
     repository,
     remoteFileSystem,
-    ipcRendererSyncEngine
+    eventBus,
+    notifier
   );
 
   const folderByPartialSearcher = new FolderByPartialSearcher(repository);
diff --git a/src/context/shared/domain/Notifier.ts b/src/context/shared/domain/Notifier.ts
new file mode 100644
index 000000000..d1029ec6e
--- /dev/null
+++ b/src/context/shared/domain/Notifier.ts
@@ -0,0 +1,5 @@
+export abstract class Notifier {
+  protected nameWithExtension(name: string, type: string): string {
+    return `${name}.${type}`;
+  }
+}
diff --git a/src/context/virtual-drive/contents/application/ContentsDownloader.ts b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
index 91306a6e7..c3610f577 100644
--- a/src/context/virtual-drive/contents/application/ContentsDownloader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
@@ -16,7 +16,7 @@ export class ContentsDownloader {
   private readableDownloader: Readable | null;
   constructor(
     private readonly managerFactory: ContentsManagersFactory,
-    private readonly localWriter: LocalFileSystem,
+    private readonly localFileSystem: LocalFileSystem,
     private readonly ipc: SyncEngineIpc,
     private readonly localFileContentsDirectoryProvider: LocalFileContentsDirectoryProvider,
     private readonly eventBus: EventBus
@@ -102,7 +102,7 @@ export class ContentsDownloader {
       downloader.elapsedTime()
     );
 
-    const write = await this.localWriter.write(localContents);
+    const write = await this.localFileSystem.write(localContents);
 
     const events = localContents.pullDomainEvents();
     await this.eventBus.publish(events);
diff --git a/src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts b/src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts
index 5a73d99cf..cab9274c1 100644
--- a/src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts
+++ b/src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts
@@ -4,15 +4,13 @@ import {
 } from '../../../../apps/main/analytics/service';
 import { setTrayStatus } from '../../../../apps/main/tray/tray';
 import { broadcastToWindows } from '../../../../apps/main/windows';
+import { Notifier } from '../../../shared/domain/Notifier';
 import { ContentsActionNotifier } from '../domain/ContentsActionsNotifier';
 
 export class MainProcessContentsActionNotifier
+  extends Notifier
   implements ContentsActionNotifier
 {
-  private nameWithExtension(name: string, type: string): string {
-    return `${name}.${type}`;
-  }
-
   uploadStarted(name: string, extension: string, size: number): void {
     trackEvent('Upload Started', {
       file_name: name,
diff --git a/src/context/virtual-drive/files/application/FileCreator.ts b/src/context/virtual-drive/files/application/FileCreator.ts
index df90731e0..4ce1b65c7 100644
--- a/src/context/virtual-drive/files/application/FileCreator.ts
+++ b/src/context/virtual-drive/files/application/FileCreator.ts
@@ -8,6 +8,7 @@ import { PlatformPathConverter } from '../../shared/application/PlatformPathConv
 import { FileRepository } from '../domain/FileRepository';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 import { OfflineFile } from '../domain/OfflineFile';
+import { FileSyncNotifier } from '../domain/FileSyncNotifier';
 
 export class FileCreator {
   constructor(
@@ -15,7 +16,8 @@ export class FileCreator {
     private readonly repository: FileRepository,
     private readonly folderFinder: FolderFinder,
     private readonly fileDeleter: FileDeleter,
-    private readonly eventBus: EventBus
+    private readonly eventBus: EventBus,
+    private readonly notifier: FileSyncNotifier
   ) {}
 
   async run(path: string, contentsId: string, size: number): Promise<File> {
@@ -47,22 +49,17 @@ export class FileCreator {
       await this.repository.add(file);
 
       await this.eventBus.publish(offline.pullDomainEvents());
-      // this.ipc.send('FILE_CREATED', {
-      //   name: file.name,
-      //   extension: file.type,
-      //   nameWithExtension: file.nameWithExtension,
-      // });
+      await this.notifier.created(file.name, file.type);
 
       return file;
     } catch (error: unknown) {
-      const _message = error instanceof Error ? error.message : 'unknown error';
+      const message =
+        error instanceof Error ? error.message : '[File Creator] unknown error';
+
+      const filePath = new FilePath(path);
+
+      await this.notifier.error(filePath.name(), filePath.extension(), message);
 
-      // this.ipc.send('FILE_UPLOAD_ERROR', {
-      //   name: filePath.name(),
-      //   extension: filePath.extension(),
-      //   nameWithExtension: filePath.nameWithExtension(),
-      //   error: message,
-      // });
       throw error;
     }
   }
diff --git a/src/context/virtual-drive/files/application/FileDeleter.ts b/src/context/virtual-drive/files/application/FileDeleter.ts
index 16e83bc6b..f1003a90c 100644
--- a/src/context/virtual-drive/files/application/FileDeleter.ts
+++ b/src/context/virtual-drive/files/application/FileDeleter.ts
@@ -1,17 +1,19 @@
 import Logger from 'electron-log';
 import { AllParentFoldersStatusIsExists } from '../../folders/application/AllParentFoldersStatusIsExists';
-import { FileStatuses } from '../domain/FileStatus';
 import { File } from '../domain/File';
 import { FileRepository } from '../domain/FileRepository';
-import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { FileStatuses } from '../domain/FileStatus';
+import { FileSyncNotifier } from '../domain/FileSyncNotifier';
 import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 
 export class FileDeleter {
   constructor(
     private readonly remote: RemoteFileSystem,
     private readonly local: LocalFileSystem,
     private readonly repository: FileRepository,
-    private readonly allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists
+    private readonly allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists,
+    private readonly notifier: FileSyncNotifier
   ) {}
 
   async run(contentsId: File['contentsId']): Promise<void> {
@@ -36,49 +38,23 @@ export class FileDeleter {
       );
       return;
     }
-
-    // this.ipc.send('FILE_DELETING', {
-    //   name: file.name,
-    //   extension: file.type,
-    //   nameWithExtension: file.nameWithExtension,
-    //   size: file.size,
-    // });
+    await this.notifier.trashing(file.name, file.type, file.size);
 
     try {
       file.trash();
 
       await this.remote.trash(file.contentsId);
       await this.repository.delete(file.contentsId);
-
-      // this.ipc.send('FILE_DELETED', {
-      //   name: file.name,
-      //   extension: file.type,
-      //   nameWithExtension: file.nameWithExtension,
-      //   size: file.size,
-      // });
+      await this.notifier.trashed(file.name, file.type, file.size);
     } catch (error: unknown) {
       Logger.error(
         `Error deleting the file ${file.nameWithExtension}: `,
         error
       );
 
-      // const message = error instanceof Error ? error.message : 'Unknown error';
-
-      // this.ipc.send('FILE_DELETION_ERROR', {
-      //   name: file.name,
-      //   extension: file.type,
-      //   nameWithExtension: file.nameWithExtension,
-      //   error: message,
-      // });
-
-      // this.ipc.send('SYNC_INFO_UPDATE', {
-      //   kind: 'REMOTE',
-      //   name: file.nameWithExtension,
-      //   action: 'DELETE_ERROR',
-      //   errorName: 'BAD_RESPONSE',
-      //   process: 'SYNC',
-      // });
+      const message = error instanceof Error ? error.message : 'Unknown error';
 
+      this.notifier.errorWhileTrashing(file.name, file.type, message);
       this.local.createPlaceHolder(file);
 
       throw error;
diff --git a/src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts b/src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts
index 7e0623758..a59899534 100644
--- a/src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts
+++ b/src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts
@@ -46,6 +46,7 @@ export class FilesPlaceholderUpdater {
       if (remote.name !== local.name) {
         const event = new FileRenamedDomainEvent({
           aggregateId: remote.contentsId,
+          oldName: local.name,
         });
         this.eventHistory.store(event);
       }
diff --git a/src/context/virtual-drive/files/domain/FileSyncNotifier.ts b/src/context/virtual-drive/files/domain/FileSyncNotifier.ts
new file mode 100644
index 000000000..f59ecaed2
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/FileSyncNotifier.ts
@@ -0,0 +1,11 @@
+export interface FileSyncNotifier {
+  created(name: string, extension: string): Promise<void>;
+  error(name: string, extension: string, message: string): Promise<void>;
+  trashing(name: string, type: string, size: number): Promise<void>;
+  trashed(name: string, type: string, size: number): Promise<void>;
+  errorWhileTrashing(
+    name: string,
+    type: string,
+    message: string
+  ): Promise<void>;
+}
diff --git a/src/context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier.ts b/src/context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier.ts
new file mode 100644
index 000000000..92ba153c0
--- /dev/null
+++ b/src/context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier.ts
@@ -0,0 +1,92 @@
+import {
+  trackError,
+  trackEvent,
+} from '../../../../apps/main/analytics/service';
+import { addProcessIssue } from '../../../../apps/main/background-processes/process-issues';
+import { setTrayStatus } from '../../../../apps/main/tray/tray';
+import { broadcastToWindows } from '../../../../apps/main/windows';
+import { ProcessIssue } from '../../../../apps/shared/types';
+import { Notifier } from '../../../shared/domain/Notifier';
+import { FileSyncNotifier } from '../domain/FileSyncNotifier';
+
+export class MainProcessFileSyncNotifier
+  extends Notifier
+  implements FileSyncNotifier
+{
+  async created(name: string, extension: string): Promise<void> {
+    const nameWithExtension = this.nameWithExtension(name, extension);
+
+    broadcastToWindows('sync-info-update', {
+      action: 'UPLOADED',
+      name: nameWithExtension,
+    });
+  }
+
+  async error(name: string, extension: string, message: string): Promise<void> {
+    const nameWithExtension = this.nameWithExtension(name, extension);
+
+    setTrayStatus('ALERT');
+
+    trackError('Upload Error', new Error(message), {
+      itemType: 'File',
+      root: '',
+      from: name,
+      action: 'Upload',
+    });
+
+    broadcastToWindows('sync-info-update', {
+      action: 'UPLOAD_ERROR',
+      name: nameWithExtension,
+    });
+  }
+
+  async trashing(_name: string, _type: string, _size: number): Promise<void> {
+    setTrayStatus('SYNCING');
+  }
+
+  async trashed(name: string, type: string, size: number): Promise<void> {
+    const nameWithExtension = this.nameWithExtension(name, type);
+
+    trackEvent('Delete Completed', {
+      file_name: name,
+      file_extension: type,
+      file_size: size,
+    });
+
+    broadcastToWindows('sync-info-update', {
+      action: 'DELETED',
+      name: nameWithExtension,
+    });
+
+    setTrayStatus('IDLE');
+  }
+
+  async errorWhileTrashing(
+    name: string,
+    type: string,
+    message: string
+  ): Promise<void> {
+    const nameWithExtension = this.nameWithExtension(name, type);
+    broadcastToWindows('sync-info-update', {
+      action: 'DELETE_ERROR',
+      name: nameWithExtension,
+    });
+
+    trackError('Delete Error', new Error(message), {
+      itemType: 'File',
+      root: '',
+      from: name,
+      action: 'Delete',
+    });
+
+    const issue: ProcessIssue = {
+      kind: 'REMOTE',
+      name,
+      action: 'DELETE_ERROR',
+      errorName: 'UNKNOWN',
+      process: 'SYNC',
+    };
+
+    addProcessIssue(issue);
+  }
+}
diff --git a/src/context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem.ts b/src/context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem.ts
index 49e7e5cf1..e89303a83 100644
--- a/src/context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem.ts
+++ b/src/context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem.ts
@@ -1,3 +1,4 @@
+// @ts-ignore this package can only be installed on win32, so in other platforms will give an ts-error
 import { VirtualDrive } from 'virtual-drive/dist';
 import { FileStatuses } from '../../files/domain/FileStatus';
 import { File } from '../domain/File';
diff --git a/src/context/virtual-drive/folders/domain/FolderSyncNotifier.ts b/src/context/virtual-drive/folders/domain/FolderSyncNotifier.ts
index b47294082..80eeb4dfa 100644
--- a/src/context/virtual-drive/folders/domain/FolderSyncNotifier.ts
+++ b/src/context/virtual-drive/folders/domain/FolderSyncNotifier.ts
@@ -1,7 +1,7 @@
 export interface FolderSyncNotifier {
-  creating(name: string): void;
-  created(name: string): void;
-  rename(name: string, newName: string): void;
-  renamed(name: string, newName: string): void;
-  error(): void;
+  creating(name: string): Promise<void>;
+  created(name: string): Promise<void>;
+  rename(name: string, newName: string): Promise<void>;
+  renamed(name: string, newName: string): Promise<void>;
+  error(): Promise<void>;
 }
diff --git a/src/context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier.ts b/src/context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier.ts
index 97a4cea3f..656d85b51 100644
--- a/src/context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier.ts
+++ b/src/context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier.ts
@@ -2,19 +2,19 @@ import { setTrayStatus } from '../../../../apps/main/tray/tray';
 import { FolderSyncNotifier } from '../domain/FolderSyncNotifier';
 
 export class MainProcessFolderSyncNotifier implements FolderSyncNotifier {
-  rename(name: string, newName: string): void {
+  async rename(_name: string, _newName: string): Promise<void> {
     setTrayStatus('SYNCING');
   }
-  renamed(name: string, newName: string): void {
+  async renamed(_name: string, _newName: string): Promise<void> {
     setTrayStatus('IDLE');
   }
-  creating(name: string): void {
+  async creating(_name: string): Promise<void> {
     setTrayStatus('SYNCING');
   }
-  created(name: string): void {
+  async created(_name: string): Promise<void> {
     setTrayStatus('IDLE');
   }
-  error(): void {
+  async error(): Promise<void> {
     throw new Error('Method not implemented.');
   }
 }
diff --git a/src/context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem.ts b/src/context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem.ts
index 1c1a2d5b2..d3af2205e 100644
--- a/src/context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem.ts
+++ b/src/context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem.ts
@@ -1,3 +1,4 @@
+// @ts-ignore this package can only be installed on win32, so in other platforms will give an ts-error
 import { VirtualDrive } from 'virtual-drive/dist';
 import { Folder } from '../domain/Folder';
 import { FolderStatuses } from '../domain/FolderStatus';
diff --git a/src/context/virtual-drive/items/application/FileCreatorFromServerFile.ts b/src/context/virtual-drive/items/application/FileCreatorFromServerFile.ts
index 75dfcb3d2..b33cdcd3f 100644
--- a/src/context/virtual-drive/items/application/FileCreatorFromServerFile.ts
+++ b/src/context/virtual-drive/items/application/FileCreatorFromServerFile.ts
@@ -6,6 +6,7 @@ export function createFileFromServerFile(
   relativePath: string
 ): File {
   return File.from({
+    id: server.id,
     folderId: server.folderId,
     contentsId: server.fileId,
     modificationTime: server.modificationTime,
diff --git a/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts b/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
index 43485d2ac..3fb24d4a8 100644
--- a/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
+++ b/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
@@ -1,3 +1,4 @@
+import { ContentsId } from '../../../../../src/context/virtual-drive/contents/domain/ContentsId';
 import { LocalFileContents } from '../../../../../src/context/virtual-drive/contents/domain/LocalFileContents';
 import { LocalFileSystem } from '../../../../../src/context/virtual-drive/contents/domain/LocalFileSystem';
 
@@ -5,14 +6,26 @@ export class LocalFileSystemMock implements LocalFileSystem {
   public writeMock = jest.fn();
   public removeMock = jest.fn();
   public existsMock = jest.fn();
+  public addMock = jest.fn();
+  public listExistentFilesMock = jest.fn();
 
   write(contents: LocalFileContents): Promise<string> {
     return this.writeMock(contents);
   }
-  remove(path: string): Promise<void> {
-    return this.removeMock(path);
+
+  remove(contentsId: ContentsId): Promise<void> {
+    return this.removeMock(contentsId);
+  }
+
+  exists(contentId: ContentsId): Promise<boolean> {
+    return this.existsMock(contentId);
   }
-  exists(path: string): Promise<boolean> {
-    return this.existsMock(path);
+
+  add(contentsId: ContentsId, source: string): Promise<void> {
+    return this.addMock(contentsId, source);
+  }
+
+  listExistentFiles(): Promise<ContentsId[]> {
+    return this.listExistentFilesMock();
   }
 }
diff --git a/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts b/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
index e8e60a061..fbad10b7d 100644
--- a/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
+++ b/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
@@ -9,7 +9,7 @@ import { ReadableHelloWorld } from '../__mocks__/ReadableHelloWorld';
 import { RemoteFileContentsManagersFactoryMock } from '../__mocks__/RemoteFileContentsManagersFactoryMock';
 
 describe.skip('Contents Downloader', () => {
-  let localWriter: LocalFileSystemMock;
+  let localFileSystem: LocalFileSystemMock;
   let factory: RemoteFileContentsManagersFactoryMock;
   let localFileContentsDirectoryProviderMock: LocalFileContentsDirectoryProviderMock;
   let ipc: IpcRendererSyncEngineMock;
@@ -19,7 +19,7 @@ describe.skip('Contents Downloader', () => {
 
   beforeEach(() => {
     factory = new RemoteFileContentsManagersFactoryMock();
-    localWriter = new LocalFileSystemMock();
+    localFileSystem = new LocalFileSystemMock();
     localFileContentsDirectoryProviderMock =
       new LocalFileContentsDirectoryProviderMock();
     ipc = new IpcRendererSyncEngineMock();
@@ -27,7 +27,7 @@ describe.skip('Contents Downloader', () => {
 
     SUT = new ContentsDownloader(
       factory,
-      localWriter,
+      localFileSystem,
       ipc,
       localFileContentsDirectoryProviderMock,
       eventBus
@@ -64,7 +64,7 @@ describe.skip('Contents Downloader', () => {
       return { finished: true, progress: 100 };
     });
 
-    expect(localWriter.writeMock).toBeCalledWith(
+    expect(localFileSystem.writeMock).toBeCalledWith(
       expect.objectContaining({
         name: file.name,
         extension: file.type,
diff --git a/tests/context/virtual-drive/files/__mocks__/FileDeleterFactory.ts b/tests/context/virtual-drive/files/__mocks__/FileDeleterFactory.ts
index 3a5504d5c..66b3429eb 100644
--- a/tests/context/virtual-drive/files/__mocks__/FileDeleterFactory.ts
+++ b/tests/context/virtual-drive/files/__mocks__/FileDeleterFactory.ts
@@ -1,7 +1,7 @@
 import { FileDeleter } from '../../../../../src/context/virtual-drive/files/application/FileDeleter';
 
 export class FileDeleterFactory {
-  static deletionSucces(): FileDeleter {
+  static deletionSuccess(): FileDeleter {
     return {
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       run: (_id: string) => {
diff --git a/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts b/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts
new file mode 100644
index 000000000..cc71dcff4
--- /dev/null
+++ b/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts
@@ -0,0 +1,29 @@
+import { FileSyncNotifier } from '../../../../../src/context/virtual-drive/files/domain/FileSyncNotifier';
+
+export class FileSyncNotifierMock implements FileSyncNotifier {
+  public createdMock = jest.fn();
+  public errorMock = jest.fn();
+  public trashingMock = jest.fn();
+  public trashedMock = jest.fn();
+  public errorWhileTrashingMock = jest.fn();
+
+  created(name: string, extension: string): Promise<void> {
+    return this.createdMock(name, extension);
+  }
+  error(name: string, extension: string, message: string): Promise<void> {
+    return this.errorMock(name, extension, message);
+  }
+  trashing(name: string, type: string, size: number): Promise<void> {
+    return this.trashingMock(name, type, size);
+  }
+  trashed(name: string, type: string, size: number): Promise<void> {
+    return this.trashedMock(name, type, size);
+  }
+  errorWhileTrashing(
+    name: string,
+    type: string,
+    message: string
+  ): Promise<void> {
+    return this.errorWhileTrashing(name, type, message);
+  }
+}
diff --git a/tests/context/virtual-drive/files/application/FileCreator.test.ts b/tests/context/virtual-drive/files/application/FileCreator.test.ts
index b7297765e..7bcc8f19a 100644
--- a/tests/context/virtual-drive/files/application/FileCreator.test.ts
+++ b/tests/context/virtual-drive/files/application/FileCreator.test.ts
@@ -9,28 +9,32 @@ import { RemoteFileSystemMock } from '../__mocks__/RemoteFileSystemMock';
 import { FileMother } from '../domain/FileMother';
 import { FolderFinderFactory } from '../../folders/__mocks__/FolderFinderFactory';
 import { FileDeleterFactory } from '../__mocks__/FileDeleterFactory';
+import { FileSyncNotifierMock } from '../__mocks__/FileSyncNotifierMock';
 
 describe('File Creator', () => {
   let remoteFileSystemMock: RemoteFileSystemMock;
   let fileRepository: FileRepositoryMock;
   let fileDeleter: FileDeleter;
   let eventBus: EventBusMock;
+  let notifier: FileSyncNotifierMock;
 
   let SUT: FileCreator;
 
   beforeEach(() => {
     remoteFileSystemMock = new RemoteFileSystemMock();
     fileRepository = new FileRepositoryMock();
-    fileDeleter = FileDeleterFactory.deletionSucces();
+    fileDeleter = FileDeleterFactory.deletionSuccess();
     const folderFinder = FolderFinderFactory.existingFolder();
     eventBus = new EventBusMock();
+    notifier = new FileSyncNotifierMock();
 
     SUT = new FileCreator(
       remoteFileSystemMock,
       fileRepository,
       folderFinder,
       fileDeleter,
-      eventBus
+      eventBus,
+      notifier
     );
   });
 
diff --git a/tests/context/virtual-drive/files/application/FileDeleter.test.ts b/tests/context/virtual-drive/files/application/FileDeleter.test.ts
index 5081d6ffa..ffda7f1ec 100644
--- a/tests/context/virtual-drive/files/application/FileDeleter.test.ts
+++ b/tests/context/virtual-drive/files/application/FileDeleter.test.ts
@@ -2,18 +2,18 @@ import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
 import { FileMother } from '../domain/FileMother';
 import { RemoteFileSystemMock } from '../__mocks__/RemoteFileSystemMock';
 import { LocalFileSystemMock } from '../__mocks__/LocalFileSystemMock';
-import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
 import { FileDeleter } from '../../../../../src/context/virtual-drive/files/application/FileDeleter';
 import { FolderRepositoryMock } from '../../folders/__mocks__/FolderRepositoryMock';
 import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
 import { AllParentFoldersStatusIsExists } from '../../../../../src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
+import { FileSyncNotifierMock } from '../__mocks__/FileSyncNotifierMock';
 
 describe('File Deleter', () => {
   let repository: FileRepositoryMock;
   let allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
   let remoteFileSystemMock: RemoteFileSystemMock;
   let localFilesSystemMock: LocalFileSystemMock;
-  let ipc: IpcRendererSyncEngineMock;
+  let notifier: FileSyncNotifierMock;
 
   let SUT: FileDeleter;
 
@@ -25,13 +25,14 @@ describe('File Deleter', () => {
     );
     localFilesSystemMock = new LocalFileSystemMock();
     remoteFileSystemMock = new RemoteFileSystemMock();
-    ipc = new IpcRendererSyncEngineMock();
+    notifier = new FileSyncNotifierMock();
 
     SUT = new FileDeleter(
       remoteFileSystemMock,
       localFilesSystemMock,
       repository,
-      allParentFoldersStatusIsExists
+      allParentFoldersStatusIsExists,
+      notifier
     );
   });
 
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
new file mode 100644
index 000000000..5e4f7748e
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
@@ -0,0 +1,25 @@
+import { FolderSyncNotifier } from '../../../../../src/context/virtual-drive/folders/domain/FolderSyncNotifier';
+
+export class FolderSyncNotifierMock implements FolderSyncNotifier {
+  creatingMock = jest.fn();
+  createdMock = jest.fn();
+  renameMock = jest.fn();
+  renamedMock = jest.fn();
+  errorMock = jest.fn();
+
+  creating(name: string): Promise<void> {
+    return this.creatingMock(name);
+  }
+  created(name: string): Promise<void> {
+    return this.createdMock(name);
+  }
+  rename(name: string, newName: string): Promise<void> {
+    return this.renameMock(name, newName);
+  }
+  renamed(name: string, newName: string): Promise<void> {
+    return this.renamedMock(name, newName);
+  }
+  error(): Promise<void> {
+    return this.errorMock();
+  }
+}
diff --git a/tests/context/virtual-drive/folders/application/FolderCreator.test.ts b/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
index abcd5f126..20fd73ba8 100644
--- a/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
+++ b/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
@@ -1,9 +1,11 @@
 import { FolderCreator } from '../../../../../src/context/virtual-drive/folders/application/FolderCreator';
 import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { FolderSyncNotifier } from '../../../../../src/context/virtual-drive/folders/domain/FolderSyncNotifier';
 import { EventBusMock } from '../../shared/__mock__/EventBusMock';
 import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
 import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
 import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
+import { FolderSyncNotifierMock } from '../__mocks__/FolderSyncManagerMock';
 import { FolderMother } from '../domain/FolderMother';
 import { OfflineFolderMother } from '../domain/OfflineFolderMother';
 
@@ -14,15 +16,17 @@ describe('Folder Creator', () => {
   let remote: FolderRemoteFileSystemMock;
   let syncEngineIpc: IpcRendererSyncEngineMock;
   let eventBus: EventBusMock;
+  let notifier: FolderSyncNotifier;
 
   beforeEach(() => {
     repository = new FolderRepositoryMock();
     syncEngineIpc = new IpcRendererSyncEngineMock();
     remote = new FolderRemoteFileSystemMock();
+    notifier = new FolderSyncNotifierMock();
 
     eventBus = new EventBusMock();
 
-    SUT = new FolderCreator(repository, remote, eventBus);
+    SUT = new FolderCreator(repository, remote, eventBus, notifier);
   });
 
   it('creates on a folder from a offline folder', async () => {
diff --git a/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts b/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
index bc34ee291..1b89cce02 100644
--- a/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
+++ b/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
@@ -8,6 +8,7 @@ import { EventBusMock } from '../../shared/__mock__/EventBusMock';
 import { EventRepositoryMock } from '../../shared/__mock__/EventRepositoryMock';
 import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
 import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
+import { FolderSyncNotifierMock } from '../__mocks__/FolderSyncManagerMock';
 import { FolderMother } from '../domain/FolderMother';
 import { OfflineFolderMother } from '../domain/OfflineFolderMother';
 
@@ -17,6 +18,7 @@ describe('Synchronize Offline Modifications', () => {
   let folderRemoteFileSystemMock: FolderRemoteFileSystemMock;
   let renamer: FolderRenamer;
   let eventRepositoryMock: EventRepositoryMock;
+  let notifier: FolderSyncNotifierMock;
 
   let SUT: SynchronizeOfflineModifications;
 
@@ -24,10 +26,13 @@ describe('Synchronize Offline Modifications', () => {
     offlineRepository = new InMemoryOfflineFolderRepository();
     folderRemoteFileSystemMock = new FolderRemoteFileSystemMock();
     repository = new FolderRepositoryMock();
+    notifier = new FolderSyncNotifierMock();
+
     renamer = new FolderRenamer(
       repository,
       folderRemoteFileSystemMock,
-      new EventBusMock()
+      new EventBusMock(),
+      notifier
     );
     eventRepositoryMock = new EventRepositoryMock();
 

From 2caf9bcfc740115e5a393ea2f647000db7322c5c Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 11 Jan 2024 12:00:03 +0100
Subject: [PATCH 116/188] fix: folder creator notify creating folder

---
 .../folders/application/FolderCreator.ts           |  2 +-
 .../folders/__mocks__/FolderSyncManagerMock.ts     | 10 +++++-----
 .../folders/application/FolderCreator.test.ts      | 14 +++-----------
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/context/virtual-drive/folders/application/FolderCreator.ts b/src/context/virtual-drive/folders/application/FolderCreator.ts
index 05459badd..a0a1f0992 100644
--- a/src/context/virtual-drive/folders/application/FolderCreator.ts
+++ b/src/context/virtual-drive/folders/application/FolderCreator.ts
@@ -14,7 +14,7 @@ export class FolderCreator {
   ) {}
 
   async run(offlineFolder: OfflineFolder): Promise<Folder> {
-    this.notifier.created(offlineFolder.name);
+    this.notifier.creating(offlineFolder.name);
 
     const attributes = await this.remote.persist(offlineFolder);
 
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
index 5e4f7748e..a86bd2e26 100644
--- a/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
@@ -1,11 +1,11 @@
 import { FolderSyncNotifier } from '../../../../../src/context/virtual-drive/folders/domain/FolderSyncNotifier';
 
 export class FolderSyncNotifierMock implements FolderSyncNotifier {
-  creatingMock = jest.fn();
-  createdMock = jest.fn();
-  renameMock = jest.fn();
-  renamedMock = jest.fn();
-  errorMock = jest.fn();
+  public creatingMock = jest.fn();
+  public createdMock = jest.fn();
+  public renameMock = jest.fn();
+  public renamedMock = jest.fn();
+  public errorMock = jest.fn();
 
   creating(name: string): Promise<void> {
     return this.creatingMock(name);
diff --git a/tests/context/virtual-drive/folders/application/FolderCreator.test.ts b/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
index 20fd73ba8..f3b6bf96a 100644
--- a/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
+++ b/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
@@ -1,8 +1,6 @@
 import { FolderCreator } from '../../../../../src/context/virtual-drive/folders/application/FolderCreator';
 import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
-import { FolderSyncNotifier } from '../../../../../src/context/virtual-drive/folders/domain/FolderSyncNotifier';
 import { EventBusMock } from '../../shared/__mock__/EventBusMock';
-import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
 import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
 import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
 import { FolderSyncNotifierMock } from '../__mocks__/FolderSyncManagerMock';
@@ -14,13 +12,11 @@ describe('Folder Creator', () => {
 
   let repository: FolderRepositoryMock;
   let remote: FolderRemoteFileSystemMock;
-  let syncEngineIpc: IpcRendererSyncEngineMock;
   let eventBus: EventBusMock;
-  let notifier: FolderSyncNotifier;
+  let notifier: FolderSyncNotifierMock;
 
   beforeEach(() => {
     repository = new FolderRepositoryMock();
-    syncEngineIpc = new IpcRendererSyncEngineMock();
     remote = new FolderRemoteFileSystemMock();
     notifier = new FolderSyncNotifierMock();
 
@@ -58,9 +54,7 @@ describe('Folder Creator', () => {
 
       await SUT.run(offlineFolder);
 
-      expect(syncEngineIpc.sendMock).toBeCalledWith('FOLDER_CREATING', {
-        name: offlineFolder.name,
-      });
+      expect(notifier.creatingMock).toBeCalledWith(offlineFolder.name);
     });
 
     it('sends the message FOLDER_CREATED', async () => {
@@ -78,9 +72,7 @@ describe('Folder Creator', () => {
 
       await SUT.run(offlineFolder);
 
-      expect(syncEngineIpc.sendMock).toBeCalledWith('FOLDER_CREATED', {
-        name: offlineFolder.name,
-      });
+      expect(notifier.createdMock).toBeCalledWith(offlineFolder.name);
     });
   });
 });

From 97214b8f450d32138b574cd78df56e283a31ca16 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 11 Jan 2024 12:07:32 +0100
Subject: [PATCH 117/188] fix: create file test

---
 .../files/application/FileCreator.test.ts              | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/context/virtual-drive/files/application/FileCreator.test.ts b/tests/context/virtual-drive/files/application/FileCreator.test.ts
index 7bcc8f19a..3076ef382 100644
--- a/tests/context/virtual-drive/files/application/FileCreator.test.ts
+++ b/tests/context/virtual-drive/files/application/FileCreator.test.ts
@@ -1,7 +1,6 @@
 import { FileCreator } from '../../../../../src/context/virtual-drive/files/application/FileCreator';
 import { FileDeleter } from '../../../../../src/context/virtual-drive/files/application/FileDeleter';
 import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/FilePath';
-import { File } from '../../../../../src/context/virtual-drive/files/domain/File';
 import { FileContentsMother } from '../../contents/domain/FileContentsMother';
 import { EventBusMock } from '../../shared/__mock__/EventBusMock';
 import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
@@ -10,6 +9,7 @@ import { FileMother } from '../domain/FileMother';
 import { FolderFinderFactory } from '../../folders/__mocks__/FolderFinderFactory';
 import { FileDeleterFactory } from '../__mocks__/FileDeleterFactory';
 import { FileSyncNotifierMock } from '../__mocks__/FileSyncNotifierMock';
+import { ContentsId } from '../../../../../src/context/virtual-drive/contents/domain/ContentsId';
 
 describe('File Creator', () => {
   let remoteFileSystemMock: RemoteFileSystemMock;
@@ -56,7 +56,9 @@ describe('File Creator', () => {
     await SUT.run(path.value, contents.id, contents.size);
 
     expect(fileRepository.addMock).toBeCalledWith(
-      expect.objectContaining(File.from(fileAttributes))
+      expect.objectContaining({
+        _contentsId: new ContentsId(fileAttributes.contentsId),
+      })
     );
   });
 
@@ -117,7 +119,9 @@ describe('File Creator', () => {
       })
     );
     expect(fileRepository.addMock).toBeCalledWith(
-      expect.objectContaining(File.from(fileAttributes))
+      expect.objectContaining({
+        _contentsId: new ContentsId(fileAttributes.contentsId),
+      })
     );
   });
 });

From 96c45ab27902273e6c26998eb74f95d254d38b3a Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 11 Jan 2024 12:31:17 +0100
Subject: [PATCH 118/188] test: OfflineFileCreator

---
 .../files/application/OfflineFileCreator.ts   |  4 +-
 .../__mocks__/OfflineFileRepositoryMock.ts    | 23 ++++++++++++
 .../application/OfflineFileCreator.test.ts    | 37 +++++++++++++++++++
 3 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 tests/context/offline-drive/files/__mocks__/OfflineFileRepositoryMock.ts
 create mode 100644 tests/context/offline-drive/files/application/OfflineFileCreator.test.ts

diff --git a/src/context/offline-drive/files/application/OfflineFileCreator.ts b/src/context/offline-drive/files/application/OfflineFileCreator.ts
index 042e3f901..db23e49df 100644
--- a/src/context/offline-drive/files/application/OfflineFileCreator.ts
+++ b/src/context/offline-drive/files/application/OfflineFileCreator.ts
@@ -19,10 +19,10 @@ export class OfflineFileCreator {
 
     const file = OfflineFile.create(id, createdAt, filePath, size);
 
-    await this.eventBus.publish(file.pullDomainEvents());
-
     await this.repository.save(file);
 
+    await this.eventBus.publish(file.pullDomainEvents());
+
     return file;
   }
 }
diff --git a/tests/context/offline-drive/files/__mocks__/OfflineFileRepositoryMock.ts b/tests/context/offline-drive/files/__mocks__/OfflineFileRepositoryMock.ts
new file mode 100644
index 000000000..41e279dcf
--- /dev/null
+++ b/tests/context/offline-drive/files/__mocks__/OfflineFileRepositoryMock.ts
@@ -0,0 +1,23 @@
+import {
+  OfflineFile,
+  OfflineFileAttributes,
+} from '../../../../../src/context/offline-drive/files/domain/OfflineFile';
+import { OfflineFileRepository } from '../../../../../src/context/offline-drive/files/domain/OfflineFileRepository';
+
+export class OfflineFileRepositoryMock implements OfflineFileRepository {
+  public saveMock = jest.fn();
+  public searchByPartialMock = jest.fn();
+  public deleteMock = jest.fn();
+
+  save(file: OfflineFile): Promise<void> {
+    return this.saveMock(file);
+  }
+  searchByPartial(
+    partial: Partial<OfflineFileAttributes>
+  ): Promise<OfflineFile | undefined> {
+    return this.searchByPartialMock(partial);
+  }
+  delete(id: string): Promise<void> {
+    return this.deleteMock(id);
+  }
+}
diff --git a/tests/context/offline-drive/files/application/OfflineFileCreator.test.ts b/tests/context/offline-drive/files/application/OfflineFileCreator.test.ts
new file mode 100644
index 000000000..41421c38d
--- /dev/null
+++ b/tests/context/offline-drive/files/application/OfflineFileCreator.test.ts
@@ -0,0 +1,37 @@
+import { OfflineFileCreator } from '../../../../../src/context/offline-drive/files/application/OfflineFileCreator';
+import { FileSize } from '../../../../../src/context/virtual-drive/files/domain/FileSize';
+import { FilePathMother } from '../../../virtual-drive/files/domain/FilePathMother';
+import { EventBusMock } from '../../../virtual-drive/shared/__mock__/EventBusMock';
+import { OfflineFileRepositoryMock } from '../__mocks__/OfflineFileRepositoryMock';
+
+describe('Offline File Creator', () => {
+  let offlineFileRepository: OfflineFileRepositoryMock;
+  let eventBus: EventBusMock;
+
+  let SUT: OfflineFileCreator;
+
+  beforeEach(() => {
+    offlineFileRepository = new OfflineFileRepositoryMock();
+    eventBus = new EventBusMock();
+
+    SUT = new OfflineFileCreator(offlineFileRepository, eventBus);
+  });
+
+  it('creates an file with the given path and size 0', async () => {
+    const path = FilePathMother.random(5);
+
+    await SUT.run(path.value);
+
+    expect(offlineFileRepository.saveMock).toBeCalledWith(
+      expect.objectContaining({ _path: path, _size: new FileSize(0) })
+    );
+  });
+
+  it('publishes offline file created event', async () => {
+    const path = FilePathMother.random(7);
+
+    await SUT.run(path.value);
+
+    expect(eventBus.publishMock).toBeCalled();
+  });
+});

From a03af784090d9d9bdba27324b12de0fbbee5e105 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 11 Jan 2024 13:17:04 +0100
Subject: [PATCH 119/188] test: offline file deleter test

---
 .../offline-drive/files/domain/OfflineFile.ts |  9 +++++
 .../application/OfflineFileDeleter.test.ts    | 36 +++++++++++++++++++
 .../files/domain/OfflineFileMother.ts         | 27 ++++++++++++++
 .../files/domain/FileSizeMother.ts            |  9 +++++
 4 files changed, 81 insertions(+)
 create mode 100644 tests/context/offline-drive/files/application/OfflineFileDeleter.test.ts
 create mode 100644 tests/context/offline-drive/files/domain/OfflineFileMother.ts
 create mode 100644 tests/context/virtual-drive/files/domain/FileSizeMother.ts

diff --git a/src/context/offline-drive/files/domain/OfflineFile.ts b/src/context/offline-drive/files/domain/OfflineFile.ts
index 9427fed71..cb381c7f7 100644
--- a/src/context/offline-drive/files/domain/OfflineFile.ts
+++ b/src/context/offline-drive/files/domain/OfflineFile.ts
@@ -43,6 +43,15 @@ export class OfflineFile extends AggregateRoot {
     return file;
   }
 
+  static from(attributes: OfflineFileAttributes): OfflineFile {
+    return new OfflineFile(
+      attributes.id,
+      attributes.createdAt,
+      new FilePath(attributes.path),
+      new FileSize(attributes.size)
+    );
+  }
+
   increaseSizeBy(bytes: number): void {
     const newSize = this.size + bytes;
 
diff --git a/tests/context/offline-drive/files/application/OfflineFileDeleter.test.ts b/tests/context/offline-drive/files/application/OfflineFileDeleter.test.ts
new file mode 100644
index 000000000..c733f65bc
--- /dev/null
+++ b/tests/context/offline-drive/files/application/OfflineFileDeleter.test.ts
@@ -0,0 +1,36 @@
+import { OfflineFileDeleter } from '../../../../../src/context/offline-drive/files/application/OfflineFileDeleter';
+import { FilePathMother } from '../../../virtual-drive/files/domain/FilePathMother';
+import { OfflineFileRepositoryMock } from '../__mocks__/OfflineFileRepositoryMock';
+import { OfflineFileMother } from '../domain/OfflineFileMother';
+
+describe('Offline File Deleter', () => {
+  let repository: OfflineFileRepositoryMock;
+  let SUT: OfflineFileDeleter;
+
+  beforeEach(() => {
+    repository = new OfflineFileRepositoryMock();
+    SUT = new OfflineFileDeleter(repository);
+  });
+
+  it('deletes the file if funded', async () => {
+    const path = FilePathMother.random().value;
+    const offlineFile = OfflineFileMother.fromPartial({
+      path,
+    });
+
+    repository.searchByPartialMock.mockResolvedValueOnce(offlineFile);
+
+    await SUT.run(path);
+
+    expect(repository.deleteMock).toBeCalled();
+  });
+
+  it('does nothing if does not found the file', async () => {
+    const path = FilePathMother.random();
+
+    repository.searchByPartialMock.mockResolvedValueOnce(undefined);
+    await SUT.run(path.value);
+
+    expect(repository.deleteMock).not.toBeCalled();
+  });
+});
diff --git a/tests/context/offline-drive/files/domain/OfflineFileMother.ts b/tests/context/offline-drive/files/domain/OfflineFileMother.ts
new file mode 100644
index 000000000..ba2f88fcc
--- /dev/null
+++ b/tests/context/offline-drive/files/domain/OfflineFileMother.ts
@@ -0,0 +1,27 @@
+import {
+  OfflineFile,
+  OfflineFileAttributes,
+} from '../../../../../src/context/offline-drive/files/domain/OfflineFile';
+import * as uuid from 'uuid';
+import { FilePathMother } from '../../../virtual-drive/files/domain/FilePathMother';
+import { FileSizeMother } from '../../../virtual-drive/files/domain/FileSizeMother';
+
+export class OfflineFileMother {
+  static any(): OfflineFile {
+    return OfflineFile.from({
+      id: uuid.v4(),
+      createdAt: Date.now(),
+      path: FilePathMother.random().value,
+      size: FileSizeMother.random().value,
+    });
+  }
+
+  static fromPartial(partial: Partial<OfflineFileAttributes>): OfflineFile {
+    const complete = OfflineFileMother.any().attributes();
+
+    return OfflineFile.from({
+      ...complete,
+      ...partial,
+    });
+  }
+}
diff --git a/tests/context/virtual-drive/files/domain/FileSizeMother.ts b/tests/context/virtual-drive/files/domain/FileSizeMother.ts
new file mode 100644
index 000000000..61fcfd6d6
--- /dev/null
+++ b/tests/context/virtual-drive/files/domain/FileSizeMother.ts
@@ -0,0 +1,9 @@
+import Chance from 'chance';
+import { FileSize } from '../../../../../src/context/virtual-drive/files/domain/FileSize';
+const chance = new Chance();
+
+export class FileSizeMother {
+  static random() {
+    return new FileSize(chance.integer({ min: 0, max: FileSize.MAX_SIZE }));
+  }
+}

From 9cbfc6467e134b7026ee3f93310b7a0a5a17291e Mon Sep 17 00:00:00 2001
From: Joan Vicens <joanvicens@proton.me>
Date: Thu, 11 Jan 2024 14:12:22 +0000
Subject: [PATCH 120/188] [PB-1489] Fix: ignore nodes with same name (#438)

* fix: ignore duplicated nodes

* feat: comunicate the traverser error to user

* test: update traverser test

* chore: allow long error messages
---
 .../background-processes/process-issues.ts    | 10 ++
 src/apps/main/fordwardToWindows.ts            |  8 ++
 src/apps/renderer/localize/locales/en.json    |  8 +-
 src/apps/renderer/localize/locales/es.json    |  6 +-
 src/apps/renderer/localize/locales/fr.json    |  6 +-
 src/apps/renderer/messages/process-error.ts   |  2 +
 .../renderer/pages/ProcessIssues/List.tsx     |  2 +-
 src/apps/renderer/pages/Widget/Item.tsx       |  9 +-
 src/apps/shared/IPC/events/sync-engine.ts     |  4 +
 src/apps/shared/types.ts                      |  8 +-
 .../dependency-injection/common/traverser.ts  |  7 +-
 .../dependency-injection/items/builder.ts     |  2 +
 .../items/application/Traverser.ts            | 99 ++++++++++++-------
 .../virtual-drive/items/domain/FolderNode.ts  |  3 +-
 .../items/application/Traverser.test.ts       | 11 +++
 15 files changed, 132 insertions(+), 53 deletions(-)

diff --git a/src/apps/main/background-processes/process-issues.ts b/src/apps/main/background-processes/process-issues.ts
index f62c58376..fbbcd4570 100644
--- a/src/apps/main/background-processes/process-issues.ts
+++ b/src/apps/main/background-processes/process-issues.ts
@@ -72,6 +72,16 @@ ipcMain.on('SYNC_INFO_UPDATE', (_, payload: ProcessInfoUpdatePayload) => {
   }
 });
 
+ipcMain.on('SYNC_PROBLEM', (_, payload) => {
+  addProcessIssue({
+    action: 'GENERATE_TREE',
+    process: 'SYNC',
+    errorName: 'DUPLICATED_NODE',
+    kind: 'LOCAL',
+    name: payload.additionalData.name,
+  });
+});
+
 ipcMain.on('BACKUP_ISSUE', (_, issue: ProcessIssue) => {
   addProcessIssue(issue);
 });
diff --git a/src/apps/main/fordwardToWindows.ts b/src/apps/main/fordwardToWindows.ts
index b0cc9f986..a592cef9a 100644
--- a/src/apps/main/fordwardToWindows.ts
+++ b/src/apps/main/fordwardToWindows.ts
@@ -1,5 +1,6 @@
 import { broadcastToWindows } from './windows';
 import { ipcMainDrive } from './ipcs/mainDrive';
+import { ipcMainSyncEngine } from './ipcs/ipcMainSyncEngine';
 import { FileErrorInfo } from '../shared/IPC/events/drive';
 
 ipcMainDrive.on('FILE_DELETED', (_, payload) => {
@@ -130,3 +131,10 @@ ipcMainDrive.on('FILE_DELETION_ERROR', (_, payload: FileErrorInfo) => {
     name: nameWithExtension,
   });
 });
+
+ipcMainSyncEngine.on('SYNC_PROBLEM', (_, payload) => {
+  broadcastToWindows('sync-info-update', {
+    action: 'SYNC_PROBLEM',
+    name: payload.additionalData.name,
+  });
+});
diff --git a/src/apps/renderer/localize/locales/en.json b/src/apps/renderer/localize/locales/en.json
index 466044150..d5d0c02a4 100644
--- a/src/apps/renderer/localize/locales/en.json
+++ b/src/apps/renderer/localize/locales/en.json
@@ -321,7 +321,8 @@
       "no-permission": "Insufficient permissions",
       "file-does-not-exist": "File doesn't exist",
       "file-too-big": "Max upload size is 20GB. Please try smaller files.",
-      "file-non-extension": "Files without extensions are not supported."
+      "file-non-extension": "Files without extensions are not supported.",
+      "duplicated-node": "It appears that there are duplicate file or folder names in this directory. Please rename one of them to ensure synchronization"
     },
     "error-messages": {
       "no-internet": "Looks like you are not connected to the internet, we'll try again later",
@@ -334,9 +335,10 @@
       "unknown": "An unknown error ocurred while trying to sync your files",
       "empty-file": "We don't support files with a size of 0 bytes because of our processes of sharding and encryption",
       "bad-response": "We got a bad response from our servers while processing this file. Please, try starting the sync process again.",
-      "file-does-not-exist": "This file was present when we compared your local folder with your Internxt drive but dissapeared when we tried to access it. If you deleted this file, don't worry, this error should dissapear the next time the sync process starts.",
+      "file-does-not-exist": "This file was present when we compared your local folder with your Internxt drive but disappeared when we tried to access it. If you deleted this file, don't worry, this error should dissapear the next time the sync process starts.",
       "file-too-big": "Max upload size is 20GB. Please try smaller files.",
-      "file-non-extension": "Files without extensions are not supported. Not synchronized."
+      "file-non-extension": "Files without extensions are not supported. Not synchronized.",
+      "duplicated-node": "There are two elements (file or folder) with the same name on a folder. Rename one of them to sync them both"
     },
     "report-modal": {
       "actions": {
diff --git a/src/apps/renderer/localize/locales/es.json b/src/apps/renderer/localize/locales/es.json
index 99c0e4fde..e66dd663f 100644
--- a/src/apps/renderer/localize/locales/es.json
+++ b/src/apps/renderer/localize/locales/es.json
@@ -320,7 +320,8 @@
       "no-permission": "Permisos insuficientes",
       "file-does-not-exist": "El archivo no existe",
       "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños.",
-      "file-non-extension": "Archivos sin extensión no son soportados"
+      "file-non-extension": "Archivos sin extensión no son soportados",
+      "duplicated-node": "Hay un conflicto con el elemento"
     },
     "error-messages": {
       "no-internet": "No estás conectado a Internet, lo intentaremos más tarde",
@@ -335,7 +336,8 @@
       "bad-response": "Error de servidor al procesar este archivo. Por favor, intente iniciar de nuevo el proceso de sincronización",
       "file-does-not-exist": "Este archivo estaba presente cuando comparamos su carpeta local con su unidad Internxt, pero desapareció cuando intentamos acceder a él. Si has eliminado este archivo, no te preocupes, este error debería desaparecer la próxima vez que se inicie el proceso de sincronización",
       "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños.",
-      "file-non-extension": "Los archivos sin extensiones no son soportados. No sincronizado"
+      "file-non-extension": "Los archivos sin extensiones no son soportados. No sincronizado",
+      "duplicated-node": "Hay dos elementos (archivo o carpeta) con el mismo nombre en una carpeta. Cambia el nombre de uno de ellos para sincronizar ambos."
     },
     "report-modal": {
       "actions": {
diff --git a/src/apps/renderer/localize/locales/fr.json b/src/apps/renderer/localize/locales/fr.json
index d34615e7b..b57c8821c 100644
--- a/src/apps/renderer/localize/locales/fr.json
+++ b/src/apps/renderer/localize/locales/fr.json
@@ -314,7 +314,8 @@
       "no-internet-connection": "Pas de connexion internet",
       "no-permission": "Permissions insuffisantes",
       "file-does-not-exist": "Le fichier n'existe pas",
-      "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits."
+      "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits.",
+      "duplicated-node": "Il y a un conflit avec l'élément."
     },
     "error-messages": {
       "no-internet": "Il semble que vous ne soyez pas connecté à l'internet, nous réessayerons plus tard",
@@ -329,7 +330,8 @@
       "bad-response": "Nous avons reçu une mauvaise réponse de nos serveurs lors du traitement de ce fichier. Veuillez essayer de relancer le processus de synchronisation.",
       "file-does-not-exist": "Ce fichier était présent lorsque nous avons comparé votre dossier local avec votre disque interne, mais il a disparu lorsque nous avons essayé d'y accéder. Si vous avez supprimé ce fichier, ne vous inquiétez pas, cette erreur devrait disparaître au prochain démarrage du processus de synchronisation.",
       "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits.",
-      "file-non-extension": "Les archives sans extensions ne sont pas supportées. Non synchronisées"
+      "file-non-extension": "Les archives sans extensions ne sont pas supportées. Non synchronisées",
+      "duplicated-node": "Il y a deux éléments (fichier ou dossier) avec le même nom dans un dossier. Renommez l'un d'eux pour les synchroniser tous les deux."
     },
     "report-modal": {
       "actions": {
diff --git a/src/apps/renderer/messages/process-error.ts b/src/apps/renderer/messages/process-error.ts
index 34df86b4a..d381f4d8c 100644
--- a/src/apps/renderer/messages/process-error.ts
+++ b/src/apps/renderer/messages/process-error.ts
@@ -12,6 +12,7 @@ export const shortMessages: ProcessErrorMessages = {
   UNKNOWN: 'issues.short-error-messages.unknown',
   FILE_TOO_BIG: 'issues.short-error-messages.file-too-big',
   FILE_NON_EXTENSION: 'issues.short-error-messages.file-non-extension',
+  DUPLICATED_NODE: 'issues.short-error-messages.duplicated-node',
 };
 
 export const longMessages: ProcessErrorMessages = {
@@ -25,4 +26,5 @@ export const longMessages: ProcessErrorMessages = {
   UNKNOWN: 'issues.error-messages.unknown',
   FILE_TOO_BIG: 'issues.error-messages.file-too-big',
   FILE_NON_EXTENSION: 'issues.error-messages.file-non-extension',
+  DUPLICATED_NODE: 'issues.error-messages.duplicated-node',
 };
diff --git a/src/apps/renderer/pages/ProcessIssues/List.tsx b/src/apps/renderer/pages/ProcessIssues/List.tsx
index a6887aade..eee9a0e82 100644
--- a/src/apps/renderer/pages/ProcessIssues/List.tsx
+++ b/src/apps/renderer/pages/ProcessIssues/List.tsx
@@ -202,7 +202,7 @@ function Item({
 
         <div className="flex flex-col space-y-1">
           <h1
-            className="flex flex-1 flex-col truncate text-base font-medium leading-5 text-gray-100"
+            className="flex flex-1 flex-col text-base font-medium leading-5 text-gray-100"
             data-test="sync-issue-name"
           >
             {translate(shortMessages[errorName])}
diff --git a/src/apps/renderer/pages/Widget/Item.tsx b/src/apps/renderer/pages/Widget/Item.tsx
index 5bd6f9ab8..f1397d12a 100644
--- a/src/apps/renderer/pages/Widget/Item.tsx
+++ b/src/apps/renderer/pages/Widget/Item.tsx
@@ -68,7 +68,8 @@ export function Item({
                 action === 'DOWNLOAD_ERROR' ||
                 action === 'UPLOAD_ERROR' ||
                 action === 'RENAME_ERROR' ||
-                action === 'METADATA_READ_ERROR')
+                action === 'METADATA_READ_ERROR' ||
+                action === 'GENERATE_TREE')
                 ? 'text-red'
                 : undefined
             }`}
@@ -78,7 +79,8 @@ export function Item({
                 action === 'DOWNLOAD_ERROR' ||
                 action === 'UPLOAD_ERROR' ||
                 action === 'RENAME_ERROR' ||
-                action === 'METADATA_READ_ERROR')
+                action === 'METADATA_READ_ERROR' ||
+                action === 'GENERATE_TREE')
                 ? description
                 : undefined
             }
@@ -123,7 +125,8 @@ export function Item({
               action === 'DOWNLOAD_ERROR' ||
               action === 'UPLOAD_ERROR' ||
               action === 'RENAME_ERROR' ||
-              action === 'METADATA_READ_ERROR') && (
+              action === 'METADATA_READ_ERROR' ||
+              action === 'GENERATE_TREE') && (
               <WarningCircle size={24} className="text-red" weight="regular" />
             )}
         </div>
diff --git a/src/apps/shared/IPC/events/sync-engine.ts b/src/apps/shared/IPC/events/sync-engine.ts
index bf09401ed..2b9494796 100644
--- a/src/apps/shared/IPC/events/sync-engine.ts
+++ b/src/apps/shared/IPC/events/sync-engine.ts
@@ -128,6 +128,10 @@ export type SyncEngineInvocableFunctions = {
 // TODO: change how errors are reported to the ui
 export type ProcessInfoUpdate = {
   SYNC_INFO_UPDATE: (payload: ProcessInfoUpdatePayload) => void;
+  SYNC_PROBLEM: (payload: {
+    key: string;
+    additionalData: Record<string, any>;
+  }) => void;
 };
 
 export type FromProcess = FilesEvents &
diff --git a/src/apps/shared/types.ts b/src/apps/shared/types.ts
index 8c204661b..d77562c62 100644
--- a/src/apps/shared/types.ts
+++ b/src/apps/shared/types.ts
@@ -149,7 +149,10 @@ export type ProcessErrorName =
   | 'FILE_NON_EXTENSION'
 
   // Unknown error
-  | 'UNKNOWN';
+  | 'UNKNOWN'
+
+  // Duplicated node path
+  | 'DUPLICATED_NODE';
 
 export class ProcessError extends Error {
   details: ErrorDetails;
@@ -213,7 +216,8 @@ export type ProcessIssue = ProcessInfoBase & {
     | 'DOWNLOAD_ERROR'
     | 'RENAME_ERROR'
     | 'DELETE_ERROR'
-    | 'METADATA_READ_ERROR';
+    | 'METADATA_READ_ERROR'
+    | 'GENERATE_TREE';
 
   errorName: ProcessErrorName;
   process: 'SYNC' | 'BACKUPS';
diff --git a/src/apps/sync-engine/dependency-injection/common/traverser.ts b/src/apps/sync-engine/dependency-injection/common/traverser.ts
index b25de6491..be17a4e0c 100644
--- a/src/apps/sync-engine/dependency-injection/common/traverser.ts
+++ b/src/apps/sync-engine/dependency-injection/common/traverser.ts
@@ -1,6 +1,7 @@
 import crypt from '../../../../context/shared/infrastructure/crypt';
 import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
 import { DependencyInjectionUserProvider } from './user';
+import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
 
 export class DependencyInjectionTraverserProvider {
   private static traverser: Traverser;
@@ -12,7 +13,11 @@ export class DependencyInjectionTraverserProvider {
 
     const user = DependencyInjectionUserProvider.get();
 
-    const traverser = Traverser.existingItems(crypt, user.root_folder_id);
+    const traverser = Traverser.existingItems(
+      crypt,
+      ipcRendererSyncEngine,
+      user.root_folder_id
+    );
 
     DependencyInjectionTraverserProvider.traverser = traverser;
 
diff --git a/src/apps/sync-engine/dependency-injection/items/builder.ts b/src/apps/sync-engine/dependency-injection/items/builder.ts
index c6f66a759..20a7c7ffd 100644
--- a/src/apps/sync-engine/dependency-injection/items/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/items/builder.ts
@@ -19,10 +19,12 @@ export function buildItemsContainer(): ItemsContainer {
 
   const existingItemsTraverser = Traverser.existingItems(
     nameDecryptor,
+    ipcRendererSyncEngine,
     user.root_folder_id
   );
   const allStatusesTraverser = Traverser.allItems(
     nameDecryptor,
+    ipcRendererSyncEngine,
     user.root_folder_id
   );
   const treeBuilder = new TreeBuilder(
diff --git a/src/context/virtual-drive/items/application/Traverser.ts b/src/context/virtual-drive/items/application/Traverser.ts
index 53c964a71..f6a312553 100644
--- a/src/context/virtual-drive/items/application/Traverser.ts
+++ b/src/context/virtual-drive/items/application/Traverser.ts
@@ -1,14 +1,6 @@
+import * as Sentry from '@sentry/electron/renderer';
 import Logger from 'electron-log';
-import {
-  FolderStatus,
-  FolderStatuses,
-} from '../../folders/domain/FolderStatus';
-import { Folder } from '../../folders/domain/Folder';
-import { EitherTransformer } from '../../shared/application/EitherTransformer';
-import { createFileFromServerFile } from '../../files/application/FileCreatorFromServerFile';
-import { createFolderFromServerFolder } from '../../folders/application/FolderCreatorFromServerFolder';
-import { NameDecrypt } from '../domain/NameDecrypt';
-import { Tree } from '../domain/Tree';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 import {
   ServerFile,
   ServerFileStatus,
@@ -17,6 +9,16 @@ import {
   ServerFolder,
   ServerFolderStatus,
 } from '../../../shared/domain/ServerFolder';
+import { createFileFromServerFile } from '../../files/application/FileCreatorFromServerFile';
+import { createFolderFromServerFolder } from '../../folders/application/FolderCreatorFromServerFolder';
+import { Folder } from '../../folders/domain/Folder';
+import {
+  FolderStatus,
+  FolderStatuses,
+} from '../../folders/domain/FolderStatus';
+import { EitherTransformer } from '../../shared/application/EitherTransformer';
+import { NameDecrypt } from '../domain/NameDecrypt';
+import { Tree } from '../domain/Tree';
 
 type Items = {
   files: Array<ServerFile>;
@@ -26,22 +28,32 @@ type Items = {
 export class Traverser {
   constructor(
     private readonly decrypt: NameDecrypt,
+    private readonly ipc: SyncEngineIpc,
     private readonly baseFolderId: number,
     private readonly fileStatusesToFilter: Array<ServerFileStatus>,
     private readonly folderStatusesToFilter: Array<ServerFolderStatus>
   ) {}
 
-  static existingItems(decrypt: NameDecrypt, baseFolderId: number): Traverser {
+  static existingItems(
+    decrypt: NameDecrypt,
+    ipc: SyncEngineIpc,
+    baseFolderId: number
+  ): Traverser {
     return new Traverser(
       decrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS],
       [ServerFolderStatus.EXISTS]
     );
   }
 
-  static allItems(decrypt: NameDecrypt, baseFolderId: number): Traverser {
-    return new Traverser(decrypt, baseFolderId, [], []);
+  static allItems(
+    decrypt: NameDecrypt,
+    ipc: SyncEngineIpc,
+    baseFolderId: number
+  ): Traverser {
+    return new Traverser(decrypt, ipc, baseFolderId, [], []);
   }
 
   private createRootFolder(): Folder {
@@ -69,17 +81,17 @@ export class Traverser {
       return folder.parentId === currentFolder.id;
     });
 
-    filesInThisFolder.forEach((file) => {
-      if (!this.fileStatusesToFilter.includes(file.status)) {
+    filesInThisFolder.forEach((serverFile) => {
+      if (!this.fileStatusesToFilter.includes(serverFile.status)) {
         return;
       }
 
       const decryptedName = this.decrypt.decryptName(
-        file.name,
-        file.folderId.toString(),
-        file.encrypt_version
+        serverFile.name,
+        serverFile.folderId.toString(),
+        serverFile.encrypt_version
       );
-      const extensionToAdd = file.type ? `.${file.type}` : '';
+      const extensionToAdd = serverFile.type ? `.${serverFile.type}` : '';
 
       const relativeFilePath =
         `${currentFolder.path}/${decryptedName}${extensionToAdd}`.replaceAll(
@@ -87,17 +99,22 @@ export class Traverser {
           '/'
         );
 
-      EitherTransformer.handleWithEither(() =>
-        createFileFromServerFile(file, relativeFilePath)
-      ).fold(
-        (error) => {
-          Logger.warn(
-            `[Traverser] File with path ${relativeFilePath} could not be created: `,
-            error
-          );
+      EitherTransformer.handleWithEither(() => {
+        const file = createFileFromServerFile(serverFile, relativeFilePath);
+        tree.addFile(currentFolder, file);
+      }).fold(
+        (error): void => {
+          Logger.warn('[Traverser] Error adding file:', error);
+          Sentry.captureException(error);
+          this.ipc.send('SYNC_PROBLEM', {
+            key: 'node-duplicated',
+            additionalData: {
+              name: serverFile.plainName,
+            },
+          });
         },
-        (file) => {
-          tree.addFile(currentFolder, file);
+        () => {
+          //  no-op
         }
       );
     });
@@ -118,18 +135,24 @@ export class Traverser {
         return;
       }
 
-      EitherTransformer.handleWithEither(() =>
-        createFolderFromServerFolder(serverFolder, name)
-      ).fold(
+      EitherTransformer.handleWithEither(() => {
+        const folder = createFolderFromServerFolder(serverFolder, name);
+
+        tree.addFolder(currentFolder, folder);
+
+        return folder;
+      }).fold(
         (error) => {
-          Logger.warn(
-            `[Traverser] Folder with path ${name} could not be created: `,
-            error
-          );
+          Logger.warn(`[Traverser] Error adding folder:  ${error} `);
+          Sentry.captureException(error);
+          this.ipc.send('SYNC_PROBLEM', {
+            key: 'node-duplicated',
+            additionalData: {
+              name,
+            },
+          });
         },
         (folder) => {
-          tree.addFolder(currentFolder, folder);
-
           if (folder.hasStatus(FolderStatuses.EXISTS)) {
             // The folders and the files inside trashed or deleted folders
             // will have the status "EXISTS", to avoid filtering witch folders and files
diff --git a/src/context/virtual-drive/items/domain/FolderNode.ts b/src/context/virtual-drive/items/domain/FolderNode.ts
index f14c98718..3a2565cfd 100644
--- a/src/context/virtual-drive/items/domain/FolderNode.ts
+++ b/src/context/virtual-drive/items/domain/FolderNode.ts
@@ -1,6 +1,7 @@
 import { Folder } from '../../folders/domain/Folder';
 import { FileNode } from './FileNode';
 import { Node } from './Node';
+
 export class FolderNode {
   private constructor(
     public readonly folder: Folder,
@@ -17,7 +18,7 @@ export class FolderNode {
 
   addChild(node: Node): void {
     if (this.children.has(node.id)) {
-      throw new Error('Child already exists');
+      throw new Error(`Duplicated node detected: ${node.id}`);
     }
 
     this.children.set(node.id, node);
diff --git a/tests/context/virtual-drive/items/application/Traverser.test.ts b/tests/context/virtual-drive/items/application/Traverser.test.ts
index 62adf56d4..7c98bce10 100644
--- a/tests/context/virtual-drive/items/application/Traverser.test.ts
+++ b/tests/context/virtual-drive/items/application/Traverser.test.ts
@@ -8,10 +8,12 @@ import {
 } from '../../../../../src/context/shared/domain/ServerFolder';
 import { Traverser } from '../../../../../src/context/virtual-drive/items/application/Traverser';
 import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
+import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
 import { FakeNameDecrypt } from '../infrastructure/FakeNameDecrypt';
 
 describe('Traverser', () => {
   const nameDecrypt = new FakeNameDecrypt();
+  const ipc = new IpcRendererSyncEngineMock();
 
   it('first level files starts with /', () => {
     const baseFolderId = 6;
@@ -29,6 +31,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -64,6 +67,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -91,6 +95,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -124,6 +129,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -157,6 +163,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -197,6 +204,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -224,6 +232,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -259,6 +268,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -294,6 +304,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]

From 7c8ad25eea76018ff5add7f4e8dc677a2146ce01 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 11 Jan 2024 15:16:22 +0100
Subject: [PATCH 121/188] test: offline file size increaser

---
 .../contents/domain/OfflineContentsId.ts      |  2 +-
 .../offline-drive/files/domain/OfflineFile.ts | 13 +++----
 .../files/domain/OfflineFileId.ts             |  3 ++
 .../{virtual-drive => }/shared/domain/Uuid.ts |  4 +--
 .../OfflineFileSizeIncreaser.test.ts          | 35 +++++++++++++++++++
 .../files/domain/OfflineFileIdMother.ts       |  3 ++
 tests/context/shared/domain/UuidMother.ts     |  8 +++++
 7 files changed, 59 insertions(+), 9 deletions(-)
 create mode 100644 src/context/offline-drive/files/domain/OfflineFileId.ts
 rename src/context/{virtual-drive => }/shared/domain/Uuid.ts (72%)
 create mode 100644 tests/context/offline-drive/files/application/OfflineFileSizeIncreaser.test.ts
 create mode 100644 tests/context/offline-drive/files/domain/OfflineFileIdMother.ts
 create mode 100644 tests/context/shared/domain/UuidMother.ts

diff --git a/src/context/offline-drive/contents/domain/OfflineContentsId.ts b/src/context/offline-drive/contents/domain/OfflineContentsId.ts
index 29f5083b9..e794d1ae2 100644
--- a/src/context/offline-drive/contents/domain/OfflineContentsId.ts
+++ b/src/context/offline-drive/contents/domain/OfflineContentsId.ts
@@ -1,3 +1,3 @@
-import { Uuid } from '../../../virtual-drive/shared/domain/Uuid';
+import { Uuid } from '../../../shared/domain/Uuid';
 
 export class OfflineContentsId extends Uuid {}
diff --git a/src/context/offline-drive/files/domain/OfflineFile.ts b/src/context/offline-drive/files/domain/OfflineFile.ts
index cb381c7f7..47b61bcd0 100644
--- a/src/context/offline-drive/files/domain/OfflineFile.ts
+++ b/src/context/offline-drive/files/domain/OfflineFile.ts
@@ -1,6 +1,7 @@
 import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
 import { FilePath } from '../../../virtual-drive/files/domain/FilePath';
 import { FileSize } from '../../../virtual-drive/files/domain/FileSize';
+import { OfflineFileId } from './OfflineFileId';
 
 export type OfflineFileAttributes = {
   id: string;
@@ -11,7 +12,7 @@ export type OfflineFileAttributes = {
 
 export class OfflineFile extends AggregateRoot {
   private constructor(
-    private _id: string,
+    private _id: OfflineFileId,
     private _createdAt: number,
     private _path: FilePath,
     private _size: FileSize
@@ -19,10 +20,10 @@ export class OfflineFile extends AggregateRoot {
     super();
   }
 
-  public get id() {
-    return this._id;
+  public get id(): string {
+    return this._id.value;
   }
-  public get createdAt() {
+  public get createdAt(): number {
     return this._createdAt;
   }
   public get path() {
@@ -33,7 +34,7 @@ export class OfflineFile extends AggregateRoot {
   }
 
   static create(
-    id: string,
+    id: OfflineFileId,
     createdAt: number,
     path: FilePath,
     size: FileSize
@@ -45,7 +46,7 @@ export class OfflineFile extends AggregateRoot {
 
   static from(attributes: OfflineFileAttributes): OfflineFile {
     return new OfflineFile(
-      attributes.id,
+      new OfflineFileId(attributes.id),
       attributes.createdAt,
       new FilePath(attributes.path),
       new FileSize(attributes.size)
diff --git a/src/context/offline-drive/files/domain/OfflineFileId.ts b/src/context/offline-drive/files/domain/OfflineFileId.ts
new file mode 100644
index 000000000..4c33705b7
--- /dev/null
+++ b/src/context/offline-drive/files/domain/OfflineFileId.ts
@@ -0,0 +1,3 @@
+import { Uuid } from '../../../shared/domain/Uuid';
+
+export class OfflineFileId extends Uuid {}
diff --git a/src/context/virtual-drive/shared/domain/Uuid.ts b/src/context/shared/domain/Uuid.ts
similarity index 72%
rename from src/context/virtual-drive/shared/domain/Uuid.ts
rename to src/context/shared/domain/Uuid.ts
index 1a72dbaef..10734de10 100644
--- a/src/context/virtual-drive/shared/domain/Uuid.ts
+++ b/src/context/shared/domain/Uuid.ts
@@ -1,6 +1,6 @@
 import * as uuid from 'uuid';
-import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
-import { ValueObject } from '../../../shared/domain/ValueObject';
+import { InvalidArgumentError } from './InvalidArgumentError';
+import { ValueObject } from './ValueObject';
 
 export class Uuid extends ValueObject<string> {
   constructor(value: string) {
diff --git a/tests/context/offline-drive/files/application/OfflineFileSizeIncreaser.test.ts b/tests/context/offline-drive/files/application/OfflineFileSizeIncreaser.test.ts
new file mode 100644
index 000000000..577d69981
--- /dev/null
+++ b/tests/context/offline-drive/files/application/OfflineFileSizeIncreaser.test.ts
@@ -0,0 +1,35 @@
+import { OfflineFileSizeIncreaser } from '../../../../../src/context/offline-drive/files/application/OfflineFileSizeIncreaser';
+import { OfflineFile } from '../../../../../src/context/offline-drive/files/domain/OfflineFile';
+import { FileSize } from '../../../../../src/context/virtual-drive/files/domain/FileSize';
+import { OfflineFileRepositoryMock } from '../__mocks__/OfflineFileRepositoryMock';
+import { OfflineFileIdMother } from '../domain/OfflineFileIdMother';
+import { OfflineFileMother } from '../domain/OfflineFileMother';
+
+describe('Offline File Size Increaser', () => {
+  let SUT: OfflineFileSizeIncreaser;
+
+  let repository: OfflineFileRepositoryMock;
+
+  beforeEach(() => {
+    repository = new OfflineFileRepositoryMock();
+
+    SUT = new OfflineFileSizeIncreaser(repository);
+  });
+
+  it('increases the file size from a funded file', async () => {
+    const id = OfflineFileIdMother.random();
+    const file = OfflineFileMother.fromPartial({ id: id.value });
+
+    const amount = 100;
+
+    repository.searchByPartialMock.mockResolvedValueOnce(
+      OfflineFile.from(file.attributes())
+    );
+
+    await SUT.run(id.value, amount);
+
+    expect(repository.saveMock).toBeCalledWith(
+      expect.objectContaining({ _size: new FileSize(file.size + amount) })
+    );
+  });
+});
diff --git a/tests/context/offline-drive/files/domain/OfflineFileIdMother.ts b/tests/context/offline-drive/files/domain/OfflineFileIdMother.ts
new file mode 100644
index 000000000..ca5637d5e
--- /dev/null
+++ b/tests/context/offline-drive/files/domain/OfflineFileIdMother.ts
@@ -0,0 +1,3 @@
+import { UuidMother } from '../../../shared/domain/UuidMother';
+
+export class OfflineFileIdMother extends UuidMother {}
diff --git a/tests/context/shared/domain/UuidMother.ts b/tests/context/shared/domain/UuidMother.ts
new file mode 100644
index 000000000..47059006c
--- /dev/null
+++ b/tests/context/shared/domain/UuidMother.ts
@@ -0,0 +1,8 @@
+import { Uuid } from '../../../../src/context/shared/domain/Uuid';
+import * as uuid from 'uuid';
+
+export class UuidMother {
+  static random(): Uuid {
+    return new Uuid(uuid.v4());
+  }
+}

From 107167e0153e4728f6a9429fcba3c8f2eb0b7269 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 11 Jan 2024 15:23:09 +0100
Subject: [PATCH 122/188] chore: create offline file

---
 .../offline-drive/files/application/OfflineFileCreator.ts   | 3 +--
 src/context/offline-drive/files/domain/OfflineFile.ts       | 2 +-
 src/context/offline-drive/files/domain/OfflineFileId.ts     | 6 +++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/context/offline-drive/files/application/OfflineFileCreator.ts b/src/context/offline-drive/files/application/OfflineFileCreator.ts
index db23e49df..e767b79f6 100644
--- a/src/context/offline-drive/files/application/OfflineFileCreator.ts
+++ b/src/context/offline-drive/files/application/OfflineFileCreator.ts
@@ -12,12 +12,11 @@ export class OfflineFileCreator {
   ) {}
 
   async run(path: string): Promise<OfflineFile> {
-    const id = uuid.v4();
     const createdAt = Date.now();
     const filePath = new FilePath(path);
     const size = new FileSize(0);
 
-    const file = OfflineFile.create(id, createdAt, filePath, size);
+    const file = OfflineFile.create(createdAt, filePath, size);
 
     await this.repository.save(file);
 
diff --git a/src/context/offline-drive/files/domain/OfflineFile.ts b/src/context/offline-drive/files/domain/OfflineFile.ts
index 47b61bcd0..8812943b6 100644
--- a/src/context/offline-drive/files/domain/OfflineFile.ts
+++ b/src/context/offline-drive/files/domain/OfflineFile.ts
@@ -34,11 +34,11 @@ export class OfflineFile extends AggregateRoot {
   }
 
   static create(
-    id: OfflineFileId,
     createdAt: number,
     path: FilePath,
     size: FileSize
   ): OfflineFile {
+    const id = OfflineFileId.create();
     const file = new OfflineFile(id, createdAt, path, size);
 
     return file;
diff --git a/src/context/offline-drive/files/domain/OfflineFileId.ts b/src/context/offline-drive/files/domain/OfflineFileId.ts
index 4c33705b7..37d1123a7 100644
--- a/src/context/offline-drive/files/domain/OfflineFileId.ts
+++ b/src/context/offline-drive/files/domain/OfflineFileId.ts
@@ -1,3 +1,7 @@
 import { Uuid } from '../../../shared/domain/Uuid';
 
-export class OfflineFileId extends Uuid {}
+export class OfflineFileId extends Uuid {
+  static create(): OfflineFileId {
+    return new OfflineFileId(this.random().value);
+  }
+}

From e7954b8d9defe3afb606cdfe3b6b83f25faacc82 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 11 Jan 2024 15:33:19 +0100
Subject: [PATCH 123/188] feat: creat offline file value objects

---
 .../files/application/OfflineFileCreator.ts   |  1 -
 .../offline-drive/files/domain/OfflineFile.ts | 18 +++---
 .../files/domain/OfflineFilePath.ts           | 58 +++++++++++++++++++
 .../files/domain/OfflineFileSize.ts           |  3 +
 .../{virtual-drive => }/shared/domain/Path.ts |  4 +-
 .../virtual-drive/files/domain/FilePath.ts    |  2 +-
 .../folders/domain/FolderPath.ts              |  2 +-
 .../virtual-drive/shared/domain/Path.test.ts  |  2 +-
 8 files changed, 75 insertions(+), 15 deletions(-)
 create mode 100644 src/context/offline-drive/files/domain/OfflineFilePath.ts
 create mode 100644 src/context/offline-drive/files/domain/OfflineFileSize.ts
 rename src/context/{virtual-drive => }/shared/domain/Path.ts (90%)

diff --git a/src/context/offline-drive/files/application/OfflineFileCreator.ts b/src/context/offline-drive/files/application/OfflineFileCreator.ts
index e767b79f6..7f90c52a2 100644
--- a/src/context/offline-drive/files/application/OfflineFileCreator.ts
+++ b/src/context/offline-drive/files/application/OfflineFileCreator.ts
@@ -3,7 +3,6 @@ import { FileSize } from '../../../virtual-drive/files/domain/FileSize';
 import { EventBus } from '../../../virtual-drive/shared/domain/EventBus';
 import { OfflineFile } from '../domain/OfflineFile';
 import { OfflineFileRepository } from '../domain/OfflineFileRepository';
-import * as uuid from 'uuid';
 
 export class OfflineFileCreator {
   constructor(
diff --git a/src/context/offline-drive/files/domain/OfflineFile.ts b/src/context/offline-drive/files/domain/OfflineFile.ts
index 8812943b6..b766c0cc9 100644
--- a/src/context/offline-drive/files/domain/OfflineFile.ts
+++ b/src/context/offline-drive/files/domain/OfflineFile.ts
@@ -1,7 +1,7 @@
 import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
-import { FilePath } from '../../../virtual-drive/files/domain/FilePath';
-import { FileSize } from '../../../virtual-drive/files/domain/FileSize';
 import { OfflineFileId } from './OfflineFileId';
+import { OfflineFilePath } from './OfflineFilePath';
+import { OfflineFileSize } from './OfflineFileSize';
 
 export type OfflineFileAttributes = {
   id: string;
@@ -14,8 +14,8 @@ export class OfflineFile extends AggregateRoot {
   private constructor(
     private _id: OfflineFileId,
     private _createdAt: number,
-    private _path: FilePath,
-    private _size: FileSize
+    private _path: OfflineFilePath,
+    private _size: OfflineFileSize
   ) {
     super();
   }
@@ -35,8 +35,8 @@ export class OfflineFile extends AggregateRoot {
 
   static create(
     createdAt: number,
-    path: FilePath,
-    size: FileSize
+    path: OfflineFilePath,
+    size: OfflineFileSize
   ): OfflineFile {
     const id = OfflineFileId.create();
     const file = new OfflineFile(id, createdAt, path, size);
@@ -48,15 +48,15 @@ export class OfflineFile extends AggregateRoot {
     return new OfflineFile(
       new OfflineFileId(attributes.id),
       attributes.createdAt,
-      new FilePath(attributes.path),
-      new FileSize(attributes.size)
+      new OfflineFilePath(attributes.path),
+      new OfflineFileSize(attributes.size)
     );
   }
 
   increaseSizeBy(bytes: number): void {
     const newSize = this.size + bytes;
 
-    this._size = new FileSize(newSize);
+    this._size = new OfflineFileSize(newSize);
   }
 
   attributes(): OfflineFileAttributes {
diff --git a/src/context/offline-drive/files/domain/OfflineFilePath.ts b/src/context/offline-drive/files/domain/OfflineFilePath.ts
new file mode 100644
index 000000000..52ae96f54
--- /dev/null
+++ b/src/context/offline-drive/files/domain/OfflineFilePath.ts
@@ -0,0 +1,58 @@
+import path from 'path';
+import { Path } from '../../../shared/domain/Path';
+
+export class OfflineFilePath extends Path {
+  constructor(value: string) {
+    super(value);
+  }
+
+  static fromParts(parts: Array<string>) {
+    const full = path.posix.join(...parts);
+
+    return new OfflineFilePath(full);
+  }
+
+  extension(): string {
+    const base = path.posix.basename(this.value);
+    const { ext } = path.posix.parse(base);
+    return ext.slice(1);
+  }
+
+  hasExtension(): boolean {
+    const extension = this.extension();
+
+    return extension !== '';
+  }
+
+  name(): string {
+    const base = path.posix.basename(this.value);
+    const { name } = path.posix.parse(base);
+    return name;
+  }
+
+  nameWithExtension(): string {
+    const basename = path.posix.basename(this.value);
+    const { base } = path.posix.parse(basename);
+    return base;
+  }
+
+  hasSameDirname(other: OfflineFilePath): boolean {
+    return this.dirname() === other.dirname();
+  }
+
+  extensionMatch(extension: string): boolean {
+    return this.extension() === extension;
+  }
+
+  hasSameExtension(other: OfflineFilePath): boolean {
+    return this.extension() === other.extension();
+  }
+
+  changeFolder(folder: string): OfflineFilePath {
+    return OfflineFilePath.fromParts([folder, this.nameWithExtension()]);
+  }
+
+  updateName(name: string): OfflineFilePath {
+    return OfflineFilePath.fromParts([this.dirname(), name]);
+  }
+}
diff --git a/src/context/offline-drive/files/domain/OfflineFileSize.ts b/src/context/offline-drive/files/domain/OfflineFileSize.ts
new file mode 100644
index 000000000..ed064f230
--- /dev/null
+++ b/src/context/offline-drive/files/domain/OfflineFileSize.ts
@@ -0,0 +1,3 @@
+import { BucketEntry } from '../../../virtual-drive/shared/domain/BucketEntry';
+
+export class OfflineFileSize extends BucketEntry {}
diff --git a/src/context/virtual-drive/shared/domain/Path.ts b/src/context/shared/domain/Path.ts
similarity index 90%
rename from src/context/virtual-drive/shared/domain/Path.ts
rename to src/context/shared/domain/Path.ts
index d864f5b20..a0100e0eb 100644
--- a/src/context/virtual-drive/shared/domain/Path.ts
+++ b/src/context/shared/domain/Path.ts
@@ -1,6 +1,6 @@
 import path from 'path';
-import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
-import { ValueObject } from '../../../shared/domain/ValueObject';
+import { InvalidArgumentError } from './InvalidArgumentError';
+import { ValueObject } from './ValueObject';
 
 const isWindowsRootDirectory = /[a-zA-Z]:[\\/]/;
 const containsNullCharacter = /\0/g;
diff --git a/src/context/virtual-drive/files/domain/FilePath.ts b/src/context/virtual-drive/files/domain/FilePath.ts
index 82a36b423..6c82e82d9 100644
--- a/src/context/virtual-drive/files/domain/FilePath.ts
+++ b/src/context/virtual-drive/files/domain/FilePath.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import { Path } from '../../shared/domain/Path';
+import { Path } from '../../../shared/domain/Path';
 
 export class FilePath extends Path {
   constructor(value: string) {
diff --git a/src/context/virtual-drive/folders/domain/FolderPath.ts b/src/context/virtual-drive/folders/domain/FolderPath.ts
index d6dc7c0e4..fc26ac443 100644
--- a/src/context/virtual-drive/folders/domain/FolderPath.ts
+++ b/src/context/virtual-drive/folders/domain/FolderPath.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import { Path } from '../../shared/domain/Path';
+import { Path } from '../../../shared/domain/Path';
 
 export class FolderPath extends Path {
   constructor(value: string) {
diff --git a/tests/context/virtual-drive/shared/domain/Path.test.ts b/tests/context/virtual-drive/shared/domain/Path.test.ts
index 443624cf9..16efbb6c5 100644
--- a/tests/context/virtual-drive/shared/domain/Path.test.ts
+++ b/tests/context/virtual-drive/shared/domain/Path.test.ts
@@ -1,4 +1,4 @@
-import { Path } from '../../../../../src/context/virtual-drive/shared/domain/Path';
+import { Path } from '../../../../../src/context/shared/domain/Path';
 
 class PathTestClass extends Path {
   constructor(value: string) {

From a7ccae3e0e0188fd3c5575bec733b3005d4f7005 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 11 Jan 2024 15:38:08 +0100
Subject: [PATCH 124/188] fix: file name

---
 .../virtual-drive/contents/application/ContentsUploader.ts      | 2 +-
 .../{ContentsActionsNotifier.ts => ContentsActionNotifier.ts}   | 0
 .../infrastructure/MainProcessContentsActionNotifier.ts         | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/context/virtual-drive/contents/domain/{ContentsActionsNotifier.ts => ContentsActionNotifier.ts} (100%)

diff --git a/src/context/virtual-drive/contents/application/ContentsUploader.ts b/src/context/virtual-drive/contents/application/ContentsUploader.ts
index e253b66a5..dd8067bcb 100644
--- a/src/context/virtual-drive/contents/application/ContentsUploader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsUploader.ts
@@ -2,7 +2,7 @@ import { PlatformPathConverter } from '../../shared/application/PlatformPathConv
 import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
 import { EventBus } from '../../shared/domain/EventBus';
 import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
-import { ContentsActionNotifier } from '../domain/ContentsActionsNotifier';
+import { ContentsActionNotifier } from '../domain/ContentsActionNotifier';
 import { LocalFileContents } from '../domain/LocalFileContents';
 import { LocalContentsProvider } from '../domain/LocalFileProvider';
 import { RemoteFileContents } from '../domain/RemoteFileContents';
diff --git a/src/context/virtual-drive/contents/domain/ContentsActionsNotifier.ts b/src/context/virtual-drive/contents/domain/ContentsActionNotifier.ts
similarity index 100%
rename from src/context/virtual-drive/contents/domain/ContentsActionsNotifier.ts
rename to src/context/virtual-drive/contents/domain/ContentsActionNotifier.ts
diff --git a/src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts b/src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts
index cab9274c1..cd4fa3035 100644
--- a/src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts
+++ b/src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts
@@ -5,7 +5,7 @@ import {
 import { setTrayStatus } from '../../../../apps/main/tray/tray';
 import { broadcastToWindows } from '../../../../apps/main/windows';
 import { Notifier } from '../../../shared/domain/Notifier';
-import { ContentsActionNotifier } from '../domain/ContentsActionsNotifier';
+import { ContentsActionNotifier } from '../domain/ContentsActionNotifier';
 
 export class MainProcessContentsActionNotifier
   extends Notifier

From fd1df44fac6433c9a1bd5b288afd83857e6722c2 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 11 Jan 2024 15:54:11 +0100
Subject: [PATCH 125/188] feat: track offline file upload

---
 .../offlineContentsContainerBuilder.ts        |  6 ++-
 .../virtual-drive/contents/builder.ts         |  4 +-
 .../dependency-injection/contents/builder.ts  |  4 +-
 .../application/OfflineFileUploader.ts        |  8 +++-
 .../application/OfflineContentsUploader.ts    | 40 +++++++++++++++----
 .../contents/domain/OfflineContentsSize.ts    |  2 +-
 .../offline-drive/files/domain/OfflineFile.ts |  6 +++
 .../files/domain/OfflineFileSize.ts           |  2 +-
 .../shared/domain/BucketEntry.ts              |  2 +-
 .../domain/UploadProgressTracker.ts}          |  2 +-
 .../MainProcessUploadProgressTracker.ts}      | 17 ++++----
 .../contents/application/ContentsUploader.ts  |  4 +-
 .../contents/domain/ContentsSize.ts           |  2 +-
 .../virtual-drive/files/domain/FileSize.ts    |  2 +-
 14 files changed, 69 insertions(+), 32 deletions(-)
 rename src/context/{virtual-drive => }/shared/domain/BucketEntry.ts (86%)
 rename src/context/{virtual-drive/contents/domain/ContentsActionNotifier.ts => shared/domain/UploadProgressTracker.ts} (91%)
 rename src/context/{virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts => shared/infrastructure/MainProcessUploadProgressTracker.ts} (81%)

diff --git a/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts b/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
index 2d00a5949..248ee0d94 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
@@ -4,6 +4,7 @@ import { OfflineContentsPathCalculator } from '../../../../../context/offline-dr
 import { OfflineContentsUploader } from '../../../../../context/offline-drive/contents/application/OfflineContentsUploader';
 import { EnvironmentOfflineContentsManagersFactory } from '../../../../../context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
 import { NodeFSOfflineContentsRepository } from '../../../../../context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository';
+import { MainProcessUploadProgressTracker } from '../../../../../context/shared/infrastructure/MainProcessUploadProgressTracker';
 import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
 import { DependencyInjectionInxtEnvironment } from '../../common/inxt-environment';
 import { DependencyInjectionUserProvider } from '../../common/user';
@@ -25,6 +26,8 @@ export async function buildOfflineContentsContainer(
 
   await repository.init();
 
+  const tracker = new MainProcessUploadProgressTracker();
+
   const offlineContentsAppender = new OfflineContentsAppender(
     offlineFilesContainer.offlineFileFinder,
     offlineFilesContainer.offlineFileSizeIncreaser,
@@ -40,7 +43,8 @@ export async function buildOfflineContentsContainer(
 
   const offlineContentsUploader = new OfflineContentsUploader(
     environmentOfflineContentsManagersFactory,
-    repository
+    repository,
+    tracker
   );
 
   const offlineContentsCreator = new OfflineContentsCreator(repository);
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
index f05eebf1e..d18ee1ff5 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
@@ -15,7 +15,7 @@ import { ContentsContainer } from './ContentsContainer';
 import { MoveOfflineContentsOnContentsUploaded } from '../../../../../context/virtual-drive/contents/application/MoveOfflineContentsOnContentsUploaded';
 import { LocalContentsMover } from '../../../../../context/virtual-drive/contents/application/LocalContentsMover';
 import { AllLocalContentsDeleter } from '../../../../../context/virtual-drive/contents/application/AllLocalContentsDeleter';
-import { MainProcessContentsActionNotifier } from '../../../../../context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier';
+import { MainProcessUploadProgressTracker } from '../../../../../context/shared/infrastructure/MainProcessUploadProgressTracker';
 
 export async function buildContentsContainer(
   sharedContainer: SharedContainer
@@ -24,7 +24,7 @@ export async function buildContentsContainer(
   const mnemonic = DependencyInjectionMnemonicProvider.get();
   const { bus: eventBus } = DependencyInjectionEventBus;
 
-  const contentsActionNotifier = new MainProcessContentsActionNotifier();
+  const contentsActionNotifier = new MainProcessUploadProgressTracker();
 
   const environment = new Environment({
     bridgeUrl: process.env.BRIDGE_URL,
diff --git a/src/apps/sync-engine/dependency-injection/contents/builder.ts b/src/apps/sync-engine/dependency-injection/contents/builder.ts
index 4b4e86074..e6b66140a 100644
--- a/src/apps/sync-engine/dependency-injection/contents/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/contents/builder.ts
@@ -14,7 +14,7 @@ import { FSLocalFileProvider } from '../../../../context/virtual-drive/contents/
 import { FSLocalFileSystem } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileSystem';
 import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
 import { IPCLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/IPCLocalFileContentsDirectoryProvider';
-import { MainProcessContentsActionNotifier } from '../../../../context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier';
+import { MainProcessUploadProgressTracker } from '../../../../context/shared/infrastructure/MainProcessUploadProgressTracker';
 
 export async function buildContentsContainer(
   sharedContainer: SharedContainer
@@ -31,7 +31,7 @@ export async function buildContentsContainer(
     encryptionKey: mnemonic,
   });
 
-  const notifier = new MainProcessContentsActionNotifier();
+  const notifier = new MainProcessUploadProgressTracker();
 
   const contentsManagerFactory =
     new EnvironmentRemoteFileContentsManagersFactory(environment, user.bucket);
diff --git a/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts b/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
index 151ff2187..ed8d4526f 100644
--- a/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
+++ b/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
@@ -14,7 +14,13 @@ export class OfflineFileUploader {
   async run(file: OfflineFile): Promise<void> {
     const absolutePath = await this.offlineFilePathRetriever.run(file);
 
-    const contentsId = await this.contentsUploader.run(absolutePath);
+    const { name, extension } = file;
+
+    const contentsId = await this.contentsUploader.run(
+      name,
+      extension,
+      absolutePath
+    );
 
     const contentsUploadedEvent = new OfflineContentsUploadedDomainEvent({
       aggregateId: contentsId,
diff --git a/src/context/offline-drive/contents/application/OfflineContentsUploader.ts b/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
index 1ab16c824..750e030a0 100644
--- a/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
+++ b/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
@@ -1,3 +1,4 @@
+import { UploadProgressTracker } from '../../../shared/domain/UploadProgressTracker';
 import {
   OfflineContentUploader,
   OfflineContentsManagersFactory,
@@ -8,45 +9,68 @@ import Logger from 'electron-log';
 export class OfflineContentsUploader {
   constructor(
     private readonly contentsManagersFactory: OfflineContentsManagersFactory,
-    private readonly repository: OfflineContentsRepository
+    private readonly repository: OfflineContentsRepository,
+    private readonly progressTracker: UploadProgressTracker
   ) {}
 
-  private registerEvents(uploader: OfflineContentUploader) {
+  private registerEvents(
+    name: string,
+    extension: string,
+    size: number,
+    uploader: OfflineContentUploader
+  ) {
     uploader.on('start', () => {
+      this.progressTracker.uploadStarted(name, extension, size, {
+        elapsedTime: uploader.elapsedTime(),
+      });
       Logger.debug('FILE_UPLOADING', {
         processInfo: { elapsedTime: uploader.elapsedTime() },
       });
     });
 
     uploader.on('progress', (progress: number) => {
+      this.progressTracker.uploadProgress(name, extension, size, {
+        elapsedTime: uploader.elapsedTime(),
+        progress,
+      });
       Logger.debug('FILE_UPLOADING', {
         processInfo: { elapsedTime: uploader.elapsedTime(), progress },
       });
     });
 
     uploader.on('error', (error: Error) => {
+      this.progressTracker.uploadError(name, extension, error.message);
       Logger.debug('FILE_UPLOAD_ERROR', {
         error: error.message,
       });
     });
 
     uploader.on('finish', () => {
+      this.progressTracker.uploadCompleted(name, extension, size, {
+        elapsedTime: uploader.elapsedTime(),
+      });
       Logger.debug('FILE_UPLOADED', {
         processInfo: { elapsedTime: uploader.elapsedTime() },
       });
     });
   }
 
-  async run(absolutePath: string): Promise<string> {
-    const { contents, abortSignal, size } = await this.repository.provide(
-      absolutePath
-    );
+  async run(
+    name: string,
+    extension: string,
+    absolutePath: string
+  ): Promise<string> {
+    const {
+      contents: readable,
+      abortSignal,
+      size,
+    } = await this.repository.provide(absolutePath);
 
     const uploader = this.contentsManagersFactory.uploader(size, abortSignal);
 
-    this.registerEvents(uploader);
+    this.registerEvents(name, extension, size, uploader);
 
-    const contentsId = await uploader.upload(contents, size);
+    const contentsId = await uploader.upload(readable, size);
 
     Logger.debug('FILE UPLOADED WITH ID: ', contentsId);
 
diff --git a/src/context/offline-drive/contents/domain/OfflineContentsSize.ts b/src/context/offline-drive/contents/domain/OfflineContentsSize.ts
index aaca41f00..8cee39cef 100644
--- a/src/context/offline-drive/contents/domain/OfflineContentsSize.ts
+++ b/src/context/offline-drive/contents/domain/OfflineContentsSize.ts
@@ -1,3 +1,3 @@
-import { BucketEntry } from '../../../virtual-drive/shared/domain/BucketEntry';
+import { BucketEntry } from '../../../shared/domain/BucketEntry';
 
 export class OfflineContentsSize extends BucketEntry {}
diff --git a/src/context/offline-drive/files/domain/OfflineFile.ts b/src/context/offline-drive/files/domain/OfflineFile.ts
index b766c0cc9..64a832cfa 100644
--- a/src/context/offline-drive/files/domain/OfflineFile.ts
+++ b/src/context/offline-drive/files/domain/OfflineFile.ts
@@ -32,6 +32,12 @@ export class OfflineFile extends AggregateRoot {
   public get size() {
     return this._size.value;
   }
+  public get name() {
+    return this._path.name();
+  }
+  public get extension() {
+    return this._path.extension();
+  }
 
   static create(
     createdAt: number,
diff --git a/src/context/offline-drive/files/domain/OfflineFileSize.ts b/src/context/offline-drive/files/domain/OfflineFileSize.ts
index ed064f230..2e593669f 100644
--- a/src/context/offline-drive/files/domain/OfflineFileSize.ts
+++ b/src/context/offline-drive/files/domain/OfflineFileSize.ts
@@ -1,3 +1,3 @@
-import { BucketEntry } from '../../../virtual-drive/shared/domain/BucketEntry';
+import { BucketEntry } from '../../../shared/domain/BucketEntry';
 
 export class OfflineFileSize extends BucketEntry {}
diff --git a/src/context/virtual-drive/shared/domain/BucketEntry.ts b/src/context/shared/domain/BucketEntry.ts
similarity index 86%
rename from src/context/virtual-drive/shared/domain/BucketEntry.ts
rename to src/context/shared/domain/BucketEntry.ts
index 96f9e45fd..fba1e19dd 100644
--- a/src/context/virtual-drive/shared/domain/BucketEntry.ts
+++ b/src/context/shared/domain/BucketEntry.ts
@@ -1,4 +1,4 @@
-import { ValueObject } from '../../../shared/domain/ValueObject';
+import { ValueObject } from './ValueObject';
 
 export class BucketEntry extends ValueObject<number> {
   public static MAX_SIZE = 20 * 1024 * 1024 * 1024;
diff --git a/src/context/virtual-drive/contents/domain/ContentsActionNotifier.ts b/src/context/shared/domain/UploadProgressTracker.ts
similarity index 91%
rename from src/context/virtual-drive/contents/domain/ContentsActionNotifier.ts
rename to src/context/shared/domain/UploadProgressTracker.ts
index 280e2d302..48df4eacf 100644
--- a/src/context/virtual-drive/contents/domain/ContentsActionNotifier.ts
+++ b/src/context/shared/domain/UploadProgressTracker.ts
@@ -1,4 +1,4 @@
-export interface ContentsActionNotifier {
+export interface UploadProgressTracker {
   uploadStarted(
     name: string,
     extension: string,
diff --git a/src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts b/src/context/shared/infrastructure/MainProcessUploadProgressTracker.ts
similarity index 81%
rename from src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts
rename to src/context/shared/infrastructure/MainProcessUploadProgressTracker.ts
index cd4fa3035..ee15fa21e 100644
--- a/src/context/virtual-drive/contents/infrastructure/MainProcessContentsActionNotifier.ts
+++ b/src/context/shared/infrastructure/MainProcessUploadProgressTracker.ts
@@ -1,15 +1,12 @@
-import {
-  trackError,
-  trackEvent,
-} from '../../../../apps/main/analytics/service';
-import { setTrayStatus } from '../../../../apps/main/tray/tray';
-import { broadcastToWindows } from '../../../../apps/main/windows';
-import { Notifier } from '../../../shared/domain/Notifier';
-import { ContentsActionNotifier } from '../domain/ContentsActionNotifier';
+import { trackError, trackEvent } from '../../../apps/main/analytics/service';
+import { setTrayStatus } from '../../../apps/main/tray/tray';
+import { broadcastToWindows } from '../../../apps/main/windows';
+import { Notifier } from '../domain/Notifier';
+import { UploadProgressTracker } from '../domain/UploadProgressTracker';
 
-export class MainProcessContentsActionNotifier
+export class MainProcessUploadProgressTracker
   extends Notifier
-  implements ContentsActionNotifier
+  implements UploadProgressTracker
 {
   uploadStarted(name: string, extension: string, size: number): void {
     trackEvent('Upload Started', {
diff --git a/src/context/virtual-drive/contents/application/ContentsUploader.ts b/src/context/virtual-drive/contents/application/ContentsUploader.ts
index dd8067bcb..d4d6a0a2f 100644
--- a/src/context/virtual-drive/contents/application/ContentsUploader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsUploader.ts
@@ -2,7 +2,7 @@ import { PlatformPathConverter } from '../../shared/application/PlatformPathConv
 import { RelativePathToAbsoluteConverter } from '../../shared/application/RelativePathToAbsoluteConverter';
 import { EventBus } from '../../shared/domain/EventBus';
 import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
-import { ContentsActionNotifier } from '../domain/ContentsActionNotifier';
+import { UploadProgressTracker } from '../../../shared/domain/UploadProgressTracker';
 import { LocalFileContents } from '../domain/LocalFileContents';
 import { LocalContentsProvider } from '../domain/LocalFileProvider';
 import { RemoteFileContents } from '../domain/RemoteFileContents';
@@ -14,7 +14,7 @@ export class ContentsUploader {
     private readonly contentProvider: LocalContentsProvider,
     private readonly relativePathToAbsoluteConverter: RelativePathToAbsoluteConverter,
     private readonly eventBus: EventBus,
-    private readonly notifier: ContentsActionNotifier
+    private readonly notifier: UploadProgressTracker
   ) {}
 
   private registerEvents(
diff --git a/src/context/virtual-drive/contents/domain/ContentsSize.ts b/src/context/virtual-drive/contents/domain/ContentsSize.ts
index a1f263f13..e125107fa 100644
--- a/src/context/virtual-drive/contents/domain/ContentsSize.ts
+++ b/src/context/virtual-drive/contents/domain/ContentsSize.ts
@@ -1,3 +1,3 @@
-import { BucketEntry } from '../../shared/domain/BucketEntry';
+import { BucketEntry } from '../../../shared/domain/BucketEntry';
 
 export class ContentsSize extends BucketEntry {}
diff --git a/src/context/virtual-drive/files/domain/FileSize.ts b/src/context/virtual-drive/files/domain/FileSize.ts
index 411a4809f..26929cbdd 100644
--- a/src/context/virtual-drive/files/domain/FileSize.ts
+++ b/src/context/virtual-drive/files/domain/FileSize.ts
@@ -1,3 +1,3 @@
-import { BucketEntry } from '../../shared/domain/BucketEntry';
+import { BucketEntry } from '../../../shared/domain/BucketEntry';
 
 export class FileSize extends BucketEntry {}

From 058eb40b6a9bed457602f3f413e5f5fa24101959 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 11 Jan 2024 16:04:09 +0100
Subject: [PATCH 126/188] chore: store only offline file attributes

---
 .../infrastructure/InMemoryOfflineFileRepository.ts    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts b/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts
index c9360b418..990646496 100644
--- a/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts
+++ b/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts
@@ -2,10 +2,10 @@ import { OfflineFile, OfflineFileAttributes } from '../domain/OfflineFile';
 import { OfflineFileRepository } from '../domain/OfflineFileRepository';
 
 export class InMemoryOfflineFileRepository implements OfflineFileRepository {
-  private readonly files = new Map<string, OfflineFile>();
+  private readonly files = new Map<string, OfflineFileAttributes>();
 
   async save(file: OfflineFile): Promise<void> {
-    this.files.set(file.id, file);
+    this.files.set(file.id, file.attributes());
   }
 
   async searchByPartial(
@@ -23,7 +23,11 @@ export class InMemoryOfflineFileRepository implements OfflineFileRepository {
       );
     });
 
-    return file;
+    if (!file) {
+      return undefined;
+    }
+
+    return OfflineFile.from(file);
   }
 
   async delete(id: OfflineFileAttributes['id']): Promise<void> {

From 84624d57c3e44bb5f1b610b6aaed1dde43ba5c72 Mon Sep 17 00:00:00 2001
From: Joan Vicens <joanvicens@proton.me>
Date: Thu, 11 Jan 2024 14:12:22 +0000
Subject: [PATCH 127/188] [PB-1489] Fix: ignore nodes with same name

---
 .../background-processes/process-issues.ts    | 10 ++
 src/apps/main/fordwardToWindows.ts            |  8 ++
 src/apps/renderer/localize/locales/en.json    | 10 +-
 src/apps/renderer/localize/locales/es.json    |  8 +-
 src/apps/renderer/localize/locales/fr.json    |  7 +-
 src/apps/renderer/messages/process-error.ts   |  2 +
 .../renderer/pages/ProcessIssues/List.tsx     |  2 +-
 src/apps/renderer/pages/Widget/Item.tsx       |  9 +-
 src/apps/shared/IPC/events/sync-engine.ts     |  4 +
 src/apps/shared/types.ts                      |  8 +-
 .../dependency-injection/common/traverser.ts  |  7 +-
 .../dependency-injection/items/builder.ts     |  2 +
 .../items/application/Traverser.ts            | 99 ++++++++++++-------
 .../virtual-drive/items/domain/FolderNode.ts  |  9 +-
 .../items/application/Traverser.test.ts       | 11 +++
 15 files changed, 140 insertions(+), 56 deletions(-)

diff --git a/src/apps/main/background-processes/process-issues.ts b/src/apps/main/background-processes/process-issues.ts
index f62c58376..fbbcd4570 100644
--- a/src/apps/main/background-processes/process-issues.ts
+++ b/src/apps/main/background-processes/process-issues.ts
@@ -72,6 +72,16 @@ ipcMain.on('SYNC_INFO_UPDATE', (_, payload: ProcessInfoUpdatePayload) => {
   }
 });
 
+ipcMain.on('SYNC_PROBLEM', (_, payload) => {
+  addProcessIssue({
+    action: 'GENERATE_TREE',
+    process: 'SYNC',
+    errorName: 'DUPLICATED_NODE',
+    kind: 'LOCAL',
+    name: payload.additionalData.name,
+  });
+});
+
 ipcMain.on('BACKUP_ISSUE', (_, issue: ProcessIssue) => {
   addProcessIssue(issue);
 });
diff --git a/src/apps/main/fordwardToWindows.ts b/src/apps/main/fordwardToWindows.ts
index b0cc9f986..a592cef9a 100644
--- a/src/apps/main/fordwardToWindows.ts
+++ b/src/apps/main/fordwardToWindows.ts
@@ -1,5 +1,6 @@
 import { broadcastToWindows } from './windows';
 import { ipcMainDrive } from './ipcs/mainDrive';
+import { ipcMainSyncEngine } from './ipcs/ipcMainSyncEngine';
 import { FileErrorInfo } from '../shared/IPC/events/drive';
 
 ipcMainDrive.on('FILE_DELETED', (_, payload) => {
@@ -130,3 +131,10 @@ ipcMainDrive.on('FILE_DELETION_ERROR', (_, payload: FileErrorInfo) => {
     name: nameWithExtension,
   });
 });
+
+ipcMainSyncEngine.on('SYNC_PROBLEM', (_, payload) => {
+  broadcastToWindows('sync-info-update', {
+    action: 'SYNC_PROBLEM',
+    name: payload.additionalData.name,
+  });
+});
diff --git a/src/apps/renderer/localize/locales/en.json b/src/apps/renderer/localize/locales/en.json
index 080cebafd..41d7dfba0 100644
--- a/src/apps/renderer/localize/locales/en.json
+++ b/src/apps/renderer/localize/locales/en.json
@@ -320,7 +320,9 @@
       "no-internet-connection": "No internet connection",
       "no-permission": "Insufficient permissions",
       "file-does-not-exist": "File doesn't exist",
-      "file-too-big": "Max upload size is 20GB. Please try smaller files."
+      "file-too-big": "Max upload size is 20GB. Please try smaller files.",
+      "file-non-extension": "Files without extensions are not supported.",
+      "duplicated-node": "It appears that there are duplicate file or folder names in this directory. Please rename one of them to ensure synchronization"
     },
     "error-messages": {
       "no-internet": "Looks like you are not connected to the internet, we'll try again later",
@@ -333,8 +335,10 @@
       "unknown": "An unknown error ocurred while trying to sync your files",
       "empty-file": "We don't support files with a size of 0 bytes because of our processes of sharding and encryption",
       "bad-response": "We got a bad response from our servers while processing this file. Please, try starting the sync process again.",
-      "file-does-not-exist": "This file was present when we compared your local folder with your Internxt drive but dissapeared when we tried to access it. If you deleted this file, don't worry, this error should dissapear the next time the sync process starts.",
-      "file-too-big": "Max upload size is 20GB. Please try smaller files."
+      "file-does-not-exist": "This file was present when we compared your local folder with your Internxt drive but disappeared when we tried to access it. If you deleted this file, don't worry, this error should dissapear the next time the sync process starts.",
+      "file-too-big": "Max upload size is 20GB. Please try smaller files.",
+      "file-non-extension": "Files without extensions are not supported. Not synchronized.",
+      "duplicated-node": "There are two elements (file or folder) with the same name on a folder. Rename one of them to sync them both"
     },
     "report-modal": {
       "actions": {
diff --git a/src/apps/renderer/localize/locales/es.json b/src/apps/renderer/localize/locales/es.json
index 94376a65b..3341b9b99 100644
--- a/src/apps/renderer/localize/locales/es.json
+++ b/src/apps/renderer/localize/locales/es.json
@@ -319,7 +319,9 @@
       "no-internet-connection": "No hay conexión a Internet",
       "no-permission": "Permisos insuficientes",
       "file-does-not-exist": "El archivo no existe",
-      "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños."
+      "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños.",
+      "file-non-extension": "Archivos sin extensión no son soportados",
+      "duplicated-node": "Hay un conflicto con el elemento"
     },
     "error-messages": {
       "no-internet": "No estás conectado a Internet, lo intentaremos más tarde",
@@ -333,7 +335,9 @@
       "empty-file": "No admitimos archivos con un tamaño de 0 bytes debido a nuestros procesos de cifrado",
       "bad-response": "Error de servidor al procesar este archivo. Por favor, intente iniciar de nuevo el proceso de sincronización",
       "file-does-not-exist": "Este archivo estaba presente cuando comparamos su carpeta local con su unidad Internxt, pero desapareció cuando intentamos acceder a él. Si has eliminado este archivo, no te preocupes, este error debería desaparecer la próxima vez que se inicie el proceso de sincronización",
-      "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños."
+      "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños.",
+      "file-non-extension": "Los archivos sin extensiones no son soportados. No sincronizado",
+      "duplicated-node": "Hay dos elementos (archivo o carpeta) con el mismo nombre en una carpeta. Cambia el nombre de uno de ellos para sincronizar ambos."
     },
     "report-modal": {
       "actions": {
diff --git a/src/apps/renderer/localize/locales/fr.json b/src/apps/renderer/localize/locales/fr.json
index 1a43bb3b1..3ab6b1de3 100644
--- a/src/apps/renderer/localize/locales/fr.json
+++ b/src/apps/renderer/localize/locales/fr.json
@@ -314,7 +314,8 @@
       "no-internet-connection": "Pas de connexion internet",
       "no-permission": "Permissions insuffisantes",
       "file-does-not-exist": "Le fichier n'existe pas",
-      "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits."
+      "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits.",
+      "duplicated-node": "Il y a un conflit avec l'élément."
     },
     "error-messages": {
       "no-internet": "Il semble que vous ne soyez pas connecté à l'internet, nous réessayerons plus tard",
@@ -328,7 +329,9 @@
       "empty-file": "Nous ne prenons pas en charge les fichiers d'une taille de 0 octet en raison de nos processus de  chiffrement",
       "bad-response": "Nous avons reçu une mauvaise réponse de nos serveurs lors du traitement de ce fichier. Veuillez essayer de relancer le processus de synchronisation.",
       "file-does-not-exist": "Ce fichier était présent lorsque nous avons comparé votre dossier local avec votre disque interne, mais il a disparu lorsque nous avons essayé d'y accéder. Si vous avez supprimé ce fichier, ne vous inquiétez pas, cette erreur devrait disparaître au prochain démarrage du processus de synchronisation.",
-      "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits."
+      "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits.",
+      "file-non-extension": "Les archives sans extensions ne sont pas supportées. Non synchronisées",
+      "duplicated-node": "Il y a deux éléments (fichier ou dossier) avec le même nom dans un dossier. Renommez l'un d'eux pour les synchroniser tous les deux."
     },
     "report-modal": {
       "actions": {
diff --git a/src/apps/renderer/messages/process-error.ts b/src/apps/renderer/messages/process-error.ts
index 90b76900b..6b97bda03 100644
--- a/src/apps/renderer/messages/process-error.ts
+++ b/src/apps/renderer/messages/process-error.ts
@@ -11,6 +11,7 @@ export const shortMessages: ProcessErrorMessages = {
   EMPTY_FILE: 'issues.short-error-messages.empty-file',
   UNKNOWN: 'issues.short-error-messages.unknown',
   FILE_TOO_BIG: 'issues.short-error-messages.file-too-big',
+  DUPLICATED_NODE: 'issues.short-error-messages.duplicated-node',
 };
 
 export const longMessages: ProcessErrorMessages = {
@@ -23,4 +24,5 @@ export const longMessages: ProcessErrorMessages = {
   EMPTY_FILE: 'issues.error-messages.empty-file',
   UNKNOWN: 'issues.error-messages.unknown',
   FILE_TOO_BIG: 'issues.error-messages.file-too-big',
+  DUPLICATED_NODE: 'issues.error-messages.duplicated-node',
 };
diff --git a/src/apps/renderer/pages/ProcessIssues/List.tsx b/src/apps/renderer/pages/ProcessIssues/List.tsx
index a6887aade..eee9a0e82 100644
--- a/src/apps/renderer/pages/ProcessIssues/List.tsx
+++ b/src/apps/renderer/pages/ProcessIssues/List.tsx
@@ -202,7 +202,7 @@ function Item({
 
         <div className="flex flex-col space-y-1">
           <h1
-            className="flex flex-1 flex-col truncate text-base font-medium leading-5 text-gray-100"
+            className="flex flex-1 flex-col text-base font-medium leading-5 text-gray-100"
             data-test="sync-issue-name"
           >
             {translate(shortMessages[errorName])}
diff --git a/src/apps/renderer/pages/Widget/Item.tsx b/src/apps/renderer/pages/Widget/Item.tsx
index 5bd6f9ab8..f1397d12a 100644
--- a/src/apps/renderer/pages/Widget/Item.tsx
+++ b/src/apps/renderer/pages/Widget/Item.tsx
@@ -68,7 +68,8 @@ export function Item({
                 action === 'DOWNLOAD_ERROR' ||
                 action === 'UPLOAD_ERROR' ||
                 action === 'RENAME_ERROR' ||
-                action === 'METADATA_READ_ERROR')
+                action === 'METADATA_READ_ERROR' ||
+                action === 'GENERATE_TREE')
                 ? 'text-red'
                 : undefined
             }`}
@@ -78,7 +79,8 @@ export function Item({
                 action === 'DOWNLOAD_ERROR' ||
                 action === 'UPLOAD_ERROR' ||
                 action === 'RENAME_ERROR' ||
-                action === 'METADATA_READ_ERROR')
+                action === 'METADATA_READ_ERROR' ||
+                action === 'GENERATE_TREE')
                 ? description
                 : undefined
             }
@@ -123,7 +125,8 @@ export function Item({
               action === 'DOWNLOAD_ERROR' ||
               action === 'UPLOAD_ERROR' ||
               action === 'RENAME_ERROR' ||
-              action === 'METADATA_READ_ERROR') && (
+              action === 'METADATA_READ_ERROR' ||
+              action === 'GENERATE_TREE') && (
               <WarningCircle size={24} className="text-red" weight="regular" />
             )}
         </div>
diff --git a/src/apps/shared/IPC/events/sync-engine.ts b/src/apps/shared/IPC/events/sync-engine.ts
index bf09401ed..2b9494796 100644
--- a/src/apps/shared/IPC/events/sync-engine.ts
+++ b/src/apps/shared/IPC/events/sync-engine.ts
@@ -128,6 +128,10 @@ export type SyncEngineInvocableFunctions = {
 // TODO: change how errors are reported to the ui
 export type ProcessInfoUpdate = {
   SYNC_INFO_UPDATE: (payload: ProcessInfoUpdatePayload) => void;
+  SYNC_PROBLEM: (payload: {
+    key: string;
+    additionalData: Record<string, any>;
+  }) => void;
 };
 
 export type FromProcess = FilesEvents &
diff --git a/src/apps/shared/types.ts b/src/apps/shared/types.ts
index 0b6409d00..c23f93c90 100644
--- a/src/apps/shared/types.ts
+++ b/src/apps/shared/types.ts
@@ -146,7 +146,10 @@ export type ProcessErrorName =
   | 'FILE_TOO_BIG'
 
   // Unknown error
-  | 'UNKNOWN';
+  | 'UNKNOWN'
+
+  // Duplicated node path
+  | 'DUPLICATED_NODE';
 
 export class ProcessError extends Error {
   details: ErrorDetails;
@@ -210,7 +213,8 @@ export type ProcessIssue = ProcessInfoBase & {
     | 'DOWNLOAD_ERROR'
     | 'RENAME_ERROR'
     | 'DELETE_ERROR'
-    | 'METADATA_READ_ERROR';
+    | 'METADATA_READ_ERROR'
+    | 'GENERATE_TREE';
 
   errorName: ProcessErrorName;
   process: 'SYNC' | 'BACKUPS';
diff --git a/src/apps/sync-engine/dependency-injection/common/traverser.ts b/src/apps/sync-engine/dependency-injection/common/traverser.ts
index b25de6491..be17a4e0c 100644
--- a/src/apps/sync-engine/dependency-injection/common/traverser.ts
+++ b/src/apps/sync-engine/dependency-injection/common/traverser.ts
@@ -1,6 +1,7 @@
 import crypt from '../../../../context/shared/infrastructure/crypt';
 import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
 import { DependencyInjectionUserProvider } from './user';
+import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
 
 export class DependencyInjectionTraverserProvider {
   private static traverser: Traverser;
@@ -12,7 +13,11 @@ export class DependencyInjectionTraverserProvider {
 
     const user = DependencyInjectionUserProvider.get();
 
-    const traverser = Traverser.existingItems(crypt, user.root_folder_id);
+    const traverser = Traverser.existingItems(
+      crypt,
+      ipcRendererSyncEngine,
+      user.root_folder_id
+    );
 
     DependencyInjectionTraverserProvider.traverser = traverser;
 
diff --git a/src/apps/sync-engine/dependency-injection/items/builder.ts b/src/apps/sync-engine/dependency-injection/items/builder.ts
index 430a77a4b..2c09bc7e7 100644
--- a/src/apps/sync-engine/dependency-injection/items/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/items/builder.ts
@@ -21,10 +21,12 @@ export function buildItemsContainer(): ItemsContainer {
 
   const existingItemsTraverser = Traverser.existingItems(
     nameDecryptor,
+    ipcRendererSyncEngine,
     user.root_folder_id
   );
   const allStatusesTraverser = Traverser.allItems(
     nameDecryptor,
+    ipcRendererSyncEngine,
     user.root_folder_id
   );
   const treeBuilder = new TreeBuilder(
diff --git a/src/context/virtual-drive/items/application/Traverser.ts b/src/context/virtual-drive/items/application/Traverser.ts
index 53c964a71..f6a312553 100644
--- a/src/context/virtual-drive/items/application/Traverser.ts
+++ b/src/context/virtual-drive/items/application/Traverser.ts
@@ -1,14 +1,6 @@
+import * as Sentry from '@sentry/electron/renderer';
 import Logger from 'electron-log';
-import {
-  FolderStatus,
-  FolderStatuses,
-} from '../../folders/domain/FolderStatus';
-import { Folder } from '../../folders/domain/Folder';
-import { EitherTransformer } from '../../shared/application/EitherTransformer';
-import { createFileFromServerFile } from '../../files/application/FileCreatorFromServerFile';
-import { createFolderFromServerFolder } from '../../folders/application/FolderCreatorFromServerFolder';
-import { NameDecrypt } from '../domain/NameDecrypt';
-import { Tree } from '../domain/Tree';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 import {
   ServerFile,
   ServerFileStatus,
@@ -17,6 +9,16 @@ import {
   ServerFolder,
   ServerFolderStatus,
 } from '../../../shared/domain/ServerFolder';
+import { createFileFromServerFile } from '../../files/application/FileCreatorFromServerFile';
+import { createFolderFromServerFolder } from '../../folders/application/FolderCreatorFromServerFolder';
+import { Folder } from '../../folders/domain/Folder';
+import {
+  FolderStatus,
+  FolderStatuses,
+} from '../../folders/domain/FolderStatus';
+import { EitherTransformer } from '../../shared/application/EitherTransformer';
+import { NameDecrypt } from '../domain/NameDecrypt';
+import { Tree } from '../domain/Tree';
 
 type Items = {
   files: Array<ServerFile>;
@@ -26,22 +28,32 @@ type Items = {
 export class Traverser {
   constructor(
     private readonly decrypt: NameDecrypt,
+    private readonly ipc: SyncEngineIpc,
     private readonly baseFolderId: number,
     private readonly fileStatusesToFilter: Array<ServerFileStatus>,
     private readonly folderStatusesToFilter: Array<ServerFolderStatus>
   ) {}
 
-  static existingItems(decrypt: NameDecrypt, baseFolderId: number): Traverser {
+  static existingItems(
+    decrypt: NameDecrypt,
+    ipc: SyncEngineIpc,
+    baseFolderId: number
+  ): Traverser {
     return new Traverser(
       decrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS],
       [ServerFolderStatus.EXISTS]
     );
   }
 
-  static allItems(decrypt: NameDecrypt, baseFolderId: number): Traverser {
-    return new Traverser(decrypt, baseFolderId, [], []);
+  static allItems(
+    decrypt: NameDecrypt,
+    ipc: SyncEngineIpc,
+    baseFolderId: number
+  ): Traverser {
+    return new Traverser(decrypt, ipc, baseFolderId, [], []);
   }
 
   private createRootFolder(): Folder {
@@ -69,17 +81,17 @@ export class Traverser {
       return folder.parentId === currentFolder.id;
     });
 
-    filesInThisFolder.forEach((file) => {
-      if (!this.fileStatusesToFilter.includes(file.status)) {
+    filesInThisFolder.forEach((serverFile) => {
+      if (!this.fileStatusesToFilter.includes(serverFile.status)) {
         return;
       }
 
       const decryptedName = this.decrypt.decryptName(
-        file.name,
-        file.folderId.toString(),
-        file.encrypt_version
+        serverFile.name,
+        serverFile.folderId.toString(),
+        serverFile.encrypt_version
       );
-      const extensionToAdd = file.type ? `.${file.type}` : '';
+      const extensionToAdd = serverFile.type ? `.${serverFile.type}` : '';
 
       const relativeFilePath =
         `${currentFolder.path}/${decryptedName}${extensionToAdd}`.replaceAll(
@@ -87,17 +99,22 @@ export class Traverser {
           '/'
         );
 
-      EitherTransformer.handleWithEither(() =>
-        createFileFromServerFile(file, relativeFilePath)
-      ).fold(
-        (error) => {
-          Logger.warn(
-            `[Traverser] File with path ${relativeFilePath} could not be created: `,
-            error
-          );
+      EitherTransformer.handleWithEither(() => {
+        const file = createFileFromServerFile(serverFile, relativeFilePath);
+        tree.addFile(currentFolder, file);
+      }).fold(
+        (error): void => {
+          Logger.warn('[Traverser] Error adding file:', error);
+          Sentry.captureException(error);
+          this.ipc.send('SYNC_PROBLEM', {
+            key: 'node-duplicated',
+            additionalData: {
+              name: serverFile.plainName,
+            },
+          });
         },
-        (file) => {
-          tree.addFile(currentFolder, file);
+        () => {
+          //  no-op
         }
       );
     });
@@ -118,18 +135,24 @@ export class Traverser {
         return;
       }
 
-      EitherTransformer.handleWithEither(() =>
-        createFolderFromServerFolder(serverFolder, name)
-      ).fold(
+      EitherTransformer.handleWithEither(() => {
+        const folder = createFolderFromServerFolder(serverFolder, name);
+
+        tree.addFolder(currentFolder, folder);
+
+        return folder;
+      }).fold(
         (error) => {
-          Logger.warn(
-            `[Traverser] Folder with path ${name} could not be created: `,
-            error
-          );
+          Logger.warn(`[Traverser] Error adding folder:  ${error} `);
+          Sentry.captureException(error);
+          this.ipc.send('SYNC_PROBLEM', {
+            key: 'node-duplicated',
+            additionalData: {
+              name,
+            },
+          });
         },
         (folder) => {
-          tree.addFolder(currentFolder, folder);
-
           if (folder.hasStatus(FolderStatuses.EXISTS)) {
             // The folders and the files inside trashed or deleted folders
             // will have the status "EXISTS", to avoid filtering witch folders and files
diff --git a/src/context/virtual-drive/items/domain/FolderNode.ts b/src/context/virtual-drive/items/domain/FolderNode.ts
index 0efeaf2c7..3a2565cfd 100644
--- a/src/context/virtual-drive/items/domain/FolderNode.ts
+++ b/src/context/virtual-drive/items/domain/FolderNode.ts
@@ -1,10 +1,11 @@
 import { Folder } from '../../folders/domain/Folder';
 import { FileNode } from './FileNode';
 import { Node } from './Node';
+
 export class FolderNode {
   private constructor(
     public readonly folder: Folder,
-    private childern: Map<string, Node>
+    private children: Map<string, Node>
   ) {}
 
   static from(folder: Folder): FolderNode {
@@ -16,11 +17,11 @@ export class FolderNode {
   }
 
   addChild(node: Node): void {
-    if (this.childern.has(node.id)) {
-      throw new Error('Child already exists');
+    if (this.children.has(node.id)) {
+      throw new Error(`Duplicated node detected: ${node.id}`);
     }
 
-    this.childern.set(node.id, node);
+    this.children.set(node.id, node);
   }
 
   public isFile(): this is FileNode {
diff --git a/tests/context/virtual-drive/items/application/Traverser.test.ts b/tests/context/virtual-drive/items/application/Traverser.test.ts
index 62adf56d4..7c98bce10 100644
--- a/tests/context/virtual-drive/items/application/Traverser.test.ts
+++ b/tests/context/virtual-drive/items/application/Traverser.test.ts
@@ -8,10 +8,12 @@ import {
 } from '../../../../../src/context/shared/domain/ServerFolder';
 import { Traverser } from '../../../../../src/context/virtual-drive/items/application/Traverser';
 import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
+import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
 import { FakeNameDecrypt } from '../infrastructure/FakeNameDecrypt';
 
 describe('Traverser', () => {
   const nameDecrypt = new FakeNameDecrypt();
+  const ipc = new IpcRendererSyncEngineMock();
 
   it('first level files starts with /', () => {
     const baseFolderId = 6;
@@ -29,6 +31,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -64,6 +67,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -91,6 +95,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -124,6 +129,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -157,6 +163,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -197,6 +204,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -224,6 +232,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -259,6 +268,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -294,6 +304,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
+      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]

From 3714d538a16563f1f34d63e652c1aa2560d9930a Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Fri, 12 Jan 2024 12:32:26 +0100
Subject: [PATCH 128/188] fix: traverser deps

---
 src/apps/fuse/callbacks/FuseCallback.ts       |  6 +++-
 src/apps/fuse/callbacks/ReaddirCallback.ts    |  2 +-
 .../dependency-injection/items/builder.ts     |  8 ++---
 .../items/application/Traverser.ts            | 29 ++-----------------
 4 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/src/apps/fuse/callbacks/FuseCallback.ts b/src/apps/fuse/callbacks/FuseCallback.ts
index 1d49d87f1..13c0a3b7a 100644
--- a/src/apps/fuse/callbacks/FuseCallback.ts
+++ b/src/apps/fuse/callbacks/FuseCallback.ts
@@ -10,9 +10,13 @@ export type CallbackWithData<T> = (code: number, params?: T) => void;
 export abstract class FuseCallback<T> {
   protected static readonly OK = 0;
 
-  constructor(private readonly name: string) {}
+  constructor(private readonly name: string, private readonly debug = false) {}
 
   protected right(value: T): Either<FuseError, T> {
+    if (this.debug) {
+      Logger.debug(`${this.name} Result: ${value}`);
+    }
+
     return right(value);
   }
 
diff --git a/src/apps/fuse/callbacks/ReaddirCallback.ts b/src/apps/fuse/callbacks/ReaddirCallback.ts
index e950a69eb..d6099d15a 100644
--- a/src/apps/fuse/callbacks/ReaddirCallback.ts
+++ b/src/apps/fuse/callbacks/ReaddirCallback.ts
@@ -4,7 +4,7 @@ import { NoSuchFileOrDirectoryError } from './FuseErrors';
 
 export class ReaddirCallback extends FuseCallback<Array<string>> {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
-    super('Read Directory');
+    super('Read Directory', true);
   }
 
   async execute(path: string) {
diff --git a/src/apps/sync-engine/dependency-injection/items/builder.ts b/src/apps/sync-engine/dependency-injection/items/builder.ts
index 2c09bc7e7..2c8652807 100644
--- a/src/apps/sync-engine/dependency-injection/items/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/items/builder.ts
@@ -17,16 +17,14 @@ export function buildItemsContainer(): ItemsContainer {
     ipcRendererSyncEngine
   );
 
-  const nameDecryptor = new CryptoJsNameDecrypt();
+  const nameDecrypt = new CryptoJsNameDecrypt();
 
   const existingItemsTraverser = Traverser.existingItems(
-    nameDecryptor,
-    ipcRendererSyncEngine,
+    nameDecrypt,
     user.root_folder_id
   );
   const allStatusesTraverser = Traverser.allItems(
-    nameDecryptor,
-    ipcRendererSyncEngine,
+    nameDecrypt,
     user.root_folder_id
   );
   const treeBuilder = new TreeBuilder(
diff --git a/src/context/virtual-drive/items/application/Traverser.ts b/src/context/virtual-drive/items/application/Traverser.ts
index f6a312553..681bf8a02 100644
--- a/src/context/virtual-drive/items/application/Traverser.ts
+++ b/src/context/virtual-drive/items/application/Traverser.ts
@@ -1,6 +1,5 @@
 import * as Sentry from '@sentry/electron/renderer';
 import Logger from 'electron-log';
-import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
 import {
   ServerFile,
   ServerFileStatus,
@@ -28,32 +27,22 @@ type Items = {
 export class Traverser {
   constructor(
     private readonly decrypt: NameDecrypt,
-    private readonly ipc: SyncEngineIpc,
     private readonly baseFolderId: number,
     private readonly fileStatusesToFilter: Array<ServerFileStatus>,
     private readonly folderStatusesToFilter: Array<ServerFolderStatus>
   ) {}
 
-  static existingItems(
-    decrypt: NameDecrypt,
-    ipc: SyncEngineIpc,
-    baseFolderId: number
-  ): Traverser {
+  static existingItems(decrypt: NameDecrypt, baseFolderId: number): Traverser {
     return new Traverser(
       decrypt,
-      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS],
       [ServerFolderStatus.EXISTS]
     );
   }
 
-  static allItems(
-    decrypt: NameDecrypt,
-    ipc: SyncEngineIpc,
-    baseFolderId: number
-  ): Traverser {
-    return new Traverser(decrypt, ipc, baseFolderId, [], []);
+  static allItems(decrypt: NameDecrypt, baseFolderId: number): Traverser {
+    return new Traverser(decrypt, baseFolderId, [], []);
   }
 
   private createRootFolder(): Folder {
@@ -106,12 +95,6 @@ export class Traverser {
         (error): void => {
           Logger.warn('[Traverser] Error adding file:', error);
           Sentry.captureException(error);
-          this.ipc.send('SYNC_PROBLEM', {
-            key: 'node-duplicated',
-            additionalData: {
-              name: serverFile.plainName,
-            },
-          });
         },
         () => {
           //  no-op
@@ -145,12 +128,6 @@ export class Traverser {
         (error) => {
           Logger.warn(`[Traverser] Error adding folder:  ${error} `);
           Sentry.captureException(error);
-          this.ipc.send('SYNC_PROBLEM', {
-            key: 'node-duplicated',
-            additionalData: {
-              name,
-            },
-          });
         },
         (folder) => {
           if (folder.hasStatus(FolderStatuses.EXISTS)) {

From 0d76ecab4209b3ad4abbd0d62f3021407b84f0e8 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Fri, 12 Jan 2024 15:12:49 +0100
Subject: [PATCH 129/188] chore: callback improvements

---
 src/apps/fuse/callbacks/FuseCallback.ts       |  2 +-
 .../fuse/callbacks/GetAttributesCallback.ts   | 14 ++++--
 src/apps/fuse/callbacks/ReadCallback.ts       | 49 +++++++++++--------
 3 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/apps/fuse/callbacks/FuseCallback.ts b/src/apps/fuse/callbacks/FuseCallback.ts
index 13c0a3b7a..e0e8e8d4f 100644
--- a/src/apps/fuse/callbacks/FuseCallback.ts
+++ b/src/apps/fuse/callbacks/FuseCallback.ts
@@ -14,7 +14,7 @@ export abstract class FuseCallback<T> {
 
   protected right(value: T): Either<FuseError, T> {
     if (this.debug) {
-      Logger.debug(`${this.name} Result: ${value}`);
+      Logger.debug(`${this.name} Result: ${JSON.stringify({ value })}`);
     }
 
     return right(value);
diff --git a/src/apps/fuse/callbacks/GetAttributesCallback.ts b/src/apps/fuse/callbacks/GetAttributesCallback.ts
index af930161a..5e7a26eb7 100644
--- a/src/apps/fuse/callbacks/GetAttributesCallback.ts
+++ b/src/apps/fuse/callbacks/GetAttributesCallback.ts
@@ -6,6 +6,9 @@ import { NoSuchFileOrDirectoryError } from './FuseErrors';
 type GetAttributesCallbackData = { mode: number; size: number };
 
 export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackData> {
+  private static readonly FILE = 33188;
+  private static readonly FOLDER = 16877;
+
   constructor(
     private readonly virtualDriveContainer: VirtualDriveDependencyContainer,
     private readonly offlineDriveContainer: OfflineDriveDependencyContainer
@@ -15,13 +18,13 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
 
   async execute(path: string) {
     if (path === '/') {
-      return this.right({ mode: 16877, size: 0 });
+      return this.right({ mode: GetAttributesCallback.FOLDER, size: 0 });
     }
 
     const file = await this.virtualDriveContainer.filesSearcher.run({ path });
 
     if (file) {
-      return this.right({ mode: 33188, size: file.size });
+      return this.right({ mode: GetAttributesCallback.FILE, size: file.size });
     }
 
     const folder = await this.virtualDriveContainer.folderSearcher.run({
@@ -29,14 +32,17 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
     });
 
     if (folder) {
-      return this.right({ mode: 16877, size: 0 });
+      return this.right({ mode: GetAttributesCallback.FOLDER, size: 0 });
     }
 
     const offlineFile =
       await this.offlineDriveContainer.offlineFileSearcher.run({ path });
 
     if (offlineFile) {
-      return this.right({ mode: 33188, size: offlineFile.size });
+      return this.right({
+        mode: GetAttributesCallback.FILE,
+        size: offlineFile.size,
+      });
     }
 
     return this.left(
diff --git a/src/apps/fuse/callbacks/ReadCallback.ts b/src/apps/fuse/callbacks/ReadCallback.ts
index 1f7c7cb0c..7268726b0 100644
--- a/src/apps/fuse/callbacks/ReadCallback.ts
+++ b/src/apps/fuse/callbacks/ReadCallback.ts
@@ -1,5 +1,5 @@
 import Logger from 'electron-log';
-import fs from 'fs';
+import fs from 'fs/promises';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -8,6 +8,26 @@ const fuse = require('@gcas/fuse');
 export class ReadCallback {
   constructor(private readonly container: VirtualDriveDependencyContainer) {}
 
+  private async read(
+    filePath: string,
+    buffer: Buffer,
+    length: number,
+    position: number
+  ): Promise<number> {
+    Logger.debug('READING FILE FROM ', filePath, length, position);
+
+    const data = await fs.readFile(filePath);
+
+    if (position >= data.length) {
+      Logger.debug('READ DONE');
+      return 0;
+    }
+
+    const part = data.slice(position, position + length);
+    part.copy(buffer); // write the result of the read to the result buffer
+    return part.length; // number of bytes read
+  }
+
   async execute(
     path: string,
     _fd: any,
@@ -16,8 +36,6 @@ export class ReadCallback {
     pos: number,
     cb: (code: number, params?: any) => void
   ) {
-    Logger.debug(`READ ${path}`);
-
     const file = await this.container.filesSearcher.run({ path });
 
     if (!file) {
@@ -29,23 +47,12 @@ export class ReadCallback {
       file.contentsId
     );
 
-    Logger.debug('READING FILE FROM ', filePath);
-
-    fs.readFile(filePath, (err, data) => {
-      if (err) {
-        Logger.error(`Error reading file: ${err}`);
-        cb(fuse.ENOENT);
-        return;
-      }
-
-      if (pos >= data.length) return cb(0);
-
-      // const bytesRead = Math.min(buffer.length - pos, len);
-      const part = data.slice(pos, pos + len);
-
-      part.copy(buf);
-
-      cb(part.length); // Indicate the number of bytes read ????????????
-    });
+    try {
+      const bytesRead = await this.read(filePath, buf, len, pos);
+      cb(bytesRead);
+    } catch (err) {
+      Logger.error(`Error reading file: ${err}`);
+      cb(fuse.ENOENT);
+    }
   }
 }

From 3ce8eefe27af57970746a9531e730dcadfaa6025 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Fri, 12 Jan 2024 16:56:59 +0100
Subject: [PATCH 130/188] feat: usage container

---
 src/apps/fuse/FuseApp.ts                      |  6 ++-
 src/apps/fuse/callbacks/FuseCallback.ts       |  2 +-
 src/apps/fuse/callbacks/ReadCallback.ts       |  2 +-
 src/apps/fuse/callbacks/ReaddirCallback.ts    |  2 +-
 src/apps/fuse/callbacks/StatFsCallback.ts     | 35 +++++++++++++
 .../FuseDependencyContainer.ts                |  2 +
 .../FuseDependencyContainerFactory.ts         |  7 +++
 .../FuseDomainEventSubscribers.ts             |  1 +
 .../dependency-injection/common/Photos.ts     | 25 +++++++++
 .../user/UserContainerFactory.ts              | 33 ++++++++++++
 .../user/UserDependencyContainer.ts           |  3 ++
 .../user/usage/UsageContainer.ts              | 18 +++++++
 .../user/usage/builder.ts                     | 51 +++++++++++++++++++
 .../BytesInBinaryToInternationalSystem.ts}    |  8 +--
 .../DecrementDriveUsageOnFileDeleted.ts       | 10 ++--
 .../FreeSpacePerEnvironmentCalculator.ts      |  6 +--
 .../IncrementDriveUsageOnFileCreated.ts       |  8 +--
 .../usage}/application/UsedSpaceCalculator.ts |  6 +--
 .../application/UserUsageDecrementor.ts}      |  2 +-
 .../application/UserUsageIncrementor.ts}      |  2 +-
 .../usage}/domain/UserUsage.ts                |  0
 .../usage}/domain/UserUsageRepository.ts      |  0
 .../CachedHttpUserUsageRepository.ts          | 10 ++--
 .../infrastrucutre/dtos/UserUsageLimitDTO.ts  |  0
 24 files changed, 208 insertions(+), 31 deletions(-)
 create mode 100644 src/apps/fuse/callbacks/StatFsCallback.ts
 create mode 100644 src/apps/fuse/dependency-injection/common/Photos.ts
 create mode 100644 src/apps/fuse/dependency-injection/user/UserContainerFactory.ts
 create mode 100644 src/apps/fuse/dependency-injection/user/UserDependencyContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/user/usage/UsageContainer.ts
 create mode 100644 src/apps/fuse/dependency-injection/user/usage/builder.ts
 rename src/context/{virtual-drive/userUsage/application/BytesInBinaryToInternacionalSystem.ts => user/usage/application/BytesInBinaryToInternationalSystem.ts} (62%)
 rename src/context/{virtual-drive/userUsage => user/usage}/application/DecrementDriveUsageOnFileDeleted.ts (51%)
 rename src/context/{virtual-drive/userUsage => user/usage}/application/FreeSpacePerEnvironmentCalculator.ts (68%)
 rename src/context/{virtual-drive/userUsage => user/usage}/application/IncrementDriveUsageOnFileCreated.ts (59%)
 rename src/context/{virtual-drive/userUsage => user/usage}/application/UsedSpaceCalculator.ts (65%)
 rename src/context/{virtual-drive/userUsage/application/UserUsageDecrementer.ts => user/usage/application/UserUsageDecrementor.ts} (90%)
 rename src/context/{virtual-drive/userUsage/application/UserUsageIncrementer.ts => user/usage/application/UserUsageIncrementor.ts} (90%)
 rename src/context/{virtual-drive/userUsage => user/usage}/domain/UserUsage.ts (100%)
 rename src/context/{virtual-drive/userUsage => user/usage}/domain/UserUsageRepository.ts (100%)
 rename src/context/{virtual-drive/userUsage => user/usage}/infrastrucutre/CachedHttpUserUsageRepository.ts (85%)
 rename src/context/{virtual-drive/userUsage => user/usage}/infrastrucutre/dtos/UserUsageLimitDTO.ts (100%)

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index 94c3513f1..f44d053ea 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -18,6 +18,7 @@ import { FuseDependencyContainer } from './dependency-injection/FuseDependencyCo
 const fuse = require('@gcas/fuse');
 
 export class FuseApp {
+  private static readonly SID = 41033;
   private _fuse: any;
 
   constructor(
@@ -28,7 +29,7 @@ export class FuseApp {
     }
   ) {}
 
-  private getOpt() {
+  private async getOpt() {
     const listXAttributes = new ListXAttributesCallback('ListXAttributes');
     const getXAttribute = new GetXAttributeCallback('GetXAttribute');
     const readdir = new ReaddirCallback(
@@ -72,11 +73,12 @@ export class FuseApp {
       release: release.handle.bind(release),
       unlink: trashFile.handle.bind(trashFile),
       rmdir: trashFolder.handle.bind(trashFolder),
+      // statfs: statfs.execute.bind(statfs),
     };
   }
 
   async start(): Promise<void> {
-    const ops = this.getOpt();
+    const ops = await this.getOpt();
 
     this._fuse = new fuse(this.paths.root, ops, {
       debug: false,
diff --git a/src/apps/fuse/callbacks/FuseCallback.ts b/src/apps/fuse/callbacks/FuseCallback.ts
index e0e8e8d4f..0086a7ee7 100644
--- a/src/apps/fuse/callbacks/FuseCallback.ts
+++ b/src/apps/fuse/callbacks/FuseCallback.ts
@@ -10,7 +10,7 @@ export type CallbackWithData<T> = (code: number, params?: T) => void;
 export abstract class FuseCallback<T> {
   protected static readonly OK = 0;
 
-  constructor(private readonly name: string, private readonly debug = false) {}
+  constructor(private readonly name: string, private readonly debug = true) {}
 
   protected right(value: T): Either<FuseError, T> {
     if (this.debug) {
diff --git a/src/apps/fuse/callbacks/ReadCallback.ts b/src/apps/fuse/callbacks/ReadCallback.ts
index 7268726b0..7e9c4cc01 100644
--- a/src/apps/fuse/callbacks/ReadCallback.ts
+++ b/src/apps/fuse/callbacks/ReadCallback.ts
@@ -14,7 +14,7 @@ export class ReadCallback {
     length: number,
     position: number
   ): Promise<number> {
-    Logger.debug('READING FILE FROM ', filePath, length, position);
+    // Logger.debug('READING FILE FROM ', filePath, length, position);
 
     const data = await fs.readFile(filePath);
 
diff --git a/src/apps/fuse/callbacks/ReaddirCallback.ts b/src/apps/fuse/callbacks/ReaddirCallback.ts
index d6099d15a..e950a69eb 100644
--- a/src/apps/fuse/callbacks/ReaddirCallback.ts
+++ b/src/apps/fuse/callbacks/ReaddirCallback.ts
@@ -4,7 +4,7 @@ import { NoSuchFileOrDirectoryError } from './FuseErrors';
 
 export class ReaddirCallback extends FuseCallback<Array<string>> {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
-    super('Read Directory', true);
+    super('Read Directory');
   }
 
   async execute(path: string) {
diff --git a/src/apps/fuse/callbacks/StatFsCallback.ts b/src/apps/fuse/callbacks/StatFsCallback.ts
new file mode 100644
index 000000000..9c0719f8b
--- /dev/null
+++ b/src/apps/fuse/callbacks/StatFsCallback.ts
@@ -0,0 +1,35 @@
+import { UserDependencyContainer } from '../dependency-injection/user/UserDependencyContainer';
+import { FuseCallback } from './FuseCallback';
+import Logger from 'electron-log';
+
+type StatFsCallbackData = {
+  bsize: number; // fundamental file system block size in bytes
+  frsize: number; // fundamental file system fragment size. It might be (or has to be?) the same as bsize
+  blocks: number; // the total number of blocks on the filesystem in frsize units
+  bfree: number; // the total number of free blocks
+  bavail: number; // the number of free blocks available to non-superusers
+  files: number; // total number of file nodes
+  ffree: number; // total number of free file nodes
+  favail: number; // number of free file nodes available to non-superusers
+  fsid: number; // id of the file system
+  flag: number; // flags about the fs
+  namemax: number; // maximum length of a file name on the file system
+};
+
+export class StatFsCallback extends FuseCallback<Partial<StatFsCallbackData>> {
+  constructor(
+    private readonly _userContainer: UserDependencyContainer,
+    private readonly localStats: Partial<StatFsCallbackData>,
+    private readonly sid: number
+  ) {
+    super('Stat FS', true);
+  }
+
+  async execute(path: string) {
+    Logger.debug('Stats FS', path);
+
+    return this.right({
+      ...this.localStats,
+    });
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/FuseDependencyContainer.ts b/src/apps/fuse/dependency-injection/FuseDependencyContainer.ts
index 0e28e2da9..70e7f1eda 100644
--- a/src/apps/fuse/dependency-injection/FuseDependencyContainer.ts
+++ b/src/apps/fuse/dependency-injection/FuseDependencyContainer.ts
@@ -1,7 +1,9 @@
 import { OfflineDriveDependencyContainer } from './offline/OfflineDriveDependencyContainer';
+import { UserDependencyContainer } from './user/UserDependencyContainer';
 import { VirtualDriveDependencyContainer } from './virtual-drive/VirtualDriveDependencyContainer';
 
 export interface FuseDependencyContainer {
   offlineDriveContainer: OfflineDriveDependencyContainer;
   virtualDriveContainer: VirtualDriveDependencyContainer;
+  userContainer: UserDependencyContainer;
 }
diff --git a/src/apps/fuse/dependency-injection/FuseDependencyContainerFactory.ts b/src/apps/fuse/dependency-injection/FuseDependencyContainerFactory.ts
index 12bb98384..40aa63bda 100644
--- a/src/apps/fuse/dependency-injection/FuseDependencyContainerFactory.ts
+++ b/src/apps/fuse/dependency-injection/FuseDependencyContainerFactory.ts
@@ -2,11 +2,13 @@ import { FuseDependencyContainer } from './FuseDependencyContainer';
 import { FuseDomainEventSubscribers } from './FuseDomainEventSubscribers';
 import { DependencyInjectionEventBus } from './common/eventBus';
 import { OfflineDriveDependencyContainerFactory } from './offline/OfflineDriveDependencyContainerFactory';
+import { UserContainerFactory } from './user/UserContainerFactory';
 import { VirtualDriveDependencyContainerFactory } from './virtual-drive/VirtualDriveDependencyContainerFactory';
 
 type FuseDependencyContainerFactorySubscribers = Array<
   | keyof FuseDependencyContainer['offlineDriveContainer']
   | keyof FuseDependencyContainer['virtualDriveContainer']
+  | keyof FuseDependencyContainer['userContainer']
 >;
 
 export class FuseDependencyContainerFactory {
@@ -15,6 +17,7 @@ export class FuseDependencyContainerFactory {
   static readonly subscribers: FuseDependencyContainerFactorySubscribers = [
     ...VirtualDriveDependencyContainerFactory.subscribers,
     ...OfflineDriveDependencyContainerFactory.subscribers,
+    ...UserContainerFactory.subscribers,
   ];
 
   eventSubscribers(
@@ -40,9 +43,13 @@ export class FuseDependencyContainerFactory {
       new OfflineDriveDependencyContainerFactory();
     const offlineDriveContainer = await offlineDriveContainerFactory.build();
 
+    const userContainerFactory = new UserContainerFactory();
+    const userContainer = await userContainerFactory.build();
+
     const container = {
       offlineDriveContainer,
       virtualDriveContainer,
+      userContainer,
     };
 
     bus.addSubscribers(FuseDomainEventSubscribers.from(container));
diff --git a/src/apps/fuse/dependency-injection/FuseDomainEventSubscribers.ts b/src/apps/fuse/dependency-injection/FuseDomainEventSubscribers.ts
index db66dbd2b..288e3966e 100644
--- a/src/apps/fuse/dependency-injection/FuseDomainEventSubscribers.ts
+++ b/src/apps/fuse/dependency-injection/FuseDomainEventSubscribers.ts
@@ -10,6 +10,7 @@ export class FuseDomainEventSubscribers {
     const plainContainer = {
       ...container.offlineDriveContainer,
       ...container.virtualDriveContainer,
+      ...container.userContainer,
     };
 
     const subscribers = FuseDependencyContainerFactory.subscribers.map(
diff --git a/src/apps/fuse/dependency-injection/common/Photos.ts b/src/apps/fuse/dependency-injection/common/Photos.ts
new file mode 100644
index 000000000..8b1b2593c
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/common/Photos.ts
@@ -0,0 +1,25 @@
+import PhotosSubmodule from '@internxt/sdk/dist/photos/photos';
+import { obtainToken } from '../../../main/auth/service';
+
+export class Photos {
+  private static _photos: PhotosSubmodule;
+
+  static get photos() {
+    if (Photos._photos) {
+      return Photos._photos;
+    }
+
+    const photosUrl = process.env.PHOTOS_URL;
+
+    const newToken = obtainToken('newToken');
+
+    const photosSubmodule = new PhotosSubmodule({
+      baseUrl: photosUrl,
+      accessToken: newToken,
+    });
+
+    Photos._photos = photosSubmodule;
+
+    return photosSubmodule;
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/user/UserContainerFactory.ts b/src/apps/fuse/dependency-injection/user/UserContainerFactory.ts
new file mode 100644
index 000000000..27a5dc8db
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/user/UserContainerFactory.ts
@@ -0,0 +1,33 @@
+import { UserDependencyContainer } from './UserDependencyContainer';
+import { buildUsageContainer } from './usage/builder';
+
+export class UserContainerFactory {
+  private static _container: UserDependencyContainer | undefined;
+
+  static readonly subscribers: Array<keyof UserDependencyContainer> = [
+    'decrementDriveUsageOnFileDeleted',
+    'incrementDriveUsageOnFileCreated',
+  ];
+
+  eventSubscribers(
+    key: keyof UserDependencyContainer
+  ): UserDependencyContainer[keyof UserDependencyContainer] | undefined {
+    if (!UserContainerFactory._container) return undefined;
+
+    return UserContainerFactory._container[key];
+  }
+
+  async build(): Promise<UserDependencyContainer> {
+    if (UserContainerFactory._container !== undefined) {
+      return UserContainerFactory._container;
+    }
+
+    const usage = await buildUsageContainer();
+
+    const container: UserDependencyContainer = {
+      ...usage,
+    };
+
+    return container;
+  }
+}
diff --git a/src/apps/fuse/dependency-injection/user/UserDependencyContainer.ts b/src/apps/fuse/dependency-injection/user/UserDependencyContainer.ts
new file mode 100644
index 000000000..e6dbba8f7
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/user/UserDependencyContainer.ts
@@ -0,0 +1,3 @@
+import { UsageContainer } from './usage/UsageContainer';
+
+export type UserDependencyContainer = UsageContainer;
diff --git a/src/apps/fuse/dependency-injection/user/usage/UsageContainer.ts b/src/apps/fuse/dependency-injection/user/usage/UsageContainer.ts
new file mode 100644
index 000000000..61461313a
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/user/usage/UsageContainer.ts
@@ -0,0 +1,18 @@
+import { BytesInBinaryToInternationalSystem } from '../../../../../context/user/usage/application/BytesInBinaryToInternationalSystem';
+import { DecrementDriveUsageOnFileDeleted } from '../../../../../context/user/usage/application/DecrementDriveUsageOnFileDeleted';
+import { FreeSpacePerEnvironmentCalculator } from '../../../../../context/user/usage/application/FreeSpacePerEnvironmentCalculator';
+import { IncrementDriveUsageOnFileCreated } from '../../../../../context/user/usage/application/IncrementDriveUsageOnFileCreated';
+import { UsedSpaceCalculator } from '../../../../../context/user/usage/application/UsedSpaceCalculator';
+import { UserUsageDecrementor } from '../../../../../context/user/usage/application/UserUsageDecrementor';
+import { UserUsageIncrementor } from '../../../../../context/user/usage/application/UserUsageIncrementor';
+
+export interface UsageContainer {
+  bytesInBinaryToInternationalSystem: BytesInBinaryToInternationalSystem;
+  freeSpacePerEnvironmentCalculator: FreeSpacePerEnvironmentCalculator;
+  usedSpaceCalculator: UsedSpaceCalculator;
+  userUsageDecrementor: UserUsageDecrementor;
+  userUsageIncrementor: UserUsageIncrementor;
+  // event handlers
+  decrementDriveUsageOnFileDeleted: DecrementDriveUsageOnFileDeleted;
+  incrementDriveUsageOnFileCreated: IncrementDriveUsageOnFileCreated;
+}
diff --git a/src/apps/fuse/dependency-injection/user/usage/builder.ts b/src/apps/fuse/dependency-injection/user/usage/builder.ts
new file mode 100644
index 000000000..6fc96a491
--- /dev/null
+++ b/src/apps/fuse/dependency-injection/user/usage/builder.ts
@@ -0,0 +1,51 @@
+import { BytesInBinaryToInternationalSystem } from '../../../../../context/user/usage/application/BytesInBinaryToInternationalSystem';
+import { DecrementDriveUsageOnFileDeleted } from '../../../../../context/user/usage/application/DecrementDriveUsageOnFileDeleted';
+import { FreeSpacePerEnvironmentCalculator } from '../../../../../context/user/usage/application/FreeSpacePerEnvironmentCalculator';
+import { IncrementDriveUsageOnFileCreated } from '../../../../../context/user/usage/application/IncrementDriveUsageOnFileCreated';
+import { UsedSpaceCalculator } from '../../../../../context/user/usage/application/UsedSpaceCalculator';
+import { UserUsageDecrementor } from '../../../../../context/user/usage/application/UserUsageDecrementor';
+import { UserUsageIncrementor } from '../../../../../context/user/usage/application/UserUsageIncrementor';
+import { CachedHttpUserUsageRepository } from '../../../../../context/user/usage/infrastrucutre/CachedHttpUserUsageRepository';
+import { Photos } from '../../common/Photos';
+import { DependencyInjectionHttpClientsProvider } from '../../common/clients';
+import { UsageContainer } from './UsageContainer';
+
+export async function buildUsageContainer(): Promise<UsageContainer> {
+  const clients = DependencyInjectionHttpClientsProvider.get();
+  const { photos } = Photos;
+
+  const repository = new CachedHttpUserUsageRepository(
+    clients.newDrive,
+    photos
+  );
+
+  const bytesInBinaryToInternationalSystem =
+    new BytesInBinaryToInternationalSystem();
+
+  const freeSpacePerEnvironmentCalculator =
+    new FreeSpacePerEnvironmentCalculator(repository);
+  const usedSpaceCalculator = new UsedSpaceCalculator(repository);
+  const userUsageDecrementor = new UserUsageDecrementor(repository);
+  const userUsageIncrementor = new UserUsageIncrementor(repository);
+
+  // event handlers
+  const incrementDriveUsageOnFileCreated = new IncrementDriveUsageOnFileCreated(
+    userUsageIncrementor
+  );
+  const decrementDriveUsageOnFileDeleted = new DecrementDriveUsageOnFileDeleted(
+    userUsageDecrementor
+  );
+
+  const container: UsageContainer = {
+    bytesInBinaryToInternationalSystem,
+    freeSpacePerEnvironmentCalculator,
+    usedSpaceCalculator,
+    userUsageDecrementor,
+    userUsageIncrementor,
+    // event handlers
+    incrementDriveUsageOnFileCreated,
+    decrementDriveUsageOnFileDeleted,
+  };
+
+  return container;
+}
diff --git a/src/context/virtual-drive/userUsage/application/BytesInBinaryToInternacionalSystem.ts b/src/context/user/usage/application/BytesInBinaryToInternationalSystem.ts
similarity index 62%
rename from src/context/virtual-drive/userUsage/application/BytesInBinaryToInternacionalSystem.ts
rename to src/context/user/usage/application/BytesInBinaryToInternationalSystem.ts
index fb3928191..49014a654 100644
--- a/src/context/virtual-drive/userUsage/application/BytesInBinaryToInternacionalSystem.ts
+++ b/src/context/user/usage/application/BytesInBinaryToInternationalSystem.ts
@@ -1,4 +1,4 @@
-export class BytesInBinaryToInternacionalSystem {
+export class BytesInBinaryToInternationalSystem {
   private static BINARY_CONVERSION_FACTOR = 1024;
   private static SI_CONVERSION_FACTOR = 1000;
 
@@ -9,20 +9,20 @@ export class BytesInBinaryToInternacionalSystem {
 
     const exponent = Math.floor(
       Math.log(bytes) /
-        Math.log(BytesInBinaryToInternacionalSystem.BINARY_CONVERSION_FACTOR)
+        Math.log(BytesInBinaryToInternationalSystem.BINARY_CONVERSION_FACTOR)
     );
 
     const bin =
       bytes /
       Math.pow(
-        BytesInBinaryToInternacionalSystem.BINARY_CONVERSION_FACTOR,
+        BytesInBinaryToInternationalSystem.BINARY_CONVERSION_FACTOR,
         exponent
       );
 
     return (
       bin *
       Math.pow(
-        BytesInBinaryToInternacionalSystem.SI_CONVERSION_FACTOR,
+        BytesInBinaryToInternationalSystem.SI_CONVERSION_FACTOR,
         exponent
       )
     );
diff --git a/src/context/virtual-drive/userUsage/application/DecrementDriveUsageOnFileDeleted.ts b/src/context/user/usage/application/DecrementDriveUsageOnFileDeleted.ts
similarity index 51%
rename from src/context/virtual-drive/userUsage/application/DecrementDriveUsageOnFileDeleted.ts
rename to src/context/user/usage/application/DecrementDriveUsageOnFileDeleted.ts
index b77e7fdce..e96690fe9 100644
--- a/src/context/virtual-drive/userUsage/application/DecrementDriveUsageOnFileDeleted.ts
+++ b/src/context/user/usage/application/DecrementDriveUsageOnFileDeleted.ts
@@ -1,19 +1,19 @@
-import { FileCreatedDomainEvent } from '../../files/domain/events/FileCreatedDomainEvent';
 import { DomainEventClass } from '../../../shared/domain/DomainEvent';
 import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
-import { UserUsageIncrementer } from './UserUsageIncrementer';
-import { FileDeletedDomainEvent } from '../../files/domain/events/FileDeletedDomainEvent';
+import { FileCreatedDomainEvent } from '../../../virtual-drive/files/domain/events/FileCreatedDomainEvent';
+import { FileDeletedDomainEvent } from '../../../virtual-drive/files/domain/events/FileDeletedDomainEvent';
+import { UserUsageDecrementor } from './UserUsageDecrementor';
 
 export class DecrementDriveUsageOnFileDeleted
   implements DomainEventSubscriber<FileCreatedDomainEvent>
 {
-  constructor(private readonly incrementer: UserUsageIncrementer) {}
+  constructor(private readonly decrementor: UserUsageDecrementor) {}
 
   subscribedTo(): DomainEventClass[] {
     return [FileDeletedDomainEvent];
   }
 
   on(domainEvent: FileDeletedDomainEvent): Promise<void> {
-    return this.incrementer.run(domainEvent.size);
+    return this.decrementor.run(domainEvent.size);
   }
 }
diff --git a/src/context/virtual-drive/userUsage/application/FreeSpacePerEnvironmentCalculator.ts b/src/context/user/usage/application/FreeSpacePerEnvironmentCalculator.ts
similarity index 68%
rename from src/context/virtual-drive/userUsage/application/FreeSpacePerEnvironmentCalculator.ts
rename to src/context/user/usage/application/FreeSpacePerEnvironmentCalculator.ts
index 91e1b531c..a7bd8e42e 100644
--- a/src/context/virtual-drive/userUsage/application/FreeSpacePerEnvironmentCalculator.ts
+++ b/src/context/user/usage/application/FreeSpacePerEnvironmentCalculator.ts
@@ -1,5 +1,5 @@
 import { UserUsageRepository } from '../domain/UserUsageRepository';
-import { BytesInBinaryToInternacionalSystem } from './BytesInBinaryToInternacionalSystem';
+import { BytesInBinaryToInternationalSystem } from './BytesInBinaryToInternationalSystem';
 
 export class FreeSpacePerEnvironmentCalculator {
   constructor(private readonly repository: UserUsageRepository) {}
@@ -14,10 +14,10 @@ export class FreeSpacePerEnvironmentCalculator {
     const freeSpace = usage.free();
 
     if (process.platform === 'linux')
-      return BytesInBinaryToInternacionalSystem.run(freeSpace);
+      return BytesInBinaryToInternationalSystem.run(freeSpace);
 
     if (process.platform === 'darwin')
-      return BytesInBinaryToInternacionalSystem.run(freeSpace);
+      return BytesInBinaryToInternationalSystem.run(freeSpace);
 
     return freeSpace;
   }
diff --git a/src/context/virtual-drive/userUsage/application/IncrementDriveUsageOnFileCreated.ts b/src/context/user/usage/application/IncrementDriveUsageOnFileCreated.ts
similarity index 59%
rename from src/context/virtual-drive/userUsage/application/IncrementDriveUsageOnFileCreated.ts
rename to src/context/user/usage/application/IncrementDriveUsageOnFileCreated.ts
index 53c2e1cbf..1bbe5339a 100644
--- a/src/context/virtual-drive/userUsage/application/IncrementDriveUsageOnFileCreated.ts
+++ b/src/context/user/usage/application/IncrementDriveUsageOnFileCreated.ts
@@ -1,18 +1,18 @@
-import { FileCreatedDomainEvent } from '../../files/domain/events/FileCreatedDomainEvent';
 import { DomainEventClass } from '../../../shared/domain/DomainEvent';
 import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
-import { UserUsageIncrementer } from './UserUsageIncrementer';
+import { FileCreatedDomainEvent } from '../../../virtual-drive/files/domain/events/FileCreatedDomainEvent';
+import { UserUsageIncrementor } from './UserUsageIncrementor';
 
 export class IncrementDriveUsageOnFileCreated
   implements DomainEventSubscriber<FileCreatedDomainEvent>
 {
-  constructor(private readonly incrementer: UserUsageIncrementer) {}
+  constructor(private readonly incrementor: UserUsageIncrementor) {}
 
   subscribedTo(): DomainEventClass[] {
     return [FileCreatedDomainEvent];
   }
 
   on(domainEvent: FileCreatedDomainEvent): Promise<void> {
-    return this.incrementer.run(domainEvent.size);
+    return this.incrementor.run(domainEvent.size);
   }
 }
diff --git a/src/context/virtual-drive/userUsage/application/UsedSpaceCalculator.ts b/src/context/user/usage/application/UsedSpaceCalculator.ts
similarity index 65%
rename from src/context/virtual-drive/userUsage/application/UsedSpaceCalculator.ts
rename to src/context/user/usage/application/UsedSpaceCalculator.ts
index 2dab7dbbe..ba8375486 100644
--- a/src/context/virtual-drive/userUsage/application/UsedSpaceCalculator.ts
+++ b/src/context/user/usage/application/UsedSpaceCalculator.ts
@@ -1,5 +1,5 @@
 import { UserUsageRepository } from '../domain/UserUsageRepository';
-import { BytesInBinaryToInternacionalSystem } from './BytesInBinaryToInternacionalSystem';
+import { BytesInBinaryToInternationalSystem } from './BytesInBinaryToInternationalSystem';
 
 export class UsedSpaceCalculator {
   constructor(private readonly repository: UserUsageRepository) {}
@@ -10,10 +10,10 @@ export class UsedSpaceCalculator {
     const used = usage.totalInUse();
 
     if (process.platform === 'linux')
-      return BytesInBinaryToInternacionalSystem.run(used);
+      return BytesInBinaryToInternationalSystem.run(used);
 
     if (process.platform === 'darwin')
-      return BytesInBinaryToInternacionalSystem.run(used);
+      return BytesInBinaryToInternationalSystem.run(used);
 
     return used;
   }
diff --git a/src/context/virtual-drive/userUsage/application/UserUsageDecrementer.ts b/src/context/user/usage/application/UserUsageDecrementor.ts
similarity index 90%
rename from src/context/virtual-drive/userUsage/application/UserUsageDecrementer.ts
rename to src/context/user/usage/application/UserUsageDecrementor.ts
index b1e487f7e..e69b34503 100644
--- a/src/context/virtual-drive/userUsage/application/UserUsageDecrementer.ts
+++ b/src/context/user/usage/application/UserUsageDecrementor.ts
@@ -1,6 +1,6 @@
 import { UserUsageRepository } from '../domain/UserUsageRepository';
 
-export class UserUsageDecrementer {
+export class UserUsageDecrementor {
   constructor(private readonly repository: UserUsageRepository) {}
 
   async run(weight: number) {
diff --git a/src/context/virtual-drive/userUsage/application/UserUsageIncrementer.ts b/src/context/user/usage/application/UserUsageIncrementor.ts
similarity index 90%
rename from src/context/virtual-drive/userUsage/application/UserUsageIncrementer.ts
rename to src/context/user/usage/application/UserUsageIncrementor.ts
index 81e3d0dae..c24f1c7fa 100644
--- a/src/context/virtual-drive/userUsage/application/UserUsageIncrementer.ts
+++ b/src/context/user/usage/application/UserUsageIncrementor.ts
@@ -1,6 +1,6 @@
 import { UserUsageRepository } from '../domain/UserUsageRepository';
 
-export class UserUsageIncrementer {
+export class UserUsageIncrementor {
   constructor(private readonly repository: UserUsageRepository) {}
 
   async run(weight: number) {
diff --git a/src/context/virtual-drive/userUsage/domain/UserUsage.ts b/src/context/user/usage/domain/UserUsage.ts
similarity index 100%
rename from src/context/virtual-drive/userUsage/domain/UserUsage.ts
rename to src/context/user/usage/domain/UserUsage.ts
diff --git a/src/context/virtual-drive/userUsage/domain/UserUsageRepository.ts b/src/context/user/usage/domain/UserUsageRepository.ts
similarity index 100%
rename from src/context/virtual-drive/userUsage/domain/UserUsageRepository.ts
rename to src/context/user/usage/domain/UserUsageRepository.ts
diff --git a/src/context/virtual-drive/userUsage/infrastrucutre/CachedHttpUserUsageRepository.ts b/src/context/user/usage/infrastrucutre/CachedHttpUserUsageRepository.ts
similarity index 85%
rename from src/context/virtual-drive/userUsage/infrastrucutre/CachedHttpUserUsageRepository.ts
rename to src/context/user/usage/infrastrucutre/CachedHttpUserUsageRepository.ts
index 9e3b57083..e68951f5f 100644
--- a/src/context/virtual-drive/userUsage/infrastrucutre/CachedHttpUserUsageRepository.ts
+++ b/src/context/user/usage/infrastrucutre/CachedHttpUserUsageRepository.ts
@@ -5,7 +5,7 @@ import { UserUsageRepository } from '../domain/UserUsageRepository';
 import { UserUsageLimitDTO } from './dtos/UserUsageLimitDTO';
 
 export class CachedHttpUserUsageRepository implements UserUsageRepository {
-  private cahdedUserUsage: UserUsage | undefined;
+  private cachedUserUsage: UserUsage | undefined;
 
   constructor(
     private readonly driveClient: Axios,
@@ -18,7 +18,7 @@ export class CachedHttpUserUsageRepository implements UserUsageRepository {
     );
 
     if (response.status !== 200) {
-      throw new Error('Error retriving drive usage');
+      throw new Error('Error retrieving drive usage');
     }
 
     return response.data.total;
@@ -37,7 +37,7 @@ export class CachedHttpUserUsageRepository implements UserUsageRepository {
   }
 
   async getUsage(): Promise<UserUsage> {
-    if (this.cahdedUserUsage) return this.cahdedUserUsage;
+    if (this.cachedUserUsage) return this.cachedUserUsage;
 
     const drive = await this.getDriveUsage();
     const { usage: photos } = await this.photosSubmodule.getUsage();
@@ -49,12 +49,12 @@ export class CachedHttpUserUsageRepository implements UserUsageRepository {
       limit,
     });
 
-    this.cahdedUserUsage = usage;
+    this.cachedUserUsage = usage;
 
     return usage;
   }
 
   async save(usage: UserUsage) {
-    this.cahdedUserUsage = usage;
+    this.cachedUserUsage = usage;
   }
 }
diff --git a/src/context/virtual-drive/userUsage/infrastrucutre/dtos/UserUsageLimitDTO.ts b/src/context/user/usage/infrastrucutre/dtos/UserUsageLimitDTO.ts
similarity index 100%
rename from src/context/virtual-drive/userUsage/infrastrucutre/dtos/UserUsageLimitDTO.ts
rename to src/context/user/usage/infrastrucutre/dtos/UserUsageLimitDTO.ts

From 2dd30e9333be2572ff3408a6b2bc4f3f9ab2d78d Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 15 Jan 2024 12:06:50 +0100
Subject: [PATCH 131/188] chore: callback logs

---
 src/apps/fuse/callbacks/FuseCallback.ts       | 42 +++++++++++++++----
 src/apps/fuse/callbacks/ReaddirCallback.ts    | 19 +++++----
 src/apps/fuse/callbacks/StatFsCallback.ts     |  2 +-
 .../virtual-drive/folders/FoldersContainer.ts |  4 +-
 .../virtual-drive/folders/builder.ts          |  6 +--
 .../folders/FoldersContainer.ts               |  4 +-
 .../dependency-injection/folders/builder.ts   |  4 +-
 .../application/FilesByFolderPathSearcher.ts  |  4 +-
 ...Lister.ts => FoldersByParentPathLister.ts} |  6 +--
 9 files changed, 58 insertions(+), 33 deletions(-)
 rename src/context/virtual-drive/folders/application/{FoldersByParentPathNameLister.ts => FoldersByParentPathLister.ts} (73%)

diff --git a/src/apps/fuse/callbacks/FuseCallback.ts b/src/apps/fuse/callbacks/FuseCallback.ts
index 0086a7ee7..7cb2e71ff 100644
--- a/src/apps/fuse/callbacks/FuseCallback.ts
+++ b/src/apps/fuse/callbacks/FuseCallback.ts
@@ -7,13 +7,37 @@ export type Callback = (code: number) => void;
 
 export type CallbackWithData<T> = (code: number, params?: T) => void;
 
+type DebugOptions = {
+  input: boolean;
+  result: boolean;
+  elapsedTime: boolean;
+};
+
 export abstract class FuseCallback<T> {
   protected static readonly OK = 0;
 
-  constructor(private readonly name: string, private readonly debug = true) {}
+  constructor(
+    private readonly name: string,
+    private readonly debug: Partial<DebugOptions> = {
+      input: false,
+      result: false,
+      elapsedTime: false,
+    }
+  ) {}
+
+  private logTime(fun: () => Promise<Either<FuseError, T>>) {
+    const stopwatch = new Stopwatch();
+    stopwatch.start();
+
+    const result = fun();
+
+    Logger.debug(`Elapsed time for ${this.name}: `, stopwatch.elapsedTime());
+
+    return result;
+  }
 
   protected right(value: T): Either<FuseError, T> {
-    if (this.debug) {
+    if (this.debug.result) {
       Logger.debug(`${this.name} Result: ${JSON.stringify({ value })}`);
     }
 
@@ -26,13 +50,15 @@ export abstract class FuseCallback<T> {
   }
 
   async handle(...params: any[]): Promise<void> {
-    const stopwatch = new Stopwatch();
-    stopwatch.start();
-
     const callback = params.pop() as CallbackWithData<T>;
-    // Logger.info(`${this.name}: `, ...params);
 
-    const result = await this.execute(...params);
+    if (this.debug.input) {
+      Logger.debug(`${this.name}: `, ...params);
+    }
+
+    const result = await (this.debug.elapsedTime
+      ? this.logTime(() => this.execute(...params))
+      : this.execute(...params));
 
     if (result.isLeft()) {
       const error = result.getLeft();
@@ -41,8 +67,6 @@ export abstract class FuseCallback<T> {
 
     const data = result.getRight();
 
-    // Logger.info(`Elapsed time for ${this.name}: `, stopwatch.elapsedTime());
-
     callback(FuseCallback.OK, data);
   }
 
diff --git a/src/apps/fuse/callbacks/ReaddirCallback.ts b/src/apps/fuse/callbacks/ReaddirCallback.ts
index e950a69eb..e4150b355 100644
--- a/src/apps/fuse/callbacks/ReaddirCallback.ts
+++ b/src/apps/fuse/callbacks/ReaddirCallback.ts
@@ -4,22 +4,23 @@ import { NoSuchFileOrDirectoryError } from './FuseErrors';
 
 export class ReaddirCallback extends FuseCallback<Array<string>> {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
-    super('Read Directory');
+    super('Read Directory', {});
   }
 
   async execute(path: string) {
     try {
-      const files = await this.container.filesByFolderPathNameLister.run(path);
+      const filesNamesPromise =
+        this.container.filesByFolderPathNameLister.run(path);
 
-      const fileNames = files.map((file) => file.nameWithExtension);
+      const folderNamesPromise =
+        this.container.foldersByParentPathLister.run(path);
 
-      const folders = await this.container.foldersByParentPathSearcher.run(
-        path
-      );
-
-      const foldersNames = folders.map((folder) => folder.name);
+      const [filesNames, foldersNames] = await Promise.all([
+        filesNamesPromise,
+        folderNamesPromise,
+      ]);
 
-      return this.right(['.', '..', ...fileNames, ...foldersNames]);
+      return this.right(['.', '..', ...filesNames, ...foldersNames]);
     } catch (error) {
       return this.left(
         new NoSuchFileOrDirectoryError(
diff --git a/src/apps/fuse/callbacks/StatFsCallback.ts b/src/apps/fuse/callbacks/StatFsCallback.ts
index 9c0719f8b..6a02eada7 100644
--- a/src/apps/fuse/callbacks/StatFsCallback.ts
+++ b/src/apps/fuse/callbacks/StatFsCallback.ts
@@ -22,7 +22,7 @@ export class StatFsCallback extends FuseCallback<Partial<StatFsCallbackData>> {
     private readonly localStats: Partial<StatFsCallbackData>,
     private readonly sid: number
   ) {
-    super('Stat FS', true);
+    super('Stat FS');
   }
 
   async execute(path: string) {
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
index c81a1d3e7..8e1349669 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
@@ -4,13 +4,13 @@ import { FolderDeleter } from '../../../../../context/virtual-drive/folders/appl
 import { FolderFinder } from '../../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderPathUpdater } from '../../../../../context/virtual-drive/folders/application/FolderPathUpdater';
 import { FolderSearcher } from '../../../../../context/virtual-drive/folders/application/FolderSearcher';
-import { FoldersByParentPathSearcher } from '../../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
+import { FoldersByParentPathLister } from '../../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
 import { OfflineFolderCreator } from '../../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
 
 export interface FoldersContainer {
   folderFinder: FolderFinder;
   folderSearcher: FolderSearcher;
-  foldersByParentPathSearcher: FoldersByParentPathSearcher;
+  foldersByParentPathLister: FoldersByParentPathLister;
   folderPathUpdater: FolderPathUpdater;
   allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
   folderCreator: FolderCreator;
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
index 950614c87..0443bfed9 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
@@ -7,7 +7,7 @@ import { FolderPathUpdater } from '../../../../../context/virtual-drive/folders/
 import { FolderRenamer } from '../../../../../context/virtual-drive/folders/application/FolderRenamer';
 import { FolderRepositoryInitiator } from '../../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
 import { FolderSearcher } from '../../../../../context/virtual-drive/folders/application/FolderSearcher';
-import { FoldersByParentPathSearcher } from '../../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
+import { FoldersByParentPathLister } from '../../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
 import { OfflineFolderCreator } from '../../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
 import { Folder } from '../../../../../context/virtual-drive/folders/domain/Folder';
 import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/FuseLocalFileSystem';
@@ -48,7 +48,7 @@ export async function buildFoldersContainer(
 
   const folderSearcher = new FolderSearcher(repository);
 
-  const foldersByParentPathSearcher = new FoldersByParentPathSearcher(
+  const foldersByParentPathSearcher = new FoldersByParentPathLister(
     folderFinder,
     repository
   );
@@ -103,7 +103,7 @@ export async function buildFoldersContainer(
   return {
     folderFinder,
     folderSearcher,
-    foldersByParentPathSearcher,
+    foldersByParentPathLister: foldersByParentPathSearcher,
     folderPathUpdater,
     allParentFoldersStatusIsExists,
     folderCreator,
diff --git a/src/apps/hydration-api/dependency-injection/folders/FoldersContainer.ts b/src/apps/hydration-api/dependency-injection/folders/FoldersContainer.ts
index a87567c8e..6dd4b46a7 100644
--- a/src/apps/hydration-api/dependency-injection/folders/FoldersContainer.ts
+++ b/src/apps/hydration-api/dependency-injection/folders/FoldersContainer.ts
@@ -1,9 +1,9 @@
 import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
-import { FoldersByParentPathSearcher } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
+import { FoldersByParentPathLister } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
 
 export interface FoldersContainer {
   folderFinder: FolderFinder;
   folderSearcher: FolderSearcher;
-  foldersByParentPathSearcher: FoldersByParentPathSearcher;
+  foldersByParentPathSearcher: FoldersByParentPathLister;
 }
diff --git a/src/apps/hydration-api/dependency-injection/folders/builder.ts b/src/apps/hydration-api/dependency-injection/folders/builder.ts
index 130dff0d0..46b7c6253 100644
--- a/src/apps/hydration-api/dependency-injection/folders/builder.ts
+++ b/src/apps/hydration-api/dependency-injection/folders/builder.ts
@@ -1,7 +1,7 @@
 import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderRepositoryInitiator } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
 import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
-import { FoldersByParentPathSearcher } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathNameLister';
+import { FoldersByParentPathLister } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
 import { Folder } from '../../../../context/virtual-drive/folders/domain/Folder';
 import { InMemoryFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
 import { FoldersContainer } from './FoldersContainer';
@@ -19,7 +19,7 @@ export async function buildFoldersContainer(
 
   const folderSearcher = new FolderSearcher(repository);
 
-  const foldersByParentPathSearcher = new FoldersByParentPathSearcher(
+  const foldersByParentPathSearcher = new FoldersByParentPathLister(
     folderFinder,
     repository
   );
diff --git a/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts b/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts
index c4ca13a5f..978bf149c 100644
--- a/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts
+++ b/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts
@@ -8,11 +8,11 @@ export class FilesByFolderPathSearcher {
     private readonly folderFinder: FolderFinder
   ) {}
 
-  async run(folderPath: string): Promise<Array<File>> {
+  async run(folderPath: string): Promise<Array<File['nameWithExtension']>> {
     const folder = this.folderFinder.run(folderPath);
 
     const files = await this.repository.listByPartial({ folderId: folder.id });
 
-    return files;
+    return files.map((file) => file.nameWithExtension);
   }
 }
diff --git a/src/context/virtual-drive/folders/application/FoldersByParentPathNameLister.ts b/src/context/virtual-drive/folders/application/FoldersByParentPathLister.ts
similarity index 73%
rename from src/context/virtual-drive/folders/application/FoldersByParentPathNameLister.ts
rename to src/context/virtual-drive/folders/application/FoldersByParentPathLister.ts
index 626454f00..dee1ba466 100644
--- a/src/context/virtual-drive/folders/application/FoldersByParentPathNameLister.ts
+++ b/src/context/virtual-drive/folders/application/FoldersByParentPathLister.ts
@@ -2,19 +2,19 @@ import { Folder } from '../domain/Folder';
 import { FolderRepository } from '../domain/FolderRepository';
 import { FolderFinder } from './FolderFinder';
 
-export class FoldersByParentPathSearcher {
+export class FoldersByParentPathLister {
   constructor(
     private readonly folderFinder: FolderFinder,
     private readonly repository: FolderRepository
   ) {}
 
-  async run(path: string): Promise<Array<Folder>> {
+  async run(path: string): Promise<Array<Folder['name']>> {
     const parent = this.folderFinder.run(path);
 
     const folders = await this.repository.listByPartial({
       parentId: parent?.id,
     });
 
-    return folders;
+    return folders.map((folder) => folder.name);
   }
 }

From cc0ecc50ffb4b98151b161f61715487bd06ef344 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 15 Jan 2024 12:51:01 +0100
Subject: [PATCH 132/188] chore: ignore default files

---
 src/apps/fuse/callbacks/FuseCallback.ts  | 6 ++++++
 src/apps/fuse/callbacks/PathsToIgnore.ts | 8 ++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 src/apps/fuse/callbacks/PathsToIgnore.ts

diff --git a/src/apps/fuse/callbacks/FuseCallback.ts b/src/apps/fuse/callbacks/FuseCallback.ts
index 7cb2e71ff..ca163ee44 100644
--- a/src/apps/fuse/callbacks/FuseCallback.ts
+++ b/src/apps/fuse/callbacks/FuseCallback.ts
@@ -2,6 +2,8 @@ import { Either, right, left } from '../../../context/shared/domain/Either';
 import { Stopwatch } from '../../shared/types/Stopwatch';
 import { FuseError } from './FuseErrors';
 import Logger from 'electron-log';
+import { PathsToIgnore } from './PathsToIgnore';
+import { FuseCodes } from './FuseCodes';
 
 export type Callback = (code: number) => void;
 
@@ -52,6 +54,10 @@ export abstract class FuseCallback<T> {
   async handle(...params: any[]): Promise<void> {
     const callback = params.pop() as CallbackWithData<T>;
 
+    if (PathsToIgnore.includes(params[0])) {
+      return callback(FuseCodes.EINVAL);
+    }
+
     if (this.debug.input) {
       Logger.debug(`${this.name}: `, ...params);
     }
diff --git a/src/apps/fuse/callbacks/PathsToIgnore.ts b/src/apps/fuse/callbacks/PathsToIgnore.ts
new file mode 100644
index 000000000..f04e2e94c
--- /dev/null
+++ b/src/apps/fuse/callbacks/PathsToIgnore.ts
@@ -0,0 +1,8 @@
+export const PathsToIgnore = [
+  '/BDMV',
+  '/.xdg-volume-info',
+  '/autorun.inf',
+  '/.Trash',
+  '/.Trash-1001/files',
+  '/.hidden',
+];

From 5f52a7b5a246311f787cd52e31a0142f7a084e99 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Tue, 16 Jan 2024 11:46:18 +0100
Subject: [PATCH 133/188] chore: minor fixes

---
 src/apps/fuse/FuseApp.ts                      |  2 +-
 src/apps/fuse/callbacks/FuseCallback.ts       | 16 ++++----
 .../fuse/callbacks/GetAttributesCallback.ts   | 37 ++++++++++++++++---
 .../fuse/callbacks/ListXAttributesCallback.ts |  4 ++
 .../files/application/OfflineFileCreator.ts   |  3 +-
 .../offline-drive/files/domain/OfflineFile.ts | 14 +++----
 6 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index f44d053ea..8da9f77a8 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -30,7 +30,7 @@ export class FuseApp {
   ) {}
 
   private async getOpt() {
-    const listXAttributes = new ListXAttributesCallback('ListXAttributes');
+    const listXAttributes = new ListXAttributesCallback();
     const getXAttribute = new GetXAttributeCallback('GetXAttribute');
     const readdir = new ReaddirCallback(
       this.fuseContainer.virtualDriveContainer
diff --git a/src/apps/fuse/callbacks/FuseCallback.ts b/src/apps/fuse/callbacks/FuseCallback.ts
index ca163ee44..da74da696 100644
--- a/src/apps/fuse/callbacks/FuseCallback.ts
+++ b/src/apps/fuse/callbacks/FuseCallback.ts
@@ -27,20 +27,24 @@ export abstract class FuseCallback<T> {
     }
   ) {}
 
-  private logTime(fun: () => Promise<Either<FuseError, T>>) {
+  private async logTime(fun: () => Promise<Either<FuseError, T>>) {
     const stopwatch = new Stopwatch();
     stopwatch.start();
 
-    const result = fun();
+    const result = await fun();
 
-    Logger.debug(`Elapsed time for ${this.name}: `, stopwatch.elapsedTime());
+    if (this.debug.elapsedTime) {
+      Logger.debug(`Elapsed time for ${this.name}: `, stopwatch.elapsedTime());
+    }
 
     return result;
   }
 
   protected right(value: T): Either<FuseError, T> {
     if (this.debug.result) {
-      Logger.debug(`${this.name} Result: ${JSON.stringify({ value })}`);
+      Logger.debug(
+        `${this.name} Result: ${JSON.stringify({ value }, null, 2)}`
+      );
     }
 
     return right(value);
@@ -62,9 +66,7 @@ export abstract class FuseCallback<T> {
       Logger.debug(`${this.name}: `, ...params);
     }
 
-    const result = await (this.debug.elapsedTime
-      ? this.logTime(() => this.execute(...params))
-      : this.execute(...params));
+    const result = await this.logTime(() => this.execute(...params));
 
     if (result.isLeft()) {
       const error = result.getLeft();
diff --git a/src/apps/fuse/callbacks/GetAttributesCallback.ts b/src/apps/fuse/callbacks/GetAttributesCallback.ts
index 5e7a26eb7..657f83d0c 100644
--- a/src/apps/fuse/callbacks/GetAttributesCallback.ts
+++ b/src/apps/fuse/callbacks/GetAttributesCallback.ts
@@ -3,7 +3,13 @@ import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual
 import { FuseCallback } from './FuseCallback';
 import { NoSuchFileOrDirectoryError } from './FuseErrors';
 
-type GetAttributesCallbackData = { mode: number; size: number };
+type GetAttributesCallbackData = {
+  mode: number;
+  size: number;
+  mtime: Date;
+  atime?: Date;
+  ctime: Date;
+};
 
 export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackData> {
   private static readonly FILE = 33188;
@@ -13,18 +19,30 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
     private readonly virtualDriveContainer: VirtualDriveDependencyContainer,
     private readonly offlineDriveContainer: OfflineDriveDependencyContainer
   ) {
-    super('Get Attributes');
+    super('Get Attributes', { elapsedTime: false, result: false });
   }
 
   async execute(path: string) {
     if (path === '/') {
-      return this.right({ mode: GetAttributesCallback.FOLDER, size: 0 });
+      return this.right({
+        mode: GetAttributesCallback.FOLDER,
+        size: 0,
+        mtime: new Date(),
+        ctime: new Date(),
+        atime: undefined,
+      });
     }
 
     const file = await this.virtualDriveContainer.filesSearcher.run({ path });
 
     if (file) {
-      return this.right({ mode: GetAttributesCallback.FILE, size: file.size });
+      return this.right({
+        mode: GetAttributesCallback.FILE,
+        size: file.size,
+        ctime: file.createdAt,
+        mtime: file.updatedAt,
+        atime: new Date(),
+      });
     }
 
     const folder = await this.virtualDriveContainer.folderSearcher.run({
@@ -32,7 +50,13 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
     });
 
     if (folder) {
-      return this.right({ mode: GetAttributesCallback.FOLDER, size: 0 });
+      return this.right({
+        mode: GetAttributesCallback.FOLDER,
+        size: 0,
+        ctime: folder.createdAt,
+        mtime: folder.updatedAt,
+        atime: folder.createdAt,
+      });
     }
 
     const offlineFile =
@@ -42,6 +66,9 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
       return this.right({
         mode: GetAttributesCallback.FILE,
         size: offlineFile.size,
+        mtime: new Date(),
+        ctime: offlineFile.createdAt,
+        atime: offlineFile.createdAt,
       });
     }
 
diff --git a/src/apps/fuse/callbacks/ListXAttributesCallback.ts b/src/apps/fuse/callbacks/ListXAttributesCallback.ts
index c815806c0..26813562d 100644
--- a/src/apps/fuse/callbacks/ListXAttributesCallback.ts
+++ b/src/apps/fuse/callbacks/ListXAttributesCallback.ts
@@ -3,6 +3,10 @@ import { FuseCallback } from './FuseCallback';
 type ListXAttributesCallbackData = Array<string>;
 
 export class ListXAttributesCallback extends FuseCallback<ListXAttributesCallbackData> {
+  constructor() {
+    super('List X Attributes');
+  }
+
   async execute(_path: string) {
     return this.right([]);
   }
diff --git a/src/context/offline-drive/files/application/OfflineFileCreator.ts b/src/context/offline-drive/files/application/OfflineFileCreator.ts
index 7f90c52a2..4b446eefc 100644
--- a/src/context/offline-drive/files/application/OfflineFileCreator.ts
+++ b/src/context/offline-drive/files/application/OfflineFileCreator.ts
@@ -11,11 +11,10 @@ export class OfflineFileCreator {
   ) {}
 
   async run(path: string): Promise<OfflineFile> {
-    const createdAt = Date.now();
     const filePath = new FilePath(path);
     const size = new FileSize(0);
 
-    const file = OfflineFile.create(createdAt, filePath, size);
+    const file = OfflineFile.create(filePath, size);
 
     await this.repository.save(file);
 
diff --git a/src/context/offline-drive/files/domain/OfflineFile.ts b/src/context/offline-drive/files/domain/OfflineFile.ts
index 64a832cfa..b24934821 100644
--- a/src/context/offline-drive/files/domain/OfflineFile.ts
+++ b/src/context/offline-drive/files/domain/OfflineFile.ts
@@ -5,7 +5,7 @@ import { OfflineFileSize } from './OfflineFileSize';
 
 export type OfflineFileAttributes = {
   id: string;
-  createdAt: number;
+  createdAt: Date;
   path: string;
   size: number;
 };
@@ -13,7 +13,7 @@ export type OfflineFileAttributes = {
 export class OfflineFile extends AggregateRoot {
   private constructor(
     private _id: OfflineFileId,
-    private _createdAt: number,
+    private _createdAt: Date,
     private _path: OfflineFilePath,
     private _size: OfflineFileSize
   ) {
@@ -23,7 +23,7 @@ export class OfflineFile extends AggregateRoot {
   public get id(): string {
     return this._id.value;
   }
-  public get createdAt(): number {
+  public get createdAt(): Date {
     return this._createdAt;
   }
   public get path() {
@@ -39,12 +39,10 @@ export class OfflineFile extends AggregateRoot {
     return this._path.extension();
   }
 
-  static create(
-    createdAt: number,
-    path: OfflineFilePath,
-    size: OfflineFileSize
-  ): OfflineFile {
+  static create(path: OfflineFilePath, size: OfflineFileSize): OfflineFile {
     const id = OfflineFileId.create();
+    const createdAt = new Date();
+
     const file = new OfflineFile(id, createdAt, path, size);
 
     return file;

From 03e131b9f4a503a021efd952f3cd142b31f310d5 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Tue, 16 Jan 2024 12:06:14 +0100
Subject: [PATCH 134/188] feat: update tree on remote changes

---
 src/apps/fuse/FuseApp.ts                      | 21 +++++++++++++++++--
 .../virtual-drive/files/FilesContainer.ts     |  2 ++
 .../virtual-drive/files/builder.ts            |  3 +++
 .../virtual-drive/folders/FoldersContainer.ts |  2 ++
 .../virtual-drive/folders/builder.ts          |  1 +
 src/apps/fuse/index.ts                        | 15 ++++++-------
 src/apps/main/event-bus.ts                    |  3 +++
 src/apps/main/remote-sync/handlers.ts         |  2 +-
 8 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index 8da9f77a8..44d8e047c 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -88,7 +88,7 @@ export class FuseApp {
 
     this._fuse.mount((err: any) => {
       if (err) {
-        Logger.error(`FUSE mount error: ${err}`);
+        Logger.error(`[FUSE] mount error: ${err}`);
       }
     });
   }
@@ -96,7 +96,7 @@ export class FuseApp {
   async stop(): Promise<void> {
     this._fuse?.unmount((err: any) => {
       if (err) {
-        Logger.error(`FUSE unmount error: ${err}`);
+        Logger.error(`[FUSE] unmount error: ${err}`);
       }
     });
   }
@@ -104,4 +104,21 @@ export class FuseApp {
   async clearCache(): Promise<void> {
     await this.fuseContainer.virtualDriveContainer.allLocalContentsDeleter.run();
   }
+
+  async update(): Promise<void> {
+    Logger.info('[FUSE] Updating tree');
+
+    const tree =
+      await this.fuseContainer.virtualDriveContainer.existingNodesTreeBuilder.run();
+
+    await this.fuseContainer.virtualDriveContainer.repositoryPopulator.run(
+      tree.files
+    );
+
+    await this.fuseContainer.virtualDriveContainer.folderRepositoryInitiator.run(
+      tree.folders
+    );
+
+    Logger.info('[FUSE] Tree updated successfully');
+  }
 }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
index 5c748db86..0eb4c9228 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
@@ -5,6 +5,7 @@ import { FileCreator } from '../../../../../context/virtual-drive/files/applicat
 import { SameFileWasMoved } from '../../../../../context/virtual-drive/files/application/SameFileWasMoved';
 import { FileDeleter } from '../../../../../context/virtual-drive/files/application/FileDeleter';
 import { CreateFileOnOfflineFileUploaded } from '../../../../../context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded';
+import { RepositoryPopulator } from '../../../../../context/virtual-drive/files/application/RepositoryPopulator';
 
 export interface FilesContainer {
   filesByFolderPathNameLister: FilesByFolderPathSearcher;
@@ -13,5 +14,6 @@ export interface FilesContainer {
   fileCreator: FileCreator;
   fileDeleter: FileDeleter;
   sameFileWasMoved: SameFileWasMoved;
+  repositoryPopulator: RepositoryPopulator;
   createFileOnOfflineFileUploaded: CreateFileOnOfflineFileUploaded;
 }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
index f069c8d99..4bda1cc95 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
@@ -95,6 +95,9 @@ export async function buildFilesContainer(
     sameFileWasMoved,
     fileCreator,
     fileDeleter,
+    repositoryPopulator,
+
+    // event handlers
     createFileOnOfflineFileUploaded,
   };
 }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
index 8e1349669..8bec5565c 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
@@ -3,6 +3,7 @@ import { FolderCreator } from '../../../../../context/virtual-drive/folders/appl
 import { FolderDeleter } from '../../../../../context/virtual-drive/folders/application/FolderDeleter';
 import { FolderFinder } from '../../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderPathUpdater } from '../../../../../context/virtual-drive/folders/application/FolderPathUpdater';
+import { FolderRepositoryInitiator } from '../../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
 import { FolderSearcher } from '../../../../../context/virtual-drive/folders/application/FolderSearcher';
 import { FoldersByParentPathLister } from '../../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
 import { OfflineFolderCreator } from '../../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
@@ -15,6 +16,7 @@ export interface FoldersContainer {
   allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
   folderCreator: FolderCreator;
   folderDeleter: FolderDeleter;
+  folderRepositoryInitiator: FolderRepositoryInitiator;
   offline: {
     offlineFolderCreator: OfflineFolderCreator;
   };
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
index 0443bfed9..bc5c0f3a1 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
@@ -109,5 +109,6 @@ export async function buildFoldersContainer(
     folderCreator,
     folderDeleter,
     offline,
+    folderRepositoryInitiator,
   };
 }
diff --git a/src/apps/fuse/index.ts b/src/apps/fuse/index.ts
index df66a730c..101f2fc07 100644
--- a/src/apps/fuse/index.ts
+++ b/src/apps/fuse/index.ts
@@ -10,7 +10,7 @@ import { HydrationApi } from '../hydration-api/HydrationApi';
 
 let fuseApp: FuseApp;
 
-async function spawnSyncEngineWorker() {
+async function startFuseApp() {
   const api = new HydrationApi();
 
   await api.start({
@@ -39,15 +39,16 @@ export async function stopSyncEngineWatcher() {
   await fuseApp.stop();
 }
 
-async function stopAndClearSyncEngineWatcher() {
+async function stopAndClearFuseApp() {
   await fuseApp.clearCache();
   await fuseApp.stop();
 }
 
-export function updateSyncEngine() {
-  // no op
+async function updateFuseApp() {
+  await fuseApp.update();
 }
 
-eventBus.on('USER_LOGGED_OUT', stopAndClearSyncEngineWatcher);
-eventBus.on('USER_WAS_UNAUTHORIZED', stopAndClearSyncEngineWatcher);
-eventBus.on('INITIAL_SYNC_READY', spawnSyncEngineWorker);
+eventBus.on('USER_LOGGED_OUT', stopAndClearFuseApp);
+eventBus.on('USER_WAS_UNAUTHORIZED', stopAndClearFuseApp);
+eventBus.on('INITIAL_SYNC_READY', startFuseApp);
+eventBus.on('REMOTE_CHANGES_SYNCHED', updateFuseApp);
diff --git a/src/apps/main/event-bus.ts b/src/apps/main/event-bus.ts
index 069f346b6..f5d678e5c 100644
--- a/src/apps/main/event-bus.ts
+++ b/src/apps/main/event-bus.ts
@@ -26,6 +26,9 @@ interface Events {
 
   // Used when we have at least one full remote-local sync so we can display content
   INITIAL_SYNC_READY: () => void;
+
+  // Used when the local DB has the most recent changes of remote
+  REMOTE_CHANGES_SYNCHED: () => void;
 }
 
 declare interface EventBus {
diff --git a/src/apps/main/remote-sync/handlers.ts b/src/apps/main/remote-sync/handlers.ts
index 2426f0bc3..a03f8ef2a 100644
--- a/src/apps/main/remote-sync/handlers.ts
+++ b/src/apps/main/remote-sync/handlers.ts
@@ -84,7 +84,7 @@ eventBus.on('RECEIVED_REMOTE_CHANGES', async () => {
   await sleep(2_000);
 
   await remoteSyncManager.startRemoteSync();
-  updateSyncEngine();
+  eventBus.emit('REMOTE_CHANGES_SYNCHED');
 });
 
 eventBus.on('USER_LOGGED_IN', async () => {

From 6ec4ea1fe19727a619300dfe7126265abd3a71de Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Tue, 16 Jan 2024 15:35:37 +0100
Subject: [PATCH 135/188] chore: reduce log info

---
 src/apps/main/analytics/service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/main/analytics/service.ts b/src/apps/main/analytics/service.ts
index 4cc906c6d..346f5a2f9 100644
--- a/src/apps/main/analytics/service.ts
+++ b/src/apps/main/analytics/service.ts
@@ -266,7 +266,7 @@ export function trackEvent(
     properties,
     context: deviceContext,
   };
-  Logger.debug('Tracked event', payload);
+  Logger.debug('Tracked event', event);
 
   client.track(payload);
 }

From c15124b74d6e2554d5bd41b5db379f49d72b9b29 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Tue, 16 Jan 2024 17:46:42 +0100
Subject: [PATCH 136/188] feat: create folders without offline

---
 .../fuse/callbacks/GetAttributesCallback.ts   |  2 +-
 .../fuse/callbacks/MakeDirectoryCallback.ts   | 15 ++-
 .../virtual-drive/folders/FoldersContainer.ts |  8 +-
 .../virtual-drive/folders/builder.ts          | 22 ++---
 .../controllers/AddController.ts              |  4 +-
 .../folders/FoldersContainer.ts               |  4 +-
 .../dependency-injection/folders/builder.ts   |  4 +-
 .../contents/domain/OfflineContentsId.ts      |  2 +-
 .../contents/domain/OfflineContentsSize.ts    |  2 +-
 .../files/domain/OfflineFileId.ts             |  2 +-
 .../files/domain/OfflineFileSize.ts           |  2 +-
 src/context/shared/domain/AggregateRoot.ts    |  2 +-
 src/context/shared/domain/BucketEntry.ts      | 20 ----
 src/context/shared/domain/EnumValueObject.ts  | 16 ---
 src/context/shared/domain/Path.ts             |  2 +-
 src/context/shared/domain/Uuid.ts             | 20 ----
 src/context/shared/domain/ValueObject.ts      | 25 -----
 .../contents/domain/ContentsId.ts             |  2 +-
 .../contents/domain/ContentsSize.ts           |  2 +-
 .../virtual-drive/files/domain/FileSize.ts    |  2 +-
 .../virtual-drive/files/domain/FileStatus.ts  |  2 +-
 .../folders/application/FolderCreator.ts      | 57 ++++++++---
 .../Offline/OfflineFolderCreator.ts           |  5 +-
 .../SynchronizeOfflineModifications.ts        |  3 +-
 .../application/UpdatePlaceholderFolder.ts    |  8 +-
 .../virtual-drive/folders/domain/Folder.ts    | 99 ++++++++++++-------
 .../folders/domain/FolderStatus.ts            |  2 +-
 .../folders/domain/FolderUuid.ts              |  2 +-
 .../folders/domain/OfflineFolder.ts           | 19 ++--
 .../domain/file-systems/RemoteFileSystem.ts   | 20 +++-
 .../infrastructure/HttpRemoteFileSystem.ts    | 32 +++---
 .../shared/domain/BucketEntryId.ts            |  2 +-
 .../files/domain/OfflineFileMother.ts         |  2 +-
 tests/context/shared/domain/UuidMother.ts     |  2 +-
 .../__mocks__/FolderRemoteFileSystemMock.ts   | 21 ++--
 .../folders/application/FolderCreator.test.ts | 78 ---------------
 .../SynchronizeOfflineModifications.test.ts   |  7 +-
 .../items/application/Traverser.test.ts       | 19 ++--
 ...BytesInBinaryToInternacionalSystem.test.ts | 22 ++---
 39 files changed, 248 insertions(+), 312 deletions(-)
 delete mode 100644 src/context/shared/domain/BucketEntry.ts
 delete mode 100644 src/context/shared/domain/EnumValueObject.ts
 delete mode 100644 src/context/shared/domain/Uuid.ts
 delete mode 100644 src/context/shared/domain/ValueObject.ts
 delete mode 100644 tests/context/virtual-drive/folders/application/FolderCreator.test.ts

diff --git a/src/apps/fuse/callbacks/GetAttributesCallback.ts b/src/apps/fuse/callbacks/GetAttributesCallback.ts
index 657f83d0c..7c05caf0a 100644
--- a/src/apps/fuse/callbacks/GetAttributesCallback.ts
+++ b/src/apps/fuse/callbacks/GetAttributesCallback.ts
@@ -7,8 +7,8 @@ type GetAttributesCallbackData = {
   mode: number;
   size: number;
   mtime: Date;
-  atime?: Date;
   ctime: Date;
+  atime?: Date;
 };
 
 export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackData> {
diff --git a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
index 83d58bc4c..93eb5813c 100644
--- a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
+++ b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
@@ -1,5 +1,6 @@
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { NotifyFuseCallback } from './FuseCallback';
+import { IOError } from './FuseErrors';
 
 export class MakeDirectoryCallback extends NotifyFuseCallback {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
@@ -7,10 +8,18 @@ export class MakeDirectoryCallback extends NotifyFuseCallback {
   }
 
   async execute(path: string, _mode: number) {
-    const offlineFolder = this.container.offline.offlineFolderCreator.run(path);
+    try {
+      await this.container.folderSyncNotifier.creating(path);
 
-    await this.container.folderCreator.run(offlineFolder);
+      await this.container.folderCreator.run(path);
 
-    return this.right();
+      await this.container.folderSyncNotifier.created(path);
+
+      return this.right();
+    } catch (err: unknown) {
+      await this.container.folderSyncNotifier.error();
+
+      return this.left(new IOError(path));
+    }
   }
 }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
index 8bec5565c..7e26fa41c 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
@@ -1,12 +1,13 @@
 import { AllParentFoldersStatusIsExists } from '../../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
 import { FolderCreator } from '../../../../../context/virtual-drive/folders/application/FolderCreator';
+import { FolderCreatorFromOfflineFolder } from '../../../../../context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder';
 import { FolderDeleter } from '../../../../../context/virtual-drive/folders/application/FolderDeleter';
 import { FolderFinder } from '../../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderPathUpdater } from '../../../../../context/virtual-drive/folders/application/FolderPathUpdater';
 import { FolderRepositoryInitiator } from '../../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
 import { FolderSearcher } from '../../../../../context/virtual-drive/folders/application/FolderSearcher';
 import { FoldersByParentPathLister } from '../../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
-import { OfflineFolderCreator } from '../../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
+import { FolderSyncNotifier } from '../../../../../context/virtual-drive/folders/domain/FolderSyncNotifier';
 
 export interface FoldersContainer {
   folderFinder: FolderFinder;
@@ -14,10 +15,9 @@ export interface FoldersContainer {
   foldersByParentPathLister: FoldersByParentPathLister;
   folderPathUpdater: FolderPathUpdater;
   allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
+  folderCreatorFromOfflineFolder: FolderCreatorFromOfflineFolder;
   folderCreator: FolderCreator;
   folderDeleter: FolderDeleter;
   folderRepositoryInitiator: FolderRepositoryInitiator;
-  offline: {
-    offlineFolderCreator: OfflineFolderCreator;
-  };
+  folderSyncNotifier: FolderSyncNotifier;
 }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
index bc5c0f3a1..41f98b35b 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
@@ -1,5 +1,6 @@
 import { AllParentFoldersStatusIsExists } from '../../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
 import { FolderCreator } from '../../../../../context/virtual-drive/folders/application/FolderCreator';
+import { FolderCreatorFromOfflineFolder } from '../../../../../context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder';
 import { FolderDeleter } from '../../../../../context/virtual-drive/folders/application/FolderDeleter';
 import { FolderFinder } from '../../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderMover } from '../../../../../context/virtual-drive/folders/application/FolderMover';
@@ -8,12 +9,10 @@ import { FolderRenamer } from '../../../../../context/virtual-drive/folders/appl
 import { FolderRepositoryInitiator } from '../../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
 import { FolderSearcher } from '../../../../../context/virtual-drive/folders/application/FolderSearcher';
 import { FoldersByParentPathLister } from '../../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
-import { OfflineFolderCreator } from '../../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
 import { Folder } from '../../../../../context/virtual-drive/folders/domain/Folder';
 import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/FuseLocalFileSystem';
 import { HttpRemoteFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
 import { InMemoryFolderRepository } from '../../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
-import { InMemoryOfflineFolderRepository } from '../../../../../context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository';
 import { MainProcessFolderSyncNotifier } from '../../../../../context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier';
 import { DependencyInjectionHttpClientsProvider } from '../../common/clients';
 import { DependencyInjectionEventBus } from '../../common/eventBus';
@@ -38,8 +37,6 @@ export async function buildFoldersContainer(
 
   const { bus: eventBus } = DependencyInjectionEventBus;
 
-  const offlineFolderRepository = new InMemoryOfflineFolderRepository();
-
   const folderRepositoryInitiator = new FolderRepositoryInitiator(repository);
 
   await folderRepositoryInitiator.run(initialFolders);
@@ -76,17 +73,17 @@ export async function buildFoldersContainer(
     repository
   );
 
-  const folderCreator = new FolderCreator(
+  const folderCreatorFromOfflineFolder = new FolderCreatorFromOfflineFolder(
     repository,
     remoteFileSystem,
     eventBus,
     notifier
   );
 
-  const offlineFolderCreator = new OfflineFolderCreator(
-    folderFinder,
-    offlineFolderRepository,
-    repository
+  const folderCreator = new FolderCreator(
+    repository,
+    remoteFileSystem,
+    eventBus
   );
 
   const folderDeleter = new FolderDeleter(
@@ -96,19 +93,16 @@ export async function buildFoldersContainer(
     allParentFoldersStatusIsExists
   );
 
-  const offline = {
-    offlineFolderCreator,
-  };
-
   return {
     folderFinder,
     folderSearcher,
     foldersByParentPathLister: foldersByParentPathSearcher,
     folderPathUpdater,
     allParentFoldersStatusIsExists,
+    folderCreatorFromOfflineFolder,
     folderCreator,
     folderDeleter,
-    offline,
+    folderSyncNotifier: notifier,
     folderRepositoryInitiator,
   };
 }
diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
index 6530dbbeb..6c9b7d7b2 100644
--- a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
@@ -1,7 +1,7 @@
 import Logger from 'electron-log';
 import { FileCreationOrchestrator } from '../../../../context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator';
 import { createFilePlaceholderId } from '../../../../context/virtual-drive/files/domain/PlaceholderId';
-import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
+import { FolderCreatorFromOfflineFolder } from '../../../../context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder';
 import { OfflineFolderCreator } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
 import { createFolderPlaceholderId } from '../../../../context/virtual-drive/folders/domain/FolderPlaceholderId';
 import { OfflineFolder } from '../../../../context/virtual-drive/folders/domain/OfflineFolder';
@@ -35,7 +35,7 @@ export class AddController extends CallbackController {
   constructor(
     private readonly absolutePathToRelativeConverter: AbsolutePathToRelativeConverter,
     private readonly fileCreationOrchestrator: FileCreationOrchestrator,
-    private readonly folderCreator: FolderCreator,
+    private readonly folderCreator: FolderCreatorFromOfflineFolder,
     private readonly offlineFolderCreator: OfflineFolderCreator
   ) {
     super();
diff --git a/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts b/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
index bcb774e3d..749b37ba3 100644
--- a/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
+++ b/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
@@ -1,6 +1,6 @@
 import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
 import { FolderByPartialSearcher } from '../../../../context/virtual-drive/folders/application/FolderByPartialSearcher';
-import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
+import { FolderCreatorFromOfflineFolder } from '../../../../context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder';
 import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
 import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
@@ -14,7 +14,7 @@ import { SynchronizeOfflineModificationsOnFolderCreated } from '../../../../cont
 import { FolderPlaceholderUpdater } from '../../../../context/virtual-drive/folders/application/UpdatePlaceholderFolder';
 
 export interface FoldersContainer {
-  folderCreator: FolderCreator;
+  folderCreator: FolderCreatorFromOfflineFolder;
   folderFinder: FolderFinder;
   folderDeleter: FolderDeleter;
   allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
diff --git a/src/apps/sync-engine/dependency-injection/folders/builder.ts b/src/apps/sync-engine/dependency-injection/folders/builder.ts
index dab3e0171..63bbfe1f8 100644
--- a/src/apps/sync-engine/dependency-injection/folders/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/folders/builder.ts
@@ -1,7 +1,7 @@
 import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem';
 import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
 import { FolderByPartialSearcher } from '../../../../context/virtual-drive/folders/application/FolderByPartialSearcher';
-import { FolderCreator } from '../../../../context/virtual-drive/folders/application/FolderCreator';
+import { FolderCreatorFromOfflineFolder } from '../../../../context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder';
 import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
 import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderMover } from '../../../../context/virtual-drive/folders/application/FolderMover';
@@ -60,7 +60,7 @@ export async function buildFoldersContainer(
     allParentFoldersStatusIsExists
   );
 
-  const folderCreator = new FolderCreator(
+  const folderCreator = new FolderCreatorFromOfflineFolder(
     repository,
     remoteFileSystem,
     eventBus,
diff --git a/src/context/offline-drive/contents/domain/OfflineContentsId.ts b/src/context/offline-drive/contents/domain/OfflineContentsId.ts
index e794d1ae2..f71728522 100644
--- a/src/context/offline-drive/contents/domain/OfflineContentsId.ts
+++ b/src/context/offline-drive/contents/domain/OfflineContentsId.ts
@@ -1,3 +1,3 @@
-import { Uuid } from '../../../shared/domain/Uuid';
+import { Uuid } from '../../../shared/domain/value-objects/Uuid';
 
 export class OfflineContentsId extends Uuid {}
diff --git a/src/context/offline-drive/contents/domain/OfflineContentsSize.ts b/src/context/offline-drive/contents/domain/OfflineContentsSize.ts
index 8cee39cef..7ca903a76 100644
--- a/src/context/offline-drive/contents/domain/OfflineContentsSize.ts
+++ b/src/context/offline-drive/contents/domain/OfflineContentsSize.ts
@@ -1,3 +1,3 @@
-import { BucketEntry } from '../../../shared/domain/BucketEntry';
+import { BucketEntry } from '../../../shared/domain/value-objects/BucketEntry';
 
 export class OfflineContentsSize extends BucketEntry {}
diff --git a/src/context/offline-drive/files/domain/OfflineFileId.ts b/src/context/offline-drive/files/domain/OfflineFileId.ts
index 37d1123a7..3ed857c26 100644
--- a/src/context/offline-drive/files/domain/OfflineFileId.ts
+++ b/src/context/offline-drive/files/domain/OfflineFileId.ts
@@ -1,4 +1,4 @@
-import { Uuid } from '../../../shared/domain/Uuid';
+import { Uuid } from '../../../shared/domain/value-objects/Uuid';
 
 export class OfflineFileId extends Uuid {
   static create(): OfflineFileId {
diff --git a/src/context/offline-drive/files/domain/OfflineFileSize.ts b/src/context/offline-drive/files/domain/OfflineFileSize.ts
index 2e593669f..40397925f 100644
--- a/src/context/offline-drive/files/domain/OfflineFileSize.ts
+++ b/src/context/offline-drive/files/domain/OfflineFileSize.ts
@@ -1,3 +1,3 @@
-import { BucketEntry } from '../../../shared/domain/BucketEntry';
+import { BucketEntry } from '../../../shared/domain/value-objects/BucketEntry';
 
 export class OfflineFileSize extends BucketEntry {}
diff --git a/src/context/shared/domain/AggregateRoot.ts b/src/context/shared/domain/AggregateRoot.ts
index 5293e60bf..db8c51f4f 100644
--- a/src/context/shared/domain/AggregateRoot.ts
+++ b/src/context/shared/domain/AggregateRoot.ts
@@ -1,4 +1,4 @@
-import { Primitives } from './ValueObject';
+import { Primitives } from './value-objects/ValueObject';
 import { DomainEvent } from './DomainEvent';
 
 export abstract class AggregateRoot {
diff --git a/src/context/shared/domain/BucketEntry.ts b/src/context/shared/domain/BucketEntry.ts
deleted file mode 100644
index fba1e19dd..000000000
--- a/src/context/shared/domain/BucketEntry.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { ValueObject } from './ValueObject';
-
-export class BucketEntry extends ValueObject<number> {
-  public static MAX_SIZE = 20 * 1024 * 1024 * 1024;
-
-  constructor(value: number) {
-    super(value);
-    this.ensureIsValid(value);
-  }
-
-  private ensureIsValid(value: number) {
-    if (value > BucketEntry.MAX_SIZE) {
-      throw new Error('File size to big');
-    }
-
-    if (value < 0) {
-      throw new Error('File size cannot be negative');
-    }
-  }
-}
diff --git a/src/context/shared/domain/EnumValueObject.ts b/src/context/shared/domain/EnumValueObject.ts
deleted file mode 100644
index adcd5c691..000000000
--- a/src/context/shared/domain/EnumValueObject.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-export abstract class EnumValueObject<T> {
-  readonly value: T;
-
-  constructor(value: T, public readonly validValues: T[]) {
-    this.value = value;
-    this.checkValueIsValid(value);
-  }
-
-  public checkValueIsValid(value: T): void {
-    if (!this.validValues.includes(value)) {
-      this.throwErrorForInvalidValue(value);
-    }
-  }
-
-  protected abstract throwErrorForInvalidValue(value: T): void;
-}
diff --git a/src/context/shared/domain/Path.ts b/src/context/shared/domain/Path.ts
index a0100e0eb..c4c056950 100644
--- a/src/context/shared/domain/Path.ts
+++ b/src/context/shared/domain/Path.ts
@@ -1,6 +1,6 @@
 import path from 'path';
 import { InvalidArgumentError } from './InvalidArgumentError';
-import { ValueObject } from './ValueObject';
+import { ValueObject } from './value-objects/ValueObject';
 
 const isWindowsRootDirectory = /[a-zA-Z]:[\\/]/;
 const containsNullCharacter = /\0/g;
diff --git a/src/context/shared/domain/Uuid.ts b/src/context/shared/domain/Uuid.ts
deleted file mode 100644
index 10734de10..000000000
--- a/src/context/shared/domain/Uuid.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import * as uuid from 'uuid';
-import { InvalidArgumentError } from './InvalidArgumentError';
-import { ValueObject } from './ValueObject';
-
-export class Uuid extends ValueObject<string> {
-  constructor(value: string) {
-    super(value);
-    this.ensureIsValid(value);
-  }
-
-  private ensureIsValid(value: string) {
-    if (!uuid.validate(value)) {
-      throw new InvalidArgumentError(`Value: ${value} is not a valid uuid`);
-    }
-  }
-
-  static random(): Uuid {
-    return new Uuid(uuid.v4());
-  }
-}
diff --git a/src/context/shared/domain/ValueObject.ts b/src/context/shared/domain/ValueObject.ts
deleted file mode 100644
index d1908baba..000000000
--- a/src/context/shared/domain/ValueObject.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { InvalidArgumentError } from './InvalidArgumentError';
-
-export type Primitives = string | number | boolean | Date | undefined;
-
-export abstract class ValueObject<T extends Primitives> {
-  readonly value: T;
-
-  constructor(value: T) {
-    this.value = value;
-    this.ensureValueIsDefined(value);
-  }
-
-  private ensureValueIsDefined(value: T): void {
-    if (value === null || value === undefined) {
-      throw new InvalidArgumentError('Value must be defined');
-    }
-  }
-
-  equals(other: ValueObject<T>): boolean {
-    return (
-      other.constructor.name === this.constructor.name &&
-      other.value === this.value
-    );
-  }
-}
diff --git a/src/context/virtual-drive/contents/domain/ContentsId.ts b/src/context/virtual-drive/contents/domain/ContentsId.ts
index 607a9b52b..1e6249835 100644
--- a/src/context/virtual-drive/contents/domain/ContentsId.ts
+++ b/src/context/virtual-drive/contents/domain/ContentsId.ts
@@ -1,5 +1,5 @@
 import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
-import { ValueObject } from '../../../shared/domain/ValueObject';
+import { ValueObject } from '../../../shared/domain/value-objects/ValueObject';
 
 export class ContentsId extends ValueObject<string> {
   static readonly VALID_LENGTH = 24;
diff --git a/src/context/virtual-drive/contents/domain/ContentsSize.ts b/src/context/virtual-drive/contents/domain/ContentsSize.ts
index e125107fa..ffb45d892 100644
--- a/src/context/virtual-drive/contents/domain/ContentsSize.ts
+++ b/src/context/virtual-drive/contents/domain/ContentsSize.ts
@@ -1,3 +1,3 @@
-import { BucketEntry } from '../../../shared/domain/BucketEntry';
+import { BucketEntry } from '../../../shared/domain/value-objects/BucketEntry';
 
 export class ContentsSize extends BucketEntry {}
diff --git a/src/context/virtual-drive/files/domain/FileSize.ts b/src/context/virtual-drive/files/domain/FileSize.ts
index 26929cbdd..9b94ea516 100644
--- a/src/context/virtual-drive/files/domain/FileSize.ts
+++ b/src/context/virtual-drive/files/domain/FileSize.ts
@@ -1,3 +1,3 @@
-import { BucketEntry } from '../../../shared/domain/BucketEntry';
+import { BucketEntry } from '../../../shared/domain/value-objects/BucketEntry';
 
 export class FileSize extends BucketEntry {}
diff --git a/src/context/virtual-drive/files/domain/FileStatus.ts b/src/context/virtual-drive/files/domain/FileStatus.ts
index 66070c4a1..685d9d314 100644
--- a/src/context/virtual-drive/files/domain/FileStatus.ts
+++ b/src/context/virtual-drive/files/domain/FileStatus.ts
@@ -1,4 +1,4 @@
-import { EnumValueObject } from '../../../shared/domain/EnumValueObject';
+import { EnumValueObject } from '../../../shared/domain/value-objects/EnumValueObject';
 import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
 import { ActionNotPermittedError } from './errors/ActionNotPermittedError';
 
diff --git a/src/context/virtual-drive/folders/application/FolderCreator.ts b/src/context/virtual-drive/folders/application/FolderCreator.ts
index a0a1f0992..c7874bf5e 100644
--- a/src/context/virtual-drive/folders/application/FolderCreator.ts
+++ b/src/context/virtual-drive/folders/application/FolderCreator.ts
@@ -1,32 +1,65 @@
 import { EventBus } from '../../shared/domain/EventBus';
 import { Folder } from '../domain/Folder';
+import { FolderCreatedAt } from '../domain/FolderCreatedAt';
+import { FolderId } from '../domain/FolderId';
+import { FolderPath } from '../domain/FolderPath';
 import { FolderRepository } from '../domain/FolderRepository';
-import { FolderSyncNotifier } from '../domain/FolderSyncNotifier';
-import { OfflineFolder } from '../domain/OfflineFolder';
+import { FolderUpdatedAt } from '../domain/FolderUpdatedAt';
+import { FolderUuid } from '../domain/FolderUuid';
+import { FolderAlreadyExists } from '../domain/errors/FolderAlreadyExists';
+import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 
 export class FolderCreator {
   constructor(
     private readonly repository: FolderRepository,
     private readonly remote: RemoteFileSystem,
-    private readonly eventBus: EventBus,
-    private readonly notifier: FolderSyncNotifier
+    private readonly eventBus: EventBus
   ) {}
 
-  async run(offlineFolder: OfflineFolder): Promise<Folder> {
-    this.notifier.creating(offlineFolder.name);
+  private ensureItDoesNotExists(path: FolderPath): void {
+    const folder = this.repository.searchByPartial({ path: path.value });
 
-    const attributes = await this.remote.persist(offlineFolder);
+    if (!folder) {
+      return;
+    }
 
-    const folder = Folder.create(attributes);
+    throw new FolderAlreadyExists(folder);
+  }
+
+  private findParentId(path: FolderPath): FolderId {
+    const parent = this.repository.searchByPartial({
+      path: path.dirname(),
+    });
+
+    if (!parent) {
+      throw new FolderNotFoundError(path.dirname());
+    }
+
+    return new FolderId(parent.id);
+  }
+
+  async run(path: string): Promise<void> {
+    const folderPath = new FolderPath(path);
+
+    this.ensureItDoesNotExists(folderPath);
+
+    const parentId = this.findParentId(folderPath);
+
+    const response = await this.remote.persist(folderPath, parentId);
+
+    const folder = Folder.create(
+      new FolderId(response.id),
+      new FolderUuid(response.uuid),
+      folderPath,
+      parentId,
+      FolderCreatedAt.fromString(response.createdAt),
+      FolderUpdatedAt.fromString(response.updatedAt)
+    );
 
     await this.repository.add(folder);
 
     const events = folder.pullDomainEvents();
     this.eventBus.publish(events);
-
-    this.notifier.created(offlineFolder.name);
-
-    return folder;
   }
 }
diff --git a/src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts b/src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts
index 30650be19..e1bfad328 100644
--- a/src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts
+++ b/src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts
@@ -3,6 +3,7 @@ import { OfflineFolder } from '../../domain/OfflineFolder';
 import { OfflineFolderRepository } from '../../domain/OfflineFolderRepository';
 import { FolderFinder } from '../FolderFinder';
 import { FolderRepository } from '../../domain/FolderRepository';
+import { FolderId } from '../../domain/FolderId';
 
 export class OfflineFolderCreator {
   constructor(
@@ -24,7 +25,9 @@ export class OfflineFolderCreator {
 
     const parent = this.folderFinder.run(folderPath.dirname());
 
-    const folder = OfflineFolder.create(folderPath, parent.id);
+    const parentId = new FolderId(parent.id);
+
+    const folder = OfflineFolder.create(folderPath, parentId);
 
     this.offlineRepository.update(folder);
 
diff --git a/src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts b/src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts
index 3f6a24fb0..fd5818b5a 100644
--- a/src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts
+++ b/src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts
@@ -6,6 +6,7 @@ import { FolderRenamer } from './FolderRenamer';
 import Logger from 'electron-log';
 import { FolderRepository } from '../domain/FolderRepository';
 import { EventRepository } from '../../shared/domain/EventRepository';
+import { FolderPath } from '../domain/FolderPath';
 
 export class SynchronizeOfflineModifications {
   constructor(
@@ -46,7 +47,7 @@ export class SynchronizeOfflineModifications {
 
       try {
         Logger.debug('Updating the folder with path: ', offlineFolder.path);
-        await this.renamer.run(folder, offlineFolder.path);
+        await this.renamer.run(folder, new FolderPath(offlineFolder.path));
         Logger.debug('Folder updated with the path: ', offlineFolder.path);
       } catch (error: unknown) {
         Logger.error(error);
diff --git a/src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts b/src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts
index 1a6a22618..9b06bd1b7 100644
--- a/src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts
+++ b/src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts
@@ -67,9 +67,9 @@ export class FolderPlaceholderUpdater {
   }
 
   private hasToBeDeleted(local: Folder, remote: Folder) {
-    const localExists = local.status.is(FolderStatuses.EXISTS);
-    const remoteIsTrashed = remote.status.is(FolderStatuses.TRASHED);
-    const remoteIsDeleted = remote.status.is(FolderStatuses.DELETED);
+    const localExists = local.hasStatus(FolderStatuses.EXISTS);
+    const remoteIsTrashed = remote.hasStatus(FolderStatuses.TRASHED);
+    const remoteIsDeleted = remote.hasStatus(FolderStatuses.DELETED);
     return localExists && (remoteIsTrashed || remoteIsDeleted);
   }
 
@@ -83,7 +83,7 @@ export class FolderPlaceholderUpdater {
     });
 
     if (!local) {
-      if (remote.status.is(FolderStatuses.EXISTS)) {
+      if (remote.hasStatus(FolderStatuses.EXISTS)) {
         Logger.debug('Creating folder placeholder: ', remote.path);
         await this.repository.add(remote);
         this.local.createPlaceHolder(remote);
diff --git a/src/context/virtual-drive/folders/domain/Folder.ts b/src/context/virtual-drive/folders/domain/Folder.ts
index bc916a2cd..8940cfa6d 100644
--- a/src/context/virtual-drive/folders/domain/Folder.ts
+++ b/src/context/virtual-drive/folders/domain/Folder.ts
@@ -5,6 +5,10 @@ import { FolderUuid } from './FolderUuid';
 import { FolderCreatedDomainEvent } from './events/FolderCreatedDomainEvent';
 import { FolderRenamedDomainEvent } from './events/FolderRenamedDomainEvent';
 import { createFolderPlaceholderId } from './FolderPlaceholderId';
+import { FolderId } from './FolderId';
+import { FolderCreatedAt } from './FolderCreatedAt';
+import { FolderUpdatedAt } from './FolderUpdatedAt';
+import { FolderMovedDomainEvent } from './events/FolderMovedDomainEvent';
 
 export type FolderAttributes = {
   id: number;
@@ -18,17 +22,21 @@ export type FolderAttributes = {
 
 export class Folder extends AggregateRoot {
   private constructor(
-    public id: number,
+    private _id: FolderId,
     private _uuid: FolderUuid,
     private _path: FolderPath,
-    private _parentId: null | number,
-    public createdAt: Date,
-    public updatedAt: Date,
+    private _parentId: null | FolderId,
+    public _createdAt: FolderCreatedAt,
+    public _updatedAt: FolderUpdatedAt,
     private _status: FolderStatus
   ) {
     super();
   }
 
+  public get id(): number {
+    return this._id.value;
+  }
+
   public get uuid(): string {
     return this._uuid.value;
   }
@@ -45,12 +53,12 @@ export class Folder extends AggregateRoot {
     return this._path.dirname();
   }
 
-  public get parentId() {
-    return this._parentId;
+  public get parentId(): number | undefined {
+    return this._parentId?.value;
   }
 
-  public get status() {
-    return this._status;
+  public get status(): string {
+    return this._status.value;
   }
 
   public get size() {
@@ -62,25 +70,33 @@ export class Folder extends AggregateRoot {
     return createFolderPlaceholderId(this.uuid);
   }
 
+  public get createdAt(): Date {
+    return this._createdAt.value;
+  }
+
+  public get updatedAt(): Date {
+    return this._updatedAt.value;
+  }
+
   public update(attributes: Partial<FolderAttributes>) {
     if (attributes.path) {
       this._path = new FolderPath(attributes.path);
     }
 
     if (attributes.createdAt) {
-      this.createdAt = new Date(attributes.createdAt);
+      this._createdAt = FolderCreatedAt.fromString(attributes.createdAt);
     }
 
     if (attributes.updatedAt) {
-      this.updatedAt = new Date(attributes.updatedAt);
+      this._updatedAt = FolderUpdatedAt.fromString(attributes.updatedAt);
     }
 
     if (attributes.id) {
-      this.id = attributes.id;
+      this._id = new FolderId(attributes.id);
     }
 
     if (attributes.parentId) {
-      this._parentId = attributes.parentId;
+      this._parentId = new FolderId(attributes.parentId);
     }
 
     if (attributes.status) {
@@ -92,29 +108,36 @@ export class Folder extends AggregateRoot {
 
   static from(attributes: FolderAttributes): Folder {
     return new Folder(
-      attributes.id,
+      new FolderId(attributes.id),
       new FolderUuid(attributes.uuid),
       new FolderPath(attributes.path),
-      attributes.parentId,
-      new Date(attributes.updatedAt),
-      new Date(attributes.createdAt),
+      attributes.parentId ? new FolderId(attributes.parentId) : null,
+      FolderUpdatedAt.fromString(attributes.updatedAt),
+      FolderCreatedAt.fromString(attributes.createdAt),
       FolderStatus.fromValue(attributes.status)
     );
   }
 
-  static create(attributes: FolderAttributes): Folder {
+  static create(
+    id: FolderId,
+    uuid: FolderUuid,
+    path: FolderPath,
+    parentId: FolderId,
+    createdAt: FolderCreatedAt,
+    updatedAt: FolderUpdatedAt
+  ): Folder {
     const folder = new Folder(
-      attributes.id,
-      new FolderUuid(attributes.uuid),
-      new FolderPath(attributes.path),
-      attributes.parentId,
-      new Date(attributes.updatedAt),
-      new Date(attributes.createdAt),
+      id,
+      uuid,
+      path,
+      parentId,
+      updatedAt,
+      createdAt,
       FolderStatus.Exists
     );
 
     const folderCreatedEvent = new FolderCreatedDomainEvent({
-      aggregateId: attributes.uuid,
+      aggregateId: folder.uuid,
     });
     folder.record(folderCreatedEvent);
 
@@ -126,14 +149,22 @@ export class Folder extends AggregateRoot {
       throw new Error('Root folder cannot be moved');
     }
 
-    if (this._parentId === folder.id) {
+    if (this.isIn(folder)) {
       throw new Error('Cannot move a folder to its current folder');
     }
 
-    this._path = this._path.changeFolder(folder.path);
-    this._parentId = folder.id;
+    const before = this.path;
 
-    //TODO: record moved event
+    this._path = this._path.changeFolder(folder.path);
+    this._parentId = new FolderId(folder.id);
+
+    this.record(
+      new FolderMovedDomainEvent({
+        aggregateId: this.uuid,
+        from: before,
+        to: this.path,
+      })
+    );
   }
 
   rename(newPath: FolderPath) {
@@ -142,7 +173,7 @@ export class Folder extends AggregateRoot {
       throw new Error('Cannot rename a folder to the same name');
     }
     this._path = this._path.updateName(newPath.name());
-    this.updatedAt = new Date();
+    this._updatedAt = FolderUpdatedAt.now();
 
     const event = new FolderRenamedDomainEvent({
       aggregateId: this.uuid,
@@ -155,13 +186,13 @@ export class Folder extends AggregateRoot {
 
   trash() {
     this._status = this._status.changeTo(FolderStatuses.TRASHED);
-    this.updatedAt = new Date();
+    this._updatedAt = FolderUpdatedAt.now();
 
     // TODO: record trashed event
   }
 
   isIn(folder: Folder): boolean {
-    return this._parentId === folder.id;
+    return this.parentId === folder.id;
   }
 
   isFolder(): this is Folder {
@@ -184,11 +215,11 @@ export class Folder extends AggregateRoot {
     return {
       id: this.id,
       uuid: this.uuid,
-      parentId: this._parentId || 0,
-      path: this._path.value,
+      parentId: this.parentId || 0,
+      path: this.path,
       updatedAt: this.updatedAt.toISOString(),
       createdAt: this.createdAt.toISOString(),
-      status: this.status.value,
+      status: this.status,
     };
   }
 }
diff --git a/src/context/virtual-drive/folders/domain/FolderStatus.ts b/src/context/virtual-drive/folders/domain/FolderStatus.ts
index e14364dba..dc13c0673 100644
--- a/src/context/virtual-drive/folders/domain/FolderStatus.ts
+++ b/src/context/virtual-drive/folders/domain/FolderStatus.ts
@@ -1,4 +1,4 @@
-import { EnumValueObject } from '../../../shared/domain/EnumValueObject';
+import { EnumValueObject } from '../../../shared/domain/value-objects/EnumValueObject';
 import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
 import { ActionNotPermittedError } from './errors/ActionNotPermittedError';
 
diff --git a/src/context/virtual-drive/folders/domain/FolderUuid.ts b/src/context/virtual-drive/folders/domain/FolderUuid.ts
index 01538a9ad..999581a6b 100644
--- a/src/context/virtual-drive/folders/domain/FolderUuid.ts
+++ b/src/context/virtual-drive/folders/domain/FolderUuid.ts
@@ -1,6 +1,6 @@
 import * as uuid from 'uuid';
 import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
-import { ValueObject } from '../../../shared/domain/ValueObject';
+import { ValueObject } from '../../../shared/domain/value-objects/ValueObject';
 
 export class FolderUuid extends ValueObject<string> {
   constructor(value: string) {
diff --git a/src/context/virtual-drive/folders/domain/OfflineFolder.ts b/src/context/virtual-drive/folders/domain/OfflineFolder.ts
index 4ff81e1e7..5fdec9da7 100644
--- a/src/context/virtual-drive/folders/domain/OfflineFolder.ts
+++ b/src/context/virtual-drive/folders/domain/OfflineFolder.ts
@@ -4,6 +4,7 @@ import { FolderStatus, FolderStatuses } from './FolderStatus';
 import { FolderUuid } from './FolderUuid';
 import { Folder } from './Folder';
 import { FolderRenamedDomainEvent } from './events/FolderRenamedDomainEvent';
+import { FolderId } from './FolderId';
 
 export type OfflineFolderAttributes = {
   uuid: string;
@@ -18,7 +19,7 @@ export class OfflineFolder extends AggregateRoot {
   private constructor(
     private _uuid: FolderUuid,
     private _path: FolderPath,
-    private _parentId: number,
+    private _parentId: FolderId,
     public createdAt: Date,
     public updatedAt: Date,
     private _status: FolderStatus
@@ -30,8 +31,8 @@ export class OfflineFolder extends AggregateRoot {
     return this._uuid.value;
   }
 
-  public get path() {
-    return this._path;
+  public get path(): string {
+    return this._path.value;
   }
 
   public get name() {
@@ -42,8 +43,8 @@ export class OfflineFolder extends AggregateRoot {
     return this._path.dirname();
   }
 
-  public get parentId() {
-    return this._parentId;
+  public get parentId(): number {
+    return this._parentId.value;
   }
 
   public get status() {
@@ -59,14 +60,14 @@ export class OfflineFolder extends AggregateRoot {
     return new OfflineFolder(
       new FolderUuid(attributes.uuid),
       new FolderPath(attributes.path),
-      attributes.parentId,
+      new FolderId(attributes.parentId),
       new Date(attributes.updatedAt),
       new Date(attributes.createdAt),
       FolderStatus.fromValue(attributes.status)
     );
   }
 
-  static create(path: FolderPath, parentId: number): OfflineFolder {
+  static create(path: FolderPath, parentId: FolderId): OfflineFolder {
     return new OfflineFolder(
       FolderUuid.random(),
       path,
@@ -78,7 +79,7 @@ export class OfflineFolder extends AggregateRoot {
   }
 
   moveTo(destinationFolder: Folder) {
-    this._parentId = destinationFolder.id;
+    this._parentId = new FolderId(destinationFolder.id);
   }
 
   rename(destination: FolderPath) {
@@ -114,7 +115,7 @@ export class OfflineFolder extends AggregateRoot {
   attributes(): OfflineFolderAttributes {
     const attributes: OfflineFolderAttributes = {
       uuid: this.uuid,
-      parentId: this._parentId,
+      parentId: this.parentId,
       path: this._path.value,
       updatedAt: this.updatedAt.toISOString(),
       createdAt: this.createdAt.toISOString(),
diff --git a/src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem.ts b/src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem.ts
index 109e1c62f..ff2aa5e3a 100644
--- a/src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem.ts
+++ b/src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem.ts
@@ -1,8 +1,22 @@
-import { Folder, FolderAttributes } from '../Folder';
-import { OfflineFolder } from '../OfflineFolder';
+import { Folder } from '../Folder';
+import { FolderId } from '../FolderId';
+import { FolderPath } from '../FolderPath';
+import { FolderUuid } from '../FolderUuid';
+
+export type FolderPersistedDto = {
+  id: number;
+  uuid: string;
+  parentId: number;
+  updatedAt: string;
+  createdAt: string;
+};
 
 export interface RemoteFileSystem {
-  persist(offline: OfflineFolder): Promise<FolderAttributes>;
+  persist(
+    path: FolderPath,
+    parentId: FolderId,
+    uuid?: FolderUuid
+  ): Promise<FolderPersistedDto>;
 
   trash(id: Folder['id']): Promise<void>;
 
diff --git a/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
index fa86fe46c..fa0c09637 100644
--- a/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
+++ b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
@@ -1,13 +1,17 @@
 import { Axios } from 'axios';
 import Logger from 'electron-log';
 import * as uuid from 'uuid';
-import { Folder, FolderAttributes } from '../domain/Folder';
-import { FolderStatuses } from '../domain/FolderStatus';
+import { Folder } from '../domain/Folder';
 import { UpdateFolderNameDTO } from './dtos/UpdateFolderNameDTO';
-import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
-import { OfflineFolder } from '../domain/OfflineFolder';
+import {
+  FolderPersistedDto,
+  RemoteFileSystem,
+} from '../domain/file-systems/RemoteFileSystem';
 import { ServerFolder } from '../../../shared/domain/ServerFolder';
 import { CreateFolderDTO } from './dtos/CreateFolderDTO';
+import { FolderPath } from '../domain/FolderPath';
+import { FolderUuid } from '../domain/FolderUuid';
+import { FolderId } from '../domain/FolderId';
 
 export class HttpRemoteFileSystem implements RemoteFileSystem {
   public folders: Record<string, Folder> = {};
@@ -17,15 +21,15 @@ export class HttpRemoteFileSystem implements RemoteFileSystem {
     private readonly trashClient: Axios
   ) {}
 
-  async persist(offline: OfflineFolder): Promise<FolderAttributes> {
-    if (!offline.name) {
-      throw new Error('Bad folder name');
-    }
-
+  async persist(
+    path: FolderPath,
+    parentId: FolderId,
+    uuid?: FolderUuid
+  ): Promise<FolderPersistedDto> {
     const body: CreateFolderDTO = {
-      folderName: offline.name,
-      parentFolderId: offline.parentId,
-      uuid: offline.uuid,
+      folderName: path.name(),
+      parentFolderId: parentId.value,
+      uuid: uuid?.value,
     };
 
     const response = await this.driveClient.post(
@@ -46,11 +50,9 @@ export class HttpRemoteFileSystem implements RemoteFileSystem {
     return {
       id: serverFolder.id,
       uuid: serverFolder.uuid,
-      parentId: serverFolder.parentId,
+      parentId: parentId.value,
       updatedAt: serverFolder.updatedAt,
       createdAt: serverFolder.createdAt,
-      path: offline.path.value,
-      status: FolderStatuses.EXISTS,
     };
   }
 
diff --git a/src/context/virtual-drive/shared/domain/BucketEntryId.ts b/src/context/virtual-drive/shared/domain/BucketEntryId.ts
index c150ec958..ac7325fe0 100644
--- a/src/context/virtual-drive/shared/domain/BucketEntryId.ts
+++ b/src/context/virtual-drive/shared/domain/BucketEntryId.ts
@@ -1,5 +1,5 @@
 import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
-import { ValueObject } from '../../../shared/domain/ValueObject';
+import { ValueObject } from '../../../shared/domain/value-objects/ValueObject';
 
 export class BucketEntryId extends ValueObject<string> {
   static readonly VALID_LENGTH = 24;
diff --git a/tests/context/offline-drive/files/domain/OfflineFileMother.ts b/tests/context/offline-drive/files/domain/OfflineFileMother.ts
index ba2f88fcc..b41c41fe7 100644
--- a/tests/context/offline-drive/files/domain/OfflineFileMother.ts
+++ b/tests/context/offline-drive/files/domain/OfflineFileMother.ts
@@ -10,7 +10,7 @@ export class OfflineFileMother {
   static any(): OfflineFile {
     return OfflineFile.from({
       id: uuid.v4(),
-      createdAt: Date.now(),
+      createdAt: new Date(),
       path: FilePathMother.random().value,
       size: FileSizeMother.random().value,
     });
diff --git a/tests/context/shared/domain/UuidMother.ts b/tests/context/shared/domain/UuidMother.ts
index 47059006c..f1c7d5701 100644
--- a/tests/context/shared/domain/UuidMother.ts
+++ b/tests/context/shared/domain/UuidMother.ts
@@ -1,4 +1,4 @@
-import { Uuid } from '../../../../src/context/shared/domain/Uuid';
+import { Uuid } from '../../../../src/context/shared/domain/value-objects/Uuid';
 import * as uuid from 'uuid';
 
 export class UuidMother {
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderRemoteFileSystemMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderRemoteFileSystemMock.ts
index 4a43211c3..b83472fe1 100644
--- a/tests/context/virtual-drive/folders/__mocks__/FolderRemoteFileSystemMock.ts
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderRemoteFileSystemMock.ts
@@ -1,9 +1,11 @@
+import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { FolderId } from '../../../../../src/context/virtual-drive/folders/domain/FolderId';
+import { FolderPath } from '../../../../../src/context/virtual-drive/folders/domain/FolderPath';
+import { FolderUuid } from '../../../../../src/context/virtual-drive/folders/domain/FolderUuid';
 import {
-  Folder,
-  FolderAttributes,
-} from '../../../../../src/context/virtual-drive/folders/domain/Folder';
-import { OfflineFolder } from '../../../../../src/context/virtual-drive/folders/domain/OfflineFolder';
-import { RemoteFileSystem } from '../../../../../src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem';
+  FolderPersistedDto,
+  RemoteFileSystem,
+} from '../../../../../src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem';
 
 export class FolderRemoteFileSystemMock implements RemoteFileSystem {
   public readonly persistMock = jest.fn();
@@ -11,9 +13,14 @@ export class FolderRemoteFileSystemMock implements RemoteFileSystem {
   public readonly moveMock = jest.fn();
   public readonly renameMock = jest.fn();
 
-  persist(offline: OfflineFolder): Promise<FolderAttributes> {
-    return this.persistMock(offline);
+  persist(
+    path: FolderPath,
+    parentId: FolderId,
+    uuid?: FolderUuid | undefined
+  ): Promise<FolderPersistedDto> {
+    return this.persistMock(path, parentId, uuid);
   }
+
   trash(id: number): Promise<void> {
     return this.trashMock(id);
   }
diff --git a/tests/context/virtual-drive/folders/application/FolderCreator.test.ts b/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
deleted file mode 100644
index f3b6bf96a..000000000
--- a/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { FolderCreator } from '../../../../../src/context/virtual-drive/folders/application/FolderCreator';
-import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
-import { EventBusMock } from '../../shared/__mock__/EventBusMock';
-import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
-import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
-import { FolderSyncNotifierMock } from '../__mocks__/FolderSyncManagerMock';
-import { FolderMother } from '../domain/FolderMother';
-import { OfflineFolderMother } from '../domain/OfflineFolderMother';
-
-describe('Folder Creator', () => {
-  let SUT: FolderCreator;
-
-  let repository: FolderRepositoryMock;
-  let remote: FolderRemoteFileSystemMock;
-  let eventBus: EventBusMock;
-  let notifier: FolderSyncNotifierMock;
-
-  beforeEach(() => {
-    repository = new FolderRepositoryMock();
-    remote = new FolderRemoteFileSystemMock();
-    notifier = new FolderSyncNotifierMock();
-
-    eventBus = new EventBusMock();
-
-    SUT = new FolderCreator(repository, remote, eventBus, notifier);
-  });
-
-  it('creates on a folder from a offline folder', async () => {
-    const offlineFolder = OfflineFolderMother.random();
-    const folder = FolderMother.fromPartial(offlineFolder.attributes());
-
-    remote.persistMock.mockResolvedValueOnce(folder.attributes());
-
-    repository.addMock.mockResolvedValueOnce(Promise.resolve());
-
-    await SUT.run(offlineFolder);
-
-    expect(repository.addMock).toBeCalledWith(folder);
-  });
-
-  describe('Synchronization messages', () => {
-    it('sends the message FOLDER_CREATING', async () => {
-      const offlineFolder = OfflineFolderMother.random();
-
-      const resultFolderAttributes = FolderMother.fromPartial(
-        offlineFolder.attributes()
-      ).attributes();
-
-      remote.persistMock.mockResolvedValueOnce(resultFolderAttributes);
-
-      repository.addMock.mockResolvedValueOnce(
-        Folder.create(resultFolderAttributes)
-      );
-
-      await SUT.run(offlineFolder);
-
-      expect(notifier.creatingMock).toBeCalledWith(offlineFolder.name);
-    });
-
-    it('sends the message FOLDER_CREATED', async () => {
-      const offlineFolder = OfflineFolderMother.random();
-
-      const resultFolderAttributes = FolderMother.fromPartial(
-        offlineFolder.attributes()
-      ).attributes();
-
-      repository.addMock.mockResolvedValueOnce(
-        Folder.create(resultFolderAttributes)
-      );
-
-      remote.persistMock.mockResolvedValueOnce(resultFolderAttributes);
-
-      await SUT.run(offlineFolder);
-
-      expect(notifier.createdMock).toBeCalledWith(offlineFolder.name);
-    });
-  });
-});
diff --git a/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts b/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
index 1b89cce02..75a2d243f 100644
--- a/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
+++ b/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
@@ -117,14 +117,17 @@ describe('Synchronize Offline Modifications', () => {
     const event = new FolderRenamedDomainEvent({
       aggregateId: offlineFolder.uuid,
       previousPath: folder.path,
-      nextPath: offlineFolder.path.value,
+      nextPath: offlineFolder.path,
     });
 
     eventRepositoryMock.searchMock.mockResolvedValueOnce([event]);
 
     await SUT.run(offlineFolder.uuid);
 
-    expect(renamerSpy).toBeCalledWith(folder, offlineFolder.path);
+    expect(renamerSpy).toBeCalledWith(
+      folder,
+      new FolderPath(offlineFolder.path)
+    );
   });
 
   it('makes all the name changes recoded on the events', async () => {
diff --git a/tests/context/virtual-drive/items/application/Traverser.test.ts b/tests/context/virtual-drive/items/application/Traverser.test.ts
index 7c98bce10..187fc997a 100644
--- a/tests/context/virtual-drive/items/application/Traverser.test.ts
+++ b/tests/context/virtual-drive/items/application/Traverser.test.ts
@@ -8,12 +8,10 @@ import {
 } from '../../../../../src/context/shared/domain/ServerFolder';
 import { Traverser } from '../../../../../src/context/virtual-drive/items/application/Traverser';
 import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
-import { IpcRendererSyncEngineMock } from '../../shared/__mock__/IpcRendererSyncEngineMock';
 import { FakeNameDecrypt } from '../infrastructure/FakeNameDecrypt';
 
 describe('Traverser', () => {
   const nameDecrypt = new FakeNameDecrypt();
-  const ipc = new IpcRendererSyncEngineMock();
 
   it('first level files starts with /', () => {
     const baseFolderId = 6;
@@ -31,7 +29,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
-      ipc,
+
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -67,7 +65,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
-      ipc,
+
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -95,7 +93,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
-      ipc,
+
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -129,7 +127,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
-      ipc,
+
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -163,7 +161,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
-      ipc,
+
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -204,7 +202,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
-      ipc,
+
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -232,7 +230,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
-      ipc,
+
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -268,7 +266,7 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
-      ipc,
+
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
@@ -304,7 +302,6 @@ describe('Traverser', () => {
     };
     const SUT = new Traverser(
       nameDecrypt,
-      ipc,
       baseFolderId,
       [ServerFileStatus.EXISTS, ServerFileStatus.TRASHED],
       [ServerFolderStatus.EXISTS]
diff --git a/tests/context/virtual-drive/user-usage/application/BytesInBinaryToInternacionalSystem.test.ts b/tests/context/virtual-drive/user-usage/application/BytesInBinaryToInternacionalSystem.test.ts
index fd86cf3b1..648942506 100644
--- a/tests/context/virtual-drive/user-usage/application/BytesInBinaryToInternacionalSystem.test.ts
+++ b/tests/context/virtual-drive/user-usage/application/BytesInBinaryToInternacionalSystem.test.ts
@@ -1,46 +1,46 @@
-import { BytesInBinaryToInternacionalSystem } from '../../../../../src/context/virtual-drive/userUsage/application/BytesInBinaryToInternacionalSystem';
+import { BytesInBinaryToInternationalSystem } from '../../../../../src/context/user/usage/application/BytesInBinaryToInternationalSystem';
 
-describe('Bytes in binary to internacional system conversion', () => {
+describe('Bytes in binary to international system conversion', () => {
   it('when the bytes are 0 returns 0', () => {
     const bytesInBinary = 0;
 
-    const bytesInSI = BytesInBinaryToInternacionalSystem.run(bytesInBinary);
+    const bytesInSI = BytesInBinaryToInternationalSystem.run(bytesInBinary);
 
     expect(bytesInSI).toBe(0);
   });
 
-  it('converts 3 GB from binary to 3GB in internacional', () => {
+  it('converts 3 GB from binary to 3GB in international', () => {
     const treeGBInBinary = 3 * 1024 * 1024 * 1024;
     const treeGBInSI = 3 * 1000 * 1000 * 1000;
 
-    const result = BytesInBinaryToInternacionalSystem.run(treeGBInBinary);
+    const result = BytesInBinaryToInternationalSystem.run(treeGBInBinary);
 
     expect(result).toBe(treeGBInSI);
   });
 
-  it('converts 56 MB from binary to 56MB in internacional', () => {
+  it('converts 56 MB from binary to 56MB in international', () => {
     const inBinary = 56 * 1024 * 1024;
     const inSI = 56 * 1000 * 1000;
 
-    const result = BytesInBinaryToInternacionalSystem.run(inBinary);
+    const result = BytesInBinaryToInternationalSystem.run(inBinary);
 
     expect(result).toBe(inSI);
   });
 
-  it('converts 2 KB from binary to 2KB in internacional', () => {
+  it('converts 2 KB from binary to 2KB in international', () => {
     const inBinary = 2 * 1024;
     const inSI = 2 * 1000;
 
-    const result = BytesInBinaryToInternacionalSystem.run(inBinary);
+    const result = BytesInBinaryToInternationalSystem.run(inBinary);
 
     expect(result).toBe(inSI);
   });
 
-  it('converts 78 bytes from binary to 78 bytes in internacional', () => {
+  it('converts 78 bytes from binary to 78 bytes in international', () => {
     const inBinary = 78;
     const inSI = 78;
 
-    const result = BytesInBinaryToInternacionalSystem.run(inBinary);
+    const result = BytesInBinaryToInternationalSystem.run(inBinary);
 
     expect(result).toBe(inSI);
   });

From 8207030d3e3bbd6179e651a5dcd9144a323e55f0 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Tue, 16 Jan 2024 17:54:48 +0100
Subject: [PATCH 137/188] feat: handle folder creation errors

---
 .../fuse/callbacks/MakeDirectoryCallback.ts   | 33 +++++++-
 .../domain/value-objects/BucketEntry.ts       | 20 +++++
 .../domain/value-objects/DateValueObject.ts   | 19 +++++
 .../domain/value-objects/EnumValueObject.ts   | 16 ++++
 .../shared/domain/value-objects/NumericId.ts  | 17 ++++
 .../shared/domain/value-objects/Uuid.ts       | 20 +++++
 .../domain/value-objects/ValueObject.ts       | 25 ++++++
 .../FolderCreatorFromOfflineFolder.ts         | 48 +++++++++++
 .../folders/domain/FolderCreatedAt.ts         |  3 +
 .../virtual-drive/folders/domain/FolderId.ts  |  3 +
 .../folders/domain/FolderUpdatedAt.ts         |  3 +
 .../domain/errors/FolderAlreadyExists.ts      |  7 ++
 .../domain/events/FolderMovedDomainEvent.ts   | 34 ++++++++
 .../FolderCreatorFromOfflineFolder.test.ts    | 83 +++++++++++++++++++
 14 files changed, 327 insertions(+), 4 deletions(-)
 create mode 100644 src/context/shared/domain/value-objects/BucketEntry.ts
 create mode 100644 src/context/shared/domain/value-objects/DateValueObject.ts
 create mode 100644 src/context/shared/domain/value-objects/EnumValueObject.ts
 create mode 100644 src/context/shared/domain/value-objects/NumericId.ts
 create mode 100644 src/context/shared/domain/value-objects/Uuid.ts
 create mode 100644 src/context/shared/domain/value-objects/ValueObject.ts
 create mode 100644 src/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.ts
 create mode 100644 src/context/virtual-drive/folders/domain/FolderCreatedAt.ts
 create mode 100644 src/context/virtual-drive/folders/domain/FolderId.ts
 create mode 100644 src/context/virtual-drive/folders/domain/FolderUpdatedAt.ts
 create mode 100644 src/context/virtual-drive/folders/domain/errors/FolderAlreadyExists.ts
 create mode 100644 src/context/virtual-drive/folders/domain/events/FolderMovedDomainEvent.ts
 create mode 100644 tests/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.test.ts

diff --git a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
index 93eb5813c..4f1723013 100644
--- a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
+++ b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
@@ -1,13 +1,36 @@
+import { FolderAlreadyExists } from '../../../context/virtual-drive/folders/domain/errors/FolderAlreadyExists';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { NotifyFuseCallback } from './FuseCallback';
-import { IOError } from './FuseErrors';
+import {
+  FileOrDirectoryAlreadyExistsError,
+  FuseError,
+  IOError,
+  InvalidArgumentError,
+} from './FuseErrors';
+import { FolderNotFoundError } from '../../../context/virtual-drive/folders/domain/errors/FolderNotFoundError';
 
 export class MakeDirectoryCallback extends NotifyFuseCallback {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
     super('Make Directory');
   }
 
-  async execute(path: string, _mode: number) {
+  private resolveError(
+    input: { path: string; mode: number },
+    err: unknown
+  ): FuseError {
+    if (err instanceof FolderAlreadyExists) {
+      return new FileOrDirectoryAlreadyExistsError(input.path);
+    }
+    if (err instanceof FolderNotFoundError) {
+      return new InvalidArgumentError(input.path);
+    }
+
+    return new IOError(
+      `Unknown error while creating the folder: ${input.path}`
+    );
+  }
+
+  async execute(path: string, mode: number) {
     try {
       await this.container.folderSyncNotifier.creating(path);
 
@@ -17,9 +40,11 @@ export class MakeDirectoryCallback extends NotifyFuseCallback {
 
       return this.right();
     } catch (err: unknown) {
-      await this.container.folderSyncNotifier.error();
+      const error = this.resolveError({ path, mode }, err);
+
+      this.container.folderSyncNotifier.error();
 
-      return this.left(new IOError(path));
+      return this.left(error);
     }
   }
 }
diff --git a/src/context/shared/domain/value-objects/BucketEntry.ts b/src/context/shared/domain/value-objects/BucketEntry.ts
new file mode 100644
index 000000000..fba1e19dd
--- /dev/null
+++ b/src/context/shared/domain/value-objects/BucketEntry.ts
@@ -0,0 +1,20 @@
+import { ValueObject } from './ValueObject';
+
+export class BucketEntry extends ValueObject<number> {
+  public static MAX_SIZE = 20 * 1024 * 1024 * 1024;
+
+  constructor(value: number) {
+    super(value);
+    this.ensureIsValid(value);
+  }
+
+  private ensureIsValid(value: number) {
+    if (value > BucketEntry.MAX_SIZE) {
+      throw new Error('File size to big');
+    }
+
+    if (value < 0) {
+      throw new Error('File size cannot be negative');
+    }
+  }
+}
diff --git a/src/context/shared/domain/value-objects/DateValueObject.ts b/src/context/shared/domain/value-objects/DateValueObject.ts
new file mode 100644
index 000000000..6f6efb2de
--- /dev/null
+++ b/src/context/shared/domain/value-objects/DateValueObject.ts
@@ -0,0 +1,19 @@
+import { ValueObject } from './ValueObject';
+
+export class DateValueObject extends ValueObject<Date> {
+  static fromString(value: string): DateValueObject {
+    const date = new Date(value);
+
+    return new DateValueObject(date);
+  }
+
+  static now(): DateValueObject {
+    const date = new Date();
+
+    return new DateValueObject(date);
+  }
+
+  toISOString(): string {
+    return this.value.toISOString();
+  }
+}
diff --git a/src/context/shared/domain/value-objects/EnumValueObject.ts b/src/context/shared/domain/value-objects/EnumValueObject.ts
new file mode 100644
index 000000000..adcd5c691
--- /dev/null
+++ b/src/context/shared/domain/value-objects/EnumValueObject.ts
@@ -0,0 +1,16 @@
+export abstract class EnumValueObject<T> {
+  readonly value: T;
+
+  constructor(value: T, public readonly validValues: T[]) {
+    this.value = value;
+    this.checkValueIsValid(value);
+  }
+
+  public checkValueIsValid(value: T): void {
+    if (!this.validValues.includes(value)) {
+      this.throwErrorForInvalidValue(value);
+    }
+  }
+
+  protected abstract throwErrorForInvalidValue(value: T): void;
+}
diff --git a/src/context/shared/domain/value-objects/NumericId.ts b/src/context/shared/domain/value-objects/NumericId.ts
new file mode 100644
index 000000000..e1ab5e61b
--- /dev/null
+++ b/src/context/shared/domain/value-objects/NumericId.ts
@@ -0,0 +1,17 @@
+import { InvalidArgumentError } from '../InvalidArgumentError';
+import { ValueObject } from './ValueObject';
+
+export class NumericId extends ValueObject<number> {
+  constructor(value: number) {
+    super(value);
+    this.ensureIsValid(value);
+  }
+
+  private ensureIsValid(value: number) {
+    if (value <= 0) {
+      throw new InvalidArgumentError(
+        `A numeric id cannot be negative, value: ${value}`
+      );
+    }
+  }
+}
diff --git a/src/context/shared/domain/value-objects/Uuid.ts b/src/context/shared/domain/value-objects/Uuid.ts
new file mode 100644
index 000000000..133998105
--- /dev/null
+++ b/src/context/shared/domain/value-objects/Uuid.ts
@@ -0,0 +1,20 @@
+import * as uuid from 'uuid';
+import { InvalidArgumentError } from '../InvalidArgumentError';
+import { ValueObject } from './ValueObject';
+
+export class Uuid extends ValueObject<string> {
+  constructor(value: string) {
+    super(value);
+    this.ensureIsValid(value);
+  }
+
+  private ensureIsValid(value: string) {
+    if (!uuid.validate(value)) {
+      throw new InvalidArgumentError(`Value: ${value} is not a valid uuid`);
+    }
+  }
+
+  static random(): Uuid {
+    return new Uuid(uuid.v4());
+  }
+}
diff --git a/src/context/shared/domain/value-objects/ValueObject.ts b/src/context/shared/domain/value-objects/ValueObject.ts
new file mode 100644
index 000000000..837d21025
--- /dev/null
+++ b/src/context/shared/domain/value-objects/ValueObject.ts
@@ -0,0 +1,25 @@
+import { InvalidArgumentError } from '../InvalidArgumentError';
+
+export type Primitives = string | number | boolean | Date | undefined;
+
+export abstract class ValueObject<T extends Primitives> {
+  readonly value: T;
+
+  constructor(value: T) {
+    this.value = value;
+    this.ensureValueIsDefined(value);
+  }
+
+  private ensureValueIsDefined(value: T): void {
+    if (value === null || value === undefined) {
+      throw new InvalidArgumentError('Value must be defined');
+    }
+  }
+
+  equals(other: ValueObject<T>): boolean {
+    return (
+      other.constructor.name === this.constructor.name &&
+      other.value === this.value
+    );
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.ts b/src/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.ts
new file mode 100644
index 000000000..5cab0bbfa
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.ts
@@ -0,0 +1,48 @@
+import { EventBus } from '../../shared/domain/EventBus';
+import { Folder } from '../domain/Folder';
+import { FolderCreatedAt } from '../domain/FolderCreatedAt';
+import { FolderId } from '../domain/FolderId';
+import { FolderPath } from '../domain/FolderPath';
+import { FolderRepository } from '../domain/FolderRepository';
+import { FolderSyncNotifier } from '../domain/FolderSyncNotifier';
+import { FolderUpdatedAt } from '../domain/FolderUpdatedAt';
+import { FolderUuid } from '../domain/FolderUuid';
+import { OfflineFolder } from '../domain/OfflineFolder';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+
+export class FolderCreatorFromOfflineFolder {
+  constructor(
+    private readonly repository: FolderRepository,
+    private readonly remote: RemoteFileSystem,
+    private readonly eventBus: EventBus,
+    private readonly notifier: FolderSyncNotifier
+  ) {}
+
+  async run(offlineFolder: OfflineFolder): Promise<Folder> {
+    this.notifier.creating(offlineFolder.name);
+
+    const attributes = await this.remote.persist(
+      new FolderPath(offlineFolder.path),
+      new FolderId(offlineFolder.parentId),
+      new FolderUuid(offlineFolder.uuid)
+    );
+
+    const folder = Folder.create(
+      new FolderId(attributes.id),
+      new FolderUuid(attributes.uuid),
+      new FolderPath(offlineFolder.path),
+      new FolderId(attributes.parentId),
+      FolderCreatedAt.fromString(attributes.createdAt),
+      FolderUpdatedAt.fromString(attributes.updatedAt)
+    );
+
+    await this.repository.add(folder);
+
+    const events = folder.pullDomainEvents();
+    this.eventBus.publish(events);
+
+    this.notifier.created(offlineFolder.name);
+
+    return folder;
+  }
+}
diff --git a/src/context/virtual-drive/folders/domain/FolderCreatedAt.ts b/src/context/virtual-drive/folders/domain/FolderCreatedAt.ts
new file mode 100644
index 000000000..d82221b66
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/FolderCreatedAt.ts
@@ -0,0 +1,3 @@
+import { DateValueObject } from '../../../shared/domain/value-objects/DateValueObject';
+
+export class FolderCreatedAt extends DateValueObject {}
diff --git a/src/context/virtual-drive/folders/domain/FolderId.ts b/src/context/virtual-drive/folders/domain/FolderId.ts
new file mode 100644
index 000000000..e0d7d9c31
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/FolderId.ts
@@ -0,0 +1,3 @@
+import { NumericId } from '../../../shared/domain/value-objects/NumericId';
+
+export class FolderId extends NumericId {}
diff --git a/src/context/virtual-drive/folders/domain/FolderUpdatedAt.ts b/src/context/virtual-drive/folders/domain/FolderUpdatedAt.ts
new file mode 100644
index 000000000..cadeb857c
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/FolderUpdatedAt.ts
@@ -0,0 +1,3 @@
+import { DateValueObject } from '../../../shared/domain/value-objects/DateValueObject';
+
+export class FolderUpdatedAt extends DateValueObject {}
diff --git a/src/context/virtual-drive/folders/domain/errors/FolderAlreadyExists.ts b/src/context/virtual-drive/folders/domain/errors/FolderAlreadyExists.ts
new file mode 100644
index 000000000..976d6d879
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/errors/FolderAlreadyExists.ts
@@ -0,0 +1,7 @@
+import { Folder } from '../Folder';
+
+export class FolderAlreadyExists extends Error {
+  constructor(folder: Folder) {
+    super(`Folder ${folder.path} already exists with id: ${folder.uuid}`);
+  }
+}
diff --git a/src/context/virtual-drive/folders/domain/events/FolderMovedDomainEvent.ts b/src/context/virtual-drive/folders/domain/events/FolderMovedDomainEvent.ts
new file mode 100644
index 000000000..d77fc71c9
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/events/FolderMovedDomainEvent.ts
@@ -0,0 +1,34 @@
+import { DomainEvent } from '../../../../shared/domain/DomainEvent';
+
+export class FolderMovedDomainEvent extends DomainEvent {
+  static readonly EVENT_NAME = 'virtual-drive.folder.moved';
+
+  from: string;
+  to: string;
+
+  constructor({
+    aggregateId,
+    from,
+    to,
+  }: {
+    aggregateId: string;
+    from: string;
+    to: string;
+  }) {
+    super({
+      eventName: FolderMovedDomainEvent.EVENT_NAME,
+      aggregateId,
+    });
+
+    this.from = from;
+    this.to = to;
+  }
+
+  toPrimitives() {
+    return {
+      uuid: this.aggregateId,
+      from: this.from,
+      to: this.to,
+    };
+  }
+}
diff --git a/tests/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.test.ts b/tests/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.test.ts
new file mode 100644
index 000000000..0851d0e97
--- /dev/null
+++ b/tests/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.test.ts
@@ -0,0 +1,83 @@
+import { FolderCreatorFromOfflineFolder } from '../../../../../src/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder';
+import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { EventBusMock } from '../../shared/__mock__/EventBusMock';
+import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
+import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
+import { FolderSyncNotifierMock } from '../__mocks__/FolderSyncManagerMock';
+import { FolderMother } from '../domain/FolderMother';
+import { OfflineFolderMother } from '../domain/OfflineFolderMother';
+
+describe('Folder Creator from Offline Folder', () => {
+  let SUT: FolderCreatorFromOfflineFolder;
+
+  let repository: FolderRepositoryMock;
+  let remote: FolderRemoteFileSystemMock;
+  let eventBus: EventBusMock;
+  let notifier: FolderSyncNotifierMock;
+
+  beforeEach(() => {
+    repository = new FolderRepositoryMock();
+    remote = new FolderRemoteFileSystemMock();
+    notifier = new FolderSyncNotifierMock();
+
+    eventBus = new EventBusMock();
+
+    SUT = new FolderCreatorFromOfflineFolder(
+      repository,
+      remote,
+      eventBus,
+      notifier
+    );
+  });
+
+  it('creates on a folder from a offline folder', async () => {
+    const offlineFolder = OfflineFolderMother.random();
+    const folder = FolderMother.fromPartial(offlineFolder.attributes());
+
+    remote.persistMock.mockResolvedValueOnce(folder.attributes());
+
+    repository.addMock.mockResolvedValueOnce(Promise.resolve());
+
+    await SUT.run(offlineFolder);
+
+    expect(repository.addMock).toBeCalledWith(folder);
+  });
+
+  describe('Synchronization messages', () => {
+    it('sends the message FOLDER_CREATING', async () => {
+      const offlineFolder = OfflineFolderMother.random();
+
+      const resultFolderAttributes = FolderMother.fromPartial(
+        offlineFolder.attributes()
+      ).attributes();
+
+      remote.persistMock.mockResolvedValueOnce(resultFolderAttributes);
+
+      repository.addMock.mockImplementationOnce(() => {
+        // no-op
+      });
+
+      await SUT.run(offlineFolder);
+
+      expect(notifier.creatingMock).toBeCalledWith(offlineFolder.name);
+    });
+
+    it('sends the message FOLDER_CREATED', async () => {
+      const offlineFolder = OfflineFolderMother.random();
+
+      const resultFolderAttributes = FolderMother.fromPartial(
+        offlineFolder.attributes()
+      ).attributes();
+
+      repository.addMock.mockImplementationOnce(() => {
+        // no-op
+      });
+
+      remote.persistMock.mockResolvedValueOnce(resultFolderAttributes);
+
+      await SUT.run(offlineFolder);
+
+      expect(notifier.createdMock).toBeCalledWith(offlineFolder.name);
+    });
+  });
+});

From 8b432368b0b5df978ad4ed9ad12cee6a69149c04 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 17 Jan 2024 11:56:18 +0100
Subject: [PATCH 138/188] chore: more callback improvements

---
 src/apps/fuse/callbacks/FuseCallback.ts          | 16 ++++++++++------
 src/apps/fuse/callbacks/GetAttributesCallback.ts |  2 +-
 src/apps/fuse/callbacks/PathsToIgnore.ts         | 14 +++++++-------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/apps/fuse/callbacks/FuseCallback.ts b/src/apps/fuse/callbacks/FuseCallback.ts
index da74da696..b0cb3e386 100644
--- a/src/apps/fuse/callbacks/FuseCallback.ts
+++ b/src/apps/fuse/callbacks/FuseCallback.ts
@@ -11,7 +11,7 @@ export type CallbackWithData<T> = (code: number, params?: T) => void;
 
 type DebugOptions = {
   input: boolean;
-  result: boolean;
+  output: boolean;
   elapsedTime: boolean;
 };
 
@@ -19,10 +19,10 @@ export abstract class FuseCallback<T> {
   protected static readonly OK = 0;
 
   constructor(
-    private readonly name: string,
-    private readonly debug: Partial<DebugOptions> = {
+    protected readonly name: string,
+    protected readonly debug: Partial<DebugOptions> = {
       input: false,
-      result: false,
+      output: false,
       elapsedTime: false,
     }
   ) {}
@@ -41,7 +41,7 @@ export abstract class FuseCallback<T> {
   }
 
   protected right(value: T): Either<FuseError, T> {
-    if (this.debug.result) {
+    if (this.debug.output) {
       Logger.debug(
         `${this.name} Result: ${JSON.stringify({ value }, null, 2)}`
       );
@@ -58,7 +58,7 @@ export abstract class FuseCallback<T> {
   async handle(...params: any[]): Promise<void> {
     const callback = params.pop() as CallbackWithData<T>;
 
-    if (PathsToIgnore.includes(params[0])) {
+    if (PathsToIgnore.some((regex) => regex.test(params[0]))) {
       return callback(FuseCodes.EINVAL);
     }
 
@@ -83,6 +83,10 @@ export abstract class FuseCallback<T> {
 
 export abstract class NotifyFuseCallback extends FuseCallback<undefined> {
   protected right(): Either<FuseError, undefined> {
+    if (this.debug.output) {
+      Logger.debug(`${this.name} completed successfully`);
+    }
+
     return right(undefined);
   }
 
diff --git a/src/apps/fuse/callbacks/GetAttributesCallback.ts b/src/apps/fuse/callbacks/GetAttributesCallback.ts
index 7c05caf0a..e8c5a2022 100644
--- a/src/apps/fuse/callbacks/GetAttributesCallback.ts
+++ b/src/apps/fuse/callbacks/GetAttributesCallback.ts
@@ -19,7 +19,7 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
     private readonly virtualDriveContainer: VirtualDriveDependencyContainer,
     private readonly offlineDriveContainer: OfflineDriveDependencyContainer
   ) {
-    super('Get Attributes', { elapsedTime: false, result: false });
+    super('Get Attributes');
   }
 
   async execute(path: string) {
diff --git a/src/apps/fuse/callbacks/PathsToIgnore.ts b/src/apps/fuse/callbacks/PathsToIgnore.ts
index f04e2e94c..b184cbda1 100644
--- a/src/apps/fuse/callbacks/PathsToIgnore.ts
+++ b/src/apps/fuse/callbacks/PathsToIgnore.ts
@@ -1,8 +1,8 @@
-export const PathsToIgnore = [
-  '/BDMV',
-  '/.xdg-volume-info',
-  '/autorun.inf',
-  '/.Trash',
-  '/.Trash-1001/files',
-  '/.hidden',
+export const PathsToIgnore: Array<RegExp> = [
+  /^\/BDMV$/,
+  /^\/autorun\.inf$/,
+  /^\/.Trash$/,
+  /^\/.Trash-1001\/files$/,
+  /\/.xdg-volume-info$/,
+  /\/.hidden$/,
 ];

From 704a397b9a3f1eae88b09739bf3b7cb8207207dc Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 17 Jan 2024 12:03:12 +0100
Subject: [PATCH 139/188] chore: rename

---
 src/apps/fuse/callbacks/MakeDirectoryCallback.ts       |  6 +++---
 .../virtual-drive/folders/FoldersContainer.ts          |  4 ++--
 .../virtual-drive/folders/builder.ts                   | 10 +++++-----
 .../dependency-injection/folders/builder.ts            |  8 ++++----
 .../application/FolderCreatorFromOfflineFolder.ts      |  8 ++++----
 .../virtual-drive/folders/application/FolderRenamer.ts |  8 ++++----
 .../{FolderSyncNotifier.ts => SyncFolderMessenger.ts}  |  2 +-
 .../infrastructure/MainProcessFolderSyncNotifier.ts    |  4 ++--
 .../folders/__mocks__/FolderSyncManagerMock.ts         |  4 ++--
 9 files changed, 27 insertions(+), 27 deletions(-)
 rename src/context/virtual-drive/folders/domain/{FolderSyncNotifier.ts => SyncFolderMessenger.ts} (85%)

diff --git a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
index 4f1723013..f30dcb631 100644
--- a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
+++ b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
@@ -32,17 +32,17 @@ export class MakeDirectoryCallback extends NotifyFuseCallback {
 
   async execute(path: string, mode: number) {
     try {
-      await this.container.folderSyncNotifier.creating(path);
+      await this.container.syncFolderMessenger.creating(path);
 
       await this.container.folderCreator.run(path);
 
-      await this.container.folderSyncNotifier.created(path);
+      await this.container.syncFolderMessenger.created(path);
 
       return this.right();
     } catch (err: unknown) {
       const error = this.resolveError({ path, mode }, err);
 
-      this.container.folderSyncNotifier.error();
+      this.container.syncFolderMessenger.error();
 
       return this.left(error);
     }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
index 7e26fa41c..b84e048ed 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
@@ -7,7 +7,7 @@ import { FolderPathUpdater } from '../../../../../context/virtual-drive/folders/
 import { FolderRepositoryInitiator } from '../../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
 import { FolderSearcher } from '../../../../../context/virtual-drive/folders/application/FolderSearcher';
 import { FoldersByParentPathLister } from '../../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
-import { FolderSyncNotifier } from '../../../../../context/virtual-drive/folders/domain/FolderSyncNotifier';
+import { SyncFolderMessenger } from '../../../../../context/virtual-drive/folders/domain/SyncFolderMessenger';
 
 export interface FoldersContainer {
   folderFinder: FolderFinder;
@@ -19,5 +19,5 @@ export interface FoldersContainer {
   folderCreator: FolderCreator;
   folderDeleter: FolderDeleter;
   folderRepositoryInitiator: FolderRepositoryInitiator;
-  folderSyncNotifier: FolderSyncNotifier;
+  syncFolderMessenger: SyncFolderMessenger;
 }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
index 41f98b35b..90877128b 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
@@ -13,7 +13,7 @@ import { Folder } from '../../../../../context/virtual-drive/folders/domain/Fold
 import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/FuseLocalFileSystem';
 import { HttpRemoteFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
 import { InMemoryFolderRepository } from '../../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
-import { MainProcessFolderSyncNotifier } from '../../../../../context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier';
+import { MainProcessSyncFolderMessenger } from '../../../../../context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier';
 import { DependencyInjectionHttpClientsProvider } from '../../common/clients';
 import { DependencyInjectionEventBus } from '../../common/eventBus';
 
@@ -25,7 +25,7 @@ export async function buildFoldersContainer(
   const repository = new InMemoryFolderRepository();
   const clients = DependencyInjectionHttpClientsProvider.get();
 
-  const notifier = new MainProcessFolderSyncNotifier();
+  const syncFolderMessenger = new MainProcessSyncFolderMessenger();
 
   const remoteFileSystem = new HttpRemoteFileSystem(
     // @ts-ignore
@@ -60,7 +60,7 @@ export async function buildFoldersContainer(
     repository,
     remoteFileSystem,
     eventBus,
-    notifier
+    syncFolderMessenger
   );
 
   const folderPathUpdater = new FolderPathUpdater(
@@ -77,7 +77,7 @@ export async function buildFoldersContainer(
     repository,
     remoteFileSystem,
     eventBus,
-    notifier
+    syncFolderMessenger
   );
 
   const folderCreator = new FolderCreator(
@@ -102,7 +102,7 @@ export async function buildFoldersContainer(
     folderCreatorFromOfflineFolder,
     folderCreator,
     folderDeleter,
-    folderSyncNotifier: notifier,
+    syncFolderMessenger,
     folderRepositoryInitiator,
   };
 }
diff --git a/src/apps/sync-engine/dependency-injection/folders/builder.ts b/src/apps/sync-engine/dependency-injection/folders/builder.ts
index 63bbfe1f8..09b2ff4f7 100644
--- a/src/apps/sync-engine/dependency-injection/folders/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/folders/builder.ts
@@ -26,7 +26,7 @@ import { DependencyInjectionEventRepository } from '../common/eventRepository';
 import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
 import { SharedContainer } from '../shared/SharedContainer';
 import { FoldersContainer } from './FoldersContainer';
-import { MainProcessFolderSyncNotifier } from '../../../../context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier';
+import { MainProcessSyncFolderMessenger } from '../../../../context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier';
 
 export async function buildFoldersContainer(
   shredContainer: SharedContainer
@@ -38,7 +38,7 @@ export async function buildFoldersContainer(
 
   const repository = new InMemoryFolderRepository();
 
-  const notifier = new MainProcessFolderSyncNotifier();
+  const syncFolderMessenger = new MainProcessSyncFolderMessenger();
 
   const localFileSystem = new NodeWinLocalFileSystem(virtualDrive);
   const remoteFileSystem = new HttpRemoteFileSystem(
@@ -64,7 +64,7 @@ export async function buildFoldersContainer(
     repository,
     remoteFileSystem,
     eventBus,
-    notifier
+    syncFolderMessenger
   );
 
   const folderMover = new FolderMover(
@@ -76,7 +76,7 @@ export async function buildFoldersContainer(
     repository,
     remoteFileSystem,
     eventBus,
-    notifier
+    syncFolderMessenger
   );
 
   const folderByPartialSearcher = new FolderByPartialSearcher(repository);
diff --git a/src/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.ts b/src/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.ts
index 5cab0bbfa..ce38b3b56 100644
--- a/src/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.ts
+++ b/src/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.ts
@@ -4,7 +4,7 @@ import { FolderCreatedAt } from '../domain/FolderCreatedAt';
 import { FolderId } from '../domain/FolderId';
 import { FolderPath } from '../domain/FolderPath';
 import { FolderRepository } from '../domain/FolderRepository';
-import { FolderSyncNotifier } from '../domain/FolderSyncNotifier';
+import { SyncFolderMessenger } from '../domain/SyncFolderMessenger';
 import { FolderUpdatedAt } from '../domain/FolderUpdatedAt';
 import { FolderUuid } from '../domain/FolderUuid';
 import { OfflineFolder } from '../domain/OfflineFolder';
@@ -15,11 +15,11 @@ export class FolderCreatorFromOfflineFolder {
     private readonly repository: FolderRepository,
     private readonly remote: RemoteFileSystem,
     private readonly eventBus: EventBus,
-    private readonly notifier: FolderSyncNotifier
+    private readonly syncFolderMessenger: SyncFolderMessenger
   ) {}
 
   async run(offlineFolder: OfflineFolder): Promise<Folder> {
-    this.notifier.creating(offlineFolder.name);
+    this.syncFolderMessenger.creating(offlineFolder.name);
 
     const attributes = await this.remote.persist(
       new FolderPath(offlineFolder.path),
@@ -41,7 +41,7 @@ export class FolderCreatorFromOfflineFolder {
     const events = folder.pullDomainEvents();
     this.eventBus.publish(events);
 
-    this.notifier.created(offlineFolder.name);
+    this.syncFolderMessenger.created(offlineFolder.name);
 
     return folder;
   }
diff --git a/src/context/virtual-drive/folders/application/FolderRenamer.ts b/src/context/virtual-drive/folders/application/FolderRenamer.ts
index 97a994116..eccc3e63f 100644
--- a/src/context/virtual-drive/folders/application/FolderRenamer.ts
+++ b/src/context/virtual-drive/folders/application/FolderRenamer.ts
@@ -4,18 +4,18 @@ import { FolderRepository } from '../domain/FolderRepository';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 import { EventBus } from '../../shared/domain/EventBus';
 import { FolderRenameStartedDomainEvent } from '../domain/events/FolderRenameStartedDomainEvent';
-import { FolderSyncNotifier } from '../domain/FolderSyncNotifier';
+import { SyncFolderMessenger } from '../domain/SyncFolderMessenger';
 
 export class FolderRenamer {
   constructor(
     private readonly repository: FolderRepository,
     private readonly remote: RemoteFileSystem,
     private readonly eventBus: EventBus,
-    private readonly notifier: FolderSyncNotifier
+    private readonly syncFolderMessenger: SyncFolderMessenger
   ) {}
 
   async run(folder: Folder, destination: FolderPath) {
-    this.notifier.rename(folder.name, destination.name());
+    this.syncFolderMessenger.rename(folder.name, destination.name());
     this.eventBus.publish([
       new FolderRenameStartedDomainEvent({
         aggregateId: folder.uuid,
@@ -30,6 +30,6 @@ export class FolderRenamer {
     await this.repository.update(folder);
 
     this.eventBus.publish(folder.pullDomainEvents());
-    this.notifier.renamed(folder.name, destination.name());
+    this.syncFolderMessenger.renamed(folder.name, destination.name());
   }
 }
diff --git a/src/context/virtual-drive/folders/domain/FolderSyncNotifier.ts b/src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts
similarity index 85%
rename from src/context/virtual-drive/folders/domain/FolderSyncNotifier.ts
rename to src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts
index 80eeb4dfa..947488ffe 100644
--- a/src/context/virtual-drive/folders/domain/FolderSyncNotifier.ts
+++ b/src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts
@@ -1,4 +1,4 @@
-export interface FolderSyncNotifier {
+export interface SyncFolderMessenger {
   creating(name: string): Promise<void>;
   created(name: string): Promise<void>;
   rename(name: string, newName: string): Promise<void>;
diff --git a/src/context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier.ts b/src/context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier.ts
index 656d85b51..1d8cb7734 100644
--- a/src/context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier.ts
+++ b/src/context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier.ts
@@ -1,7 +1,7 @@
 import { setTrayStatus } from '../../../../apps/main/tray/tray';
-import { FolderSyncNotifier } from '../domain/FolderSyncNotifier';
+import { SyncFolderMessenger } from '../domain/SyncFolderMessenger';
 
-export class MainProcessFolderSyncNotifier implements FolderSyncNotifier {
+export class MainProcessSyncFolderMessenger implements SyncFolderMessenger {
   async rename(_name: string, _newName: string): Promise<void> {
     setTrayStatus('SYNCING');
   }
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
index a86bd2e26..2777968e3 100644
--- a/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
@@ -1,6 +1,6 @@
-import { FolderSyncNotifier } from '../../../../../src/context/virtual-drive/folders/domain/FolderSyncNotifier';
+import { SyncFolderMessenger } from '../../../../../src/context/virtual-drive/folders/domain/SyncFolderMessenger';
 
-export class FolderSyncNotifierMock implements FolderSyncNotifier {
+export class FolderSyncNotifierMock implements SyncFolderMessenger {
   public creatingMock = jest.fn();
   public createdMock = jest.fn();
   public renameMock = jest.fn();

From cd88852541f1df7949a5a7a7d0653b49a3d8b336 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 17 Jan 2024 12:06:35 +0100
Subject: [PATCH 140/188] chore: rename

---
 .../virtual-drive/files/builder.ts            |  8 +++----
 .../dependency-injection/files/builder.ts     |  8 +++----
 src/context/shared/domain/Notifier.ts         |  5 ----
 .../MainProcessUploadProgressTracker.ts       |  4 ++--
 .../files/application/FileCreator.ts          |  4 ++--
 .../files/application/FileDeleter.ts          |  4 ++--
 .../files/domain/FileSyncNotifier.ts          | 11 ---------
 .../files/domain/OldFileRepository.ts         | 24 -------------------
 .../MainProcessFileSyncNotifier.ts            | 10 ++++----
 .../files/__mocks__/FileSyncNotifierMock.ts   |  4 ++--
 10 files changed, 21 insertions(+), 61 deletions(-)
 delete mode 100644 src/context/shared/domain/Notifier.ts
 delete mode 100644 src/context/virtual-drive/files/domain/FileSyncNotifier.ts
 delete mode 100644 src/context/virtual-drive/files/domain/OldFileRepository.ts

diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
index 4bda1cc95..68efc83b9 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
@@ -11,7 +11,7 @@ import { SameFileWasMoved } from '../../../../../context/virtual-drive/files/app
 import { File } from '../../../../../context/virtual-drive/files/domain/File';
 import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/files/infrastructure/FuseLocalFileSystem';
 import { InMemoryFileRepository } from '../../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
-import { MainProcessFileSyncNotifier } from '../../../../../context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier';
+import { MainProcessSyncFileMessenger } from '../../../../../context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier';
 import { SDKRemoteFileSystem } from '../../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
 import { DependencyInjectionEventBus } from '../../common/eventBus';
 import { DependencyInjectionEventRepository } from '../../common/eventRepository';
@@ -36,7 +36,7 @@ export async function buildFilesContainer(
 
   await repositoryPopulator.run(initialFiles);
 
-  const notifier = new MainProcessFileSyncNotifier();
+  const syncFileMessenger = new MainProcessSyncFileMessenger();
 
   const filesByFolderPathNameLister = new FilesByFolderPathSearcher(
     repository,
@@ -72,7 +72,7 @@ export async function buildFilesContainer(
     localFileSystem,
     repository,
     folderContainer.allParentFoldersStatusIsExists,
-    notifier
+    syncFileMessenger
   );
 
   const fileCreator = new FileCreator(
@@ -81,7 +81,7 @@ export async function buildFilesContainer(
     folderContainer.folderFinder,
     fileDeleter,
     eventBus,
-    notifier
+    syncFileMessenger
   );
 
   const createFileOnOfflineFileUploaded = new CreateFileOnOfflineFileUploaded(
diff --git a/src/apps/sync-engine/dependency-injection/files/builder.ts b/src/apps/sync-engine/dependency-injection/files/builder.ts
index c81a212b3..9124948bb 100644
--- a/src/apps/sync-engine/dependency-injection/files/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/files/builder.ts
@@ -22,7 +22,7 @@ import { InMemoryFileRepository } from '../../../../context/virtual-drive/files/
 import { SDKRemoteFileSystem } from '../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
 import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem';
 import { LocalFileIdProvider } from '../../../../context/virtual-drive/shared/application/LocalFileIdProvider';
-import { MainProcessFileSyncNotifier } from '../../../../context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier';
+import { MainProcessSyncFileMessenger } from '../../../../context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier';
 
 export async function buildFilesContainer(
   folderContainer: FoldersContainer,
@@ -42,7 +42,7 @@ export async function buildFilesContainer(
     virtualDrive,
     sharedContainer.relativePathToAbsoluteConverter
   );
-  const notifier = new MainProcessFileSyncNotifier();
+  const syncFileMessenger = new MainProcessSyncFileMessenger();
 
   const repository = new InMemoryFileRepository();
 
@@ -53,7 +53,7 @@ export async function buildFilesContainer(
     localFileSystem,
     repository,
     folderContainer.allParentFoldersStatusIsExists,
-    notifier
+    syncFileMessenger
   );
 
   const sameFileWasMoved = new SameFileWasMoved(
@@ -77,7 +77,7 @@ export async function buildFilesContainer(
     folderContainer.folderFinder,
     fileDeleter,
     eventBus,
-    notifier
+    syncFileMessenger
   );
 
   const filePlaceholderCreatorFromContentsId =
diff --git a/src/context/shared/domain/Notifier.ts b/src/context/shared/domain/Notifier.ts
deleted file mode 100644
index d1029ec6e..000000000
--- a/src/context/shared/domain/Notifier.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export abstract class Notifier {
-  protected nameWithExtension(name: string, type: string): string {
-    return `${name}.${type}`;
-  }
-}
diff --git a/src/context/shared/infrastructure/MainProcessUploadProgressTracker.ts b/src/context/shared/infrastructure/MainProcessUploadProgressTracker.ts
index ee15fa21e..a4b607727 100644
--- a/src/context/shared/infrastructure/MainProcessUploadProgressTracker.ts
+++ b/src/context/shared/infrastructure/MainProcessUploadProgressTracker.ts
@@ -1,11 +1,11 @@
 import { trackError, trackEvent } from '../../../apps/main/analytics/service';
 import { setTrayStatus } from '../../../apps/main/tray/tray';
 import { broadcastToWindows } from '../../../apps/main/windows';
-import { Notifier } from '../domain/Notifier';
+import { SyncMessenger } from '../domain/SyncMessenger';
 import { UploadProgressTracker } from '../domain/UploadProgressTracker';
 
 export class MainProcessUploadProgressTracker
-  extends Notifier
+  extends SyncMessenger
   implements UploadProgressTracker
 {
   uploadStarted(name: string, extension: string, size: number): void {
diff --git a/src/context/virtual-drive/files/application/FileCreator.ts b/src/context/virtual-drive/files/application/FileCreator.ts
index 4ce1b65c7..279124abe 100644
--- a/src/context/virtual-drive/files/application/FileCreator.ts
+++ b/src/context/virtual-drive/files/application/FileCreator.ts
@@ -8,7 +8,7 @@ import { PlatformPathConverter } from '../../shared/application/PlatformPathConv
 import { FileRepository } from '../domain/FileRepository';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 import { OfflineFile } from '../domain/OfflineFile';
-import { FileSyncNotifier } from '../domain/FileSyncNotifier';
+import { SyncFileMessenger } from '../domain/SyncFileMessenger';
 
 export class FileCreator {
   constructor(
@@ -17,7 +17,7 @@ export class FileCreator {
     private readonly folderFinder: FolderFinder,
     private readonly fileDeleter: FileDeleter,
     private readonly eventBus: EventBus,
-    private readonly notifier: FileSyncNotifier
+    private readonly notifier: SyncFileMessenger
   ) {}
 
   async run(path: string, contentsId: string, size: number): Promise<File> {
diff --git a/src/context/virtual-drive/files/application/FileDeleter.ts b/src/context/virtual-drive/files/application/FileDeleter.ts
index f1003a90c..2969569dd 100644
--- a/src/context/virtual-drive/files/application/FileDeleter.ts
+++ b/src/context/virtual-drive/files/application/FileDeleter.ts
@@ -3,7 +3,7 @@ import { AllParentFoldersStatusIsExists } from '../../folders/application/AllPar
 import { File } from '../domain/File';
 import { FileRepository } from '../domain/FileRepository';
 import { FileStatuses } from '../domain/FileStatus';
-import { FileSyncNotifier } from '../domain/FileSyncNotifier';
+import { SyncFileMessenger } from '../domain/SyncFileMessenger';
 import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 
@@ -13,7 +13,7 @@ export class FileDeleter {
     private readonly local: LocalFileSystem,
     private readonly repository: FileRepository,
     private readonly allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists,
-    private readonly notifier: FileSyncNotifier
+    private readonly notifier: SyncFileMessenger
   ) {}
 
   async run(contentsId: File['contentsId']): Promise<void> {
diff --git a/src/context/virtual-drive/files/domain/FileSyncNotifier.ts b/src/context/virtual-drive/files/domain/FileSyncNotifier.ts
deleted file mode 100644
index f59ecaed2..000000000
--- a/src/context/virtual-drive/files/domain/FileSyncNotifier.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export interface FileSyncNotifier {
-  created(name: string, extension: string): Promise<void>;
-  error(name: string, extension: string, message: string): Promise<void>;
-  trashing(name: string, type: string, size: number): Promise<void>;
-  trashed(name: string, type: string, size: number): Promise<void>;
-  errorWhileTrashing(
-    name: string,
-    type: string,
-    message: string
-  ): Promise<void>;
-}
diff --git a/src/context/virtual-drive/files/domain/OldFileRepository.ts b/src/context/virtual-drive/files/domain/OldFileRepository.ts
deleted file mode 100644
index ed8c81f2f..000000000
--- a/src/context/virtual-drive/files/domain/OldFileRepository.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { File, FileAttributes } from './File';
-import { FolderAttributes } from '../../folders/domain/Folder';
-import { FilePath } from './FilePath';
-
-export interface OldFileRepository {
-  search(pathLike: FilePath): File | undefined;
-
-  searchByPartial(partial: Partial<FileAttributes>): File | undefined;
-
-  delete(file: File): Promise<void>;
-
-  add(file: File): Promise<void>;
-
-  updateName(item: File): Promise<void>;
-
-  updateParentDir(item: File): Promise<void>;
-
-  searchOnFolder(folderId: FolderAttributes['id']): Promise<Array<File>>;
-
-  all(): Promise<Array<File>>;
-
-  /** @deprecated */
-  clear(): void;
-}
diff --git a/src/context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier.ts b/src/context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier.ts
index 92ba153c0..bedf39351 100644
--- a/src/context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier.ts
+++ b/src/context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier.ts
@@ -6,12 +6,12 @@ import { addProcessIssue } from '../../../../apps/main/background-processes/proc
 import { setTrayStatus } from '../../../../apps/main/tray/tray';
 import { broadcastToWindows } from '../../../../apps/main/windows';
 import { ProcessIssue } from '../../../../apps/shared/types';
-import { Notifier } from '../../../shared/domain/Notifier';
-import { FileSyncNotifier } from '../domain/FileSyncNotifier';
+import { SyncMessenger } from '../../../shared/domain/SyncMessenger';
+import { SyncFileMessenger } from '../domain/SyncFileMessenger';
 
-export class MainProcessFileSyncNotifier
-  extends Notifier
-  implements FileSyncNotifier
+export class MainProcessSyncFileMessenger
+  extends SyncMessenger
+  implements SyncFileMessenger
 {
   async created(name: string, extension: string): Promise<void> {
     const nameWithExtension = this.nameWithExtension(name, extension);
diff --git a/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts b/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts
index cc71dcff4..a9b860c72 100644
--- a/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts
+++ b/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts
@@ -1,6 +1,6 @@
-import { FileSyncNotifier } from '../../../../../src/context/virtual-drive/files/domain/FileSyncNotifier';
+import { SyncFileMessenger } from '../../../../../src/context/virtual-drive/files/domain/SyncFileMessenger';
 
-export class FileSyncNotifierMock implements FileSyncNotifier {
+export class FileSyncNotifierMock implements SyncFileMessenger {
   public createdMock = jest.fn();
   public errorMock = jest.fn();
   public trashingMock = jest.fn();

From dc40bbc6a62f7cda362cea7cf24f17b4c92698a7 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 17 Jan 2024 12:06:47 +0100
Subject: [PATCH 141/188] chore: rename

---
 src/context/shared/domain/SyncMessenger.ts            |  5 +++++
 .../virtual-drive/files/domain/SyncFileMessenger.ts   | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 src/context/shared/domain/SyncMessenger.ts
 create mode 100644 src/context/virtual-drive/files/domain/SyncFileMessenger.ts

diff --git a/src/context/shared/domain/SyncMessenger.ts b/src/context/shared/domain/SyncMessenger.ts
new file mode 100644
index 000000000..b821c6040
--- /dev/null
+++ b/src/context/shared/domain/SyncMessenger.ts
@@ -0,0 +1,5 @@
+export abstract class SyncMessenger {
+  protected nameWithExtension(name: string, type: string): string {
+    return `${name}.${type}`;
+  }
+}
diff --git a/src/context/virtual-drive/files/domain/SyncFileMessenger.ts b/src/context/virtual-drive/files/domain/SyncFileMessenger.ts
new file mode 100644
index 000000000..0693af0ea
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/SyncFileMessenger.ts
@@ -0,0 +1,11 @@
+export interface SyncFileMessenger {
+  created(name: string, extension: string): Promise<void>;
+  error(name: string, extension: string, message: string): Promise<void>;
+  trashing(name: string, type: string, size: number): Promise<void>;
+  trashed(name: string, type: string, size: number): Promise<void>;
+  errorWhileTrashing(
+    name: string,
+    type: string,
+    message: string
+  ): Promise<void>;
+}

From 35b7ee5b8d87cfd77c593be29bc80b84092c4162 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 17 Jan 2024 12:07:54 +0100
Subject: [PATCH 142/188] chore: rename

---
 .../fuse/dependency-injection/virtual-drive/files/builder.ts    | 2 +-
 .../fuse/dependency-injection/virtual-drive/folders/builder.ts  | 2 +-
 src/apps/sync-engine/dependency-injection/files/builder.ts      | 2 +-
 src/apps/sync-engine/dependency-injection/folders/builder.ts    | 2 +-
 ...ocessFileSyncNotifier.ts => MainProcessSyncFileMessenger.ts} | 0
 ...sFolderSyncNotifier.ts => MainProcessSyncFolderMessenger.ts} | 0
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename src/context/virtual-drive/files/infrastructure/{MainProcessFileSyncNotifier.ts => MainProcessSyncFileMessenger.ts} (100%)
 rename src/context/virtual-drive/folders/infrastructure/{MainProcessFolderSyncNotifier.ts => MainProcessSyncFolderMessenger.ts} (100%)

diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
index 68efc83b9..7370ce51b 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
@@ -11,7 +11,7 @@ import { SameFileWasMoved } from '../../../../../context/virtual-drive/files/app
 import { File } from '../../../../../context/virtual-drive/files/domain/File';
 import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/files/infrastructure/FuseLocalFileSystem';
 import { InMemoryFileRepository } from '../../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
-import { MainProcessSyncFileMessenger } from '../../../../../context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier';
+import { MainProcessSyncFileMessenger } from '../../../../../context/virtual-drive/files/infrastructure/MainProcessSyncFileMessenger';
 import { SDKRemoteFileSystem } from '../../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
 import { DependencyInjectionEventBus } from '../../common/eventBus';
 import { DependencyInjectionEventRepository } from '../../common/eventRepository';
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
index 90877128b..e340cdd4f 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
@@ -13,7 +13,7 @@ import { Folder } from '../../../../../context/virtual-drive/folders/domain/Fold
 import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/FuseLocalFileSystem';
 import { HttpRemoteFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
 import { InMemoryFolderRepository } from '../../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
-import { MainProcessSyncFolderMessenger } from '../../../../../context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier';
+import { MainProcessSyncFolderMessenger } from '../../../../../context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger';
 import { DependencyInjectionHttpClientsProvider } from '../../common/clients';
 import { DependencyInjectionEventBus } from '../../common/eventBus';
 
diff --git a/src/apps/sync-engine/dependency-injection/files/builder.ts b/src/apps/sync-engine/dependency-injection/files/builder.ts
index 9124948bb..15075a49c 100644
--- a/src/apps/sync-engine/dependency-injection/files/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/files/builder.ts
@@ -22,7 +22,7 @@ import { InMemoryFileRepository } from '../../../../context/virtual-drive/files/
 import { SDKRemoteFileSystem } from '../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
 import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem';
 import { LocalFileIdProvider } from '../../../../context/virtual-drive/shared/application/LocalFileIdProvider';
-import { MainProcessSyncFileMessenger } from '../../../../context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier';
+import { MainProcessSyncFileMessenger } from '../../../../context/virtual-drive/files/infrastructure/MainProcessSyncFileMessenger';
 
 export async function buildFilesContainer(
   folderContainer: FoldersContainer,
diff --git a/src/apps/sync-engine/dependency-injection/folders/builder.ts b/src/apps/sync-engine/dependency-injection/folders/builder.ts
index 09b2ff4f7..5f0c1d84d 100644
--- a/src/apps/sync-engine/dependency-injection/folders/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/folders/builder.ts
@@ -26,7 +26,7 @@ import { DependencyInjectionEventRepository } from '../common/eventRepository';
 import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
 import { SharedContainer } from '../shared/SharedContainer';
 import { FoldersContainer } from './FoldersContainer';
-import { MainProcessSyncFolderMessenger } from '../../../../context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier';
+import { MainProcessSyncFolderMessenger } from '../../../../context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger';
 
 export async function buildFoldersContainer(
   shredContainer: SharedContainer
diff --git a/src/context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier.ts b/src/context/virtual-drive/files/infrastructure/MainProcessSyncFileMessenger.ts
similarity index 100%
rename from src/context/virtual-drive/files/infrastructure/MainProcessFileSyncNotifier.ts
rename to src/context/virtual-drive/files/infrastructure/MainProcessSyncFileMessenger.ts
diff --git a/src/context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier.ts b/src/context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger.ts
similarity index 100%
rename from src/context/virtual-drive/folders/infrastructure/MainProcessFolderSyncNotifier.ts
rename to src/context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger.ts

From b606e640a24f53bb1be20c5eeec93428162f372b Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 17 Jan 2024 12:15:42 +0100
Subject: [PATCH 143/188] wip: track folder errors

---
 .../folders/domain/SyncFolderMessenger.ts           |  2 +-
 .../MainProcessSyncFolderMessenger.ts               | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts b/src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts
index 947488ffe..7a8650016 100644
--- a/src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts
+++ b/src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts
@@ -3,5 +3,5 @@ export interface SyncFolderMessenger {
   created(name: string): Promise<void>;
   rename(name: string, newName: string): Promise<void>;
   renamed(name: string, newName: string): Promise<void>;
-  error(): Promise<void>;
+  error(name: string, message: string): Promise<void>;
 }
diff --git a/src/context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger.ts b/src/context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger.ts
index 1d8cb7734..e627298ad 100644
--- a/src/context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger.ts
+++ b/src/context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger.ts
@@ -1,4 +1,6 @@
+import { trackError } from '../../../../apps/main/analytics/service';
 import { setTrayStatus } from '../../../../apps/main/tray/tray';
+import { broadcastToWindows } from '../../../../apps/main/windows';
 import { SyncFolderMessenger } from '../domain/SyncFolderMessenger';
 
 export class MainProcessSyncFolderMessenger implements SyncFolderMessenger {
@@ -14,7 +16,14 @@ export class MainProcessSyncFolderMessenger implements SyncFolderMessenger {
   async created(_name: string): Promise<void> {
     setTrayStatus('IDLE');
   }
-  async error(): Promise<void> {
-    throw new Error('Method not implemented.');
+  async error(name: string, message: string): Promise<void> {
+    setTrayStatus('ALERT');
+
+    trackError('Upload Error', new Error(message), {
+      itemType: 'Folder',
+      root: '',
+      from: name,
+      action: 'Upload',
+    });
   }
 }

From 687914dcf7c7e2a0e90647a33fb25fcce4998ab0 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 17 Jan 2024 12:42:18 +0100
Subject: [PATCH 144/188] chore: ts lint fixes

---
 src/apps/fuse/FuseApp.ts                      |  1 -
 .../fuse/callbacks/MakeDirectoryCallback.ts   |  2 +-
 src/apps/fuse/callbacks/StatFsCallback.ts     |  7 +----
 .../user/usage/builder.ts                     |  1 +
 .../virtual-drive/files/builder.ts            |  9 ++++++-
 src/apps/fuse/index.ts                        |  2 +-
 src/apps/main/remote-sync/handlers.ts         |  1 -
 .../dependency-injection/common/traverser.ts  |  7 +----
 .../folders/domain/ManagedFolderRepository.ts |  7 -----
 .../folders/domain/OldFolderRepository.ts     | 27 -------------------
 .../infrastructure/HttpRemoteFileSystem.ts    |  2 +-
 .../MainProcessSyncFolderMessenger.ts         |  1 -
 .../application/AllWebdavItemsSearcher.ts     | 27 -------------------
 .../WebdavUnknownItemTypeSearcher.ts          | 20 --------------
 .../FolderCreatorFromOfflineFolder.test.ts    |  1 -
 15 files changed, 14 insertions(+), 101 deletions(-)
 delete mode 100644 src/context/virtual-drive/folders/domain/ManagedFolderRepository.ts
 delete mode 100644 src/context/virtual-drive/folders/domain/OldFolderRepository.ts
 delete mode 100644 src/context/virtual-drive/shared/application/AllWebdavItemsSearcher.ts
 delete mode 100644 src/context/virtual-drive/shared/application/WebdavUnknownItemTypeSearcher.ts

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index 44d8e047c..03cecbd24 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -18,7 +18,6 @@ import { FuseDependencyContainer } from './dependency-injection/FuseDependencyCo
 const fuse = require('@gcas/fuse');
 
 export class FuseApp {
-  private static readonly SID = 41033;
   private _fuse: any;
 
   constructor(
diff --git a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
index f30dcb631..55c520052 100644
--- a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
+++ b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
@@ -42,7 +42,7 @@ export class MakeDirectoryCallback extends NotifyFuseCallback {
     } catch (err: unknown) {
       const error = this.resolveError({ path, mode }, err);
 
-      this.container.syncFolderMessenger.error();
+      this.container.syncFolderMessenger.error(path, 'unknown error');
 
       return this.left(error);
     }
diff --git a/src/apps/fuse/callbacks/StatFsCallback.ts b/src/apps/fuse/callbacks/StatFsCallback.ts
index 6a02eada7..332764beb 100644
--- a/src/apps/fuse/callbacks/StatFsCallback.ts
+++ b/src/apps/fuse/callbacks/StatFsCallback.ts
@@ -1,4 +1,3 @@
-import { UserDependencyContainer } from '../dependency-injection/user/UserDependencyContainer';
 import { FuseCallback } from './FuseCallback';
 import Logger from 'electron-log';
 
@@ -17,11 +16,7 @@ type StatFsCallbackData = {
 };
 
 export class StatFsCallback extends FuseCallback<Partial<StatFsCallbackData>> {
-  constructor(
-    private readonly _userContainer: UserDependencyContainer,
-    private readonly localStats: Partial<StatFsCallbackData>,
-    private readonly sid: number
-  ) {
+  constructor(private readonly localStats: Partial<StatFsCallbackData>) {
     super('Stat FS');
   }
 
diff --git a/src/apps/fuse/dependency-injection/user/usage/builder.ts b/src/apps/fuse/dependency-injection/user/usage/builder.ts
index 6fc96a491..d28b90c59 100644
--- a/src/apps/fuse/dependency-injection/user/usage/builder.ts
+++ b/src/apps/fuse/dependency-injection/user/usage/builder.ts
@@ -15,6 +15,7 @@ export async function buildUsageContainer(): Promise<UsageContainer> {
   const { photos } = Photos;
 
   const repository = new CachedHttpUserUsageRepository(
+    // @ts-ignore
     clients.newDrive,
     photos
   );
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
index 7370ce51b..f9c746779 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
@@ -13,6 +13,7 @@ import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/files/
 import { InMemoryFileRepository } from '../../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
 import { MainProcessSyncFileMessenger } from '../../../../../context/virtual-drive/files/infrastructure/MainProcessSyncFileMessenger';
 import { SDKRemoteFileSystem } from '../../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
+import { DependencyInjectionHttpClientsProvider } from '../../common/clients';
 import { DependencyInjectionEventBus } from '../../common/eventBus';
 import { DependencyInjectionEventRepository } from '../../common/eventRepository';
 import { DependencyInjectionStorageSdk } from '../../common/sdk';
@@ -31,6 +32,7 @@ export async function buildFilesContainer(
   const user = DependencyInjectionUserProvider.get();
   const sdk = await DependencyInjectionStorageSdk.get();
   const { bus: eventBus } = DependencyInjectionEventBus;
+  const clients = DependencyInjectionHttpClientsProvider.get();
 
   const repositoryPopulator = new RepositoryPopulator(repository);
 
@@ -45,7 +47,12 @@ export async function buildFilesContainer(
 
   const filesSearcher = new FilesSearcher(repository);
 
-  const remoteFileSystem = new SDKRemoteFileSystem(sdk, crypt, user.bucket);
+  const remoteFileSystem = new SDKRemoteFileSystem(
+    sdk,
+    clients,
+    crypt,
+    user.bucket
+  );
   const localFileSystem = new FuseLocalFileSystem(
     sharedContainer.relativePathToAbsoluteConverter
   );
diff --git a/src/apps/fuse/index.ts b/src/apps/fuse/index.ts
index 101f2fc07..54fed8d9c 100644
--- a/src/apps/fuse/index.ts
+++ b/src/apps/fuse/index.ts
@@ -1,12 +1,12 @@
 import Logger from 'electron-log';
 
 import { app } from 'electron';
-import { getRootVirtualDrive } from '../main/virutal-root-folder/service';
 import eventBus from '../main/event-bus';
 import { FuseApp } from './FuseApp';
 import path from 'path';
 import { FuseDependencyContainerFactory } from './dependency-injection/FuseDependencyContainerFactory';
 import { HydrationApi } from '../hydration-api/HydrationApi';
+import { getRootVirtualDrive } from '../main/virtual-root-folder/service';
 
 let fuseApp: FuseApp;
 
diff --git a/src/apps/main/remote-sync/handlers.ts b/src/apps/main/remote-sync/handlers.ts
index a03f8ef2a..6741bb16a 100644
--- a/src/apps/main/remote-sync/handlers.ts
+++ b/src/apps/main/remote-sync/handlers.ts
@@ -9,7 +9,6 @@ import { ipcMain } from 'electron';
 import { reportError } from '../bug-report/service';
 import { sleep } from '../util';
 import { broadcastToWindows } from '../windows';
-import { updateSyncEngine } from '../background-processes/sync-engine';
 
 let initialSyncReady = false;
 const driveFilesCollection = new DriveFilesCollection();
diff --git a/src/apps/sync-engine/dependency-injection/common/traverser.ts b/src/apps/sync-engine/dependency-injection/common/traverser.ts
index be17a4e0c..b25de6491 100644
--- a/src/apps/sync-engine/dependency-injection/common/traverser.ts
+++ b/src/apps/sync-engine/dependency-injection/common/traverser.ts
@@ -1,7 +1,6 @@
 import crypt from '../../../../context/shared/infrastructure/crypt';
 import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
 import { DependencyInjectionUserProvider } from './user';
-import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
 
 export class DependencyInjectionTraverserProvider {
   private static traverser: Traverser;
@@ -13,11 +12,7 @@ export class DependencyInjectionTraverserProvider {
 
     const user = DependencyInjectionUserProvider.get();
 
-    const traverser = Traverser.existingItems(
-      crypt,
-      ipcRendererSyncEngine,
-      user.root_folder_id
-    );
+    const traverser = Traverser.existingItems(crypt, user.root_folder_id);
 
     DependencyInjectionTraverserProvider.traverser = traverser;
 
diff --git a/src/context/virtual-drive/folders/domain/ManagedFolderRepository.ts b/src/context/virtual-drive/folders/domain/ManagedFolderRepository.ts
deleted file mode 100644
index cbc06f16a..000000000
--- a/src/context/virtual-drive/folders/domain/ManagedFolderRepository.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Folder } from './Folder';
-
-// TODO: Find a better name
-export interface ManagedFolderRepository {
-  insert(folder: Folder): Promise<void>;
-  overwrite(oldFolder: Folder, newFolder: Folder): Promise<void>;
-}
diff --git a/src/context/virtual-drive/folders/domain/OldFolderRepository.ts b/src/context/virtual-drive/folders/domain/OldFolderRepository.ts
deleted file mode 100644
index 1563e2499..000000000
--- a/src/context/virtual-drive/folders/domain/OldFolderRepository.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Folder, FolderAttributes } from './Folder';
-import { FolderPath } from './FolderPath';
-
-export interface OldFolderRepository {
-  all(): Promise<Array<Folder>>;
-
-  search(path: string): Folder | undefined;
-
-  searchByPartial(partial: Partial<FolderAttributes>): Folder | undefined;
-
-  create(
-    name: FolderPath,
-    parentId: FolderAttributes['parentId'],
-    uuid: Folder['uuid']
-  ): Promise<Folder>;
-
-  updateName(folder: Folder): Promise<void>;
-
-  updateParentDir(folder: Folder): Promise<void>;
-
-  searchOn(folder: Folder): Promise<Array<Folder>>;
-
-  trash(folder: Folder): Promise<void>;
-
-  /** @deprecated */
-  clear(): void;
-}
diff --git a/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
index befdb4214..fa0c09637 100644
--- a/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
+++ b/src/context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem.ts
@@ -1,4 +1,4 @@
-import axios, { Axios } from 'axios';
+import { Axios } from 'axios';
 import Logger from 'electron-log';
 import * as uuid from 'uuid';
 import { Folder } from '../domain/Folder';
diff --git a/src/context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger.ts b/src/context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger.ts
index e627298ad..a1c019dcc 100644
--- a/src/context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger.ts
+++ b/src/context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger.ts
@@ -1,6 +1,5 @@
 import { trackError } from '../../../../apps/main/analytics/service';
 import { setTrayStatus } from '../../../../apps/main/tray/tray';
-import { broadcastToWindows } from '../../../../apps/main/windows';
 import { SyncFolderMessenger } from '../domain/SyncFolderMessenger';
 
 export class MainProcessSyncFolderMessenger implements SyncFolderMessenger {
diff --git a/src/context/virtual-drive/shared/application/AllWebdavItemsSearcher.ts b/src/context/virtual-drive/shared/application/AllWebdavItemsSearcher.ts
deleted file mode 100644
index 8ab4113af..000000000
--- a/src/context/virtual-drive/shared/application/AllWebdavItemsSearcher.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { OldFileRepository } from '../../files/domain/OldFileRepository';
-import { FolderFinder } from '../../folders/application/FolderFinder';
-import { OldFolderRepository } from '../../folders/domain/OldFolderRepository';
-
-export class AllWebdavItemsNameLister {
-  constructor(
-    private readonly filesRepository: OldFileRepository,
-    private readonly folderRepository: OldFolderRepository,
-    private readonly folderfinder: FolderFinder
-  ) {}
-
-  async run(path: string): Promise<Array<string>> {
-    const folder = this.folderfinder.run(path);
-
-    const names: Array<string> = [];
-
-    const files = await this.filesRepository.searchOnFolder(folder.id);
-
-    files.forEach((file) => names.push(file.nameWithExtension));
-
-    const folders = await this.folderRepository.searchOn(folder);
-
-    folders.forEach((folder) => names.push(folder.name));
-
-    return names;
-  }
-}
diff --git a/src/context/virtual-drive/shared/application/WebdavUnknownItemTypeSearcher.ts b/src/context/virtual-drive/shared/application/WebdavUnknownItemTypeSearcher.ts
deleted file mode 100644
index 790a29f47..000000000
--- a/src/context/virtual-drive/shared/application/WebdavUnknownItemTypeSearcher.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { FilePath } from '../../files/domain/FilePath';
-import { File } from '../../files/domain/File';
-import { OldFileRepository } from '../../files/domain/OldFileRepository';
-import { Folder } from '../../folders/domain/Folder';
-import { OldFolderRepository } from '../../folders/domain/OldFolderRepository';
-
-export class WebdavUnknownItemTypeSearcher {
-  constructor(
-    private readonly filesRepository: OldFileRepository,
-    private readonly folderRepository: OldFolderRepository
-  ) {}
-
-  run(path: string): File | Folder | undefined {
-    const file = this.filesRepository.search(new FilePath(path));
-
-    if (file) return file;
-
-    return this.folderRepository.search(path);
-  }
-}
diff --git a/tests/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.test.ts b/tests/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.test.ts
index 0851d0e97..c16a6fb4d 100644
--- a/tests/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.test.ts
+++ b/tests/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.test.ts
@@ -1,5 +1,4 @@
 import { FolderCreatorFromOfflineFolder } from '../../../../../src/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder';
-import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
 import { EventBusMock } from '../../shared/__mock__/EventBusMock';
 import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
 import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';

From e936ff681d81f09f621ded21481bb3f37706a649 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 17 Jan 2024 13:09:28 +0100
Subject: [PATCH 145/188] feat: create backgorund process messenger

---
 .../fuse/callbacks/MakeDirectoryCallback.ts   |  5 +-
 .../virtual-drive/files/builder.ts            |  2 +-
 .../virtual-drive/folders/builder.ts          |  2 +-
 src/apps/shared/IPC/events/sync-engine.ts     |  6 ++
 .../dependency-injection/files/builder.ts     | 26 ++++----
 .../dependency-injection/folders/builder.ts   |  9 ++-
 .../files/application/FileCreator.ts          |  6 +-
 .../files/domain/SyncFileMessenger.ts         | 12 ++--
 .../BackgroundProcessSyncFileMessenger.ts     | 64 +++++++++++++++++++
 .../MainProcessSyncFileMessenger.ts           | 20 +++---
 .../folders/domain/SyncFolderMessenger.ts     | 16 +++--
 .../BackgroundProcessSyncFolderMessenger.ts   | 56 ++++++++++++++++
 .../MainProcessSyncFolderMessenger.ts         | 27 ++++++--
 .../files/__mocks__/FileSyncNotifierMock.ts   |  6 +-
 .../__mocks__/FolderSyncManagerMock.ts        |  2 +-
 15 files changed, 218 insertions(+), 41 deletions(-)
 create mode 100644 src/context/virtual-drive/files/infrastructure/SyncFileMessengers/BackgroundProcessSyncFileMessenger.ts
 rename src/context/virtual-drive/files/infrastructure/{ => SyncFileMessengers}/MainProcessSyncFileMessenger.ts (75%)
 create mode 100644 src/context/virtual-drive/folders/infrastructure/SyncMessengers/BackgroundProcessSyncFolderMessenger.ts
 rename src/context/virtual-drive/folders/infrastructure/{ => SyncMessengers}/MainProcessSyncFolderMessenger.ts (50%)

diff --git a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
index 55c520052..e543ce5cf 100644
--- a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
+++ b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
@@ -42,7 +42,10 @@ export class MakeDirectoryCallback extends NotifyFuseCallback {
     } catch (err: unknown) {
       const error = this.resolveError({ path, mode }, err);
 
-      this.container.syncFolderMessenger.error(path, 'unknown error');
+      this.container.syncFolderMessenger.errorWhileCreating(
+        path,
+        'unknown error'
+      );
 
       return this.left(error);
     }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
index f9c746779..385f883fa 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
@@ -11,7 +11,7 @@ import { SameFileWasMoved } from '../../../../../context/virtual-drive/files/app
 import { File } from '../../../../../context/virtual-drive/files/domain/File';
 import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/files/infrastructure/FuseLocalFileSystem';
 import { InMemoryFileRepository } from '../../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
-import { MainProcessSyncFileMessenger } from '../../../../../context/virtual-drive/files/infrastructure/MainProcessSyncFileMessenger';
+import { MainProcessSyncFileMessenger } from '../../../../../context/virtual-drive/files/infrastructure/SyncFileMessengers/MainProcessSyncFileMessenger';
 import { SDKRemoteFileSystem } from '../../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
 import { DependencyInjectionHttpClientsProvider } from '../../common/clients';
 import { DependencyInjectionEventBus } from '../../common/eventBus';
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
index e340cdd4f..f5c3a0e53 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
@@ -13,7 +13,7 @@ import { Folder } from '../../../../../context/virtual-drive/folders/domain/Fold
 import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/FuseLocalFileSystem';
 import { HttpRemoteFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
 import { InMemoryFolderRepository } from '../../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
-import { MainProcessSyncFolderMessenger } from '../../../../../context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger';
+import { MainProcessSyncFolderMessenger } from '../../../../../context/virtual-drive/folders/infrastructure/SyncMessengers/MainProcessSyncFolderMessenger';
 import { DependencyInjectionHttpClientsProvider } from '../../common/clients';
 import { DependencyInjectionEventBus } from '../../common/eventBus';
 
diff --git a/src/apps/shared/IPC/events/sync-engine.ts b/src/apps/shared/IPC/events/sync-engine.ts
index 2b9494796..9cbf931bb 100644
--- a/src/apps/shared/IPC/events/sync-engine.ts
+++ b/src/apps/shared/IPC/events/sync-engine.ts
@@ -45,9 +45,15 @@ type FileUpdatePayload = {
 export type FolderEvents = {
   FOLDER_CREATING: (payload: { name: string }) => void;
   FOLDER_CREATED: (payload: { name: string }) => void;
+  FOLDER_CREATION_ERROR: (payload: { name: string; error: string }) => void;
 
   FOLDER_RENAMING: (payload: { oldName: string; newName: string }) => void;
   FOLDER_RENAMED: (payload: { oldName: string; newName: string }) => void;
+  FOLDER_RENAME_ERROR: (payload: {
+    oldName: string;
+    newName: string;
+    error: string;
+  }) => void;
 };
 
 export type FilesEvents = {
diff --git a/src/apps/sync-engine/dependency-injection/files/builder.ts b/src/apps/sync-engine/dependency-injection/files/builder.ts
index 9061c6760..455faa89f 100644
--- a/src/apps/sync-engine/dependency-injection/files/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/files/builder.ts
@@ -1,12 +1,4 @@
 import crypt from '../../../../context/shared/infrastructure/crypt';
-import { DependencyInjectionEventBus } from '../common/eventBus';
-import { DependencyInjectionEventRepository } from '../common/eventRepository';
-import { DependencyInjectionUserProvider } from '../common/user';
-import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
-import { FoldersContainer } from '../folders/FoldersContainer';
-import { SharedContainer } from '../shared/SharedContainer';
-import { FilesContainer } from './FilesContainer';
-import { DependencyInjectionStorageSdk } from '../common/sdk';
 import { CreateFilePlaceholderOnDeletionFailed } from '../../../../context/virtual-drive/files/application/CreateFilePlaceholderOnDeletionFailed';
 import { FileCreator } from '../../../../context/virtual-drive/files/application/FileCreator';
 import { FileDeleter } from '../../../../context/virtual-drive/files/application/FileDeleter';
@@ -19,11 +11,20 @@ import { RepositoryPopulator } from '../../../../context/virtual-drive/files/app
 import { RetrieveAllFiles } from '../../../../context/virtual-drive/files/application/RetrieveAllFiles';
 import { SameFileWasMoved } from '../../../../context/virtual-drive/files/application/SameFileWasMoved';
 import { InMemoryFileRepository } from '../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
-import { SDKRemoteFileSystem } from '../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
 import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/files/infrastructure/NodeWinLocalFileSystem';
+import { SDKRemoteFileSystem } from '../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
+import { BackgroundProcessSyncFileMessenger } from '../../../../context/virtual-drive/files/infrastructure/SyncFileMessengers/BackgroundProcessSyncFileMessenger';
 import { LocalFileIdProvider } from '../../../../context/virtual-drive/shared/application/LocalFileIdProvider';
-import { MainProcessSyncFileMessenger } from '../../../../context/virtual-drive/files/infrastructure/MainProcessSyncFileMessenger';
+import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
 import { DependencyInjectionHttpClientsProvider } from '../common/clients';
+import { DependencyInjectionEventBus } from '../common/eventBus';
+import { DependencyInjectionEventRepository } from '../common/eventRepository';
+import { DependencyInjectionStorageSdk } from '../common/sdk';
+import { DependencyInjectionUserProvider } from '../common/user';
+import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
+import { FoldersContainer } from '../folders/FoldersContainer';
+import { SharedContainer } from '../shared/SharedContainer';
+import { FilesContainer } from './FilesContainer';
 
 export async function buildFilesContainer(
   folderContainer: FoldersContainer,
@@ -50,7 +51,10 @@ export async function buildFilesContainer(
     virtualDrive,
     sharedContainer.relativePathToAbsoluteConverter
   );
-  const syncFileMessenger = new MainProcessSyncFileMessenger();
+
+  const syncFileMessenger = new BackgroundProcessSyncFileMessenger(
+    ipcRendererSyncEngine
+  );
 
   const repository = new InMemoryFileRepository();
 
diff --git a/src/apps/sync-engine/dependency-injection/folders/builder.ts b/src/apps/sync-engine/dependency-injection/folders/builder.ts
index 5f0c1d84d..051d1bd99 100644
--- a/src/apps/sync-engine/dependency-injection/folders/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/folders/builder.ts
@@ -1,4 +1,3 @@
-import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem';
 import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
 import { FolderByPartialSearcher } from '../../../../context/virtual-drive/folders/application/FolderByPartialSearcher';
 import { FolderCreatorFromOfflineFolder } from '../../../../context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder';
@@ -20,13 +19,15 @@ import { FolderPlaceholderUpdater } from '../../../../context/virtual-drive/fold
 import { HttpRemoteFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
 import { InMemoryFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
 import { InMemoryOfflineFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository';
+import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem';
+import { BackgroundProcessSyncFolderMessenger } from '../../../../context/virtual-drive/folders/infrastructure/SyncMessengers/BackgroundProcessSyncFolderMessenger';
+import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
 import { DependencyInjectionHttpClientsProvider } from '../common/clients';
 import { DependencyInjectionEventBus } from '../common/eventBus';
 import { DependencyInjectionEventRepository } from '../common/eventRepository';
 import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
 import { SharedContainer } from '../shared/SharedContainer';
 import { FoldersContainer } from './FoldersContainer';
-import { MainProcessSyncFolderMessenger } from '../../../../context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger';
 
 export async function buildFoldersContainer(
   shredContainer: SharedContainer
@@ -38,7 +39,9 @@ export async function buildFoldersContainer(
 
   const repository = new InMemoryFolderRepository();
 
-  const syncFolderMessenger = new MainProcessSyncFolderMessenger();
+  const syncFolderMessenger = new BackgroundProcessSyncFolderMessenger(
+    ipcRendererSyncEngine
+  );
 
   const localFileSystem = new NodeWinLocalFileSystem(virtualDrive);
   const remoteFileSystem = new HttpRemoteFileSystem(
diff --git a/src/context/virtual-drive/files/application/FileCreator.ts b/src/context/virtual-drive/files/application/FileCreator.ts
index 0cc7cf51b..cde683228 100644
--- a/src/context/virtual-drive/files/application/FileCreator.ts
+++ b/src/context/virtual-drive/files/application/FileCreator.ts
@@ -60,7 +60,11 @@ export class FileCreator {
 
       const filePath = new FilePath(path);
 
-      await this.notifier.error(filePath.name(), filePath.extension(), message);
+      await this.notifier.errorWhileCreating(
+        filePath.name(),
+        filePath.extension(),
+        message
+      );
 
       throw error;
     }
diff --git a/src/context/virtual-drive/files/domain/SyncFileMessenger.ts b/src/context/virtual-drive/files/domain/SyncFileMessenger.ts
index 0693af0ea..f7f577581 100644
--- a/src/context/virtual-drive/files/domain/SyncFileMessenger.ts
+++ b/src/context/virtual-drive/files/domain/SyncFileMessenger.ts
@@ -1,11 +1,15 @@
 export interface SyncFileMessenger {
   created(name: string, extension: string): Promise<void>;
-  error(name: string, extension: string, message: string): Promise<void>;
-  trashing(name: string, type: string, size: number): Promise<void>;
-  trashed(name: string, type: string, size: number): Promise<void>;
+  errorWhileCreating(
+    name: string,
+    extension: string,
+    message: string
+  ): Promise<void>;
+  trashing(name: string, extension: string, size: number): Promise<void>;
+  trashed(name: string, extension: string, size: number): Promise<void>;
   errorWhileTrashing(
     name: string,
-    type: string,
+    extension: string,
     message: string
   ): Promise<void>;
 }
diff --git a/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/BackgroundProcessSyncFileMessenger.ts b/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/BackgroundProcessSyncFileMessenger.ts
new file mode 100644
index 000000000..f4110a66d
--- /dev/null
+++ b/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/BackgroundProcessSyncFileMessenger.ts
@@ -0,0 +1,64 @@
+import { SyncEngineIpc } from '../../../../../apps/sync-engine/ipcRendererSyncEngine';
+import { SyncMessenger } from '../../../../shared/domain/SyncMessenger';
+import { SyncFileMessenger } from '../../domain/SyncFileMessenger';
+
+export class BackgroundProcessSyncFileMessenger
+  extends SyncMessenger
+  implements SyncFileMessenger
+{
+  constructor(private readonly ipc: SyncEngineIpc) {
+    super();
+  }
+
+  async created(name: string, extension: string): Promise<void> {
+    this.ipc.send('FILE_CREATED', {
+      name,
+      extension,
+      nameWithExtension: this.nameWithExtension(name, extension),
+    });
+  }
+
+  async errorWhileCreating(
+    name: string,
+    extension: string,
+    message: string
+  ): Promise<void> {
+    this.ipc.send('FILE_UPLOAD_ERROR', {
+      name,
+      extension,
+      nameWithExtension: this.nameWithExtension(name, extension),
+      error: message,
+    });
+  }
+
+  async trashing(name: string, extension: string, size: number): Promise<void> {
+    this.ipc.send('FILE_DELETING', {
+      name,
+      extension,
+      nameWithExtension: this.nameWithExtension(name, extension),
+      size,
+    });
+  }
+
+  async trashed(name: string, extension: string, size: number): Promise<void> {
+    this.ipc.send('FILE_DELETED', {
+      name,
+      extension,
+      nameWithExtension: this.nameWithExtension(name, extension),
+      size,
+    });
+  }
+
+  async errorWhileTrashing(
+    name: string,
+    extension: string,
+    message: string
+  ): Promise<void> {
+    this.ipc.send('FILE_DELETION_ERROR', {
+      name,
+      extension,
+      nameWithExtension: this.nameWithExtension(name, extension),
+      error: message,
+    });
+  }
+}
diff --git a/src/context/virtual-drive/files/infrastructure/MainProcessSyncFileMessenger.ts b/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/MainProcessSyncFileMessenger.ts
similarity index 75%
rename from src/context/virtual-drive/files/infrastructure/MainProcessSyncFileMessenger.ts
rename to src/context/virtual-drive/files/infrastructure/SyncFileMessengers/MainProcessSyncFileMessenger.ts
index bedf39351..93ab2b7e0 100644
--- a/src/context/virtual-drive/files/infrastructure/MainProcessSyncFileMessenger.ts
+++ b/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/MainProcessSyncFileMessenger.ts
@@ -1,13 +1,13 @@
 import {
   trackError,
   trackEvent,
-} from '../../../../apps/main/analytics/service';
-import { addProcessIssue } from '../../../../apps/main/background-processes/process-issues';
-import { setTrayStatus } from '../../../../apps/main/tray/tray';
-import { broadcastToWindows } from '../../../../apps/main/windows';
-import { ProcessIssue } from '../../../../apps/shared/types';
-import { SyncMessenger } from '../../../shared/domain/SyncMessenger';
-import { SyncFileMessenger } from '../domain/SyncFileMessenger';
+} from '../../../../../apps/main/analytics/service';
+import { addProcessIssue } from '../../../../../apps/main/background-processes/process-issues';
+import { setTrayStatus } from '../../../../../apps/main/tray/tray';
+import { broadcastToWindows } from '../../../../../apps/main/windows';
+import { ProcessIssue } from '../../../../../apps/shared/types';
+import { SyncMessenger } from '../../../../shared/domain/SyncMessenger';
+import { SyncFileMessenger } from '../../domain/SyncFileMessenger';
 
 export class MainProcessSyncFileMessenger
   extends SyncMessenger
@@ -22,7 +22,11 @@ export class MainProcessSyncFileMessenger
     });
   }
 
-  async error(name: string, extension: string, message: string): Promise<void> {
+  async errorWhileCreating(
+    name: string,
+    extension: string,
+    message: string
+  ): Promise<void> {
     const nameWithExtension = this.nameWithExtension(name, extension);
 
     setTrayStatus('ALERT');
diff --git a/src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts b/src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts
index 7a8650016..c5ab1e607 100644
--- a/src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts
+++ b/src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts
@@ -1,7 +1,13 @@
 export interface SyncFolderMessenger {
-  creating(name: string): Promise<void>;
-  created(name: string): Promise<void>;
-  rename(name: string, newName: string): Promise<void>;
-  renamed(name: string, newName: string): Promise<void>;
-  error(name: string, message: string): Promise<void>;
+  creating(desiredName: string): Promise<void>;
+  created(desiredName: string): Promise<void>;
+  errorWhileCreating(desiredName: string, message: string): Promise<void>;
+
+  rename(currentName: string, desiredName: string): Promise<void>;
+  renamed(currentName: string, desiredName: string): Promise<void>;
+  errorWhileRenaming(
+    currentName: string,
+    desiredName: string,
+    message: string
+  ): Promise<void>;
 }
diff --git a/src/context/virtual-drive/folders/infrastructure/SyncMessengers/BackgroundProcessSyncFolderMessenger.ts b/src/context/virtual-drive/folders/infrastructure/SyncMessengers/BackgroundProcessSyncFolderMessenger.ts
new file mode 100644
index 000000000..f56f3657f
--- /dev/null
+++ b/src/context/virtual-drive/folders/infrastructure/SyncMessengers/BackgroundProcessSyncFolderMessenger.ts
@@ -0,0 +1,56 @@
+import { SyncEngineIpc } from '../../../../../apps/sync-engine/ipcRendererSyncEngine';
+import { SyncMessenger } from '../../../../shared/domain/SyncMessenger';
+import { SyncFolderMessenger } from '../../domain/SyncFolderMessenger';
+
+export class BackgroundProcessSyncFolderMessenger
+  extends SyncMessenger
+  implements SyncFolderMessenger
+{
+  constructor(private readonly ipc: SyncEngineIpc) {
+    super();
+  }
+
+  async creating(currentName: string): Promise<void> {
+    this.ipc.send('FOLDER_CREATING', { name: currentName });
+  }
+
+  async created(currentName: string): Promise<void> {
+    this.ipc.send('FOLDER_CREATED', { name: currentName });
+  }
+
+  async errorWhileCreating(
+    currentName: string,
+    message: string
+  ): Promise<void> {
+    this.ipc.send('FOLDER_CREATION_ERROR', {
+      name: currentName,
+      error: message,
+    });
+  }
+
+  async rename(currentName: string, desiredName: string): Promise<void> {
+    this.ipc.send('FOLDER_RENAMING', {
+      oldName: currentName,
+      newName: desiredName,
+    });
+  }
+
+  async renamed(currentName: string, desiredName: string): Promise<void> {
+    this.ipc.send('FOLDER_RENAMED', {
+      oldName: currentName,
+      newName: desiredName,
+    });
+  }
+
+  async errorWhileRenaming(
+    currentName: string,
+    desiredName: string,
+    message: string
+  ): Promise<void> {
+    this.ipc.send('FOLDER_RENAME_ERROR', {
+      oldName: currentName,
+      newName: desiredName,
+      error: message,
+    });
+  }
+}
diff --git a/src/context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger.ts b/src/context/virtual-drive/folders/infrastructure/SyncMessengers/MainProcessSyncFolderMessenger.ts
similarity index 50%
rename from src/context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger.ts
rename to src/context/virtual-drive/folders/infrastructure/SyncMessengers/MainProcessSyncFolderMessenger.ts
index a1c019dcc..2fbba1950 100644
--- a/src/context/virtual-drive/folders/infrastructure/MainProcessSyncFolderMessenger.ts
+++ b/src/context/virtual-drive/folders/infrastructure/SyncMessengers/MainProcessSyncFolderMessenger.ts
@@ -1,21 +1,40 @@
-import { trackError } from '../../../../apps/main/analytics/service';
-import { setTrayStatus } from '../../../../apps/main/tray/tray';
-import { SyncFolderMessenger } from '../domain/SyncFolderMessenger';
+import { trackError } from '../../../../../apps/main/analytics/service';
+import { setTrayStatus } from '../../../../../apps/main/tray/tray';
+import { SyncFolderMessenger } from '../../domain/SyncFolderMessenger';
 
 export class MainProcessSyncFolderMessenger implements SyncFolderMessenger {
   async rename(_name: string, _newName: string): Promise<void> {
     setTrayStatus('SYNCING');
   }
+
   async renamed(_name: string, _newName: string): Promise<void> {
     setTrayStatus('IDLE');
   }
+
+  async errorWhileRenaming(
+    currentName: string,
+    _desiredName: string,
+    message: string
+  ): Promise<void> {
+    setTrayStatus('ALERT');
+
+    trackError('Rename Error', new Error(message), {
+      itemType: 'Folder',
+      root: '',
+      from: currentName,
+      action: 'Rename',
+    });
+  }
+
   async creating(_name: string): Promise<void> {
     setTrayStatus('SYNCING');
   }
+
   async created(_name: string): Promise<void> {
     setTrayStatus('IDLE');
   }
-  async error(name: string, message: string): Promise<void> {
+
+  async errorWhileCreating(name: string, message: string): Promise<void> {
     setTrayStatus('ALERT');
 
     trackError('Upload Error', new Error(message), {
diff --git a/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts b/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts
index a9b860c72..9c4e61c0d 100644
--- a/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts
+++ b/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts
@@ -10,7 +10,11 @@ export class FileSyncNotifierMock implements SyncFileMessenger {
   created(name: string, extension: string): Promise<void> {
     return this.createdMock(name, extension);
   }
-  error(name: string, extension: string, message: string): Promise<void> {
+  errorWhileCreating(
+    name: string,
+    extension: string,
+    message: string
+  ): Promise<void> {
     return this.errorMock(name, extension, message);
   }
   trashing(name: string, type: string, size: number): Promise<void> {
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
index 2777968e3..0a8af5985 100644
--- a/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
@@ -19,7 +19,7 @@ export class FolderSyncNotifierMock implements SyncFolderMessenger {
   renamed(name: string, newName: string): Promise<void> {
     return this.renamedMock(name, newName);
   }
-  error(): Promise<void> {
+  errorWhileCreating(): Promise<void> {
     return this.errorMock();
   }
 }

From e0148131212f4702cc011fdeb0fae67eb7eb8f5b Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 17 Jan 2024 13:39:36 +0100
Subject: [PATCH 146/188] chore: platform dependant process

---
 release/app/package.json       |  1 -
 release/app/yarn.lock          | 27 +--------------------------
 src/apps/main/main.ts          |  2 --
 src/apps/main/virtual-drive.ts |  7 +++++++
 4 files changed, 8 insertions(+), 29 deletions(-)
 create mode 100644 src/apps/main/virtual-drive.ts

diff --git a/release/app/package.json b/release/app/package.json
index 056ce0864..7f31c2a10 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -11,7 +11,6 @@
     "reload-virtual-drive": "yarn add  --ignore-scripts ../../../node-win && npm run link-modules"
   },
   "dependencies": {
-    "@gcas/fuse": "^2.4.2",
     "@rudderstack/rudder-sdk-node": "^1.1.4",
     "better-sqlite3": "^8.3.0",
     "typeorm": "^0.3.16",
diff --git a/release/app/yarn.lock b/release/app/yarn.lock
index 752800d3f..8b0c5b3c3 100644
--- a/release/app/yarn.lock
+++ b/release/app/yarn.lock
@@ -30,14 +30,6 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
-"@gcas/fuse@^2.4.2":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@gcas/fuse/-/fuse-2.4.2.tgz#149bd97ec8a60988f4868bacd719c7e8a1c41876"
-  integrity sha512-l/vVd2eXAuzKG4QilN1VRa8za5glndSK+jxcLrzMiXRrvbbCJthwqcBZUE3VzoRL0T/l7197tW+MKR9YeQCtZQ==
-  dependencies:
-    nanoresource "^1.3.0"
-    napi-macros "^2.0.0"
-
 "@ioredis/commands@^1.1.1":
   version "1.2.0"
   resolved "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz"
@@ -622,12 +614,7 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.2.0, minimist@^1.2.3:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
-  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
-
-minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -682,23 +669,11 @@ mz@^2.4.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nanoresource@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/nanoresource/-/nanoresource-1.3.0.tgz#823945d9667ab3e81a8b2591ab8d734552878cd0"
-  integrity sha512-OI5dswqipmlYfyL3k/YMm7mbERlh4Bd1KuKdMHpeoVD1iVxqxaTMKleB4qaA2mbQZ6/zMNSxCXv9M9P/YbqTuQ==
-  dependencies:
-    inherits "^2.0.4"
-
 napi-build-utils@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
-napi-macros@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.2.2.tgz#817fef20c3e0e40a963fbf7b37d1600bd0201044"
-  integrity sha512-hmEVtAGYzVQpCKdbQea4skABsdXW4RUh5t5mJ2zzqowJS2OyXZTU1KhDVFhx+NlWZ4ap9mqR9TcDO3LTTttd+g==
-
 node-abi@^3.3.0:
   version "3.51.0"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d"
diff --git a/src/apps/main/main.ts b/src/apps/main/main.ts
index 7881316ee..3d0082c16 100644
--- a/src/apps/main/main.ts
+++ b/src/apps/main/main.ts
@@ -16,8 +16,6 @@ import './auth/handlers';
 import './windows/settings';
 import './windows/process-issues';
 import './windows';
-import './background-processes/sync-engine';
-import '../fuse/index';
 import './background-processes/process-issues';
 import './device/handlers';
 import './usage/handlers';
diff --git a/src/apps/main/virtual-drive.ts b/src/apps/main/virtual-drive.ts
new file mode 100644
index 000000000..b37eff79d
--- /dev/null
+++ b/src/apps/main/virtual-drive.ts
@@ -0,0 +1,7 @@
+if (process.platform === 'win32') {
+  import('./background-processes/sync-engine');
+}
+
+if (process.platform === 'linux') {
+  import('../fuse');
+}

From a4615937dc4b8735b51f1fec03c44c5c8e880adb Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 17 Jan 2024 14:09:34 +0100
Subject: [PATCH 147/188] fix: import virtual-drive

---
 release/app/package.json       | 1 +
 src/apps/main/main.ts          | 1 +
 src/apps/main/virtual-drive.ts | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/release/app/package.json b/release/app/package.json
index 7f31c2a10..056ce0864 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -11,6 +11,7 @@
     "reload-virtual-drive": "yarn add  --ignore-scripts ../../../node-win && npm run link-modules"
   },
   "dependencies": {
+    "@gcas/fuse": "^2.4.2",
     "@rudderstack/rudder-sdk-node": "^1.1.4",
     "better-sqlite3": "^8.3.0",
     "typeorm": "^0.3.16",
diff --git a/src/apps/main/main.ts b/src/apps/main/main.ts
index 3d0082c16..dfe7f98c1 100644
--- a/src/apps/main/main.ts
+++ b/src/apps/main/main.ts
@@ -30,6 +30,7 @@ import './migration/handlers';
 import './config/handlers';
 import './app-info/handlers';
 import './remote-sync/handlers';
+import './virtual-drive';
 
 import { app, nativeTheme } from 'electron';
 import Logger from 'electron-log';
diff --git a/src/apps/main/virtual-drive.ts b/src/apps/main/virtual-drive.ts
index b37eff79d..c8190cf80 100644
--- a/src/apps/main/virtual-drive.ts
+++ b/src/apps/main/virtual-drive.ts
@@ -3,5 +3,5 @@ if (process.platform === 'win32') {
 }
 
 if (process.platform === 'linux') {
-  import('../fuse');
+  import('../fuse/index');
 }

From b3d9e6c68cb9e1f83f64b370436729b982d16249 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 17 Jan 2024 16:35:10 +0100
Subject: [PATCH 148/188] chore: clean scripts

---
 package.json             |  4 +---
 release/app/package.json |  6 ++----
 release/app/yarn.lock    | 46 ++++++++++++++++++----------------------
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/package.json b/package.json
index 1b3b38833..f7d3aa906 100644
--- a/package.json
+++ b/package.json
@@ -27,9 +27,7 @@
     "test:unit": "jest --silent",
     "test:e2e": "playwright test --config=src/test",
     "type-check": "tsc --noEmit --pretty --skipLibCheck",
-    "prepare": "husky install",
-    "reload-virtual-drive": "cd release/app && yarn reload-virtual-drive && cd ../.. && yarn",
-    "start:reload-bindings": "npm run reload-virtual-drive && npm run start"
+    "prepare": "husky install"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
diff --git a/release/app/package.json b/release/app/package.json
index 056ce0864..c0cf7e5f5 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -7,15 +7,13 @@
   "scripts": {
     "electron-rebuild": "node -r ts-node/register ../../.erb/scripts/electron-rebuild.js",
     "link-modules": "node -r ts-node/register ../../.erb/scripts/link-modules.ts",
-    "postinstall": "npm run electron-rebuild --sequential && npm run link-modules",
-    "reload-virtual-drive": "yarn add  --ignore-scripts ../../../node-win && npm run link-modules"
+    "postinstall": "npm run electron-rebuild --sequential && npm run link-modules"
   },
   "dependencies": {
     "@gcas/fuse": "^2.4.2",
     "@rudderstack/rudder-sdk-node": "^1.1.4",
     "better-sqlite3": "^8.3.0",
-    "typeorm": "^0.3.16",
-    "virtual-drive": "../../../node-win"
+    "typeorm": "^0.3.16"
   },
   "license": "MIT"
 }
diff --git a/release/app/yarn.lock b/release/app/yarn.lock
index 8b0c5b3c3..81352052d 100644
--- a/release/app/yarn.lock
+++ b/release/app/yarn.lock
@@ -30,6 +30,14 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
+"@gcas/fuse@^2.4.2":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@gcas/fuse/-/fuse-2.4.2.tgz#149bd97ec8a60988f4868bacd719c7e8a1c41876"
+  integrity sha512-l/vVd2eXAuzKG4QilN1VRa8za5glndSK+jxcLrzMiXRrvbbCJthwqcBZUE3VzoRL0T/l7197tW+MKR9YeQCtZQ==
+  dependencies:
+    nanoresource "^1.3.0"
+    napi-macros "^2.0.0"
+
 "@ioredis/commands@^1.1.1":
   version "1.2.0"
   resolved "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz"
@@ -535,11 +543,6 @@ join-component@^1.1.0:
   resolved "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz"
   integrity sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==
 
-json5@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
-  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
-
 kuler@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz"
@@ -614,7 +617,7 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.3:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -669,11 +672,23 @@ mz@^2.4.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
+nanoresource@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/nanoresource/-/nanoresource-1.3.0.tgz#823945d9667ab3e81a8b2591ab8d734552878cd0"
+  integrity sha512-OI5dswqipmlYfyL3k/YMm7mbERlh4Bd1KuKdMHpeoVD1iVxqxaTMKleB4qaA2mbQZ6/zMNSxCXv9M9P/YbqTuQ==
+  dependencies:
+    inherits "^2.0.4"
+
 napi-build-utils@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
+napi-macros@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.2.2.tgz#817fef20c3e0e40a963fbf7b37d1600bd0201044"
+  integrity sha512-hmEVtAGYzVQpCKdbQea4skABsdXW4RUh5t5mJ2zzqowJS2OyXZTU1KhDVFhx+NlWZ4ap9mqR9TcDO3LTTttd+g==
+
 node-abi@^3.3.0:
   version "3.51.0"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d"
@@ -913,11 +928,6 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
-
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -975,15 +985,6 @@ triple-beam@^1.3.0:
   resolved "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz"
   integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
 
-tsconfig-paths@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
-  integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
-  dependencies:
-    json5 "^2.2.2"
-    minimist "^1.2.6"
-    strip-bom "^3.0.0"
-
 tslib@^2.5.0:
   version "2.5.0"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"
@@ -1032,11 +1033,6 @@ uuid@^9.0.0:
   resolved "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"
   integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
 
-virtual-drive@../../../node-win:
-  version "1.0.1"
-  dependencies:
-    tsconfig-paths "^4.2.0"
-
 winston-transport@^4.5.0:
   version "4.5.0"
   resolved "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"

From 0211fe1838f712e15e8890f7cb2e3719ae92e1cb Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 18 Jan 2024 12:17:03 +0100
Subject: [PATCH 149/188] chore: logs

---
 src/apps/fuse/callbacks/GetAttributesCallback.ts    | 13 ++++++++++++-
 src/apps/fuse/callbacks/OpenCallback.ts             |  4 +++-
 src/apps/main/realtime.ts                           |  2 +-
 src/apps/main/remote-sync/RemoteSyncManager.ts      |  5 ++---
 .../files/application/FilePathUpdater.ts            |  1 +
 .../folders/application/FolderPathUpdater.ts        |  3 ---
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/apps/fuse/callbacks/GetAttributesCallback.ts b/src/apps/fuse/callbacks/GetAttributesCallback.ts
index e8c5a2022..66ff2ccaf 100644
--- a/src/apps/fuse/callbacks/GetAttributesCallback.ts
+++ b/src/apps/fuse/callbacks/GetAttributesCallback.ts
@@ -1,7 +1,9 @@
+import { Either, left } from '../../../context/shared/domain/Either';
 import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { FuseCallback } from './FuseCallback';
-import { NoSuchFileOrDirectoryError } from './FuseErrors';
+import { FuseError, NoSuchFileOrDirectoryError } from './FuseErrors';
+import Logger from 'electron-log';
 
 type GetAttributesCallbackData = {
   mode: number;
@@ -22,6 +24,15 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
     super('Get Attributes');
   }
 
+  protected left(
+    error: FuseError
+  ): Either<FuseError, GetAttributesCallbackData> {
+    // When the OS wants to check if a node exists will try to get the attributes of it
+    // so not founding them is not an error
+    Logger.info(`Attributes of ${this.name}:.`, error.description);
+    return left(error);
+  }
+
   async execute(path: string) {
     if (path === '/') {
       return this.right({
diff --git a/src/apps/fuse/callbacks/OpenCallback.ts b/src/apps/fuse/callbacks/OpenCallback.ts
index eb51e7a9a..39e040196 100644
--- a/src/apps/fuse/callbacks/OpenCallback.ts
+++ b/src/apps/fuse/callbacks/OpenCallback.ts
@@ -24,7 +24,9 @@ export class OpenCallback extends FuseCallback<number> {
     );
 
     if (alreadyDownloaded) {
-      Logger.debug(`"${file.nameWithExtension}" contents are already in local`);
+      Logger.debug(
+        `[Local Cache] "${file.nameWithExtension}" contents are already in local`
+      );
       return this.right(file.id);
     }
 
diff --git a/src/apps/main/realtime.ts b/src/apps/main/realtime.ts
index f14774ac8..cff7b1821 100644
--- a/src/apps/main/realtime.ts
+++ b/src/apps/main/realtime.ts
@@ -60,7 +60,7 @@ function cleanAndStartRemoteNotifications() {
   });
 
   socket.on('event', (data) => {
-    logger.log('Notification received: ', JSON.stringify(data, null, 2));
+    logger.log('Notification received: ', data.event);
 
     broadcastToWindows('remote-changes', undefined);
     eventBus.emit('RECEIVED_REMOTE_CHANGES');
diff --git a/src/apps/main/remote-sync/RemoteSyncManager.ts b/src/apps/main/remote-sync/RemoteSyncManager.ts
index db87a1487..fc67c4c19 100644
--- a/src/apps/main/remote-sync/RemoteSyncManager.ts
+++ b/src/apps/main/remote-sync/RemoteSyncManager.ts
@@ -325,9 +325,8 @@ export class RemoteSyncManager {
         : undefined,
     };
 
-    Logger.info(
-      `Requesting files with params ${JSON.stringify(params, null, 2)}`
-    );
+    Logger.info('Requesting files');
+
     const response = await this.config.httpClient.get(
       `${process.env.NEW_DRIVE_URL}/drive/files`,
       {
diff --git a/src/context/virtual-drive/files/application/FilePathUpdater.ts b/src/context/virtual-drive/files/application/FilePathUpdater.ts
index 187b1faef..6c6d36ff4 100644
--- a/src/context/virtual-drive/files/application/FilePathUpdater.ts
+++ b/src/context/virtual-drive/files/application/FilePathUpdater.ts
@@ -61,6 +61,7 @@ export class FilePathUpdater {
       if (file.nameWithExtension !== destination.nameWithExtension()) {
         throw new ActionNotPermittedError('rename and change folder');
       }
+
       await this.move(file, destination);
       return;
     }
diff --git a/src/context/virtual-drive/folders/application/FolderPathUpdater.ts b/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
index f80062723..f1243cf6a 100644
--- a/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
+++ b/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
@@ -23,9 +23,6 @@ export class FolderPathUpdater {
 
     const desiredPath = new FolderPath(posixRelativePath);
 
-    Logger.debug('desired path', desiredPath);
-    Logger.debug('folder', folder.attributes());
-
     const dirnameChanged = folder.dirname !== desiredPath.dirname();
     const nameChanged = folder.name !== desiredPath.name();
 

From 01dd658a9867b3cf3dfe5671b32c78d852d576ed Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 18 Jan 2024 14:06:14 +0100
Subject: [PATCH 150/188] wip: rename files and folders

---
 src/apps/fuse/callbacks/FuseErrors.ts         | 30 ++++++--
 .../fuse/callbacks/GetAttributesCallback.ts   |  4 +-
 .../fuse/callbacks/MakeDirectoryCallback.ts   | 12 +--
 src/apps/fuse/callbacks/OpenCallback.ts       | 10 ++-
 src/apps/fuse/callbacks/ReaddirCallback.ts    |  4 +-
 src/apps/fuse/callbacks/ReleaseCallback.ts    |  6 +-
 .../fuse/callbacks/RenameOrMoveCallback.ts    | 44 +++++------
 src/apps/fuse/callbacks/RenameOrMoveFile.ts   | 73 ++++++++++++++++++
 src/apps/fuse/callbacks/RenameOrMoveFolder.ts | 76 +++++++++++++++++++
 src/apps/fuse/callbacks/TrashFileCallback.ts  |  6 +-
 .../fuse/callbacks/TrashFolderCallback.ts     | 10 ++-
 .../virtual-drive/files/FilesContainer.ts     |  3 +
 .../virtual-drive/files/builder.ts            |  2 +-
 .../files/application/FileDeleter.ts          |  2 +-
 .../files/domain/SyncFileMessenger.ts         |  7 ++
 .../BackgroundProcessSyncFileMessenger.ts     | 33 +++++++-
 .../MainProcessSyncFileMessenger.ts           | 32 ++++++++
 .../folders/application/FolderPathUpdater.ts  |  3 +-
 .../domain/errors/PathHasNotChangedError.ts   |  5 ++
 .../files/__mocks__/FileSyncNotifierMock.ts   | 22 ++++++
 .../__mocks__/FolderSyncManagerMock.ts        | 12 ++-
 21 files changed, 339 insertions(+), 57 deletions(-)
 create mode 100644 src/apps/fuse/callbacks/RenameOrMoveFile.ts
 create mode 100644 src/apps/fuse/callbacks/RenameOrMoveFolder.ts
 create mode 100644 src/context/virtual-drive/folders/domain/errors/PathHasNotChangedError.ts

diff --git a/src/apps/fuse/callbacks/FuseErrors.ts b/src/apps/fuse/callbacks/FuseErrors.ts
index 7e4a0d2de..123bfab2d 100644
--- a/src/apps/fuse/callbacks/FuseErrors.ts
+++ b/src/apps/fuse/callbacks/FuseErrors.ts
@@ -12,32 +12,52 @@ export class FuseError extends Error {
   }
 }
 
-export class NoSuchFileOrDirectoryError extends FuseError {
+export class FuseNoSuchFileOrDirectoryError extends FuseError {
   constructor(description: string) {
     super(FuseCodes.ENOENT, 'No such file or directory', description);
   }
+
+  static translate(error: Error): FuseNoSuchFileOrDirectoryError {
+    return new FuseNoSuchFileOrDirectoryError(error.message);
+  }
 }
 
-export class FileOrDirectoryAlreadyExistsError extends FuseError {
+export class FuseFileOrDirectoryAlreadyExistsError extends FuseError {
   constructor(description: string) {
     super(FuseCodes.EEXIST, 'File or directory already exists', description);
   }
+
+  static translate(error: Error): FuseFileOrDirectoryAlreadyExistsError {
+    return new FuseFileOrDirectoryAlreadyExistsError(error.message);
+  }
 }
 
-export class IOError extends FuseError {
+export class FuseIOError extends FuseError {
   constructor(description: string) {
     super(FuseCodes.EIO, 'Input/output error', description);
   }
+
+  static translate(error: Error): FuseIOError {
+    return new FuseIOError(error.message);
+  }
 }
 
-export class InvalidArgumentError extends FuseError {
+export class FuseInvalidArgumentError extends FuseError {
   constructor(description: string) {
     super(FuseCodes.EINVAL, 'Invalid argument', description);
   }
+
+  static translate(error: Error): FuseInvalidArgumentError {
+    return new FuseInvalidArgumentError(error.message);
+  }
 }
 
-export class PermissionDeniedError extends FuseError {
+export class FusePermissionDeniedError extends FuseError {
   constructor(description: string) {
     super(FuseCodes.EACCES, 'Permission denied', description);
   }
+
+  static translate(error: Error): FusePermissionDeniedError {
+    return new FusePermissionDeniedError(error.message);
+  }
 }
diff --git a/src/apps/fuse/callbacks/GetAttributesCallback.ts b/src/apps/fuse/callbacks/GetAttributesCallback.ts
index 66ff2ccaf..3af84b1f8 100644
--- a/src/apps/fuse/callbacks/GetAttributesCallback.ts
+++ b/src/apps/fuse/callbacks/GetAttributesCallback.ts
@@ -2,7 +2,7 @@ import { Either, left } from '../../../context/shared/domain/Either';
 import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { FuseCallback } from './FuseCallback';
-import { FuseError, NoSuchFileOrDirectoryError } from './FuseErrors';
+import { FuseError, FuseNoSuchFileOrDirectoryError } from './FuseErrors';
 import Logger from 'electron-log';
 
 type GetAttributesCallbackData = {
@@ -84,7 +84,7 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
     }
 
     return this.left(
-      new NoSuchFileOrDirectoryError(
+      new FuseNoSuchFileOrDirectoryError(
         `"${path}" not founded on when retrieving it's attributes`
       )
     );
diff --git a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
index e543ce5cf..d4aaed803 100644
--- a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
+++ b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
@@ -2,10 +2,10 @@ import { FolderAlreadyExists } from '../../../context/virtual-drive/folders/doma
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { NotifyFuseCallback } from './FuseCallback';
 import {
-  FileOrDirectoryAlreadyExistsError,
+  FuseFileOrDirectoryAlreadyExistsError,
   FuseError,
-  IOError,
-  InvalidArgumentError,
+  FuseIOError,
+  FuseInvalidArgumentError,
 } from './FuseErrors';
 import { FolderNotFoundError } from '../../../context/virtual-drive/folders/domain/errors/FolderNotFoundError';
 
@@ -19,13 +19,13 @@ export class MakeDirectoryCallback extends NotifyFuseCallback {
     err: unknown
   ): FuseError {
     if (err instanceof FolderAlreadyExists) {
-      return new FileOrDirectoryAlreadyExistsError(input.path);
+      return new FuseFileOrDirectoryAlreadyExistsError(input.path);
     }
     if (err instanceof FolderNotFoundError) {
-      return new InvalidArgumentError(input.path);
+      return new FuseInvalidArgumentError(input.path);
     }
 
-    return new IOError(
+    return new FuseIOError(
       `Unknown error while creating the folder: ${input.path}`
     );
   }
diff --git a/src/apps/fuse/callbacks/OpenCallback.ts b/src/apps/fuse/callbacks/OpenCallback.ts
index 39e040196..b873b7f61 100644
--- a/src/apps/fuse/callbacks/OpenCallback.ts
+++ b/src/apps/fuse/callbacks/OpenCallback.ts
@@ -1,7 +1,7 @@
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import Logger from 'electron-log';
 import { FuseCallback } from './FuseCallback';
-import { IOError, NoSuchFileOrDirectoryError } from './FuseErrors';
+import { FuseIOError, FuseNoSuchFileOrDirectoryError } from './FuseErrors';
 
 export class OpenCallback extends FuseCallback<number> {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
@@ -13,7 +13,7 @@ export class OpenCallback extends FuseCallback<number> {
 
     if (!file) {
       return this.left(
-        new NoSuchFileOrDirectoryError(
+        new FuseNoSuchFileOrDirectoryError(
           `${path} not founded on when trying to open it`
         )
       );
@@ -39,11 +39,13 @@ export class OpenCallback extends FuseCallback<number> {
       Logger.error('Error downloading file: ', err);
 
       if (err instanceof Error) {
-        return this.left(new IOError(`${err.message} when opening ${path}`));
+        return this.left(
+          new FuseIOError(`${err.message} when opening ${path}`)
+        );
       }
 
       return this.left(
-        new IOError(`unknown error when opening ${path}: ${err}`)
+        new FuseIOError(`unknown error when opening ${path}: ${err}`)
       );
     }
   }
diff --git a/src/apps/fuse/callbacks/ReaddirCallback.ts b/src/apps/fuse/callbacks/ReaddirCallback.ts
index e4150b355..a2cd77d69 100644
--- a/src/apps/fuse/callbacks/ReaddirCallback.ts
+++ b/src/apps/fuse/callbacks/ReaddirCallback.ts
@@ -1,6 +1,6 @@
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { FuseCallback } from './FuseCallback';
-import { NoSuchFileOrDirectoryError } from './FuseErrors';
+import { FuseNoSuchFileOrDirectoryError } from './FuseErrors';
 
 export class ReaddirCallback extends FuseCallback<Array<string>> {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
@@ -23,7 +23,7 @@ export class ReaddirCallback extends FuseCallback<Array<string>> {
       return this.right(['.', '..', ...filesNames, ...foldersNames]);
     } catch (error) {
       return this.left(
-        new NoSuchFileOrDirectoryError(
+        new FuseNoSuchFileOrDirectoryError(
           'Could not retrieve the files and folder of the system'
         )
       );
diff --git a/src/apps/fuse/callbacks/ReleaseCallback.ts b/src/apps/fuse/callbacks/ReleaseCallback.ts
index 5349e0537..953447bd7 100644
--- a/src/apps/fuse/callbacks/ReleaseCallback.ts
+++ b/src/apps/fuse/callbacks/ReleaseCallback.ts
@@ -1,6 +1,6 @@
 import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
 import { NotifyFuseCallback } from './FuseCallback';
-import { IOError } from './FuseErrors';
+import { FuseIOError } from './FuseErrors';
 
 export class ReleaseCallback extends NotifyFuseCallback {
   constructor(private readonly container: OfflineDriveDependencyContainer) {
@@ -20,14 +20,14 @@ export class ReleaseCallback extends NotifyFuseCallback {
     } catch (err: unknown) {
       if (err instanceof Error) {
         return this.left(
-          new IOError(
+          new FuseIOError(
             `${err.message} when uploading ${path} and with flag: ${fd}`
           )
         );
       }
 
       return this.left(
-        new IOError(`Error when uploading ${path} with flag ${fd}: ${err}`)
+        new FuseIOError(`Error when uploading ${path} with flag ${fd}: ${err}`)
       );
     }
   }
diff --git a/src/apps/fuse/callbacks/RenameOrMoveCallback.ts b/src/apps/fuse/callbacks/RenameOrMoveCallback.ts
index 999ef81b7..1d54d919b 100644
--- a/src/apps/fuse/callbacks/RenameOrMoveCallback.ts
+++ b/src/apps/fuse/callbacks/RenameOrMoveCallback.ts
@@ -1,43 +1,43 @@
-import { File } from '../../../context/virtual-drive/files/domain/File';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
-import { Folder } from '../../../context/virtual-drive/folders/domain/Folder';
 import { NotifyFuseCallback } from './FuseCallback';
-import { NoSuchFileOrDirectoryError } from './FuseErrors';
+import { FuseError, FuseNoSuchFileOrDirectoryError } from './FuseErrors';
+import { RenameOrMoveFile } from './RenameOrMoveFile';
+import { RenameOrMoveFolder } from './RenameOrMoveFolder';
 
 export class RenameOrMoveCallback extends NotifyFuseCallback {
-  constructor(private readonly container: VirtualDriveDependencyContainer) {
-    super('Rename Or Move');
-  }
-
-  private async findFile(path: string): Promise<File | undefined> {
-    const file = await this.container.filesSearcher.run({ path });
-
-    return file;
-  }
+  private readonly updateFile: RenameOrMoveFile;
+  private readonly updateFolder: RenameOrMoveFolder;
 
-  private async findFolder(path: string): Promise<Folder | undefined> {
-    const folder = await this.container.folderSearcher.run({ path });
+  constructor(container: VirtualDriveDependencyContainer) {
+    super('Rename Or Move');
 
-    return folder;
+    this.updateFile = new RenameOrMoveFile(container);
+    this.updateFolder = new RenameOrMoveFolder(container);
   }
 
   async execute(src: string, dest: string) {
-    const file = await this.findFile(src);
+    const fileResult = await this.updateFile.execute(src, dest);
+
+    if (fileResult instanceof FuseError) {
+      return this.left(fileResult);
+    }
 
-    if (file) {
-      await this.container.filePathUpdater.run(file.contentsId, dest);
+    if (fileResult === 'success') {
       return this.right();
     }
 
-    const folder = await this.findFolder(src);
+    const folderResult = await this.updateFolder.execute(src, dest);
+
+    if (folderResult instanceof FuseError) {
+      return this.left(folderResult);
+    }
 
-    if (folder) {
-      await this.container.folderPathUpdater.run(folder.uuid, dest);
+    if (folderResult === 'success') {
       return this.right();
     }
 
     return this.left(
-      new NoSuchFileOrDirectoryError(
+      new FuseNoSuchFileOrDirectoryError(
         `File or folder not found when trying to change a path, src: ${src}, dest: ${dest}`
       )
     );
diff --git a/src/apps/fuse/callbacks/RenameOrMoveFile.ts b/src/apps/fuse/callbacks/RenameOrMoveFile.ts
new file mode 100644
index 000000000..6f562e528
--- /dev/null
+++ b/src/apps/fuse/callbacks/RenameOrMoveFile.ts
@@ -0,0 +1,73 @@
+import path from 'path';
+import { FilePath } from '../../../context/virtual-drive/files/domain/FilePath';
+import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
+import { FileAlreadyExistsError } from '../../../context/virtual-drive/files/domain/errors/FileAlreadyExistsError';
+import { ActionNotPermittedError } from '../../../context/virtual-drive/folders/domain/errors/ActionNotPermittedError';
+import {
+  FuseError,
+  FuseInvalidArgumentError,
+  FuseFileOrDirectoryAlreadyExistsError,
+  FuseIOError,
+} from './FuseErrors';
+
+export class RenameOrMoveFile {
+  constructor(private readonly container: VirtualDriveDependencyContainer) {}
+
+  private resolveError(
+    input: { src: string; dest: string },
+    err: unknown
+  ): FuseError {
+    if (err instanceof ActionNotPermittedError) {
+      return new FuseInvalidArgumentError(input.src);
+    }
+    if (err instanceof FileAlreadyExistsError) {
+      return new FuseFileOrDirectoryAlreadyExistsError(input.src);
+    }
+
+    return new FuseIOError(
+      `Unknown error while updating the path from ${input.src} to ${input.dest}`
+    );
+  }
+
+  async execute(
+    src: string,
+    dest: string
+  ): Promise<FuseError | 'no-op' | 'success'> {
+    const file = await this.container.filesSearcher.run({ path: src });
+
+    if (!file) {
+      return 'no-op';
+    }
+
+    try {
+      const desiredPath = new FilePath(dest);
+
+      await this.container.syncFileMessenger.renaming(
+        file.nameWithExtension,
+        desiredPath.nameWithExtension()
+      );
+
+      await this.container.filePathUpdater.run(file.contentsId, dest);
+
+      await this.container.syncFileMessenger.renamed(
+        file.nameWithExtension,
+        desiredPath.nameWithExtension()
+      );
+
+      return 'success';
+    } catch (err: unknown) {
+      const error = this.resolveError({ src, dest }, err);
+
+      const current = path.basename(src);
+      const desired = path.basename(dest);
+
+      await this.container.syncFileMessenger.errorWhileRenaming(
+        current,
+        desired,
+        error.message
+      );
+
+      return error;
+    }
+  }
+}
diff --git a/src/apps/fuse/callbacks/RenameOrMoveFolder.ts b/src/apps/fuse/callbacks/RenameOrMoveFolder.ts
new file mode 100644
index 000000000..579837ebf
--- /dev/null
+++ b/src/apps/fuse/callbacks/RenameOrMoveFolder.ts
@@ -0,0 +1,76 @@
+import path from 'path';
+import { FolderPath } from '../../../context/virtual-drive/folders/domain/FolderPath';
+import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
+import {
+  FuseError,
+  FuseIOError,
+  FuseInvalidArgumentError,
+  FuseNoSuchFileOrDirectoryError,
+} from './FuseErrors';
+import { InvalidArgumentError } from '../../../context/shared/domain/InvalidArgumentError';
+import { FolderNotFoundError } from '../../../context/virtual-drive/folders/domain/errors/FolderNotFoundError';
+import { PathHasNotChangedError } from '../../../context/virtual-drive/folders/domain/errors/PathHasNotChangedError';
+
+export class RenameOrMoveFolder {
+  constructor(private readonly container: VirtualDriveDependencyContainer) {}
+
+  private resolverError(input: { src: string; dest: string }, err: unknown) {
+    if (err instanceof InvalidArgumentError) {
+      return FuseInvalidArgumentError.translate(err);
+    }
+
+    if (err instanceof FolderNotFoundError) {
+      return FuseNoSuchFileOrDirectoryError.translate(err);
+    }
+
+    if (err instanceof PathHasNotChangedError) {
+      return FuseInvalidArgumentError.translate(err);
+    }
+
+    return new FuseIOError(
+      `Unknown error while updating the path from ${input.src} to ${input.dest}`
+    );
+  }
+
+  async execute(
+    src: string,
+    dest: string
+  ): Promise<FuseError | 'no-op' | 'success'> {
+    const folder = await this.container.folderSearcher.run({ path: src });
+
+    if (!folder) {
+      return 'no-op';
+    }
+
+    try {
+      const desiredPath = new FolderPath(dest);
+
+      await this.container.syncFolderMessenger.rename(
+        folder.name,
+        desiredPath.name()
+      );
+
+      await this.container.folderPathUpdater.run(folder.uuid, dest);
+
+      await this.container.syncFolderMessenger.renamed(
+        folder.name,
+        desiredPath.name()
+      );
+
+      return 'success';
+    } catch (err: unknown) {
+      const error = this.resolverError({ src, dest }, err);
+
+      const current = path.basename(src);
+      const desired = path.basename(dest);
+
+      await this.container.syncFolderMessenger.errorWhileRenaming(
+        current,
+        desired,
+        error.message
+      );
+
+      return error;
+    }
+  }
+}
diff --git a/src/apps/fuse/callbacks/TrashFileCallback.ts b/src/apps/fuse/callbacks/TrashFileCallback.ts
index f7aef7a7d..7b423e9df 100644
--- a/src/apps/fuse/callbacks/TrashFileCallback.ts
+++ b/src/apps/fuse/callbacks/TrashFileCallback.ts
@@ -1,6 +1,6 @@
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { NotifyFuseCallback } from './FuseCallback';
-import { IOError, NoSuchFileOrDirectoryError } from './FuseErrors';
+import { FuseIOError, FuseNoSuchFileOrDirectoryError } from './FuseErrors';
 
 export class TrashFileCallback extends NotifyFuseCallback {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
@@ -12,7 +12,7 @@ export class TrashFileCallback extends NotifyFuseCallback {
 
     if (!file) {
       return this.left(
-        new NoSuchFileOrDirectoryError(
+        new FuseNoSuchFileOrDirectoryError(
           `${path} not founded when trying to trash it`
         )
       );
@@ -23,7 +23,7 @@ export class TrashFileCallback extends NotifyFuseCallback {
 
       return this.right();
     } catch {
-      return this.left(new IOError(`trying to trash ${path}`));
+      return this.left(new FuseIOError(`trying to trash ${path}`));
     }
   }
 }
diff --git a/src/apps/fuse/callbacks/TrashFolderCallback.ts b/src/apps/fuse/callbacks/TrashFolderCallback.ts
index 49e3a285f..7456906e8 100644
--- a/src/apps/fuse/callbacks/TrashFolderCallback.ts
+++ b/src/apps/fuse/callbacks/TrashFolderCallback.ts
@@ -1,6 +1,6 @@
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { NotifyFuseCallback } from './FuseCallback';
-import { IOError, NoSuchFileOrDirectoryError } from './FuseErrors';
+import { FuseIOError, FuseNoSuchFileOrDirectoryError } from './FuseErrors';
 
 export class TrashFolderCallback extends NotifyFuseCallback {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
@@ -12,7 +12,7 @@ export class TrashFolderCallback extends NotifyFuseCallback {
 
     if (!folder) {
       return this.left(
-        new NoSuchFileOrDirectoryError(
+        new FuseNoSuchFileOrDirectoryError(
           `folder not found when trying to delete it ${path}`
         )
       );
@@ -24,11 +24,13 @@ export class TrashFolderCallback extends NotifyFuseCallback {
       return this.right();
     } catch (err: unknown) {
       if (err instanceof Error) {
-        return this.left(new IOError(`${err.message} when trashing ${path}`));
+        return this.left(
+          new FuseIOError(`${err.message} when trashing ${path}`)
+        );
       }
 
       return this.left(
-        new IOError(`error when trying to trash the folder ${path}: ${err}`)
+        new FuseIOError(`error when trying to trash the folder ${path}: ${err}`)
       );
     }
   }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
index 0eb4c9228..6cc49b9ef 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
@@ -6,6 +6,7 @@ import { SameFileWasMoved } from '../../../../../context/virtual-drive/files/app
 import { FileDeleter } from '../../../../../context/virtual-drive/files/application/FileDeleter';
 import { CreateFileOnOfflineFileUploaded } from '../../../../../context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded';
 import { RepositoryPopulator } from '../../../../../context/virtual-drive/files/application/RepositoryPopulator';
+import { SyncFileMessenger } from '../../../../../context/virtual-drive/files/domain/SyncFileMessenger';
 
 export interface FilesContainer {
   filesByFolderPathNameLister: FilesByFolderPathSearcher;
@@ -15,5 +16,7 @@ export interface FilesContainer {
   fileDeleter: FileDeleter;
   sameFileWasMoved: SameFileWasMoved;
   repositoryPopulator: RepositoryPopulator;
+  syncFileMessenger: SyncFileMessenger;
+  // event handler
   createFileOnOfflineFileUploaded: CreateFileOnOfflineFileUploaded;
 }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
index 385f883fa..be5c64f87 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
@@ -103,7 +103,7 @@ export async function buildFilesContainer(
     fileCreator,
     fileDeleter,
     repositoryPopulator,
-
+    syncFileMessenger,
     // event handlers
     createFileOnOfflineFileUploaded,
   };
diff --git a/src/context/virtual-drive/files/application/FileDeleter.ts b/src/context/virtual-drive/files/application/FileDeleter.ts
index 2969569dd..cad8c9e68 100644
--- a/src/context/virtual-drive/files/application/FileDeleter.ts
+++ b/src/context/virtual-drive/files/application/FileDeleter.ts
@@ -44,7 +44,7 @@ export class FileDeleter {
       file.trash();
 
       await this.remote.trash(file.contentsId);
-      await this.repository.delete(file.contentsId);
+      await this.repository.update(file);
       await this.notifier.trashed(file.name, file.type, file.size);
     } catch (error: unknown) {
       Logger.error(
diff --git a/src/context/virtual-drive/files/domain/SyncFileMessenger.ts b/src/context/virtual-drive/files/domain/SyncFileMessenger.ts
index f7f577581..ba61bf910 100644
--- a/src/context/virtual-drive/files/domain/SyncFileMessenger.ts
+++ b/src/context/virtual-drive/files/domain/SyncFileMessenger.ts
@@ -12,4 +12,11 @@ export interface SyncFileMessenger {
     extension: string,
     message: string
   ): Promise<void>;
+  renaming(current: string, desired: string): Promise<void>;
+  renamed(current: string, desired: string): Promise<void>;
+  errorWhileRenaming(
+    current: string,
+    desired: string,
+    message: string
+  ): Promise<void>;
 }
diff --git a/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/BackgroundProcessSyncFileMessenger.ts b/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/BackgroundProcessSyncFileMessenger.ts
index f4110a66d..a5499f4e9 100644
--- a/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/BackgroundProcessSyncFileMessenger.ts
+++ b/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/BackgroundProcessSyncFileMessenger.ts
@@ -1,3 +1,4 @@
+import path from 'path';
 import { SyncEngineIpc } from '../../../../../apps/sync-engine/ipcRendererSyncEngine';
 import { SyncMessenger } from '../../../../shared/domain/SyncMessenger';
 import { SyncFileMessenger } from '../../domain/SyncFileMessenger';
@@ -9,7 +10,6 @@ export class BackgroundProcessSyncFileMessenger
   constructor(private readonly ipc: SyncEngineIpc) {
     super();
   }
-
   async created(name: string, extension: string): Promise<void> {
     this.ipc.send('FILE_CREATED', {
       name,
@@ -61,4 +61,35 @@ export class BackgroundProcessSyncFileMessenger
       error: message,
     });
   }
+
+  async renaming(current: string, desired: string): Promise<void> {
+    this.ipc.send('FILE_RENAMING', {
+      oldName: current,
+      nameWithExtension: desired,
+    });
+  }
+
+  async renamed(current: string, desired: string): Promise<void> {
+    this.ipc.send('FILE_RENAMED', {
+      oldName: current,
+      nameWithExtension: desired,
+    });
+  }
+
+  async errorWhileRenaming(
+    current: string,
+    _desired: string,
+    message: string
+  ): Promise<void> {
+    const extension = path.extname(current);
+
+    const name = current.replace(`.${extension}`, '');
+
+    this.ipc.send('FILE_RENAME_ERROR', {
+      name,
+      extension,
+      nameWithExtension: current,
+      error: message,
+    });
+  }
 }
diff --git a/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/MainProcessSyncFileMessenger.ts b/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/MainProcessSyncFileMessenger.ts
index 93ab2b7e0..9616657e8 100644
--- a/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/MainProcessSyncFileMessenger.ts
+++ b/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/MainProcessSyncFileMessenger.ts
@@ -93,4 +93,36 @@ export class MainProcessSyncFileMessenger
 
     addProcessIssue(issue);
   }
+
+  async renaming(current: string, desired: string): Promise<void> {
+    broadcastToWindows('sync-info-update', {
+      action: 'RENAMING',
+      name: desired,
+      oldName: current,
+    });
+
+    setTrayStatus('SYNCING');
+  }
+
+  async renamed(_current: string, desired: string): Promise<void> {
+    broadcastToWindows('sync-info-update', {
+      action: 'RENAMED',
+      name: desired,
+    });
+
+    setTrayStatus('IDLE');
+  }
+
+  async errorWhileRenaming(
+    current: string,
+    _desired: string,
+    _message: string
+  ): Promise<void> {
+    broadcastToWindows('sync-info-update', {
+      action: 'RENAME_ERROR',
+      name: current,
+    });
+
+    setTrayStatus('ALERT');
+  }
 }
diff --git a/src/context/virtual-drive/folders/application/FolderPathUpdater.ts b/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
index f1243cf6a..e54c49e5f 100644
--- a/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
+++ b/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
@@ -6,6 +6,7 @@ import { ActionNotPermittedError } from '../domain/errors/ActionNotPermittedErro
 import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
 import { FolderMover } from './FolderMover';
 import { FolderRenamer } from './FolderRenamer';
+import { PathHasNotChangedError } from '../domain/errors/PathHasNotChangedError';
 
 export class FolderPathUpdater {
   constructor(
@@ -39,6 +40,6 @@ export class FolderPathUpdater {
       return await this.folderRenamer.run(folder, desiredPath);
     }
 
-    throw new Error('No path change detected for folder path update');
+    throw new PathHasNotChangedError();
   }
 }
diff --git a/src/context/virtual-drive/folders/domain/errors/PathHasNotChangedError.ts b/src/context/virtual-drive/folders/domain/errors/PathHasNotChangedError.ts
new file mode 100644
index 000000000..d386607a4
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/errors/PathHasNotChangedError.ts
@@ -0,0 +1,5 @@
+export class PathHasNotChangedError extends Error {
+  constructor() {
+    super('No path change detected for folder path update');
+  }
+}
diff --git a/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts b/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts
index 9c4e61c0d..7058d672d 100644
--- a/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts
+++ b/tests/context/virtual-drive/files/__mocks__/FileSyncNotifierMock.ts
@@ -6,10 +6,14 @@ export class FileSyncNotifierMock implements SyncFileMessenger {
   public trashingMock = jest.fn();
   public trashedMock = jest.fn();
   public errorWhileTrashingMock = jest.fn();
+  public renamingMock = jest.fn();
+  public renamedMock = jest.fn();
+  public errorWhileRenamingMock = jest.fn();
 
   created(name: string, extension: string): Promise<void> {
     return this.createdMock(name, extension);
   }
+
   errorWhileCreating(
     name: string,
     extension: string,
@@ -17,12 +21,15 @@ export class FileSyncNotifierMock implements SyncFileMessenger {
   ): Promise<void> {
     return this.errorMock(name, extension, message);
   }
+
   trashing(name: string, type: string, size: number): Promise<void> {
     return this.trashingMock(name, type, size);
   }
+
   trashed(name: string, type: string, size: number): Promise<void> {
     return this.trashedMock(name, type, size);
   }
+
   errorWhileTrashing(
     name: string,
     type: string,
@@ -30,4 +37,19 @@ export class FileSyncNotifierMock implements SyncFileMessenger {
   ): Promise<void> {
     return this.errorWhileTrashing(name, type, message);
   }
+  renaming(current: string, desired: string): Promise<void> {
+    return this.renamingMock(current, desired);
+  }
+
+  renamed(current: string, desired: string): Promise<void> {
+    return this.renamedMock(current, desired);
+  }
+
+  errorWhileRenaming(
+    current: string,
+    desired: string,
+    message: string
+  ): Promise<void> {
+    return this.errorWhileRenamingMock(current, desired, message);
+  }
 }
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
index 0a8af5985..b35b69e78 100644
--- a/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
@@ -5,7 +5,8 @@ export class FolderSyncNotifierMock implements SyncFolderMessenger {
   public createdMock = jest.fn();
   public renameMock = jest.fn();
   public renamedMock = jest.fn();
-  public errorMock = jest.fn();
+  public errorWhileCreatingMock = jest.fn();
+  public errorWhileRenamingMock = jest.fn();
 
   creating(name: string): Promise<void> {
     return this.creatingMock(name);
@@ -20,6 +21,13 @@ export class FolderSyncNotifierMock implements SyncFolderMessenger {
     return this.renamedMock(name, newName);
   }
   errorWhileCreating(): Promise<void> {
-    return this.errorMock();
+    return this.errorWhileCreatingMock();
+  }
+  errorWhileRenaming(
+    currentName: string,
+    desiredName: string,
+    message: string
+  ): Promise<void> {
+    return this.errorWhileRenamingMock(currentName, desiredName, message);
   }
 }

From 8912cefb23a65014990baf985ae785bde8f3e8de Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 18 Jan 2024 14:10:49 +0100
Subject: [PATCH 151/188] chore: igonre import error from platform dependant
 libs

---
 .../hydration-api/dependency-injection/common/virtualDrive.ts   | 1 +
 src/apps/sync-engine/BindingManager.ts                          | 1 +
 .../dependency-injection/SyncEngineDependencyContainer.ts       | 2 +-
 .../sync-engine/dependency-injection/common/virtualDrive.ts     | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/apps/hydration-api/dependency-injection/common/virtualDrive.ts b/src/apps/hydration-api/dependency-injection/common/virtualDrive.ts
index e74b97645..73d380c30 100644
--- a/src/apps/hydration-api/dependency-injection/common/virtualDrive.ts
+++ b/src/apps/hydration-api/dependency-injection/common/virtualDrive.ts
@@ -1,3 +1,4 @@
+// @ts-ignore
 import { VirtualDrive } from 'virtual-drive/dist';
 import { DependencyInjectionLocalRootFolderPath } from './localRootFolderPath';
 
diff --git a/src/apps/sync-engine/BindingManager.ts b/src/apps/sync-engine/BindingManager.ts
index 989091f8e..64274b781 100644
--- a/src/apps/sync-engine/BindingManager.ts
+++ b/src/apps/sync-engine/BindingManager.ts
@@ -1,5 +1,6 @@
 import Logger from 'electron-log';
 import * as fs from 'fs';
+// @ts-ignore
 import { VirtualDrive } from 'virtual-drive/dist';
 import { FilePlaceholderId } from '../../context/virtual-drive/files/domain/PlaceholderId';
 import { ItemsSearcher } from '../../context/virtual-drive/items/application/ItemsSearcher';
diff --git a/src/apps/sync-engine/dependency-injection/SyncEngineDependencyContainer.ts b/src/apps/sync-engine/dependency-injection/SyncEngineDependencyContainer.ts
index 42540d7ee..54b586279 100644
--- a/src/apps/sync-engine/dependency-injection/SyncEngineDependencyContainer.ts
+++ b/src/apps/sync-engine/dependency-injection/SyncEngineDependencyContainer.ts
@@ -1,4 +1,4 @@
-/* eslint-disable max-len */
+// @ts-ignore
 import { VirtualDrive } from 'virtual-drive/dist';
 import { ContentsContainer } from './contents/ContentsContainer';
 import { FilesContainer } from './files/FilesContainer';
diff --git a/src/apps/sync-engine/dependency-injection/common/virtualDrive.ts b/src/apps/sync-engine/dependency-injection/common/virtualDrive.ts
index eeb519736..946185ada 100644
--- a/src/apps/sync-engine/dependency-injection/common/virtualDrive.ts
+++ b/src/apps/sync-engine/dependency-injection/common/virtualDrive.ts
@@ -1,3 +1,4 @@
+// @ts-ignore
 import { VirtualDrive } from 'virtual-drive/dist';
 import { DependencyInjectionLocalRootFolderPath } from './localRootFolderPath';
 import { DependencyInjectionLogEnginePath } from './logEnginePath';

From 9c13b9b035f1d8645ddc61fdb2b92811945a37b3 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Fri, 19 Jan 2024 16:44:02 +0100
Subject: [PATCH 152/188] chore: delete fuse form master

---
 release/app/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/release/app/package.json b/release/app/package.json
index c0cf7e5f5..36761c25b 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -10,7 +10,6 @@
     "postinstall": "npm run electron-rebuild --sequential && npm run link-modules"
   },
   "dependencies": {
-    "@gcas/fuse": "^2.4.2",
     "@rudderstack/rudder-sdk-node": "^1.1.4",
     "better-sqlite3": "^8.3.0",
     "typeorm": "^0.3.16"

From 3eb0ae21eb71fc1b0254311798a04406c51b00c2 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 25 Jan 2024 14:50:09 +0100
Subject: [PATCH 153/188] fixes

---
 src/context/virtual-drive/folders/domain/Folder.ts        | 1 +
 .../shared/application/AbsolutePathToRelativeConverter.ts | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/context/virtual-drive/folders/domain/Folder.ts b/src/context/virtual-drive/folders/domain/Folder.ts
index 8940cfa6d..34589f23b 100644
--- a/src/context/virtual-drive/folders/domain/Folder.ts
+++ b/src/context/virtual-drive/folders/domain/Folder.ts
@@ -131,6 +131,7 @@ export class Folder extends AggregateRoot {
       uuid,
       path,
       parentId,
+      createdAt,
       updatedAt,
       createdAt,
       FolderStatus.Exists
diff --git a/src/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.ts b/src/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.ts
index c71fdc5b6..2b8fea066 100644
--- a/src/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.ts
+++ b/src/context/virtual-drive/shared/application/AbsolutePathToRelativeConverter.ts
@@ -4,11 +4,11 @@ export class AbsolutePathToRelativeConverter {
   constructor(private readonly baseFolder: string) {}
 
   private calculateRelativePath(basePath: string, folderPath: string): string {
-    const relativePath = path.relative(basePath, folderPath);
-    const relativeFolders = path.dirname(relativePath);
-    const fileName = path.basename(folderPath);
+    const relativePath = path.win32.relative(basePath, folderPath);
+    const relativeFolders = path.win32.dirname(relativePath);
+    const fileName = path.win32.basename(folderPath);
 
-    return path.join(relativeFolders, fileName);
+    return path.win32.join(relativeFolders, fileName);
   }
 
   run(absolutePath: string): string {

From 008bc403ff106bf856f073759e1a8bb94068c47a Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 25 Jan 2024 16:56:54 +0100
Subject: [PATCH 154/188] test: folder renamer

---
 .../folders/application/FolderPathUpdater.ts  |  2 +-
 .../folders/application/FolderRenamer.ts      | 12 +--
 .../virtual-drive/folders/domain/Folder.ts    |  5 +-
 .../events/FolderRenameStartedDomainEvent.ts  | 34 -------
 .../files/application/FilePathUpdater.test.ts |  6 +-
 .../folders/__mocks__/FolderFinderMock.ts     |  6 --
 .../__mocks__/FolderFinderTestClass.ts        | 14 +++
 .../__mocks__/SycnFolderMessengerMock.ts      | 33 +++++++
 .../application/FolderPathUpdater.test.ts     | 42 ++++++++
 .../folders/application/FolderRenamer.test.ts | 97 +++++++++++++++++++
 .../folders/domain/FolderMother.ts            |  3 +-
 .../folders/domain/FolderPathMother.ts        | 25 +++++
 12 files changed, 222 insertions(+), 57 deletions(-)
 delete mode 100644 src/context/virtual-drive/folders/domain/events/FolderRenameStartedDomainEvent.ts
 delete mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts
 create mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderFinderTestClass.ts
 create mode 100644 tests/context/virtual-drive/folders/__mocks__/SycnFolderMessengerMock.ts
 create mode 100644 tests/context/virtual-drive/folders/application/FolderPathUpdater.test.ts
 create mode 100644 tests/context/virtual-drive/folders/application/FolderRenamer.test.ts
 create mode 100644 tests/context/virtual-drive/folders/domain/FolderPathMother.ts

diff --git a/src/context/virtual-drive/folders/application/FolderPathUpdater.ts b/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
index e54c49e5f..5245f593b 100644
--- a/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
+++ b/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
@@ -24,7 +24,7 @@ export class FolderPathUpdater {
 
     const desiredPath = new FolderPath(posixRelativePath);
 
-    const dirnameChanged = folder.dirname !== desiredPath.dirname();
+    const dirnameChanged = folder.dirname.value !== desiredPath.dirname();
     const nameChanged = folder.name !== desiredPath.name();
 
     if (dirnameChanged && nameChanged) {
diff --git a/src/context/virtual-drive/folders/application/FolderRenamer.ts b/src/context/virtual-drive/folders/application/FolderRenamer.ts
index eccc3e63f..40c094aa7 100644
--- a/src/context/virtual-drive/folders/application/FolderRenamer.ts
+++ b/src/context/virtual-drive/folders/application/FolderRenamer.ts
@@ -3,7 +3,6 @@ import { Folder } from '../domain/Folder';
 import { FolderRepository } from '../domain/FolderRepository';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 import { EventBus } from '../../shared/domain/EventBus';
-import { FolderRenameStartedDomainEvent } from '../domain/events/FolderRenameStartedDomainEvent';
 import { SyncFolderMessenger } from '../domain/SyncFolderMessenger';
 
 export class FolderRenamer {
@@ -16,13 +15,8 @@ export class FolderRenamer {
 
   async run(folder: Folder, destination: FolderPath) {
     this.syncFolderMessenger.rename(folder.name, destination.name());
-    this.eventBus.publish([
-      new FolderRenameStartedDomainEvent({
-        aggregateId: folder.uuid,
-        oldName: folder.name,
-        newName: destination.name(),
-      }),
-    ]);
+
+    const nameBeforeRename = folder.name;
 
     folder.rename(destination);
 
@@ -30,6 +24,6 @@ export class FolderRenamer {
     await this.repository.update(folder);
 
     this.eventBus.publish(folder.pullDomainEvents());
-    this.syncFolderMessenger.renamed(folder.name, destination.name());
+    this.syncFolderMessenger.renamed(nameBeforeRename, folder.name);
   }
 }
diff --git a/src/context/virtual-drive/folders/domain/Folder.ts b/src/context/virtual-drive/folders/domain/Folder.ts
index 34589f23b..8c5001bb2 100644
--- a/src/context/virtual-drive/folders/domain/Folder.ts
+++ b/src/context/virtual-drive/folders/domain/Folder.ts
@@ -49,8 +49,8 @@ export class Folder extends AggregateRoot {
     return this._path.name();
   }
 
-  public get dirname() {
-    return this._path.dirname();
+  public get dirname(): FolderPath {
+    return new FolderPath('/' + this._path.dirname());
   }
 
   public get parentId(): number | undefined {
@@ -133,7 +133,6 @@ export class Folder extends AggregateRoot {
       parentId,
       createdAt,
       updatedAt,
-      createdAt,
       FolderStatus.Exists
     );
 
diff --git a/src/context/virtual-drive/folders/domain/events/FolderRenameStartedDomainEvent.ts b/src/context/virtual-drive/folders/domain/events/FolderRenameStartedDomainEvent.ts
deleted file mode 100644
index 4aa1332f8..000000000
--- a/src/context/virtual-drive/folders/domain/events/FolderRenameStartedDomainEvent.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { DomainEvent } from '../../../../shared/domain/DomainEvent';
-
-export class FolderRenameStartedDomainEvent extends DomainEvent {
-  static readonly EVENT_NAME = 'file.rename.started';
-
-  private oldName: string;
-  private newName: string;
-
-  constructor({
-    aggregateId,
-    oldName,
-    newName,
-  }: {
-    aggregateId: string;
-    oldName: string;
-    newName: string;
-  }) {
-    super({
-      eventName: FolderRenameStartedDomainEvent.EVENT_NAME,
-      aggregateId,
-    });
-
-    this.oldName = oldName;
-    this.newName = newName;
-  }
-
-  toPrimitives() {
-    return {
-      contentsId: this.aggregateId,
-      oldName: this.oldName,
-      newName: this.newName,
-    };
-  }
-}
diff --git a/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts b/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
index 9f8b74125..d000b7f2e 100644
--- a/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
+++ b/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
@@ -2,7 +2,7 @@ import { FileFinderByContentsId } from '../../../../../src/context/virtual-drive
 import { FilePathUpdater } from '../../../../../src/context/virtual-drive/files/application/FilePathUpdater';
 import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/FilePath';
 import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
-import { FolderFinderMock } from '../../folders/__mocks__/FolderFinderMock';
+import { FolderFinderTestClass } from '../../folders/__mocks__/FolderFinderTestClass';
 import { FolderMother } from '../../folders/domain/FolderMother';
 import { EventBusMock } from '../../shared/__mock__/EventBusMock';
 import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
@@ -13,7 +13,7 @@ import { FileMother } from '../domain/FileMother';
 describe('File path updater', () => {
   let repository: FileRepositoryMock;
   let fileFinderByContentsId: FileFinderByContentsId;
-  let folderFinder: FolderFinderMock;
+  let folderFinder: FolderFinderTestClass;
   let localFileSystem: LocalFileSystemMock;
   let eventBus: EventBusMock;
   let remoteFileSystemMock: RemoteFileSystemMock;
@@ -21,7 +21,7 @@ describe('File path updater', () => {
 
   beforeEach(() => {
     repository = new FileRepositoryMock();
-    folderFinder = new FolderFinderMock();
+    folderFinder = new FolderFinderTestClass();
     fileFinderByContentsId = new FileFinderByContentsId(repository);
     eventBus = new EventBusMock();
     remoteFileSystemMock = new RemoteFileSystemMock();
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts
deleted file mode 100644
index b0dcdc679..000000000
--- a/tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export class FolderFinderMock {
-  public mock = jest.fn();
-  run(path: string) {
-    return this.mock(path);
-  }
-}
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderFinderTestClass.ts b/tests/context/virtual-drive/folders/__mocks__/FolderFinderTestClass.ts
new file mode 100644
index 000000000..e9405126d
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderFinderTestClass.ts
@@ -0,0 +1,14 @@
+import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
+import { FolderRepository } from '../../../../../src/context/virtual-drive/folders/domain/FolderRepository';
+
+export class FolderFinderTestClass extends FolderFinder {
+  constructor() {
+    super({} as FolderRepository);
+  }
+
+  public mock = jest.fn();
+
+  run(path: string) {
+    return this.mock(path);
+  }
+}
diff --git a/tests/context/virtual-drive/folders/__mocks__/SycnFolderMessengerMock.ts b/tests/context/virtual-drive/folders/__mocks__/SycnFolderMessengerMock.ts
new file mode 100644
index 000000000..9d765a98c
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__mocks__/SycnFolderMessengerMock.ts
@@ -0,0 +1,33 @@
+import { SyncFolderMessenger } from '../../../../../src/context/virtual-drive/folders/domain/SyncFolderMessenger';
+
+export class SyncFolderMessengerMock implements SyncFolderMessenger {
+  public readonly creatingMock = jest.fn();
+  public readonly createdMock = jest.fn();
+  public readonly errorWhileCreatingMock = jest.fn();
+  public readonly renameMock = jest.fn();
+  public readonly renamedMock = jest.fn();
+  public readonly errorWhileRenamingMock = jest.fn();
+
+  creating(desiredName: string): Promise<void> {
+    return this.creatingMock(desiredName);
+  }
+  created(desiredName: string): Promise<void> {
+    return this.createdMock(desiredName);
+  }
+  errorWhileCreating(desiredName: string, message: string): Promise<void> {
+    return this.errorWhileCreatingMock(desiredName, message);
+  }
+  rename(currentName: string, desiredName: string): Promise<void> {
+    return this.renameMock(currentName, desiredName);
+  }
+  renamed(currentName: string, desiredName: string): Promise<void> {
+    return this.renamedMock(currentName, desiredName);
+  }
+  errorWhileRenaming(
+    currentName: string,
+    desiredName: string,
+    message: string
+  ): Promise<void> {
+    return this.errorWhileRenamingMock(currentName, desiredName, message);
+  }
+}
diff --git a/tests/context/virtual-drive/folders/application/FolderPathUpdater.test.ts b/tests/context/virtual-drive/folders/application/FolderPathUpdater.test.ts
new file mode 100644
index 000000000..f6105f8f5
--- /dev/null
+++ b/tests/context/virtual-drive/folders/application/FolderPathUpdater.test.ts
@@ -0,0 +1,42 @@
+import { FolderMover } from '../../../../../src/context/virtual-drive/folders/application/FolderMover';
+import { FolderRenamer } from '../../../../../src/context/virtual-drive/folders/application/FolderRenamer';
+import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
+import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
+import { FolderFinderTestClass } from '../__mocks__/FolderFinderTestClass';
+import { EventBusMock } from '../../shared/__mock__/EventBusMock';
+import { SyncFolderMessenger } from '../../../../../src/context/virtual-drive/folders/domain/SyncFolderMessenger';
+import { SyncFolderMessengerMock } from '../__mocks__/SycnFolderMessengerMock';
+
+describe('Folder Path Updater', () => {
+  let repository: FolderRepositoryMock;
+  let remoteFS: FolderRemoteFileSystemMock;
+  let finder: FolderFinderTestClass;
+  let syncFolderMessenger: SyncFolderMessengerMock;
+  let mover: FolderMover;
+  let renamer: FolderRenamer;
+
+  let FolderPathUpdater;
+
+  beforeEach(() => {
+    repository = new FolderRepositoryMock();
+
+    remoteFS = new FolderRemoteFileSystemMock();
+
+    finder = new FolderFinderTestClass();
+
+    mover = new FolderMover(repository, remoteFS, finder);
+
+    const eventBus = new EventBusMock();
+
+    syncFolderMessenger = new SyncFolderMessengerMock();
+
+    renamer = new FolderRenamer(
+      repository,
+      remoteFS,
+      eventBus,
+      syncFolderMessenger
+    );
+  });
+
+  it('throws a Folder Not Found Error if not folder is founded', () => {});
+});
diff --git a/tests/context/virtual-drive/folders/application/FolderRenamer.test.ts b/tests/context/virtual-drive/folders/application/FolderRenamer.test.ts
new file mode 100644
index 000000000..871f7ed32
--- /dev/null
+++ b/tests/context/virtual-drive/folders/application/FolderRenamer.test.ts
@@ -0,0 +1,97 @@
+import { FolderRenamer } from '../../../../../src/context/virtual-drive/folders/application/FolderRenamer';
+import { EventBusMock } from '../../shared/__mock__/EventBusMock';
+import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
+import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
+import { SyncFolderMessengerMock } from '../__mocks__/SycnFolderMessengerMock';
+import { FolderMother } from '../domain/FolderMother';
+import { FolderPathMother } from '../domain/FolderPathMother';
+import { FolderPath } from '../../../../../src/context/virtual-drive/folders/domain/FolderPath';
+import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+
+describe('Folder Renamer', () => {
+  let repository: FolderRepositoryMock;
+  let remoteFS: FolderRemoteFileSystemMock;
+  let syncFolderMessenger: SyncFolderMessengerMock;
+  let renamer: FolderRenamer;
+
+  beforeEach(() => {
+    repository = new FolderRepositoryMock();
+
+    remoteFS = new FolderRemoteFileSystemMock();
+
+    const eventBus = new EventBusMock();
+
+    syncFolderMessenger = new SyncFolderMessengerMock();
+
+    renamer = new FolderRenamer(
+      repository,
+      remoteFS,
+      eventBus,
+      syncFolderMessenger
+    );
+  });
+
+  const provideInputs = (): { folder: Folder; destination: FolderPath } => {
+    const folder = FolderMother.any();
+    const destination = FolderPathMother.onFolder(folder.dirname);
+
+    return {
+      folder,
+      destination,
+    };
+  };
+
+  describe('Remote syncing', () => {
+    it('renames the folder with the new name', async () => {
+      const { folder, destination } = provideInputs();
+
+      await renamer.run(folder, destination);
+
+      expect(remoteFS.renameMock).toBeCalledTimes(1);
+      expect(remoteFS.renameMock).toBeCalledWith(
+        expect.objectContaining({ _path: destination })
+      );
+    });
+  });
+
+  describe('Local syncing', () => {
+    it('updates the local repository', async () => {
+      const { folder, destination } = provideInputs();
+
+      await renamer.run(folder, destination);
+
+      expect(repository.updateMock).toBeCalledTimes(1);
+      expect(repository.updateMock).toBeCalledWith(
+        expect.objectContaining({ _path: destination })
+      );
+    });
+  });
+
+  describe('Messaging', () => {
+    it('sends a message when starts to rename', async () => {
+      const { folder, destination } = provideInputs();
+      const original = folder.name;
+
+      await renamer.run(folder, destination);
+
+      expect(syncFolderMessenger.renameMock).toBeCalledTimes(1);
+      expect(syncFolderMessenger.renameMock).toBeCalledWith(
+        original,
+        destination.name()
+      );
+    });
+
+    it('sends a message when the rename has been completed', async () => {
+      const { folder, destination } = provideInputs();
+      const original = folder.name;
+
+      await renamer.run(folder, destination);
+
+      expect(syncFolderMessenger.renamedMock).toBeCalledTimes(1);
+      expect(syncFolderMessenger.renamedMock).toBeCalledWith(
+        original,
+        destination.name()
+      );
+    });
+  });
+});
diff --git a/tests/context/virtual-drive/folders/domain/FolderMother.ts b/tests/context/virtual-drive/folders/domain/FolderMother.ts
index 51f0f35ba..c34d93704 100644
--- a/tests/context/virtual-drive/folders/domain/FolderMother.ts
+++ b/tests/context/virtual-drive/folders/domain/FolderMother.ts
@@ -6,6 +6,7 @@ import {
 } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
 import { FolderUuid } from '../../../../../src/context/virtual-drive/folders/domain/FolderUuid';
 import Chance from 'chance';
+import { FolderPathMother } from './FolderPathMother';
 const chance = new Chance();
 
 export class FolderMother {
@@ -25,7 +26,7 @@ export class FolderMother {
     return Folder.from({
       id: 2048,
       uuid: FolderUuid.random().value,
-      path: '/Zodseve',
+      path: FolderPathMother.any().value,
       parentId: null,
       updatedAt: new Date().toISOString(),
       createdAt: new Date().toISOString(),
diff --git a/tests/context/virtual-drive/folders/domain/FolderPathMother.ts b/tests/context/virtual-drive/folders/domain/FolderPathMother.ts
new file mode 100644
index 000000000..e5d2d4013
--- /dev/null
+++ b/tests/context/virtual-drive/folders/domain/FolderPathMother.ts
@@ -0,0 +1,25 @@
+import path from 'path';
+import { FolderPath } from '../../../../../src/context/virtual-drive/folders/domain/FolderPath';
+import Chance from 'chance';
+
+const chance = new Chance();
+
+export class FolderPathMother {
+  static any(): FolderPath {
+    const levels = chance.integer({ min: 2, max: 10 });
+
+    const names = [''];
+
+    for (let i = 1; i < levels; i++) {
+      names.push(chance.word({ length: chance.integer({ min: 1, max: 20 }) }));
+    }
+
+    return new FolderPath(path.normalize(names.join('/')));
+  }
+
+  static onFolder(folder: FolderPath): FolderPath {
+    const name = chance.word({ length: chance.integer({ min: 1, max: 20 }) });
+
+    return new FolderPath(path.normalize([folder.value, name].join('/')));
+  }
+}

From 0aa52bead736b68405ae65c0908d963641c75aa2 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 25 Jan 2024 17:51:34 +0100
Subject: [PATCH 155/188] test: folder path updater test

---
 src/context/shared/domain/Path.ts             |   8 +-
 .../files/application/FilePathUpdater.test.ts |   6 +-
 ...FinderTestClass.ts => FolderFinderMock.ts} |   2 +-
 .../folders/__mocks__/FolderMoverMock.ts      |  18 +++
 .../folders/__mocks__/FolderRenamerMock.ts    |  24 ++++
 .../application/FolderPathUpdater.test.ts     | 115 ++++++++++++++----
 .../folders/domain/FolderPathMother.ts        |   8 ++
 7 files changed, 150 insertions(+), 31 deletions(-)
 rename tests/context/virtual-drive/folders/__mocks__/{FolderFinderTestClass.ts => FolderFinderMock.ts} (86%)
 create mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderMoverMock.ts
 create mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderRenamerMock.ts

diff --git a/src/context/shared/domain/Path.ts b/src/context/shared/domain/Path.ts
index 6ab575747..f63942631 100644
--- a/src/context/shared/domain/Path.ts
+++ b/src/context/shared/domain/Path.ts
@@ -14,10 +14,12 @@ export abstract class Path extends ValueObject<string> {
   ];
 
   constructor(value: string) {
-    super(value);
+    const normalized = path.normalize(value);
 
-    this.ensurePathIsPosix(value);
-    this.ensurePathIsNotMalicious(value);
+    super(normalized);
+
+    this.ensurePathIsPosix(normalized);
+    this.ensurePathIsNotMalicious(normalized);
   }
 
   private ensurePathIsNotMalicious(value: string) {
diff --git a/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts b/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
index d000b7f2e..9f8b74125 100644
--- a/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
+++ b/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
@@ -2,7 +2,7 @@ import { FileFinderByContentsId } from '../../../../../src/context/virtual-drive
 import { FilePathUpdater } from '../../../../../src/context/virtual-drive/files/application/FilePathUpdater';
 import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/FilePath';
 import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
-import { FolderFinderTestClass } from '../../folders/__mocks__/FolderFinderTestClass';
+import { FolderFinderMock } from '../../folders/__mocks__/FolderFinderMock';
 import { FolderMother } from '../../folders/domain/FolderMother';
 import { EventBusMock } from '../../shared/__mock__/EventBusMock';
 import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
@@ -13,7 +13,7 @@ import { FileMother } from '../domain/FileMother';
 describe('File path updater', () => {
   let repository: FileRepositoryMock;
   let fileFinderByContentsId: FileFinderByContentsId;
-  let folderFinder: FolderFinderTestClass;
+  let folderFinder: FolderFinderMock;
   let localFileSystem: LocalFileSystemMock;
   let eventBus: EventBusMock;
   let remoteFileSystemMock: RemoteFileSystemMock;
@@ -21,7 +21,7 @@ describe('File path updater', () => {
 
   beforeEach(() => {
     repository = new FileRepositoryMock();
-    folderFinder = new FolderFinderTestClass();
+    folderFinder = new FolderFinderMock();
     fileFinderByContentsId = new FileFinderByContentsId(repository);
     eventBus = new EventBusMock();
     remoteFileSystemMock = new RemoteFileSystemMock();
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderFinderTestClass.ts b/tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts
similarity index 86%
rename from tests/context/virtual-drive/folders/__mocks__/FolderFinderTestClass.ts
rename to tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts
index e9405126d..e21b4da9b 100644
--- a/tests/context/virtual-drive/folders/__mocks__/FolderFinderTestClass.ts
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts
@@ -1,7 +1,7 @@
 import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
 import { FolderRepository } from '../../../../../src/context/virtual-drive/folders/domain/FolderRepository';
 
-export class FolderFinderTestClass extends FolderFinder {
+export class FolderFinderMock extends FolderFinder {
   constructor() {
     super({} as FolderRepository);
   }
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderMoverMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderMoverMock.ts
new file mode 100644
index 000000000..b7cb996ab
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderMoverMock.ts
@@ -0,0 +1,18 @@
+import { RemoteFileSystem } from '../../../../../src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem';
+import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
+import { FolderMover } from '../../../../../src/context/virtual-drive/folders/application/FolderMover';
+import { FolderRepository } from '../../../../../src/context/virtual-drive/folders/domain/FolderRepository';
+import { FolderPath } from '../../../../../src/context/virtual-drive/folders/domain/FolderPath';
+import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+
+export class FolderMoverMock extends FolderMover {
+  constructor() {
+    super({} as FolderRepository, {} as RemoteFileSystem, {} as FolderFinder);
+  }
+
+  public readonly mock = jest.fn();
+
+  run(folder: Folder, destination: FolderPath) {
+    return this.mock(folder, destination);
+  }
+}
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderRenamerMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderRenamerMock.ts
new file mode 100644
index 000000000..12d19dcb5
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderRenamerMock.ts
@@ -0,0 +1,24 @@
+import { RemoteFileSystem } from '../../../../../src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem';
+import { FolderRenamer } from '../../../../../src/context/virtual-drive/folders/application/FolderRenamer';
+import { FolderRepository } from '../../../../../src/context/virtual-drive/folders/domain/FolderRepository';
+import { SyncFolderMessenger } from '../../../../../src/context/virtual-drive/folders/domain/SyncFolderMessenger';
+import { EventBus } from '../../../../../src/context/virtual-drive/shared/domain/EventBus';
+import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { FolderPath } from '../../../../../src/context/virtual-drive/folders/domain/FolderPath';
+
+export class FolderRenamerMock extends FolderRenamer {
+  constructor() {
+    super(
+      {} as FolderRepository,
+      {} as RemoteFileSystem,
+      {} as EventBus,
+      {} as SyncFolderMessenger
+    );
+  }
+
+  public readonly mock = jest.fn();
+
+  run(folder: Folder, destination: FolderPath) {
+    return this.mock(folder, destination);
+  }
+}
diff --git a/tests/context/virtual-drive/folders/application/FolderPathUpdater.test.ts b/tests/context/virtual-drive/folders/application/FolderPathUpdater.test.ts
index f6105f8f5..3e9489748 100644
--- a/tests/context/virtual-drive/folders/application/FolderPathUpdater.test.ts
+++ b/tests/context/virtual-drive/folders/application/FolderPathUpdater.test.ts
@@ -1,42 +1,109 @@
-import { FolderMover } from '../../../../../src/context/virtual-drive/folders/application/FolderMover';
-import { FolderRenamer } from '../../../../../src/context/virtual-drive/folders/application/FolderRenamer';
 import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
-import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
-import { FolderFinderTestClass } from '../__mocks__/FolderFinderTestClass';
-import { EventBusMock } from '../../shared/__mock__/EventBusMock';
-import { SyncFolderMessenger } from '../../../../../src/context/virtual-drive/folders/domain/SyncFolderMessenger';
-import { SyncFolderMessengerMock } from '../__mocks__/SycnFolderMessengerMock';
+import { FolderMoverMock } from '../__mocks__/FolderMoverMock';
+import { FolderRenamerMock } from '../__mocks__/FolderRenamerMock';
+import { FolderPathUpdater } from '../../../../../src/context/virtual-drive/folders/application/FolderPathUpdater';
+import { FolderMother } from '../domain/FolderMother';
+import { FolderPathMother } from '../domain/FolderPathMother';
+import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { FolderNotFoundError } from '../../../../../src/context/virtual-drive/folders/domain/errors/FolderNotFoundError';
+import { ActionNotPermittedError } from '../../../../../src/context/virtual-drive/folders/domain/errors/ActionNotPermittedError';
+import { FolderUuid } from '../../../../../src/context/virtual-drive/folders/domain/FolderUuid';
+import { FolderPath } from '../../../../../src/context/virtual-drive/folders/domain/FolderPath';
+import { PathHasNotChangedError } from '../../../../../src/context/virtual-drive/folders/domain/errors/PathHasNotChangedError';
 
 describe('Folder Path Updater', () => {
   let repository: FolderRepositoryMock;
-  let remoteFS: FolderRemoteFileSystemMock;
-  let finder: FolderFinderTestClass;
-  let syncFolderMessenger: SyncFolderMessengerMock;
-  let mover: FolderMover;
-  let renamer: FolderRenamer;
+  let mover: FolderMoverMock;
+  let renamer: FolderRenamerMock;
 
-  let FolderPathUpdater;
+  let folderPathUpdater: FolderPathUpdater;
 
   beforeEach(() => {
     repository = new FolderRepositoryMock();
 
-    remoteFS = new FolderRemoteFileSystemMock();
+    mover = new FolderMoverMock();
 
-    finder = new FolderFinderTestClass();
+    renamer = new FolderRenamerMock();
 
-    mover = new FolderMover(repository, remoteFS, finder);
+    folderPathUpdater = new FolderPathUpdater(repository, mover, renamer);
+  });
+
+  const provideInputs = (): { uuid: Folder['uuid']; destination: string } => {
+    const folder = FolderMother.any();
+    const destination = FolderPathMother.onFolder(folder.dirname).value;
+
+    return {
+      uuid: folder.uuid,
+      destination,
+    };
+  };
+
+  it('throws a Folder Not Found Error if not folder is founded', async () => {
+    const { uuid, destination } = provideInputs();
+    repository.searchByPartialMock.mockReturnValueOnce(undefined);
+
+    try {
+      await folderPathUpdater.run(uuid, destination);
+    } catch (err: unknown) {
+      expect(err).toBeInstanceOf(FolderNotFoundError);
+    }
+  });
+
+  it('throws an Action Not Permitted Error if the path has changed parent folder and name', async () => {
+    const folder = FolderMother.any();
+    const destination = FolderPathMother.any();
+
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
+
+    try {
+      await folderPathUpdater.run(folder.uuid, destination.value);
+    } catch (error: unknown) {
+      expect(error).toBeInstanceOf(ActionNotPermittedError);
+    }
+  });
+
+  it('calls folder renamer when only the name changes', async () => {
+    const folder = FolderMother.any();
+    const folderPathWithNewName = FolderPathMother.onFolder(folder.dirname);
 
-    const eventBus = new EventBusMock();
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
 
-    syncFolderMessenger = new SyncFolderMessengerMock();
+    await folderPathUpdater.run(folder.uuid, folderPathWithNewName.value);
 
-    renamer = new FolderRenamer(
-      repository,
-      remoteFS,
-      eventBus,
-      syncFolderMessenger
+    expect(renamer.mock).toBeCalledTimes(1);
+    expect(renamer.mock).toBeCalledWith(
+      expect.objectContaining({ _uuid: new FolderUuid(folder.uuid) }),
+      folderPathWithNewName
     );
   });
 
-  it('throws a Folder Not Found Error if not folder is founded', () => {});
+  it('calls folder mover when only the parent name changes', async () => {
+    const folder = FolderMother.any();
+    const desiredPath = FolderPathMother.withDifferentParent(
+      new FolderPath(folder.path),
+      folder.name + '(1)'
+    );
+
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
+
+    await folderPathUpdater.run(folder.uuid, desiredPath.value);
+
+    expect(mover.mock).toBeCalledTimes(1);
+    expect(mover.mock).toBeCalledWith(
+      expect.objectContaining({ _uuid: new FolderUuid(folder.uuid) }),
+      desiredPath
+    );
+  });
+
+  it('throws a Path Has Not Changed Error if the path desired path is the same as the current', async () => {
+    const folder = FolderMother.any();
+
+    repository.searchByPartialMock.mockReturnValueOnce(folder);
+
+    try {
+      await folderPathUpdater.run(folder.uuid, folder.path);
+    } catch (error: unknown) {
+      expect(error).toBeInstanceOf(PathHasNotChangedError);
+    }
+  });
 });
diff --git a/tests/context/virtual-drive/folders/domain/FolderPathMother.ts b/tests/context/virtual-drive/folders/domain/FolderPathMother.ts
index e5d2d4013..3c82d00c7 100644
--- a/tests/context/virtual-drive/folders/domain/FolderPathMother.ts
+++ b/tests/context/virtual-drive/folders/domain/FolderPathMother.ts
@@ -22,4 +22,12 @@ export class FolderPathMother {
 
     return new FolderPath(path.normalize([folder.value, name].join('/')));
   }
+
+  static withDifferentParent(folderPath: FolderPath, name: string): FolderPath {
+    const asArray = folderPath.value.split('/');
+
+    asArray[asArray.length - 2] = name;
+
+    return new FolderPath(asArray.join('/'));
+  }
 }

From 2a3fff2bb3051d5532adc29f2850ba3f81cea2b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 17:53:44 +0100
Subject: [PATCH 156/188] chore(deps-dev): bump electron from 25.1.0 to 25.8.4
 (#391)

Bumps [electron](https://github.com/electron/electron) from 25.1.0 to 25.8.4.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v25.1.0...v25.8.4)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joan Vicens <joanvicens@proton.me>
---
 package.json |  2 +-
 yarn.lock    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index f7d3aa906..b98b8ed93 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "detect-port": "^1.3.0",
     "dotenv": "^10.0.0",
     "dotenv-webpack": "^7.0.3",
-    "electron": "19.1.9",
+    "electron": "^25.8.4",
     "electron-builder": "^23.6.0",
     "electron-devtools-installer": "^3.2.0",
     "electron-notarize": "^1.1.1",
diff --git a/yarn.lock b/yarn.lock
index 1037e1373..bd4abbcf8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5309,10 +5309,12 @@ electron-updater@^4.6.4:
     lodash.isequal "^4.5.0"
     semver "^7.3.5"
 
-electron@19.1.9:
-  version "19.1.9"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.9.tgz#01995eea4014f7cdb2f616f5f3492d4ed6f5e4f0"
-  integrity sha512-XT5LkTzIHB+ZtD3dTmNnKjVBWrDWReCKt9G1uAFLz6uJMEVcIUiYO+fph5pLXETiBw/QZBx8egduMEfIccLx+g==
+
+electron@^25.8.4:
+  version "25.8.4"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.4.tgz#b50877aac7d96323920437baf309ad86382cb455"
+  integrity sha512-hUYS3RGdaa6E1UWnzeGnsdsBYOggwMMg4WGxNGvAoWtmRrr6J1BsjFW/yRq4WsJHJce2HdzQXtz4OGXV6yUCLg==
+
   dependencies:
     "@electron/get" "^1.14.1"
     "@types/node" "^16.11.26"

From 5139797f21d99092e2e20f9cf0b03da6b6917107 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 17:54:19 +0100
Subject: [PATCH 157/188] chore(deps): bump crypto-js from 4.1.1 to 4.2.0
 (#408)

Bumps [crypto-js](https://github.com/brix/crypto-js) from 4.1.1 to 4.2.0.
- [Commits](https://github.com/brix/crypto-js/compare/4.1.1...4.2.0)

---
updated-dependencies:
- dependency-name: crypto-js
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index b98b8ed93..2eed4aa31 100644
--- a/package.json
+++ b/package.json
@@ -271,7 +271,7 @@
     "axios": "^1.1.3",
     "bytes": "^3.1.1",
     "chance": "^1.1.11",
-    "crypto-js": "^4.1.1",
+    "crypto-js": "^4.2.0",
     "dayjs": "^1.10.7",
     "electron-debug": "^3.2.0",
     "electron-fetch": "^1.7.4",
diff --git a/yarn.lock b/yarn.lock
index bd4abbcf8..973ff2abe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4509,10 +4509,10 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-crypto-js@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf"
-  integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==
+crypto-js@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
+  integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==
 
 css-declaration-sorter@^6.3.1:
   version "6.4.0"

From eb5cce73a0900bf0a9d3edfea03b7575a66b7bd6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 17:54:52 +0100
Subject: [PATCH 158/188] chore(deps): bump @babel/traverse from 7.22.5 to
 7.23.2 (#404)

Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.5 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 99 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 87 insertions(+), 12 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 973ff2abe..70cbcb571 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -32,6 +32,14 @@
   dependencies:
     "@babel/highlight" "^7.22.5"
 
+"@babel/code-frame@^7.22.13":
+  version "7.22.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
+  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
+  dependencies:
+    "@babel/highlight" "^7.22.13"
+    chalk "^2.4.2"
+
 "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.5.tgz#b1f6c86a02d85d2dd3368a2b67c09add8cd0c255"
@@ -77,6 +85,16 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
+  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
+  dependencies:
+    "@babel/types" "^7.23.0"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
 "@babel/helper-annotate-as-pure@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
@@ -138,6 +156,11 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
+"@babel/helper-environment-visitor@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
+  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
+
 "@babel/helper-environment-visitor@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
@@ -151,6 +174,14 @@
     "@babel/template" "^7.22.5"
     "@babel/types" "^7.22.5"
 
+"@babel/helper-function-name@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
+  dependencies:
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
+
 "@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
@@ -241,11 +272,23 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-string-parser@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
   integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
 
+"@babel/helper-validator-identifier@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+
 "@babel/helper-validator-identifier@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
@@ -275,6 +318,15 @@
     "@babel/traverse" "^7.22.5"
     "@babel/types" "^7.22.5"
 
+"@babel/highlight@^7.22.13":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
+  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+
 "@babel/highlight@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
@@ -289,6 +341,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.5.tgz#721fd042f3ce1896238cf1b341c77eb7dee7dbea"
   integrity sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==
 
+"@babel/parser@^7.22.15", "@babel/parser@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
+  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e"
@@ -1043,6 +1100,15 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
+"@babel/template@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
+  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
+  dependencies:
+    "@babel/code-frame" "^7.22.13"
+    "@babel/parser" "^7.22.15"
+    "@babel/types" "^7.22.15"
+
 "@babel/template@^7.22.5", "@babel/template@^7.3.3":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
@@ -1053,18 +1119,18 @@
     "@babel/types" "^7.22.5"
 
 "@babel/traverse@^7.22.5", "@babel/traverse@^7.7.2":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.5.tgz#44bd276690db6f4940fdb84e1cb4abd2f729ccd1"
-  integrity sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==
-  dependencies:
-    "@babel/code-frame" "^7.22.5"
-    "@babel/generator" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
+  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
+  dependencies:
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.0"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.5"
-    "@babel/parser" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.23.0"
+    "@babel/types" "^7.23.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
@@ -1077,6 +1143,15 @@
     "@babel/helper-validator-identifier" "^7.22.5"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.22.15", "@babel/types@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
+  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -4010,7 +4085,7 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001473, can
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001504.tgz#eaf77e5c852dfa5f82c4924468c30602ac53744a"
   integrity sha512-5uo7eoOp2mKbWyfMXnGO9rJWOGU8duvzEiYITW+wivukL7yHH4gX9yuRaobu6El4jPxo6jKZfG+N6fB621GD/Q==
 
-chalk@^2.0.0:
+chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==

From 84d8640cc94da0b4b07b89bc30d037ddc76ede8b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 17:55:40 +0100
Subject: [PATCH 159/188] chore(deps): bump msgpackr from 1.8.2 to 1.10.1 in
 /release/app (#437)

Bumps [msgpackr](https://github.com/kriszyp/msgpackr) from 1.8.2 to 1.10.1.
- [Release notes](https://github.com/kriszyp/msgpackr/releases)
- [Commits](https://github.com/kriszyp/msgpackr/commits/v1.10.1)

---
updated-dependencies:
- dependency-name: msgpackr
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joan Vicens <joanvicens@proton.me>
---
 release/app/package-lock.json | 188 ++++++++++++++++++++++++----------
 release/app/yarn.lock         |  96 ++++++++---------
 2 files changed, 181 insertions(+), 103 deletions(-)

diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index 14777a90a..d8ea0be9a 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,6 +1,8 @@
 {
   "name": "internxt-drive",
+
   "version": "2.0.0",
+
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
@@ -19,15 +21,8 @@
     "../../../node-win": {
       "name": "virtual-drive",
       "version": "1.0.1",
-      "hasInstallScript": true,
-      "license": "ISC",
       "dependencies": {
         "tsconfig-paths": "^4.2.0"
-      },
-      "devDependencies": {
-        "@types/node": "^20.5.0",
-        "node-gyp": "^9.4.0",
-        "typescript": "^5.1.6"
       }
     },
     "node_modules/@babel/runtime": {
@@ -69,18 +64,77 @@
       "license": "MIT"
     },
     "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz",
-      "integrity": "sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz",
+      "integrity": "sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==",
       "cpu": [
         "arm64"
       ],
-      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz",
+      "integrity": "sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz",
+      "integrity": "sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz",
+      "integrity": "sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz",
+      "integrity": "sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz",
+      "integrity": "sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@rudderstack/rudder-sdk-node": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@rudderstack/rudder-sdk-node/-/rudder-sdk-node-1.1.4.tgz",
@@ -1042,34 +1096,32 @@
       "license": "MIT"
     },
     "node_modules/msgpackr": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.2.tgz",
-      "integrity": "sha512-eLuPeok0DMwsGN23AvuVg32mYpx55tsQnxI87d8V1yZsdT8U5jrWhmCa1INO/joGAFQFfo/eTlM/BxVwLKbBOQ==",
-      "license": "MIT",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.10.1.tgz",
+      "integrity": "sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ==",
       "optionalDependencies": {
-        "msgpackr-extract": "^2.2.0"
+        "msgpackr-extract": "^3.0.2"
       }
     },
     "node_modules/msgpackr-extract": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-2.2.0.tgz",
-      "integrity": "sha512-0YcvWSv7ZOGl9Od6Y5iJ3XnPww8O7WLcpYMDwX+PAA/uXLDtyw94PJv9GLQV/nnp3cWlDhMoyKZIQLrx33sWog==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz",
+      "integrity": "sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==",
       "hasInstallScript": true,
-      "license": "MIT",
       "optional": true,
       "dependencies": {
-        "node-gyp-build-optional-packages": "5.0.3"
+        "node-gyp-build-optional-packages": "5.0.7"
       },
       "bin": {
         "download-msgpackr-prebuilds": "bin/download-prebuilds.js"
       },
       "optionalDependencies": {
-        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "2.2.0",
-        "@msgpackr-extract/msgpackr-extract-darwin-x64": "2.2.0",
-        "@msgpackr-extract/msgpackr-extract-linux-arm": "2.2.0",
-        "@msgpackr-extract/msgpackr-extract-linux-arm64": "2.2.0",
-        "@msgpackr-extract/msgpackr-extract-linux-x64": "2.2.0",
-        "@msgpackr-extract/msgpackr-extract-win32-x64": "2.2.0"
+        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.2",
+        "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.2",
+        "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.2",
+        "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.2",
+        "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.2",
+        "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.2"
       }
     },
     "node_modules/mz": {
@@ -1102,10 +1154,9 @@
       }
     },
     "node_modules/node-gyp-build-optional-packages": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz",
-      "integrity": "sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==",
-      "license": "MIT",
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz",
+      "integrity": "sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==",
       "optional": true,
       "bin": {
         "node-gyp-build-optional-packages": "bin.js",
@@ -1839,9 +1890,39 @@
       "integrity": "sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg=="
     },
     "@msgpackr-extract/msgpackr-extract-darwin-arm64": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz",
-      "integrity": "sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz",
+      "integrity": "sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==",
+      "optional": true
+    },
+    "@msgpackr-extract/msgpackr-extract-darwin-x64": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz",
+      "integrity": "sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==",
+      "optional": true
+    },
+    "@msgpackr-extract/msgpackr-extract-linux-arm": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz",
+      "integrity": "sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==",
+      "optional": true
+    },
+    "@msgpackr-extract/msgpackr-extract-linux-arm64": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz",
+      "integrity": "sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==",
+      "optional": true
+    },
+    "@msgpackr-extract/msgpackr-extract-linux-x64": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz",
+      "integrity": "sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==",
+      "optional": true
+    },
+    "@msgpackr-extract/msgpackr-extract-win32-x64": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz",
+      "integrity": "sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==",
       "optional": true
     },
     "@rudderstack/rudder-sdk-node": {
@@ -2484,26 +2565,26 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "msgpackr": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.2.tgz",
-      "integrity": "sha512-eLuPeok0DMwsGN23AvuVg32mYpx55tsQnxI87d8V1yZsdT8U5jrWhmCa1INO/joGAFQFfo/eTlM/BxVwLKbBOQ==",
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.10.1.tgz",
+      "integrity": "sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ==",
       "requires": {
-        "msgpackr-extract": "^2.2.0"
+        "msgpackr-extract": "^3.0.2"
       }
     },
     "msgpackr-extract": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-2.2.0.tgz",
-      "integrity": "sha512-0YcvWSv7ZOGl9Od6Y5iJ3XnPww8O7WLcpYMDwX+PAA/uXLDtyw94PJv9GLQV/nnp3cWlDhMoyKZIQLrx33sWog==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz",
+      "integrity": "sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==",
       "optional": true,
       "requires": {
-        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "2.2.0",
-        "@msgpackr-extract/msgpackr-extract-darwin-x64": "2.2.0",
-        "@msgpackr-extract/msgpackr-extract-linux-arm": "2.2.0",
-        "@msgpackr-extract/msgpackr-extract-linux-arm64": "2.2.0",
-        "@msgpackr-extract/msgpackr-extract-linux-x64": "2.2.0",
-        "@msgpackr-extract/msgpackr-extract-win32-x64": "2.2.0",
-        "node-gyp-build-optional-packages": "5.0.3"
+        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.2",
+        "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.2",
+        "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.2",
+        "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.2",
+        "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.2",
+        "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.2",
+        "node-gyp-build-optional-packages": "5.0.7"
       }
     },
     "mz": {
@@ -2530,9 +2611,9 @@
       }
     },
     "node-gyp-build-optional-packages": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz",
-      "integrity": "sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==",
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz",
+      "integrity": "sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==",
       "optional": true
     },
     "object-assign": {
@@ -2890,10 +2971,7 @@
     "virtual-drive": {
       "version": "file:../../../node-win",
       "requires": {
-        "@types/node": "^20.5.0",
-        "node-gyp": "^9.4.0",
-        "tsconfig-paths": "^4.2.0",
-        "typescript": "^5.1.6"
+        "tsconfig-paths": "^4.2.0"
       }
     },
     "winston": {
diff --git a/release/app/yarn.lock b/release/app/yarn.lock
index 81352052d..d3d76620a 100644
--- a/release/app/yarn.lock
+++ b/release/app/yarn.lock
@@ -43,35 +43,35 @@
   resolved "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz"
   integrity sha512-Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==
 
-"@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz#901c5937e1441572ea23e631fe6deca68482fe76"
-  integrity sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==
-
-"@msgpackr-extract/msgpackr-extract-darwin-x64@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.2.0.tgz#fb877fe6bae3c4d3cea29786737840e2ae689066"
-  integrity sha512-vq0tT8sjZsy4JdSqmadWVw6f66UXqUCabLmUVHZwUFzMgtgoIIQjT4VVRHKvlof3P/dMCkbMJ5hB1oJ9OWHaaw==
-
-"@msgpackr-extract/msgpackr-extract-linux-arm64@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.2.0.tgz#986179c38b10ac41fbdaf7d036c825cbc72855d9"
-  integrity sha512-hlxxLdRmPyq16QCutUtP8Tm6RDWcyaLsRssaHROatgnkOxdleMTgetf9JsdncL8vLh7FVy/RN9i3XR5dnb9cRA==
-
-"@msgpackr-extract/msgpackr-extract-linux-arm@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.2.0.tgz#15f2c6fe9e0adc06c21af7e95f484ff4880d79ce"
-  integrity sha512-SaJ3Qq4lX9Syd2xEo9u3qPxi/OB+5JO/ngJKK97XDpa1C587H9EWYO6KD8995DAjSinWvdHKRrCOXVUC5fvGOg==
-
-"@msgpackr-extract/msgpackr-extract-linux-x64@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.2.0.tgz#30cae5c9a202f3e1fa1deb3191b18ffcb2f239a2"
-  integrity sha512-94y5PJrSOqUNcFKmOl7z319FelCLAE0rz/jPCWS+UtdMZvpa4jrQd+cJPQCLp2Fes1yAW/YUQj/Di6YVT3c3Iw==
-
-"@msgpackr-extract/msgpackr-extract-win32-x64@2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.2.0.tgz#016d855b6bc459fd908095811f6826e45dd4ba64"
-  integrity sha512-XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA==
+"@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz#44d752c1a2dc113f15f781b7cc4f53a307e3fa38"
+  integrity sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ==
+
+"@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz#f954f34355712212a8e06c465bc06c40852c6bb3"
+  integrity sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz#45c63037f045c2b15c44f80f0393fa24f9655367"
+  integrity sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg==
+
+"@msgpackr-extract/msgpackr-extract-linux-arm@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz#35707efeafe6d22b3f373caf9e8775e8920d1399"
+  integrity sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA==
+
+"@msgpackr-extract/msgpackr-extract-linux-x64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz#091b1218b66c341f532611477ef89e83f25fae4f"
+  integrity sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA==
+
+"@msgpackr-extract/msgpackr-extract-win32-x64@3.0.2":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz#0f164b726869f71da3c594171df5ebc1c4b0a407"
+  integrity sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ==
 
 "@rudderstack/rudder-sdk-node@^1.1.4":
   version "1.1.4"
@@ -642,26 +642,26 @@ ms@^2.1.1, ms@^2.1.3:
   resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-msgpackr-extract@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-2.2.0.tgz"
-  integrity sha512-0YcvWSv7ZOGl9Od6Y5iJ3XnPww8O7WLcpYMDwX+PAA/uXLDtyw94PJv9GLQV/nnp3cWlDhMoyKZIQLrx33sWog==
+msgpackr-extract@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz#e05ec1bb4453ddf020551bcd5daaf0092a2c279d"
+  integrity sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==
   dependencies:
-    node-gyp-build-optional-packages "5.0.3"
+    node-gyp-build-optional-packages "5.0.7"
   optionalDependencies:
-    "@msgpackr-extract/msgpackr-extract-darwin-arm64" "2.2.0"
-    "@msgpackr-extract/msgpackr-extract-darwin-x64" "2.2.0"
-    "@msgpackr-extract/msgpackr-extract-linux-arm" "2.2.0"
-    "@msgpackr-extract/msgpackr-extract-linux-arm64" "2.2.0"
-    "@msgpackr-extract/msgpackr-extract-linux-x64" "2.2.0"
-    "@msgpackr-extract/msgpackr-extract-win32-x64" "2.2.0"
+    "@msgpackr-extract/msgpackr-extract-darwin-arm64" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-darwin-x64" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-linux-arm" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-linux-arm64" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-linux-x64" "3.0.2"
+    "@msgpackr-extract/msgpackr-extract-win32-x64" "3.0.2"
 
 msgpackr@^1.5.2:
-  version "1.8.2"
-  resolved "https://registry.npmjs.org/msgpackr/-/msgpackr-1.8.2.tgz"
-  integrity sha512-eLuPeok0DMwsGN23AvuVg32mYpx55tsQnxI87d8V1yZsdT8U5jrWhmCa1INO/joGAFQFfo/eTlM/BxVwLKbBOQ==
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.10.1.tgz#51953bb4ce4f3494f0c4af3f484f01cfbb306555"
+  integrity sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ==
   optionalDependencies:
-    msgpackr-extract "^2.2.0"
+    msgpackr-extract "^3.0.2"
 
 mz@^2.4.0:
   version "2.7.0"
@@ -696,10 +696,10 @@ node-abi@^3.3.0:
   dependencies:
     semver "^7.3.5"
 
-node-gyp-build-optional-packages@5.0.3:
-  version "5.0.3"
-  resolved "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz"
-  integrity sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==
+node-gyp-build-optional-packages@5.0.7:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz#5d2632bbde0ab2f6e22f1bbac2199b07244ae0b3"
+  integrity sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==
 
 object-assign@^4.0.1:
   version "4.1.1"

From f4e9953f37ba70096e86d7ad4471fe13c4c831f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 17:58:09 +0100
Subject: [PATCH 160/188] chore(deps): bump follow-redirects from 1.15.2 to
 1.15.5 in /release/app (#444)

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.5.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.5)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 release/app/package-lock.json | 31 +++++++++----------------------
 release/app/yarn.lock         | 26 +++-----------------------
 2 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/release/app/package-lock.json b/release/app/package-lock.json
index d8ea0be9a..be0e524ad 100644
--- a/release/app/package-lock.json
+++ b/release/app/package-lock.json
@@ -1,8 +1,6 @@
 {
   "name": "internxt-drive",
-
   "version": "2.0.0",
-
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
@@ -14,13 +12,13 @@
       "dependencies": {
         "@rudderstack/rudder-sdk-node": "^1.1.4",
         "better-sqlite3": "^8.3.0",
-        "typeorm": "^0.3.16",
-        "virtual-drive": "../../../node-win"
+        "typeorm": "^0.3.16"
       }
     },
     "../../../node-win": {
       "name": "virtual-drive",
-      "version": "1.0.1",
+      "version": "0.0.1",
+      "extraneous": true,
       "dependencies": {
         "tsconfig-paths": "^4.2.0"
       }
@@ -742,16 +740,15 @@
       "license": "MIT"
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "version": "1.15.5",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
+      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
       "funding": [
         {
           "type": "individual",
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
-      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -1754,10 +1751,6 @@
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/virtual-drive": {
-      "resolved": "../../../node-win",
-      "link": true
-    },
     "node_modules/winston": {
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/winston/-/winston-3.8.2.tgz",
@@ -2345,9 +2338,9 @@
       "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
     },
     "follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
+      "version": "1.15.5",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
+      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw=="
     },
     "fs-constants": {
       "version": "1.0.0",
@@ -2968,12 +2961,6 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
     },
-    "virtual-drive": {
-      "version": "file:../../../node-win",
-      "requires": {
-        "tsconfig-paths": "^4.2.0"
-      }
-    },
     "winston": {
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/winston/-/winston-3.8.2.tgz",
diff --git a/release/app/yarn.lock b/release/app/yarn.lock
index d3d76620a..ebb2bf8c9 100644
--- a/release/app/yarn.lock
+++ b/release/app/yarn.lock
@@ -30,14 +30,6 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
-"@gcas/fuse@^2.4.2":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@gcas/fuse/-/fuse-2.4.2.tgz#149bd97ec8a60988f4868bacd719c7e8a1c41876"
-  integrity sha512-l/vVd2eXAuzKG4QilN1VRa8za5glndSK+jxcLrzMiXRrvbbCJthwqcBZUE3VzoRL0T/l7197tW+MKR9YeQCtZQ==
-  dependencies:
-    nanoresource "^1.3.0"
-    napi-macros "^2.0.0"
-
 "@ioredis/commands@^1.1.1":
   version "1.2.0"
   resolved "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz"
@@ -425,9 +417,9 @@ fn.name@1.x.x:
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
 follow-redirects@^1.14.8:
-  version "1.15.2"
-  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+  version "1.15.5"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
+  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
 
 fs-constants@^1.0.0:
   version "1.0.0"
@@ -672,23 +664,11 @@ mz@^2.4.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nanoresource@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/nanoresource/-/nanoresource-1.3.0.tgz#823945d9667ab3e81a8b2591ab8d734552878cd0"
-  integrity sha512-OI5dswqipmlYfyL3k/YMm7mbERlh4Bd1KuKdMHpeoVD1iVxqxaTMKleB4qaA2mbQZ6/zMNSxCXv9M9P/YbqTuQ==
-  dependencies:
-    inherits "^2.0.4"
-
 napi-build-utils@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
-napi-macros@^2.0.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.2.2.tgz#817fef20c3e0e40a963fbf7b37d1600bd0201044"
-  integrity sha512-hmEVtAGYzVQpCKdbQea4skABsdXW4RUh5t5mJ2zzqowJS2OyXZTU1KhDVFhx+NlWZ4ap9mqR9TcDO3LTTttd+g==
-
 node-abi@^3.3.0:
   version "3.51.0"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d"

From 4def3dc7b4fe0cf012c2b0ee9c102e5feeb88073 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 25 Jan 2024 18:14:28 +0100
Subject: [PATCH 161/188] chore: update ts-jest to support ts 5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2eed4aa31..950c45583 100644
--- a/package.json
+++ b/package.json
@@ -246,7 +246,7 @@
     "style-loader": "^3.3.1",
     "tailwindcss": "^3.3.3",
     "terser-webpack-plugin": "^5.3.0",
-    "ts-jest": "^27.1.2",
+    "ts-jest": "^29.1.2",
     "ts-loader": "^9.2.6",
     "ts-node": "^10.4.0",
     "typescript": "^5.2.2",

From 0d860c19db234ef8d4691e4377018fdf6f7199d5 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Fri, 26 Jan 2024 13:25:13 +0100
Subject: [PATCH 162/188] Revert "chore(deps): bump crypto-js from 4.1.1 to
 4.2.0 (#408)"

This reverts commit 5139797f21d99092e2e20f9cf0b03da6b6917107.
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 950c45583..f2f93b8d4 100644
--- a/package.json
+++ b/package.json
@@ -271,7 +271,7 @@
     "axios": "^1.1.3",
     "bytes": "^3.1.1",
     "chance": "^1.1.11",
-    "crypto-js": "^4.2.0",
+    "crypto-js": "^4.1.1",
     "dayjs": "^1.10.7",
     "electron-debug": "^3.2.0",
     "electron-fetch": "^1.7.4",
diff --git a/yarn.lock b/yarn.lock
index 70cbcb571..d88da0508 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4584,10 +4584,10 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-crypto-js@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631"
-  integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==
+crypto-js@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf"
+  integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==
 
 css-declaration-sorter@^6.3.1:
   version "6.4.0"

From a3c0b62c89df354966c5f8280e119d3429b4f3b5 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 29 Jan 2024 11:51:06 +0100
Subject: [PATCH 163/188] chore: write and upload files

---
 src/apps/fuse/callbacks/OpenCallback.ts       |  1 -
 src/apps/fuse/callbacks/WriteCallback.ts      |  4 +--
 .../OfflineDriveDependencyContainer.ts        |  2 +-
 .../offlineContentsContainerBuilder.ts        |  2 +-
 ...Appended.ts => OfflineContentsAppender.ts} | 21 +++++------
 .../domain/OfflineContentsRepository.ts       |  7 +---
 .../contents/domain/errors/IOError.ts         |  2 ++
 .../NodeFSOfflineContentsRepository.ts        | 35 ++-----------------
 .../DownloadContentsToPlainFile.ts            |  3 ++
 .../infrastructure/SDKRemoteFileSystem.ts     | 28 +++++++++------
 10 files changed, 38 insertions(+), 67 deletions(-)
 rename src/context/offline-drive/contents/application/{OfflineContentsAppended.ts => OfflineContentsAppender.ts} (62%)
 create mode 100644 src/context/offline-drive/contents/domain/errors/IOError.ts

diff --git a/src/apps/fuse/callbacks/OpenCallback.ts b/src/apps/fuse/callbacks/OpenCallback.ts
index b873b7f61..007d133d5 100644
--- a/src/apps/fuse/callbacks/OpenCallback.ts
+++ b/src/apps/fuse/callbacks/OpenCallback.ts
@@ -31,7 +31,6 @@ export class OpenCallback extends FuseCallback<number> {
     }
 
     try {
-      Logger.debug(`"${file.nameWithExtension}" contents are not in local`);
       await this.container.downloadContentsToPlainFile.run(file);
 
       return this.right(file.id);
diff --git a/src/apps/fuse/callbacks/WriteCallback.ts b/src/apps/fuse/callbacks/WriteCallback.ts
index 0e35bb90a..31770c21f 100644
--- a/src/apps/fuse/callbacks/WriteCallback.ts
+++ b/src/apps/fuse/callbacks/WriteCallback.ts
@@ -8,10 +8,10 @@ export class WriteCallback {
     _fd: string,
     buffer: Buffer,
     len: number,
-    pos: number,
+    _pos: number,
     cb: (a: number) => void
   ) {
-    await this.container.offlineContentsAppender.run(path, buffer, len, pos);
+    await this.container.offlineContentsAppender.run(path, buffer);
 
     return cb(len);
   }
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts b/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts
index decbe7adb..6830c266e 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts
@@ -1,4 +1,4 @@
-import { OfflineContentsAppender } from '../../../../../context/offline-drive/contents/application/OfflineContentsAppended';
+import { OfflineContentsAppender } from '../../../../../context/offline-drive/contents/application/OfflineContentsAppender';
 import { OfflineContentsCreator } from '../../../../../context/offline-drive/contents/application/OfflineContentsCreator';
 import { OfflineContentsPathCalculator } from '../../../../../context/offline-drive/contents/application/OfflineContentsPathCalculator';
 import { OfflineContentsUploader } from '../../../../../context/offline-drive/contents/application/OfflineContentsUploader';
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts b/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
index 248ee0d94..78560e42d 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
@@ -1,4 +1,4 @@
-import { OfflineContentsAppender } from '../../../../../context/offline-drive/contents/application/OfflineContentsAppended';
+import { OfflineContentsAppender } from '../../../../../context/offline-drive/contents/application/OfflineContentsAppender';
 import { OfflineContentsCreator } from '../../../../../context/offline-drive/contents/application/OfflineContentsCreator';
 import { OfflineContentsPathCalculator } from '../../../../../context/offline-drive/contents/application/OfflineContentsPathCalculator';
 import { OfflineContentsUploader } from '../../../../../context/offline-drive/contents/application/OfflineContentsUploader';
diff --git a/src/context/offline-drive/contents/application/OfflineContentsAppended.ts b/src/context/offline-drive/contents/application/OfflineContentsAppender.ts
similarity index 62%
rename from src/context/offline-drive/contents/application/OfflineContentsAppended.ts
rename to src/context/offline-drive/contents/application/OfflineContentsAppender.ts
index 2ceadd746..a4af6b771 100644
--- a/src/context/offline-drive/contents/application/OfflineContentsAppended.ts
+++ b/src/context/offline-drive/contents/application/OfflineContentsAppender.ts
@@ -1,6 +1,7 @@
 import { OfflineFileFinder } from '../../files/application/OfflineFileFinder';
 import { OfflineFileSizeIncreaser } from '../../files/application/OfflineFileSizeIncreaser';
 import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
+import { OfflineContentsIOError } from '../domain/errors/IOError';
 
 export class OfflineContentsAppender {
   constructor(
@@ -9,21 +10,15 @@ export class OfflineContentsAppender {
     private readonly contentsRepository: OfflineContentsRepository
   ) {}
 
-  async run(
-    path: string,
-    buffer: Buffer,
-    length: number,
-    position: number
-  ): Promise<void> {
+  async run(path: string, buffer: Buffer): Promise<void> {
     const file = await this.offlineFileFinder.run({ path });
 
-    await this.contentsRepository.writeToFile(
-      file.id,
-      buffer,
-      length,
-      position
-    );
+    try {
+      await this.contentsRepository.writeToFile(file.id, buffer);
+    } catch (error: unknown) {
+      throw new OfflineContentsIOError();
+    }
 
-    await this.offlineFileSizeIncreaser.run(file.id, length);
+    await this.offlineFileSizeIncreaser.run(file.id, buffer.length);
   }
 }
diff --git a/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts b/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts
index 0a8d4daa1..1de196948 100644
--- a/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts
+++ b/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts
@@ -2,12 +2,7 @@ import { Readable } from 'stream';
 import { OfflineFileAttributes } from '../../files/domain/OfflineFile';
 
 export interface OfflineContentsRepository {
-  writeToFile(
-    id: OfflineFileAttributes['id'],
-    buffer: Buffer,
-    length: number,
-    position: number
-  ): Promise<void>;
+  writeToFile(id: OfflineFileAttributes['id'], buffer: Buffer): Promise<void>;
 
   createEmptyFile(id: OfflineFileAttributes['id']): Promise<void>;
 
diff --git a/src/context/offline-drive/contents/domain/errors/IOError.ts b/src/context/offline-drive/contents/domain/errors/IOError.ts
new file mode 100644
index 000000000..dcc6520a7
--- /dev/null
+++ b/src/context/offline-drive/contents/domain/errors/IOError.ts
@@ -0,0 +1,2 @@
+// TODO: extend form DriveDesktopError
+export class OfflineContentsIOError extends Error {}
diff --git a/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts b/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
index 1c207c107..49fae1502 100644
--- a/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
+++ b/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
@@ -46,42 +46,11 @@ export class NodeFSOfflineContentsRepository
 
   async writeToFile(
     id: OfflineFileAttributes['id'],
-    buffer: Buffer,
-    length: number,
-    position: number
+    buffer: Buffer
   ): Promise<void> {
     const file = await this.filePath(id);
 
-    return new Promise((resolve) => {
-      fs.open(file, 'w', (err, fileDescriptor) => {
-        if (err) {
-          throw err;
-        }
-
-        const dataBuffer = Buffer.from(buffer.slice(0, length));
-
-        fs.write(
-          fileDescriptor,
-          dataBuffer,
-          0,
-          length,
-          position,
-          (writeErr) => {
-            if (writeErr) {
-              throw writeErr;
-            }
-
-            fs.close(fileDescriptor, () => {
-              if (writeErr) {
-                throw writeErr; // TODO: is this needed?
-              }
-
-              resolve();
-            });
-          }
-        );
-      });
-    });
+    fs.appendFileSync(file, buffer);
   }
 
   async createEmptyFile(id: string): Promise<void> {
diff --git a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
index 0c091b32b..dc0efca53 100644
--- a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
+++ b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
@@ -5,6 +5,7 @@ import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
 import { LocalFileContents } from '../domain/LocalFileContents';
 import { LocalFileSystem } from '../domain/LocalFileSystem';
 import { ContentFileDownloader } from '../domain/contentHandlers/ContentFileDownloader';
+import Logger from 'electron-log';
 
 export class DownloadContentsToPlainFile {
   constructor(
@@ -46,6 +47,8 @@ export class DownloadContentsToPlainFile {
   }
 
   async run(file: File): Promise<string> {
+    Logger.debug(`downloading "${file.nameWithExtension}"`);
+
     const downloader = this.managerFactory.downloader();
 
     this.registerEvents(downloader, file);
diff --git a/src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts b/src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts
index 6208baced..f6ff744b4 100644
--- a/src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts
+++ b/src/context/virtual-drive/files/infrastructure/SDKRemoteFileSystem.ts
@@ -27,16 +27,24 @@ export class SDKRemoteFileSystem implements RemoteFileSystem {
       throw new Error('Failed to encrypt name');
     }
 
-    const data = await this.sdk.createFileEntry({
-      id: offline.contentsId,
-      type: offline.type,
-      size: offline.size,
-      name: encryptedName,
-      plain_name: offline.name,
-      bucket: this.bucket,
-      folder_id: offline.folderId,
-      encrypt_version: EncryptionVersion.Aes03,
-    });
+    const body = {
+      file: {
+        fileId: offline.contentsId,
+        file_id: offline.contentsId,
+        type: offline.type,
+        size: offline.size,
+        name: encryptedName,
+        plain_name: offline.name,
+        bucket: this.bucket,
+        folder_id: offline.folderId,
+        encrypt_version: EncryptionVersion.Aes03,
+      },
+    };
+
+    const { data } = await this.clients.drive.post(
+      `${process.env.API_URL}/api/storage/file`,
+      body
+    );
 
     return {
       ...data,

From e82f6f3d92544a21be80f2385b9704a310050512 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 29 Jan 2024 11:51:54 +0100
Subject: [PATCH 164/188] chore: rename file

---
 .../HttpClient/{HttpClient.ts => AuthorizedHttpClient.ts}       | 0
 src/apps/shared/HttpClient/background-process-clients.ts        | 2 +-
 src/apps/shared/HttpClient/http-client.test.skip.ts             | 2 +-
 src/apps/shared/HttpClient/main-process-client.ts               | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename src/apps/shared/HttpClient/{HttpClient.ts => AuthorizedHttpClient.ts} (100%)

diff --git a/src/apps/shared/HttpClient/HttpClient.ts b/src/apps/shared/HttpClient/AuthorizedHttpClient.ts
similarity index 100%
rename from src/apps/shared/HttpClient/HttpClient.ts
rename to src/apps/shared/HttpClient/AuthorizedHttpClient.ts
diff --git a/src/apps/shared/HttpClient/background-process-clients.ts b/src/apps/shared/HttpClient/background-process-clients.ts
index 29d893bb8..51255f274 100644
--- a/src/apps/shared/HttpClient/background-process-clients.ts
+++ b/src/apps/shared/HttpClient/background-process-clients.ts
@@ -1,7 +1,7 @@
 import { ipcRenderer } from 'electron';
 
 import { AuthorizedClients } from './Clients';
-import { AuthorizedHttpClient } from './HttpClient';
+import { AuthorizedHttpClient } from './AuthorizedHttpClient';
 
 export const onUserUnauthorized = () =>
   ipcRenderer.emit('user-is-unauthorized');
diff --git a/src/apps/shared/HttpClient/http-client.test.skip.ts b/src/apps/shared/HttpClient/http-client.test.skip.ts
index 024f2def1..816d86aa5 100644
--- a/src/apps/shared/HttpClient/http-client.test.skip.ts
+++ b/src/apps/shared/HttpClient/http-client.test.skip.ts
@@ -1,7 +1,7 @@
 import { AxiosInstance } from 'axios';
 import MockAdapter from 'axios-mock-adapter';
 
-import { AuthorizedHttpClient } from './HttpClient';
+import { AuthorizedHttpClient } from './AuthorizedHttpClient';
 
 const URL = 'http://jibuwsik.ie/ugco';
 
diff --git a/src/apps/shared/HttpClient/main-process-client.ts b/src/apps/shared/HttpClient/main-process-client.ts
index cc07d288d..1af852568 100644
--- a/src/apps/shared/HttpClient/main-process-client.ts
+++ b/src/apps/shared/HttpClient/main-process-client.ts
@@ -3,7 +3,7 @@ import { Axios } from 'axios';
 import { onUserUnauthorized } from '../../main/auth/handlers';
 import { getHeaders, getNewApiHeaders } from '../../main/auth/service';
 import { AuthorizedClients } from './Clients';
-import { AuthorizedHttpClient } from './HttpClient';
+import { AuthorizedHttpClient } from './AuthorizedHttpClient';
 
 const headersProvider = () => Promise.resolve(getHeaders(false));
 const newHeadersProvider = () => Promise.resolve(getNewApiHeaders());

From d31e3971e0ecf22482473aa826ecd40904884faf Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 29 Jan 2024 13:11:10 +0100
Subject: [PATCH 165/188] chore: remove user container from fuse container

---
 .../fuse/dependency-injection/FuseDependencyContainer.ts   | 2 --
 .../dependency-injection/FuseDependencyContainerFactory.ts | 7 -------
 2 files changed, 9 deletions(-)

diff --git a/src/apps/fuse/dependency-injection/FuseDependencyContainer.ts b/src/apps/fuse/dependency-injection/FuseDependencyContainer.ts
index 70e7f1eda..0e28e2da9 100644
--- a/src/apps/fuse/dependency-injection/FuseDependencyContainer.ts
+++ b/src/apps/fuse/dependency-injection/FuseDependencyContainer.ts
@@ -1,9 +1,7 @@
 import { OfflineDriveDependencyContainer } from './offline/OfflineDriveDependencyContainer';
-import { UserDependencyContainer } from './user/UserDependencyContainer';
 import { VirtualDriveDependencyContainer } from './virtual-drive/VirtualDriveDependencyContainer';
 
 export interface FuseDependencyContainer {
   offlineDriveContainer: OfflineDriveDependencyContainer;
   virtualDriveContainer: VirtualDriveDependencyContainer;
-  userContainer: UserDependencyContainer;
 }
diff --git a/src/apps/fuse/dependency-injection/FuseDependencyContainerFactory.ts b/src/apps/fuse/dependency-injection/FuseDependencyContainerFactory.ts
index 40aa63bda..12bb98384 100644
--- a/src/apps/fuse/dependency-injection/FuseDependencyContainerFactory.ts
+++ b/src/apps/fuse/dependency-injection/FuseDependencyContainerFactory.ts
@@ -2,13 +2,11 @@ import { FuseDependencyContainer } from './FuseDependencyContainer';
 import { FuseDomainEventSubscribers } from './FuseDomainEventSubscribers';
 import { DependencyInjectionEventBus } from './common/eventBus';
 import { OfflineDriveDependencyContainerFactory } from './offline/OfflineDriveDependencyContainerFactory';
-import { UserContainerFactory } from './user/UserContainerFactory';
 import { VirtualDriveDependencyContainerFactory } from './virtual-drive/VirtualDriveDependencyContainerFactory';
 
 type FuseDependencyContainerFactorySubscribers = Array<
   | keyof FuseDependencyContainer['offlineDriveContainer']
   | keyof FuseDependencyContainer['virtualDriveContainer']
-  | keyof FuseDependencyContainer['userContainer']
 >;
 
 export class FuseDependencyContainerFactory {
@@ -17,7 +15,6 @@ export class FuseDependencyContainerFactory {
   static readonly subscribers: FuseDependencyContainerFactorySubscribers = [
     ...VirtualDriveDependencyContainerFactory.subscribers,
     ...OfflineDriveDependencyContainerFactory.subscribers,
-    ...UserContainerFactory.subscribers,
   ];
 
   eventSubscribers(
@@ -43,13 +40,9 @@ export class FuseDependencyContainerFactory {
       new OfflineDriveDependencyContainerFactory();
     const offlineDriveContainer = await offlineDriveContainerFactory.build();
 
-    const userContainerFactory = new UserContainerFactory();
-    const userContainer = await userContainerFactory.build();
-
     const container = {
       offlineDriveContainer,
       virtualDriveContainer,
-      userContainer,
     };
 
     bus.addSubscribers(FuseDomainEventSubscribers.from(container));

From fd01aa0c84cea7652b24aef0d3f860c5b5fd2cf7 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 29 Jan 2024 13:12:04 +0100
Subject: [PATCH 166/188] chore: log unauthorized url call

---
 src/apps/shared/HttpClient/AuthorizedHttpClient.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/shared/HttpClient/AuthorizedHttpClient.ts b/src/apps/shared/HttpClient/AuthorizedHttpClient.ts
index ed0361dc9..071f1989a 100644
--- a/src/apps/shared/HttpClient/AuthorizedHttpClient.ts
+++ b/src/apps/shared/HttpClient/AuthorizedHttpClient.ts
@@ -27,7 +27,7 @@ export class AuthorizedHttpClient {
 
   private handleUnauthorizedResponse(error: AxiosError) {
     if (error?.response?.status === 401) {
-      Logger.warn('[AUTH] Request unauthorized');
+      Logger.warn('[AUTH] Request unauthorized', error.config.url);
       this.unauthorizedNotifier();
     }
 

From 98464c6f76fb49aa77a8c98f3cc1a7a01ea7583d Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 29 Jan 2024 14:06:25 +0100
Subject: [PATCH 167/188] chore: remove unused callbacks

---
 src/apps/fuse/FuseApp.ts                | 7 -------
 src/apps/fuse/callbacks/OpenCallback.ts | 4 +---
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index 03cecbd24..14be2db07 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -4,8 +4,6 @@ import { GetAttributesCallback } from './callbacks/GetAttributesCallback';
 import { OpenCallback } from './callbacks/OpenCallback';
 import { ReadCallback } from './callbacks/ReadCallback';
 import { RenameOrMoveCallback } from './callbacks/RenameOrMoveCallback';
-import { ListXAttributesCallback } from './callbacks/ListXAttributesCallback';
-import { GetXAttributeCallback } from './callbacks/GetXAttributeCallback';
 import { CreateCallback } from './callbacks/CreateCallback';
 import { MakeDirectoryCallback } from './callbacks/MakeDirectoryCallback';
 import { TrashFileCallback } from './callbacks/TrashFileCallback';
@@ -29,8 +27,6 @@ export class FuseApp {
   ) {}
 
   private async getOpt() {
-    const listXAttributes = new ListXAttributesCallback();
-    const getXAttribute = new GetXAttributeCallback('GetXAttribute');
     const readdir = new ReaddirCallback(
       this.fuseContainer.virtualDriveContainer
     );
@@ -59,8 +55,6 @@ export class FuseApp {
     );
 
     return {
-      listxattr: listXAttributes.execute.bind(listXAttributes),
-      getxattr: getXAttribute.execute.bind(getXAttribute),
       getattr: getattr.handle.bind(getattr),
       readdir: readdir.handle.bind(readdir),
       open: open.handle.bind(open),
@@ -72,7 +66,6 @@ export class FuseApp {
       release: release.handle.bind(release),
       unlink: trashFile.handle.bind(trashFile),
       rmdir: trashFolder.handle.bind(trashFolder),
-      // statfs: statfs.execute.bind(statfs),
     };
   }
 
diff --git a/src/apps/fuse/callbacks/OpenCallback.ts b/src/apps/fuse/callbacks/OpenCallback.ts
index 007d133d5..4c2b1cff5 100644
--- a/src/apps/fuse/callbacks/OpenCallback.ts
+++ b/src/apps/fuse/callbacks/OpenCallback.ts
@@ -24,9 +24,7 @@ export class OpenCallback extends FuseCallback<number> {
     );
 
     if (alreadyDownloaded) {
-      Logger.debug(
-        `[Local Cache] "${file.nameWithExtension}" contents are already in local`
-      );
+      Logger.debug(`"${file.nameWithExtension}" contents are already in local`);
       return this.right(file.id);
     }
 

From 7e71300212fa72fb88d6d01b46c5e79d765a26c2 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 29 Jan 2024 14:52:48 +0100
Subject: [PATCH 168/188] chore: simplify contexts

---
 .../fuse/callbacks/GetAttributesCallback.ts   |  2 +-
 src/apps/fuse/callbacks/ReleaseCallback.ts    |  2 +-
 .../FuseDomainEventSubscribers.ts             |  1 -
 .../BoundaryBridge/BoundaryBridgeContainer.ts |  2 -
 .../boundaryBridgeContainerBuilder.ts         | 16 ------
 .../OfflineDriveDependencyContainer.ts        |  2 -
 .../offlineContentsContainerBuilder.ts        |  7 ++-
 .../application/OfflineFilePathRetriever.ts   | 10 ----
 .../application/OfflineFileUploader.ts        | 34 ------------
 .../application/OfflineContentsCreator.ts     |  3 +-
 .../OfflineContentsPathCalculator.ts          |  4 +-
 .../application/OfflineContentsUploader.ts    | 52 +++++++++++++------
 .../domain/OfflineContentsRepository.ts       |  8 +--
 .../NodeFSOfflineContentsRepository.ts        | 15 +++---
 .../files/application/OfflineFileCreator.ts   |  4 +-
 .../application/OfflineFileSizeIncreaser.ts   |  5 +-
 .../offline-drive/files/domain/OfflineFile.ts | 24 ++++-----
 .../files/domain/OfflineFileRepository.ts     |  2 +-
 .../files/domain/OfflineFileSize.ts           |  6 ++-
 .../InMemoryOfflineFileRepository.ts          |  5 +-
 .../application/FileCreationOrchestrator.ts   |  2 +-
 .../CreateFileOnOfflineFileUplodaded.ts       |  5 +-
 .../files/application/FileCreator.ts          | 10 ++--
 .../__mocks__/OfflineFileRepositoryMock.ts    |  4 +-
 .../OfflineFileSizeIncreaser.test.ts          |  5 +-
 .../files/application/FileCreator.test.ts     |  6 +--
 26 files changed, 102 insertions(+), 134 deletions(-)
 delete mode 100644 src/context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever.ts
 delete mode 100644 src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts

diff --git a/src/apps/fuse/callbacks/GetAttributesCallback.ts b/src/apps/fuse/callbacks/GetAttributesCallback.ts
index 3af84b1f8..a2ddf100c 100644
--- a/src/apps/fuse/callbacks/GetAttributesCallback.ts
+++ b/src/apps/fuse/callbacks/GetAttributesCallback.ts
@@ -76,7 +76,7 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
     if (offlineFile) {
       return this.right({
         mode: GetAttributesCallback.FILE,
-        size: offlineFile.size,
+        size: offlineFile.size.value,
         mtime: new Date(),
         ctime: offlineFile.createdAt,
         atime: offlineFile.createdAt,
diff --git a/src/apps/fuse/callbacks/ReleaseCallback.ts b/src/apps/fuse/callbacks/ReleaseCallback.ts
index 953447bd7..15619b8fe 100644
--- a/src/apps/fuse/callbacks/ReleaseCallback.ts
+++ b/src/apps/fuse/callbacks/ReleaseCallback.ts
@@ -15,7 +15,7 @@ export class ReleaseCallback extends NotifyFuseCallback {
     }
 
     try {
-      await this.container.offlineFileUploader.run(file);
+      await this.container.offlineContentsUploader.run(file.id, file.path);
       return this.right();
     } catch (err: unknown) {
       if (err instanceof Error) {
diff --git a/src/apps/fuse/dependency-injection/FuseDomainEventSubscribers.ts b/src/apps/fuse/dependency-injection/FuseDomainEventSubscribers.ts
index 288e3966e..db66dbd2b 100644
--- a/src/apps/fuse/dependency-injection/FuseDomainEventSubscribers.ts
+++ b/src/apps/fuse/dependency-injection/FuseDomainEventSubscribers.ts
@@ -10,7 +10,6 @@ export class FuseDomainEventSubscribers {
     const plainContainer = {
       ...container.offlineDriveContainer,
       ...container.virtualDriveContainer,
-      ...container.userContainer,
     };
 
     const subscribers = FuseDependencyContainerFactory.subscribers.map(
diff --git a/src/apps/fuse/dependency-injection/offline/BoundaryBridge/BoundaryBridgeContainer.ts b/src/apps/fuse/dependency-injection/offline/BoundaryBridge/BoundaryBridgeContainer.ts
index 0e0c0b5ad..36cac87d1 100644
--- a/src/apps/fuse/dependency-injection/offline/BoundaryBridge/BoundaryBridgeContainer.ts
+++ b/src/apps/fuse/dependency-injection/offline/BoundaryBridge/BoundaryBridgeContainer.ts
@@ -1,7 +1,5 @@
 import { OfflineFileAndContentsCreator } from '../../../../../context/offline-drive/boundaryBridge/application/OfflineFileAndContentsCreator';
-import { OfflineFileUploader } from '../../../../../context/offline-drive/boundaryBridge/application/OfflineFileUploader';
 
 export interface BoundaryBridgeContainer {
-  offlineFileUploader: OfflineFileUploader;
   offlineFileAndContentsCreator: OfflineFileAndContentsCreator;
 }
diff --git a/src/apps/fuse/dependency-injection/offline/BoundaryBridge/boundaryBridgeContainerBuilder.ts b/src/apps/fuse/dependency-injection/offline/BoundaryBridge/boundaryBridgeContainerBuilder.ts
index f4f25cda7..181e2990e 100644
--- a/src/apps/fuse/dependency-injection/offline/BoundaryBridge/boundaryBridgeContainerBuilder.ts
+++ b/src/apps/fuse/dependency-injection/offline/BoundaryBridge/boundaryBridgeContainerBuilder.ts
@@ -1,7 +1,4 @@
 import { OfflineFileAndContentsCreator } from '../../../../../context/offline-drive/boundaryBridge/application/OfflineFileAndContentsCreator';
-import { OfflineFilePathRetriever } from '../../../../../context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever';
-import { OfflineFileUploader } from '../../../../../context/offline-drive/boundaryBridge/application/OfflineFileUploader';
-import { DependencyInjectionEventBus } from '../../common/eventBus';
 import { OfflineContentsDependencyContainer } from '../OfflineContents/OfflineDriveDependencyContainer';
 import { OfflineFilesContainer } from '../OfflineFiles/OfflineFilesContainer';
 import { BoundaryBridgeContainer } from './BoundaryBridgeContainer';
@@ -10,25 +7,12 @@ export async function buildBoundaryBridgeContainer(
   offlineFileContainer: OfflineFilesContainer,
   offlineContentsContainer: OfflineContentsDependencyContainer
 ): Promise<BoundaryBridgeContainer> {
-  const { bus } = DependencyInjectionEventBus;
-
-  const offlineFilePathRetriever = new OfflineFilePathRetriever(
-    offlineContentsContainer.offlineContentsPathCalculator
-  );
-
-  const offlineFileUploader = new OfflineFileUploader(
-    offlineFilePathRetriever,
-    offlineContentsContainer.offlineContentsUploader,
-    bus
-  );
-
   const offlineFileAndContentsCreator = new OfflineFileAndContentsCreator(
     offlineFileContainer.offlineFileCreator,
     offlineContentsContainer.offlineContentsCreator
   );
 
   return {
-    offlineFileUploader,
     offlineFileAndContentsCreator,
   };
 }
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts b/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts
index 6830c266e..4492b6b84 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineContents/OfflineDriveDependencyContainer.ts
@@ -1,11 +1,9 @@
 import { OfflineContentsAppender } from '../../../../../context/offline-drive/contents/application/OfflineContentsAppender';
 import { OfflineContentsCreator } from '../../../../../context/offline-drive/contents/application/OfflineContentsCreator';
-import { OfflineContentsPathCalculator } from '../../../../../context/offline-drive/contents/application/OfflineContentsPathCalculator';
 import { OfflineContentsUploader } from '../../../../../context/offline-drive/contents/application/OfflineContentsUploader';
 
 export interface OfflineContentsDependencyContainer {
   offlineContentsCreator: OfflineContentsCreator;
   offlineContentsAppender: OfflineContentsAppender;
   offlineContentsUploader: OfflineContentsUploader;
-  offlineContentsPathCalculator: OfflineContentsPathCalculator;
 }
diff --git a/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts b/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
index 78560e42d..eee146bcc 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
@@ -6,6 +6,7 @@ import { EnvironmentOfflineContentsManagersFactory } from '../../../../../contex
 import { NodeFSOfflineContentsRepository } from '../../../../../context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository';
 import { MainProcessUploadProgressTracker } from '../../../../../context/shared/infrastructure/MainProcessUploadProgressTracker';
 import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
+import { DependencyInjectionEventBus } from '../../../../fuse/dependency-injection/common/eventBus';
 import { DependencyInjectionInxtEnvironment } from '../../common/inxt-environment';
 import { DependencyInjectionUserProvider } from '../../common/user';
 import { OfflineFilesContainer } from '../OfflineFiles/OfflineFilesContainer';
@@ -16,6 +17,7 @@ export async function buildOfflineContentsContainer(
 ): Promise<OfflineContentsDependencyContainer> {
   const environment = DependencyInjectionInxtEnvironment.get();
   const user = DependencyInjectionUserProvider.get();
+  const eventBus = DependencyInjectionEventBus.bus;
 
   const localFileContentsDirectoryProvider =
     new FuseAppDataLocalFileContentsDirectoryProvider();
@@ -42,9 +44,11 @@ export async function buildOfflineContentsContainer(
     new EnvironmentOfflineContentsManagersFactory(environment, user.bucket);
 
   const offlineContentsUploader = new OfflineContentsUploader(
+    offlineContentsPathCalculator,
     environmentOfflineContentsManagersFactory,
     repository,
-    tracker
+    tracker,
+    eventBus
   );
 
   const offlineContentsCreator = new OfflineContentsCreator(repository);
@@ -52,7 +56,6 @@ export async function buildOfflineContentsContainer(
   return {
     offlineContentsCreator,
     offlineContentsAppender,
-    offlineContentsPathCalculator,
     offlineContentsUploader,
   };
 }
diff --git a/src/context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever.ts b/src/context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever.ts
deleted file mode 100644
index 32021652b..000000000
--- a/src/context/offline-drive/boundaryBridge/application/OfflineFilePathRetriever.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { OfflineContentsPathCalculator } from '../../contents/application/OfflineContentsPathCalculator';
-import { OfflineFile } from '../../files/domain/OfflineFile';
-
-export class OfflineFilePathRetriever {
-  constructor(private readonly pathCalculator: OfflineContentsPathCalculator) {}
-
-  async run(file: OfflineFile): Promise<string> {
-    return await this.pathCalculator.run(file.id);
-  }
-}
diff --git a/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts b/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
deleted file mode 100644
index ed8d4526f..000000000
--- a/src/context/offline-drive/boundaryBridge/application/OfflineFileUploader.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { EventBus } from '../../../virtual-drive/shared/domain/EventBus';
-import { OfflineContentsUploader } from '../../contents/application/OfflineContentsUploader';
-import { OfflineContentsUploadedDomainEvent } from '../../contents/domain/events/OfflineContentsUploadedDomainEvent';
-import { OfflineFile } from '../../files/domain/OfflineFile';
-import { OfflineFilePathRetriever } from './OfflineFilePathRetriever';
-
-export class OfflineFileUploader {
-  constructor(
-    private readonly offlineFilePathRetriever: OfflineFilePathRetriever,
-    private readonly contentsUploader: OfflineContentsUploader,
-    private readonly eventBus: EventBus
-  ) {}
-
-  async run(file: OfflineFile): Promise<void> {
-    const absolutePath = await this.offlineFilePathRetriever.run(file);
-
-    const { name, extension } = file;
-
-    const contentsId = await this.contentsUploader.run(
-      name,
-      extension,
-      absolutePath
-    );
-
-    const contentsUploadedEvent = new OfflineContentsUploadedDomainEvent({
-      aggregateId: contentsId,
-      size: file.size,
-      path: file.path,
-      offlineContentsPath: absolutePath,
-    });
-
-    await this.eventBus.publish([contentsUploadedEvent]);
-  }
-}
diff --git a/src/context/offline-drive/contents/application/OfflineContentsCreator.ts b/src/context/offline-drive/contents/application/OfflineContentsCreator.ts
index 764bcfef3..42d4a8bd9 100644
--- a/src/context/offline-drive/contents/application/OfflineContentsCreator.ts
+++ b/src/context/offline-drive/contents/application/OfflineContentsCreator.ts
@@ -1,9 +1,10 @@
+import { OfflineFileId } from '../../files/domain/OfflineFileId';
 import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
 
 export class OfflineContentsCreator {
   constructor(private readonly repository: OfflineContentsRepository) {}
 
-  async run(name: string): Promise<void> {
+  async run(name: OfflineFileId): Promise<void> {
     await this.repository.createEmptyFile(name);
   }
 }
diff --git a/src/context/offline-drive/contents/application/OfflineContentsPathCalculator.ts b/src/context/offline-drive/contents/application/OfflineContentsPathCalculator.ts
index 1efc7a0a1..b52ec3b88 100644
--- a/src/context/offline-drive/contents/application/OfflineContentsPathCalculator.ts
+++ b/src/context/offline-drive/contents/application/OfflineContentsPathCalculator.ts
@@ -1,10 +1,10 @@
-import { OfflineFileAttributes } from '../../files/domain/OfflineFile';
+import { OfflineFileId } from '../../files/domain/OfflineFileId';
 import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
 
 export class OfflineContentsPathCalculator {
   constructor(private readonly repository: OfflineContentsRepository) {}
 
-  async run(id: OfflineFileAttributes['id']): Promise<string> {
+  async run(id: OfflineFileId): Promise<string> {
     return this.repository.getAbsolutePath(id);
   }
 }
diff --git a/src/context/offline-drive/contents/application/OfflineContentsUploader.ts b/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
index 750e030a0..259289ca0 100644
--- a/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
+++ b/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
@@ -1,26 +1,32 @@
 import { UploadProgressTracker } from '../../../shared/domain/UploadProgressTracker';
+import { EventBus } from '../../../virtual-drive/shared/domain/EventBus';
 import {
   OfflineContentUploader,
   OfflineContentsManagersFactory,
 } from '../domain/OfflineContentsManagersFactory';
 import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
 import Logger from 'electron-log';
+import { OfflineContentsPathCalculator } from './OfflineContentsPathCalculator';
+import { OfflineContentsUploadedDomainEvent } from '../domain/events/OfflineContentsUploadedDomainEvent';
+import { FilePath } from '../../../virtual-drive/files/domain/FilePath';
+import { OfflineFileId } from '../../files/domain/OfflineFileId';
 
 export class OfflineContentsUploader {
   constructor(
+    private readonly offlineContentsPathCalculator: OfflineContentsPathCalculator,
     private readonly contentsManagersFactory: OfflineContentsManagersFactory,
     private readonly repository: OfflineContentsRepository,
-    private readonly progressTracker: UploadProgressTracker
+    private readonly progressTracker: UploadProgressTracker,
+    private readonly eventBus: EventBus
   ) {}
 
   private registerEvents(
-    name: string,
-    extension: string,
+    path: FilePath,
     size: number,
     uploader: OfflineContentUploader
   ) {
     uploader.on('start', () => {
-      this.progressTracker.uploadStarted(name, extension, size, {
+      this.progressTracker.uploadStarted(path.name(), path.extension(), size, {
         elapsedTime: uploader.elapsedTime(),
       });
       Logger.debug('FILE_UPLOADING', {
@@ -29,7 +35,7 @@ export class OfflineContentsUploader {
     });
 
     uploader.on('progress', (progress: number) => {
-      this.progressTracker.uploadProgress(name, extension, size, {
+      this.progressTracker.uploadProgress(path.name(), path.extension(), size, {
         elapsedTime: uploader.elapsedTime(),
         progress,
       });
@@ -39,27 +45,34 @@ export class OfflineContentsUploader {
     });
 
     uploader.on('error', (error: Error) => {
-      this.progressTracker.uploadError(name, extension, error.message);
+      this.progressTracker.uploadError(
+        path.name(),
+        path.extension(),
+        error.message
+      );
       Logger.debug('FILE_UPLOAD_ERROR', {
         error: error.message,
       });
     });
 
     uploader.on('finish', () => {
-      this.progressTracker.uploadCompleted(name, extension, size, {
-        elapsedTime: uploader.elapsedTime(),
-      });
+      this.progressTracker.uploadCompleted(
+        path.name(),
+        path.extension(),
+        size,
+        {
+          elapsedTime: uploader.elapsedTime(),
+        }
+      );
       Logger.debug('FILE_UPLOADED', {
         processInfo: { elapsedTime: uploader.elapsedTime() },
       });
     });
   }
 
-  async run(
-    name: string,
-    extension: string,
-    absolutePath: string
-  ): Promise<string> {
+  async run(name: OfflineFileId, path: FilePath): Promise<string> {
+    const absolutePath = await this.offlineContentsPathCalculator.run(name);
+
     const {
       contents: readable,
       abortSignal,
@@ -68,12 +81,21 @@ export class OfflineContentsUploader {
 
     const uploader = this.contentsManagersFactory.uploader(size, abortSignal);
 
-    this.registerEvents(name, extension, size, uploader);
+    this.registerEvents(path, size, uploader);
 
     const contentsId = await uploader.upload(readable, size);
 
     Logger.debug('FILE UPLOADED WITH ID: ', contentsId);
 
+    const contentsUploadedEvent = new OfflineContentsUploadedDomainEvent({
+      aggregateId: contentsId,
+      offlineContentsPath: absolutePath,
+      size,
+      path: path.value,
+    });
+
+    await this.eventBus.publish([contentsUploadedEvent]);
+
     return contentsId;
   }
 }
diff --git a/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts b/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts
index 1de196948..39c85e4ab 100644
--- a/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts
+++ b/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts
@@ -1,12 +1,12 @@
 import { Readable } from 'stream';
-import { OfflineFileAttributes } from '../../files/domain/OfflineFile';
+import { OfflineFile } from '../../files/domain/OfflineFile';
 
 export interface OfflineContentsRepository {
-  writeToFile(id: OfflineFileAttributes['id'], buffer: Buffer): Promise<void>;
+  writeToFile(id: OfflineFile['id'], buffer: Buffer): Promise<void>;
 
-  createEmptyFile(id: OfflineFileAttributes['id']): Promise<void>;
+  createEmptyFile(id: OfflineFile['id']): Promise<void>;
 
-  getAbsolutePath(id: OfflineFileAttributes['id']): Promise<string>;
+  getAbsolutePath(id: OfflineFile['id']): Promise<string>;
 
   provide: (path: string) => Promise<{
     contents: Readable;
diff --git a/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts b/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
index 49fae1502..058fb6e2c 100644
--- a/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
+++ b/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
@@ -1,7 +1,7 @@
 import fs, { createReadStream, watch } from 'fs';
 import { stat as statPromises } from 'fs/promises';
 import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
-import { OfflineFileAttributes } from '../../files/domain/OfflineFile';
+import { OfflineFile } from '../../files/domain/OfflineFile';
 import { LocalFileContentsDirectoryProvider } from '../../../virtual-drive/shared/domain/LocalFileContentsDirectoryProvider';
 import path from 'path';
 import Logger from 'electron-log';
@@ -21,10 +21,10 @@ export class NodeFSOfflineContentsRepository
     return path.join(location, this.subfolder);
   }
 
-  private async filePath(id: string): Promise<string> {
+  private async filePath(id: OfflineFile['id']): Promise<string> {
     const folder = await this.folderPath();
 
-    return path.join(folder, id);
+    return path.join(folder, id.value);
   }
 
   private createAbortableStream(filePath: string): {
@@ -44,16 +44,13 @@ export class NodeFSOfflineContentsRepository
     fs.mkdirSync(folder, { recursive: true });
   }
 
-  async writeToFile(
-    id: OfflineFileAttributes['id'],
-    buffer: Buffer
-  ): Promise<void> {
+  async writeToFile(id: OfflineFile['id'], buffer: Buffer): Promise<void> {
     const file = await this.filePath(id);
 
     fs.appendFileSync(file, buffer);
   }
 
-  async createEmptyFile(id: string): Promise<void> {
+  async createEmptyFile(id: OfflineFile['id']): Promise<void> {
     const file = await this.filePath(id);
 
     return new Promise((resolve) => {
@@ -68,7 +65,7 @@ export class NodeFSOfflineContentsRepository
     });
   }
 
-  async getAbsolutePath(id: string): Promise<string> {
+  async getAbsolutePath(id: OfflineFile['id']): Promise<string> {
     return this.filePath(id);
   }
 
diff --git a/src/context/offline-drive/files/application/OfflineFileCreator.ts b/src/context/offline-drive/files/application/OfflineFileCreator.ts
index 4b446eefc..68428a6f3 100644
--- a/src/context/offline-drive/files/application/OfflineFileCreator.ts
+++ b/src/context/offline-drive/files/application/OfflineFileCreator.ts
@@ -1,8 +1,8 @@
 import { FilePath } from '../../../virtual-drive/files/domain/FilePath';
-import { FileSize } from '../../../virtual-drive/files/domain/FileSize';
 import { EventBus } from '../../../virtual-drive/shared/domain/EventBus';
 import { OfflineFile } from '../domain/OfflineFile';
 import { OfflineFileRepository } from '../domain/OfflineFileRepository';
+import { OfflineFileSize } from '../domain/OfflineFileSize';
 
 export class OfflineFileCreator {
   constructor(
@@ -12,7 +12,7 @@ export class OfflineFileCreator {
 
   async run(path: string): Promise<OfflineFile> {
     const filePath = new FilePath(path);
-    const size = new FileSize(0);
+    const size = new OfflineFileSize(0);
 
     const file = OfflineFile.create(filePath, size);
 
diff --git a/src/context/offline-drive/files/application/OfflineFileSizeIncreaser.ts b/src/context/offline-drive/files/application/OfflineFileSizeIncreaser.ts
index f8f4a59eb..3215d1692 100644
--- a/src/context/offline-drive/files/application/OfflineFileSizeIncreaser.ts
+++ b/src/context/offline-drive/files/application/OfflineFileSizeIncreaser.ts
@@ -1,10 +1,11 @@
+import { OfflineFileId } from '../domain/OfflineFileId';
 import { OfflineFileRepository } from '../domain/OfflineFileRepository';
 
 export class OfflineFileSizeIncreaser {
   constructor(private readonly repository: OfflineFileRepository) {}
 
-  async run(id: string, amount: number): Promise<void> {
-    const file = await this.repository.searchByPartial({ id });
+  async run(id: OfflineFileId, amount: number): Promise<void> {
+    const file = await this.repository.searchByPartial({ id: id.value });
 
     if (!file) {
       throw new Error('Offline file not found');
diff --git a/src/context/offline-drive/files/domain/OfflineFile.ts b/src/context/offline-drive/files/domain/OfflineFile.ts
index b24934821..906a2605e 100644
--- a/src/context/offline-drive/files/domain/OfflineFile.ts
+++ b/src/context/offline-drive/files/domain/OfflineFile.ts
@@ -20,21 +20,23 @@ export class OfflineFile extends AggregateRoot {
     super();
   }
 
-  public get id(): string {
-    return this._id.value;
+  public get id() {
+    return this._id;
   }
-  public get createdAt(): Date {
+  public get createdAt() {
     return this._createdAt;
   }
   public get path() {
-    return this._path.value;
+    return this._path;
   }
   public get size() {
-    return this._size.value;
+    return this._size;
   }
+
   public get name() {
     return this._path.name();
   }
+
   public get extension() {
     return this._path.extension();
   }
@@ -58,17 +60,15 @@ export class OfflineFile extends AggregateRoot {
   }
 
   increaseSizeBy(bytes: number): void {
-    const newSize = this.size + bytes;
-
-    this._size = new OfflineFileSize(newSize);
+    this._size = this._size.increment(bytes);
   }
 
   attributes(): OfflineFileAttributes {
     return {
-      id: this.id,
-      createdAt: this.createdAt,
-      path: this.path,
-      size: this.size,
+      id: this._id.value,
+      createdAt: this._createdAt,
+      path: this._path.value,
+      size: this._size.value,
     };
   }
 }
diff --git a/src/context/offline-drive/files/domain/OfflineFileRepository.ts b/src/context/offline-drive/files/domain/OfflineFileRepository.ts
index 7fc8b4ace..ccfdd8ec1 100644
--- a/src/context/offline-drive/files/domain/OfflineFileRepository.ts
+++ b/src/context/offline-drive/files/domain/OfflineFileRepository.ts
@@ -7,5 +7,5 @@ export interface OfflineFileRepository {
     partial: Partial<OfflineFileAttributes>
   ): Promise<OfflineFile | undefined>;
 
-  delete(id: OfflineFileAttributes['id']): Promise<void>;
+  delete(id: OfflineFile['id']): Promise<void>;
 }
diff --git a/src/context/offline-drive/files/domain/OfflineFileSize.ts b/src/context/offline-drive/files/domain/OfflineFileSize.ts
index 40397925f..7446410e9 100644
--- a/src/context/offline-drive/files/domain/OfflineFileSize.ts
+++ b/src/context/offline-drive/files/domain/OfflineFileSize.ts
@@ -1,3 +1,7 @@
 import { BucketEntry } from '../../../shared/domain/value-objects/BucketEntry';
 
-export class OfflineFileSize extends BucketEntry {}
+export class OfflineFileSize extends BucketEntry {
+  increment(bytes: number): OfflineFileSize {
+    return new OfflineFileSize(this.value + bytes);
+  }
+}
diff --git a/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts b/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts
index 990646496..c1b94af46 100644
--- a/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts
+++ b/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts
@@ -1,8 +1,9 @@
 import { OfflineFile, OfflineFileAttributes } from '../domain/OfflineFile';
+import { OfflineFileId } from '../domain/OfflineFileId';
 import { OfflineFileRepository } from '../domain/OfflineFileRepository';
 
 export class InMemoryOfflineFileRepository implements OfflineFileRepository {
-  private readonly files = new Map<string, OfflineFileAttributes>();
+  private readonly files = new Map<OfflineFileId, OfflineFileAttributes>();
 
   async save(file: OfflineFile): Promise<void> {
     this.files.set(file.id, file.attributes());
@@ -30,7 +31,7 @@ export class InMemoryOfflineFileRepository implements OfflineFileRepository {
     return OfflineFile.from(file);
   }
 
-  async delete(id: OfflineFileAttributes['id']): Promise<void> {
+  async delete(id: OfflineFile['id']): Promise<void> {
     this.files.delete(id);
   }
 }
diff --git a/src/context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator.ts b/src/context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator.ts
index 98a033698..f39291c51 100644
--- a/src/context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator.ts
+++ b/src/context/virtual-drive/boundaryBridge/application/FileCreationOrchestrator.ts
@@ -25,7 +25,7 @@ export class FileCreationOrchestrator {
     const fileContents = await this.contentsUploader.run(posixRelativePath);
 
     const createdFile = await this.fileCreator.run(
-      path.value,
+      path,
       fileContents.id,
       fileContents.size
     );
diff --git a/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts b/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts
index b347ca8cc..87b4457c8 100644
--- a/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts
+++ b/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts
@@ -1,6 +1,7 @@
 import { OfflineContentsUploadedDomainEvent } from '../../../offline-drive/contents/domain/events/OfflineContentsUploadedDomainEvent';
 import { DomainEventClass } from '../../../shared/domain/DomainEvent';
 import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
+import { FilePath } from '../domain/FilePath';
 import { FileCreator } from './FileCreator';
 
 export class CreateFileOnOfflineFileUploaded
@@ -13,6 +14,8 @@ export class CreateFileOnOfflineFileUploaded
   }
 
   async on(event: OfflineContentsUploadedDomainEvent): Promise<void> {
-    await this.creator.run(event.path, event.aggregateId, event.size);
+    const filePath = new FilePath(event.path);
+
+    await this.creator.run(filePath, event.aggregateId, event.size);
   }
 }
diff --git a/src/context/virtual-drive/files/application/FileCreator.ts b/src/context/virtual-drive/files/application/FileCreator.ts
index cde683228..a6e236895 100644
--- a/src/context/virtual-drive/files/application/FileCreator.ts
+++ b/src/context/virtual-drive/files/application/FileCreator.ts
@@ -21,10 +21,12 @@ export class FileCreator {
     private readonly notifier: SyncFileMessenger
   ) {}
 
-  async run(path: string, contentsId: string, size: number): Promise<File> {
+  async run(
+    filePath: FilePath,
+    contentsId: string,
+    size: number
+  ): Promise<File> {
     try {
-      const filePath = new FilePath(path);
-
       const existingFile = this.repository.searchByPartial({
         path: PlatformPathConverter.winToPosix(filePath.value),
         status: FileStatuses.EXISTS,
@@ -58,8 +60,6 @@ export class FileCreator {
       const message =
         error instanceof Error ? error.message : '[File Creator] unknown error';
 
-      const filePath = new FilePath(path);
-
       await this.notifier.errorWhileCreating(
         filePath.name(),
         filePath.extension(),
diff --git a/tests/context/offline-drive/files/__mocks__/OfflineFileRepositoryMock.ts b/tests/context/offline-drive/files/__mocks__/OfflineFileRepositoryMock.ts
index 41e279dcf..f33fa6350 100644
--- a/tests/context/offline-drive/files/__mocks__/OfflineFileRepositoryMock.ts
+++ b/tests/context/offline-drive/files/__mocks__/OfflineFileRepositoryMock.ts
@@ -2,6 +2,7 @@ import {
   OfflineFile,
   OfflineFileAttributes,
 } from '../../../../../src/context/offline-drive/files/domain/OfflineFile';
+import { OfflineFileId } from '../../../../../src/context/offline-drive/files/domain/OfflineFileId';
 import { OfflineFileRepository } from '../../../../../src/context/offline-drive/files/domain/OfflineFileRepository';
 
 export class OfflineFileRepositoryMock implements OfflineFileRepository {
@@ -17,7 +18,8 @@ export class OfflineFileRepositoryMock implements OfflineFileRepository {
   ): Promise<OfflineFile | undefined> {
     return this.searchByPartialMock(partial);
   }
-  delete(id: string): Promise<void> {
+
+  delete(id: OfflineFileId): Promise<void> {
     return this.deleteMock(id);
   }
 }
diff --git a/tests/context/offline-drive/files/application/OfflineFileSizeIncreaser.test.ts b/tests/context/offline-drive/files/application/OfflineFileSizeIncreaser.test.ts
index 577d69981..c8af7d93e 100644
--- a/tests/context/offline-drive/files/application/OfflineFileSizeIncreaser.test.ts
+++ b/tests/context/offline-drive/files/application/OfflineFileSizeIncreaser.test.ts
@@ -1,6 +1,5 @@
 import { OfflineFileSizeIncreaser } from '../../../../../src/context/offline-drive/files/application/OfflineFileSizeIncreaser';
 import { OfflineFile } from '../../../../../src/context/offline-drive/files/domain/OfflineFile';
-import { FileSize } from '../../../../../src/context/virtual-drive/files/domain/FileSize';
 import { OfflineFileRepositoryMock } from '../__mocks__/OfflineFileRepositoryMock';
 import { OfflineFileIdMother } from '../domain/OfflineFileIdMother';
 import { OfflineFileMother } from '../domain/OfflineFileMother';
@@ -26,10 +25,10 @@ describe('Offline File Size Increaser', () => {
       OfflineFile.from(file.attributes())
     );
 
-    await SUT.run(id.value, amount);
+    await SUT.run(id, amount);
 
     expect(repository.saveMock).toBeCalledWith(
-      expect.objectContaining({ _size: new FileSize(file.size + amount) })
+      expect.objectContaining({ _size: file.size.increment(amount) })
     );
   });
 });
diff --git a/tests/context/virtual-drive/files/application/FileCreator.test.ts b/tests/context/virtual-drive/files/application/FileCreator.test.ts
index 3076ef382..720122295 100644
--- a/tests/context/virtual-drive/files/application/FileCreator.test.ts
+++ b/tests/context/virtual-drive/files/application/FileCreator.test.ts
@@ -53,7 +53,7 @@ describe('File Creator', () => {
 
     remoteFileSystemMock.persistMock.mockResolvedValueOnce(fileAttributes);
 
-    await SUT.run(path.value, contents.id, contents.size);
+    await SUT.run(path, contents.id, contents.size);
 
     expect(fileRepository.addMock).toBeCalledWith(
       expect.objectContaining({
@@ -76,7 +76,7 @@ describe('File Creator', () => {
 
     remoteFileSystemMock.persistMock.mockResolvedValueOnce(fileAttributes);
 
-    await SUT.run(path.value, contents.id, contents.size);
+    await SUT.run(path, contents.id, contents.size);
 
     expect(eventBus.publishMock.mock.calls[0][0][0].eventName).toBe(
       'file.created'
@@ -109,7 +109,7 @@ describe('File Creator', () => {
       // returns Promise<void>
     });
 
-    await SUT.run(path.value, contents.id, contents.size);
+    await SUT.run(path, contents.id, contents.size);
 
     expect(deleterSpy).toBeCalledWith(existingFile.contentsId);
 

From 5db0127bb47022f3c95a2ececb2e7966b3f6bfc4 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 29 Jan 2024 16:08:46 +0100
Subject: [PATCH 169/188] fix: use scalar as key to repo

---
 .../files/infrastructure/InMemoryOfflineFileRepository.ts  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts b/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts
index c1b94af46..88d15cd37 100644
--- a/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts
+++ b/src/context/offline-drive/files/infrastructure/InMemoryOfflineFileRepository.ts
@@ -1,12 +1,11 @@
 import { OfflineFile, OfflineFileAttributes } from '../domain/OfflineFile';
-import { OfflineFileId } from '../domain/OfflineFileId';
 import { OfflineFileRepository } from '../domain/OfflineFileRepository';
 
 export class InMemoryOfflineFileRepository implements OfflineFileRepository {
-  private readonly files = new Map<OfflineFileId, OfflineFileAttributes>();
+  private readonly files = new Map<string, OfflineFileAttributes>();
 
   async save(file: OfflineFile): Promise<void> {
-    this.files.set(file.id, file.attributes());
+    this.files.set(file.id.value, file.attributes());
   }
 
   async searchByPartial(
@@ -32,6 +31,6 @@ export class InMemoryOfflineFileRepository implements OfflineFileRepository {
   }
 
   async delete(id: OfflineFile['id']): Promise<void> {
-    this.files.delete(id);
+    this.files.delete(id.value);
   }
 }

From 64b721145ee1f491428b47727a7c3bb62fb44756 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 29 Jan 2024 16:17:24 +0100
Subject: [PATCH 170/188] chore: logger changes

---
 .../contents/application/OfflineContentsUploader.ts          | 5 -----
 .../virtual-drive/contents/application/LocalContentsMover.ts | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/context/offline-drive/contents/application/OfflineContentsUploader.ts b/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
index 259289ca0..39db2c7da 100644
--- a/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
+++ b/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
@@ -64,9 +64,6 @@ export class OfflineContentsUploader {
           elapsedTime: uploader.elapsedTime(),
         }
       );
-      Logger.debug('FILE_UPLOADED', {
-        processInfo: { elapsedTime: uploader.elapsedTime() },
-      });
     });
   }
 
@@ -85,8 +82,6 @@ export class OfflineContentsUploader {
 
     const contentsId = await uploader.upload(readable, size);
 
-    Logger.debug('FILE UPLOADED WITH ID: ', contentsId);
-
     const contentsUploadedEvent = new OfflineContentsUploadedDomainEvent({
       aggregateId: contentsId,
       offlineContentsPath: absolutePath,
diff --git a/src/context/virtual-drive/contents/application/LocalContentsMover.ts b/src/context/virtual-drive/contents/application/LocalContentsMover.ts
index b78d9febe..ebc267591 100644
--- a/src/context/virtual-drive/contents/application/LocalContentsMover.ts
+++ b/src/context/virtual-drive/contents/application/LocalContentsMover.ts
@@ -6,8 +6,6 @@ export class LocalContentsMover {
   constructor(private readonly fileSystem: LocalFileSystem) {}
 
   async run(contentsId: ContentsId, src: string): Promise<void> {
-    Logger.debug('LocalContentsMover contentsId', contentsId, 'src', src);
-
     const exists = await this.fileSystem.exists(contentsId);
 
     if (exists) {
@@ -15,5 +13,7 @@ export class LocalContentsMover {
     }
 
     await this.fileSystem.add(contentsId, src);
+
+    Logger.info('Added', contentsId.value, 'to offline files contents cache');
   }
 }

From 5e1dbe63acd4f14b8979f5000da76acf35c607b8 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 29 Jan 2024 17:34:42 +0100
Subject: [PATCH 171/188] chore: simplify upload use case

---
 .../offlineContentsContainerBuilder.ts        | 15 ++--
 .../OfflineContentsPathCalculator.ts          | 10 ---
 .../application/OfflineContentsUploader.ts    | 89 ++++---------------
 .../contents/domain/OfflineContents.ts        | 32 ++-----
 .../domain/OfflineContentsManagersFactory.ts  | 22 ++---
 ...neContentsId.ts => OfflineContentsName.ts} |  2 +-
 .../domain/OfflineContentsRepository.ts       | 10 ++-
 .../EnvironmentOfflineContentsUploader.ts     |  9 +-
 ...onmentRemoteFileContentsManagersFactory.ts | 53 +++++++++--
 .../NodeFSOfflineContentsRepository.ts        | 28 ++++--
 10 files changed, 122 insertions(+), 148 deletions(-)
 delete mode 100644 src/context/offline-drive/contents/application/OfflineContentsPathCalculator.ts
 rename src/context/offline-drive/contents/domain/{OfflineContentsId.ts => OfflineContentsName.ts} (57%)

diff --git a/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts b/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
index eee146bcc..9d7513f19 100644
--- a/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
+++ b/src/apps/fuse/dependency-injection/offline/OfflineContents/offlineContentsContainerBuilder.ts
@@ -1,6 +1,5 @@
 import { OfflineContentsAppender } from '../../../../../context/offline-drive/contents/application/OfflineContentsAppender';
 import { OfflineContentsCreator } from '../../../../../context/offline-drive/contents/application/OfflineContentsCreator';
-import { OfflineContentsPathCalculator } from '../../../../../context/offline-drive/contents/application/OfflineContentsPathCalculator';
 import { OfflineContentsUploader } from '../../../../../context/offline-drive/contents/application/OfflineContentsUploader';
 import { EnvironmentOfflineContentsManagersFactory } from '../../../../../context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
 import { NodeFSOfflineContentsRepository } from '../../../../../context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository';
@@ -36,18 +35,16 @@ export async function buildOfflineContentsContainer(
     repository
   );
 
-  const offlineContentsPathCalculator = new OfflineContentsPathCalculator(
-    repository
-  );
-
   const environmentOfflineContentsManagersFactory =
-    new EnvironmentOfflineContentsManagersFactory(environment, user.bucket);
+    new EnvironmentOfflineContentsManagersFactory(
+      environment,
+      user.bucket,
+      tracker
+    );
 
   const offlineContentsUploader = new OfflineContentsUploader(
-    offlineContentsPathCalculator,
-    environmentOfflineContentsManagersFactory,
     repository,
-    tracker,
+    environmentOfflineContentsManagersFactory,
     eventBus
   );
 
diff --git a/src/context/offline-drive/contents/application/OfflineContentsPathCalculator.ts b/src/context/offline-drive/contents/application/OfflineContentsPathCalculator.ts
deleted file mode 100644
index b52ec3b88..000000000
--- a/src/context/offline-drive/contents/application/OfflineContentsPathCalculator.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { OfflineFileId } from '../../files/domain/OfflineFileId';
-import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
-
-export class OfflineContentsPathCalculator {
-  constructor(private readonly repository: OfflineContentsRepository) {}
-
-  async run(id: OfflineFileId): Promise<string> {
-    return this.repository.getAbsolutePath(id);
-  }
-}
diff --git a/src/context/offline-drive/contents/application/OfflineContentsUploader.ts b/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
index 39db2c7da..f87426f68 100644
--- a/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
+++ b/src/context/offline-drive/contents/application/OfflineContentsUploader.ts
@@ -1,91 +1,36 @@
-import { UploadProgressTracker } from '../../../shared/domain/UploadProgressTracker';
 import { EventBus } from '../../../virtual-drive/shared/domain/EventBus';
-import {
-  OfflineContentUploader,
-  OfflineContentsManagersFactory,
-} from '../domain/OfflineContentsManagersFactory';
+import { OfflineContentsManagersFactory } from '../domain/OfflineContentsManagersFactory';
 import { OfflineContentsRepository } from '../domain/OfflineContentsRepository';
-import Logger from 'electron-log';
-import { OfflineContentsPathCalculator } from './OfflineContentsPathCalculator';
 import { OfflineContentsUploadedDomainEvent } from '../domain/events/OfflineContentsUploadedDomainEvent';
 import { FilePath } from '../../../virtual-drive/files/domain/FilePath';
-import { OfflineFileId } from '../../files/domain/OfflineFileId';
+import { OfflineContentsName } from '../domain/OfflineContentsName';
 
 export class OfflineContentsUploader {
   constructor(
-    private readonly offlineContentsPathCalculator: OfflineContentsPathCalculator,
-    private readonly contentsManagersFactory: OfflineContentsManagersFactory,
     private readonly repository: OfflineContentsRepository,
-    private readonly progressTracker: UploadProgressTracker,
+    private readonly contentsManagersFactory: OfflineContentsManagersFactory,
     private readonly eventBus: EventBus
   ) {}
 
-  private registerEvents(
-    path: FilePath,
-    size: number,
-    uploader: OfflineContentUploader
-  ) {
-    uploader.on('start', () => {
-      this.progressTracker.uploadStarted(path.name(), path.extension(), size, {
-        elapsedTime: uploader.elapsedTime(),
-      });
-      Logger.debug('FILE_UPLOADING', {
-        processInfo: { elapsedTime: uploader.elapsedTime() },
-      });
-    });
-
-    uploader.on('progress', (progress: number) => {
-      this.progressTracker.uploadProgress(path.name(), path.extension(), size, {
-        elapsedTime: uploader.elapsedTime(),
-        progress,
-      });
-      Logger.debug('FILE_UPLOADING', {
-        processInfo: { elapsedTime: uploader.elapsedTime(), progress },
-      });
-    });
-
-    uploader.on('error', (error: Error) => {
-      this.progressTracker.uploadError(
-        path.name(),
-        path.extension(),
-        error.message
-      );
-      Logger.debug('FILE_UPLOAD_ERROR', {
-        error: error.message,
-      });
-    });
-
-    uploader.on('finish', () => {
-      this.progressTracker.uploadCompleted(
-        path.name(),
-        path.extension(),
-        size,
-        {
-          elapsedTime: uploader.elapsedTime(),
-        }
-      );
-    });
-  }
-
-  async run(name: OfflineFileId, path: FilePath): Promise<string> {
-    const absolutePath = await this.offlineContentsPathCalculator.run(name);
-
-    const {
-      contents: readable,
-      abortSignal,
-      size,
-    } = await this.repository.provide(absolutePath);
-
-    const uploader = this.contentsManagersFactory.uploader(size, abortSignal);
+  async run(name: OfflineContentsName, path: FilePath): Promise<string> {
+    const { contents, stream, abortSignal } = await this.repository.read(name);
 
-    this.registerEvents(path, size, uploader);
+    const uploader = this.contentsManagersFactory.uploader(
+      stream,
+      contents,
+      {
+        name: path.name(),
+        extension: path.extension(),
+      },
+      abortSignal
+    );
 
-    const contentsId = await uploader.upload(readable, size);
+    const contentsId = await uploader();
 
     const contentsUploadedEvent = new OfflineContentsUploadedDomainEvent({
       aggregateId: contentsId,
-      offlineContentsPath: absolutePath,
-      size,
+      offlineContentsPath: contents.absolutePath,
+      size: contents.size,
       path: path.value,
     });
 
diff --git a/src/context/offline-drive/contents/domain/OfflineContents.ts b/src/context/offline-drive/contents/domain/OfflineContents.ts
index c601d8efa..78cf64f7d 100644
--- a/src/context/offline-drive/contents/domain/OfflineContents.ts
+++ b/src/context/offline-drive/contents/domain/OfflineContents.ts
@@ -1,39 +1,26 @@
-import { Readable } from 'stream';
 import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
+import { OfflineContentsName } from './OfflineContentsName';
 import { OfflineContentsSize } from './OfflineContentsSize';
 
 export type LocalFileContentsAttributes = {
   name: string;
-  extension: string;
   size: number;
   birthTime: number;
   modifiedTime: number;
-  contents: Readable;
+  absolutePath: string;
 };
 
 export class OfflineContents extends AggregateRoot {
   private constructor(
-    private readonly _name: string,
-    private readonly _extension: string,
+    private _name: OfflineContentsName,
     private readonly _size: OfflineContentsSize,
     private readonly _birthTime: number,
     private readonly _modifiedTime: number,
-    public readonly stream: Readable
+    public readonly absolutePath: string
   ) {
     super();
   }
 
-  public get name(): string {
-    return this._name;
-  }
-  public get extension(): string {
-    return this._extension;
-  }
-
-  public get nameWithExtension(): string {
-    return this.name + (this.extension.length >= 0 ? '.' + this.extension : '');
-  }
-
   public get size(): number {
     return this._size.value;
   }
@@ -48,24 +35,23 @@ export class OfflineContents extends AggregateRoot {
 
   static from(attributes: LocalFileContentsAttributes): OfflineContents {
     const remoteContents = new OfflineContents(
-      attributes.name,
-      attributes.extension,
+      new OfflineContentsName(attributes.name),
       new OfflineContentsSize(attributes.size),
       attributes.birthTime,
       attributes.modifiedTime,
-      attributes.contents
+      attributes.absolutePath
     );
 
     return remoteContents;
   }
 
-  attributes(): Omit<LocalFileContentsAttributes, 'contents'> {
+  attributes(): LocalFileContentsAttributes {
     return {
-      name: this.name,
-      extension: this.extension,
+      name: this._name.value,
       size: this.size,
       birthTime: this.birthTime,
       modifiedTime: this.modifiedTime,
+      absolutePath: this.absolutePath,
     };
   }
 }
diff --git a/src/context/offline-drive/contents/domain/OfflineContentsManagersFactory.ts b/src/context/offline-drive/contents/domain/OfflineContentsManagersFactory.ts
index fc1b14c78..8b2771665 100644
--- a/src/context/offline-drive/contents/domain/OfflineContentsManagersFactory.ts
+++ b/src/context/offline-drive/contents/domain/OfflineContentsManagersFactory.ts
@@ -1,4 +1,5 @@
 import { Readable } from 'stream';
+import { OfflineContents } from './OfflineContents';
 
 type ContentsId = string;
 
@@ -9,17 +10,16 @@ export type OfflineContentsUploadEvents = {
   error: (error: Error) => void;
 };
 
-export interface OfflineContentUploader {
-  upload(contents: Readable, size: number): Promise<ContentsId>;
-
-  on(
-    event: keyof OfflineContentsUploadEvents,
-    fn: OfflineContentsUploadEvents[keyof OfflineContentsUploadEvents]
-  ): void;
-
-  elapsedTime(): number;
-}
+export type OfflineContentUploader = () => Promise<string>;
 
 export interface OfflineContentsManagersFactory {
-  uploader(size: number, abortSignal?: AbortSignal): OfflineContentUploader;
+  uploader(
+    readable: Readable,
+    contents: OfflineContents,
+    desiredPathElements: {
+      name: string;
+      extension: string;
+    },
+    abortSignal?: AbortSignal
+  ): OfflineContentUploader;
 }
diff --git a/src/context/offline-drive/contents/domain/OfflineContentsId.ts b/src/context/offline-drive/contents/domain/OfflineContentsName.ts
similarity index 57%
rename from src/context/offline-drive/contents/domain/OfflineContentsId.ts
rename to src/context/offline-drive/contents/domain/OfflineContentsName.ts
index f71728522..5ceffe230 100644
--- a/src/context/offline-drive/contents/domain/OfflineContentsId.ts
+++ b/src/context/offline-drive/contents/domain/OfflineContentsName.ts
@@ -1,3 +1,3 @@
 import { Uuid } from '../../../shared/domain/value-objects/Uuid';
 
-export class OfflineContentsId extends Uuid {}
+export class OfflineContentsName extends Uuid {}
diff --git a/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts b/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts
index 39c85e4ab..845dd9bcf 100644
--- a/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts
+++ b/src/context/offline-drive/contents/domain/OfflineContentsRepository.ts
@@ -1,16 +1,18 @@
 import { Readable } from 'stream';
 import { OfflineFile } from '../../files/domain/OfflineFile';
+import { OfflineContents } from './OfflineContents';
+import { OfflineContentsName } from './OfflineContentsName';
 
 export interface OfflineContentsRepository {
   writeToFile(id: OfflineFile['id'], buffer: Buffer): Promise<void>;
 
   createEmptyFile(id: OfflineFile['id']): Promise<void>;
 
-  getAbsolutePath(id: OfflineFile['id']): Promise<string>;
+  getAbsolutePath(id: OfflineContentsName): Promise<string>;
 
-  provide: (path: string) => Promise<{
-    contents: Readable;
-    size: number;
+  read: (offlineContentsName: OfflineContentsName) => Promise<{
+    contents: OfflineContents;
+    stream: Readable;
     abortSignal: AbortSignal;
   }>;
 }
diff --git a/src/context/offline-drive/contents/infrastructure/EnvironmentOfflineContentsUploader.ts b/src/context/offline-drive/contents/infrastructure/EnvironmentOfflineContentsUploader.ts
index f8959539b..1997a3f16 100644
--- a/src/context/offline-drive/contents/infrastructure/EnvironmentOfflineContentsUploader.ts
+++ b/src/context/offline-drive/contents/infrastructure/EnvironmentOfflineContentsUploader.ts
@@ -1,14 +1,9 @@
 import { UploadStrategyFunction } from '@internxt/inxt-js/build/lib/core/upload/strategy';
 import { EventEmitter, Readable } from 'stream';
 import { Stopwatch } from '../../../../apps/shared/types/Stopwatch';
-import {
-  OfflineContentUploader,
-  OfflineContentsUploadEvents,
-} from '../domain/OfflineContentsManagersFactory';
+import { OfflineContentsUploadEvents } from '../domain/OfflineContentsManagersFactory';
 
-export class EnvironmentOfflineContentsUploader
-  implements OfflineContentUploader
-{
+export class EnvironmentOfflineContentsUploader {
   private eventEmitter: EventEmitter;
   private stopwatch: Stopwatch;
 
diff --git a/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts b/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
index edec548a2..1aac34998 100644
--- a/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
+++ b/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
@@ -4,6 +4,9 @@ import {
   OfflineContentsManagersFactory,
 } from '../domain/OfflineContentsManagersFactory';
 import { EnvironmentOfflineContentsUploader } from './EnvironmentOfflineContentsUploader';
+import { OfflineContents } from '../domain/OfflineContents';
+import { UploadProgressTracker } from '../../../shared/domain/UploadProgressTracker';
+import { Readable } from 'stream';
 
 export class EnvironmentOfflineContentsManagersFactory
   implements OfflineContentsManagersFactory
@@ -12,17 +15,57 @@ export class EnvironmentOfflineContentsManagersFactory
 
   constructor(
     private readonly environment: Environment,
-    private readonly bucket: string
+    private readonly bucket: string,
+    private readonly progressTracker: UploadProgressTracker
   ) {}
 
-  uploader(size: number, abortSignal?: AbortSignal): OfflineContentUploader {
-    size;
+  uploader(
+    stream: Readable,
+    contents: OfflineContents,
+    {
+      name,
+      extension,
+    }: {
+      name: string;
+      extension: string;
+    },
+    abortSignal?: AbortSignal
+  ): OfflineContentUploader {
     const fn =
-      size >
+      contents.size >
       EnvironmentOfflineContentsManagersFactory.MULTIPART_UPLOAD_SIZE_THRESHOLD
         ? this.environment.uploadMultipartFile
         : this.environment.upload;
 
-    return new EnvironmentOfflineContentsUploader(fn, this.bucket, abortSignal);
+    const uploader = new EnvironmentOfflineContentsUploader(
+      fn,
+      this.bucket,
+      abortSignal
+    );
+
+    uploader.on('start', () => {
+      this.progressTracker.uploadStarted(name, extension, contents.size, {
+        elapsedTime: uploader.elapsedTime(),
+      });
+    });
+
+    uploader.on('progress', (progress: number) => {
+      this.progressTracker.uploadProgress(name, extension, contents.size, {
+        elapsedTime: uploader.elapsedTime(),
+        progress,
+      });
+    });
+
+    uploader.on('error', (error: Error) => {
+      this.progressTracker.uploadError(name, extension, error.message);
+    });
+
+    uploader.on('finish', () => {
+      this.progressTracker.uploadCompleted(name, extension, contents.size, {
+        elapsedTime: uploader.elapsedTime(),
+      });
+    });
+
+    return () => uploader.upload(stream, contents.size);
   }
 }
diff --git a/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts b/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
index 058fb6e2c..fd0cf8537 100644
--- a/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
+++ b/src/context/offline-drive/contents/infrastructure/NodeFSOfflineContentsRepository.ts
@@ -6,6 +6,8 @@ import { LocalFileContentsDirectoryProvider } from '../../../virtual-drive/share
 import path from 'path';
 import Logger from 'electron-log';
 import { Readable } from 'stream';
+import { OfflineContents } from '../domain/OfflineContents';
+import { OfflineContentsName } from '../domain/OfflineContentsName';
 
 export class NodeFSOfflineContentsRepository
   implements OfflineContentsRepository
@@ -21,10 +23,10 @@ export class NodeFSOfflineContentsRepository
     return path.join(location, this.subfolder);
   }
 
-  private async filePath(id: OfflineFile['id']): Promise<string> {
+  private async filePath(name: OfflineContentsName): Promise<string> {
     const folder = await this.folderPath();
 
-    return path.join(folder, id.value);
+    return path.join(folder, name.value);
   }
 
   private createAbortableStream(filePath: string): {
@@ -69,11 +71,17 @@ export class NodeFSOfflineContentsRepository
     return this.filePath(id);
   }
 
-  async provide(absoluteFilePath: string) {
+  async read(offlineContentsName: OfflineContentsName): Promise<{
+    contents: OfflineContents;
+    stream: Readable;
+    abortSignal: AbortSignal;
+  }> {
+    const absoluteFilePath = await this.getAbsolutePath(offlineContentsName);
+
     const { readable, controller } =
       this.createAbortableStream(absoluteFilePath);
 
-    const { size } = await statPromises(absoluteFilePath);
+    const { size, mtimeMs, birthtimeMs } = await statPromises(absoluteFilePath);
 
     const absoluteFolderPath = path.dirname(absoluteFilePath);
     const nameWithExtension = path.basename(absoluteFilePath);
@@ -94,9 +102,17 @@ export class NodeFSOfflineContentsRepository
       watcher.close();
     });
 
-    return {
-      contents: readable,
+    const contents = OfflineContents.from({
+      name: offlineContentsName.value,
       size,
+      modifiedTime: mtimeMs,
+      birthTime: birthtimeMs,
+      absolutePath: absoluteFilePath,
+    });
+
+    return {
+      contents,
+      stream: readable,
       abortSignal: controller.signal,
     };
   }

From 6766dab6cc38f9d26102b9f4a7785c7f8eb5fadb Mon Sep 17 00:00:00 2001
From: Joan Vicens <joanvicens@proton.me>
Date: Thu, 1 Feb 2024 10:51:53 +0000
Subject: [PATCH 172/188] [PB-1412] feat: added main process download tracker
 (#448)

---
 package.json                                  |  1 +
 src/apps/fuse/callbacks/OpenCallback.ts       |  9 --
 .../virtual-drive/contents/builder.ts         |  6 +-
 .../dependency-injection/contents/builder.ts  |  6 +-
 .../shared/domain/DownloadProgressTracker.ts  | 21 ++++
 .../domain/value-objects/DateValueObject.ts   | 19 ++++
 .../MainProcessDownloadProgressTracker.ts     | 93 ++++++++++++++++++
 .../DownloadContentsToPlainFile.ts            | 51 +++++-----
 .../contents/domain/ContentsMetadata.ts       | 30 ++++++
 .../contents/domain/LocalFileSystem.ts        |  6 ++
 .../contentHandlers/ContentFileDownloader.ts  |  2 +-
 .../infrastructure/FSLocalFileSystem.ts       | 11 +++
 .../EnvironmentContentFileDownloader.ts       |  4 +-
 tests/context/shared/domain/DateMother.ts     | 25 +++++
 .../value-objects/DateValueObject.test.ts     | 78 +++++++++++++++
 .../__mocks__/ContentFileDownloaderMock.ts    |  4 +-
 .../contents/__mocks__/LocalFileWriterMock.ts |  5 +
 .../application/ContentsDownloader._test.ts   |  6 +-
 .../DownloadContentsToPlainFile.test.ts       | 74 ++++++++++++++
 .../contents/domain/ContentsMetadata.test.ts  | 17 ++++
 .../__mock__/DownloadProgressTrackerMock.ts   | 38 ++++++++
 yarn.lock                                     | 97 +++++++++++++------
 22 files changed, 531 insertions(+), 72 deletions(-)
 create mode 100644 src/context/shared/domain/DownloadProgressTracker.ts
 create mode 100644 src/context/shared/infrastructure/MainProcessDownloadProgressTracker.ts
 create mode 100644 src/context/virtual-drive/contents/domain/ContentsMetadata.ts
 create mode 100644 tests/context/shared/domain/DateMother.ts
 create mode 100644 tests/context/shared/domain/value-objects/DateValueObject.test.ts
 create mode 100644 tests/context/virtual-drive/contents/application/DownloadContentsToPlainFile.test.ts
 create mode 100644 tests/context/virtual-drive/contents/domain/ContentsMetadata.test.ts
 create mode 100644 tests/context/virtual-drive/shared/__mock__/DownloadProgressTrackerMock.ts

diff --git a/package.json b/package.json
index f2f93b8d4..3e92ca65b 100644
--- a/package.json
+++ b/package.json
@@ -229,6 +229,7 @@
     "jsonwebtoken": "^8.5.1",
     "lint-staged": "^12.1.4",
     "mini-css-extract-plugin": "^2.4.5",
+    "mockdate": "^3.0.5",
     "ms": "^2.1.3",
     "node-loader": "^2.0.0",
     "opencollective-postinstall": "^2.0.3",
diff --git a/src/apps/fuse/callbacks/OpenCallback.ts b/src/apps/fuse/callbacks/OpenCallback.ts
index 4c2b1cff5..e69ab9c1d 100644
--- a/src/apps/fuse/callbacks/OpenCallback.ts
+++ b/src/apps/fuse/callbacks/OpenCallback.ts
@@ -19,15 +19,6 @@ export class OpenCallback extends FuseCallback<number> {
       );
     }
 
-    const alreadyDownloaded = await this.container.localContentChecker.run(
-      file
-    );
-
-    if (alreadyDownloaded) {
-      Logger.debug(`"${file.nameWithExtension}" contents are already in local`);
-      return this.right(file.id);
-    }
-
     try {
       await this.container.downloadContentsToPlainFile.run(file);
 
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
index d18ee1ff5..b6fb13a9e 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/contents/builder.ts
@@ -16,6 +16,7 @@ import { MoveOfflineContentsOnContentsUploaded } from '../../../../../context/vi
 import { LocalContentsMover } from '../../../../../context/virtual-drive/contents/application/LocalContentsMover';
 import { AllLocalContentsDeleter } from '../../../../../context/virtual-drive/contents/application/AllLocalContentsDeleter';
 import { MainProcessUploadProgressTracker } from '../../../../../context/shared/infrastructure/MainProcessUploadProgressTracker';
+import { MainProcessDownloadProgressTracker } from '../../../../../context/shared/infrastructure/MainProcessDownloadProgressTracker';
 
 export async function buildContentsContainer(
   sharedContainer: SharedContainer
@@ -44,10 +45,13 @@ export async function buildContentsContainer(
     'downloaded'
   );
 
+  const tracker = new MainProcessDownloadProgressTracker();
+
   const downloadContentsToPlainFile = new DownloadContentsToPlainFile(
     contentsManagerFactory,
     localFS,
-    eventBus
+    eventBus,
+    tracker
   );
 
   const localContentChecker = new LocalContentChecker(localFS);
diff --git a/src/apps/hydration-api/dependency-injection/contents/builder.ts b/src/apps/hydration-api/dependency-injection/contents/builder.ts
index 32e6826c9..8876a20e3 100644
--- a/src/apps/hydration-api/dependency-injection/contents/builder.ts
+++ b/src/apps/hydration-api/dependency-injection/contents/builder.ts
@@ -8,6 +8,7 @@ import { FSLocalFileSystem } from '../../../../context/virtual-drive/contents/in
 import { DependencyInjectionEventBus } from '../common/eventBus';
 import { FuseAppDataLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/FuseAppDataLocalFileContentsDirectoryProvider';
 import { LocalContentsDeleter } from '../../../../context/virtual-drive/contents/application/LocalContentsDeleter';
+import { MainProcessDownloadProgressTracker } from '../../../../context/shared/infrastructure/MainProcessDownloadProgressTracker';
 
 export async function buildContentsContainer(): Promise<ContentsContainer> {
   const user = DependencyInjectionUserProvider.get();
@@ -32,10 +33,13 @@ export async function buildContentsContainer(): Promise<ContentsContainer> {
     'downloaded'
   );
 
+  const tracker = new MainProcessDownloadProgressTracker();
+
   const downloadContentsToPlainFile = new DownloadContentsToPlainFile(
     contentsManagerFactory,
     localFS,
-    eventBus
+    eventBus,
+    tracker
   );
 
   const localContentsDeleter = new LocalContentsDeleter(localFS);
diff --git a/src/context/shared/domain/DownloadProgressTracker.ts b/src/context/shared/domain/DownloadProgressTracker.ts
new file mode 100644
index 000000000..277a7cd57
--- /dev/null
+++ b/src/context/shared/domain/DownloadProgressTracker.ts
@@ -0,0 +1,21 @@
+export interface DownloadProgressTracker {
+  downloadStarted(name: string, extension: string, size: number): Promise<void>;
+  downloadUpdate(
+    name: string,
+    extension: string,
+    size: number,
+    progress: {
+      elapsedTime: number;
+      percentage: number;
+    }
+  ): Promise<void>;
+  downloadFinished(
+    name: string,
+    extension: string,
+    size: number,
+    progress: {
+      elapsedTime: number;
+    }
+  ): Promise<void>;
+  error(name: string, extension: string): Promise<void>;
+}
diff --git a/src/context/shared/domain/value-objects/DateValueObject.ts b/src/context/shared/domain/value-objects/DateValueObject.ts
index 6f6efb2de..704e95f4d 100644
--- a/src/context/shared/domain/value-objects/DateValueObject.ts
+++ b/src/context/shared/domain/value-objects/DateValueObject.ts
@@ -13,6 +13,25 @@ export class DateValueObject extends ValueObject<Date> {
     return new DateValueObject(date);
   }
 
+  isPrevious(than: Date): boolean {
+    return this.value < than;
+  }
+
+  isAfter(than: Date): boolean {
+    return this.value > than;
+  }
+
+  same(other: Date): boolean {
+    return this.value.getTime() === other.getTime();
+  }
+
+  equals(other: DateValueObject): boolean {
+    return (
+      other.constructor.name === this.constructor.name &&
+      other.value.getTime() === this.value.getTime()
+    );
+  }
+
   toISOString(): string {
     return this.value.toISOString();
   }
diff --git a/src/context/shared/infrastructure/MainProcessDownloadProgressTracker.ts b/src/context/shared/infrastructure/MainProcessDownloadProgressTracker.ts
new file mode 100644
index 000000000..f3fd7a0e0
--- /dev/null
+++ b/src/context/shared/infrastructure/MainProcessDownloadProgressTracker.ts
@@ -0,0 +1,93 @@
+import { trackError, trackEvent } from '../../../apps/main/analytics/service';
+import { setTrayStatus } from '../../../apps/main/tray/tray';
+import { broadcastToWindows } from '../../../apps/main/windows';
+import { DownloadProgressTracker } from '../domain/DownloadProgressTracker';
+import { SyncMessenger } from '../domain/SyncMessenger';
+
+export class MainProcessDownloadProgressTracker
+  extends SyncMessenger
+  implements DownloadProgressTracker
+{
+  async downloadStarted(
+    name: string,
+    extension: string,
+    size: number
+  ): Promise<void> {
+    setTrayStatus('SYNCING');
+
+    trackEvent('Upload Started', {
+      file_name: name,
+      file_extension: extension,
+      file_size: size,
+      elapsedTimeMs: 0,
+    });
+
+    broadcastToWindows('sync-info-update', {
+      action: 'DOWNLOADING',
+      name: this.nameWithExtension(name, extension),
+      progress: 0,
+    });
+  }
+
+  async downloadUpdate(
+    name: string,
+    extension: string,
+    size: number,
+    progress: { elapsedTime: number; percentage: number }
+  ): Promise<void> {
+    trackEvent('Upload Started', {
+      file_name: name,
+      file_extension: extension,
+      file_size: size,
+      elapsedTimeMs: progress.elapsedTime,
+    });
+
+    broadcastToWindows('sync-info-update', {
+      action: 'DOWNLOADING',
+      name: this.nameWithExtension(name, extension),
+      progress: progress.percentage,
+    });
+  }
+
+  async downloadFinished(
+    name: string,
+    extension: string,
+    size: number,
+    progress: {
+      elapsedTime: number;
+    }
+  ): Promise<void> {
+    const nameWithExtension = this.nameWithExtension(name, extension);
+
+    setTrayStatus('IDLE');
+
+    trackEvent('Upload Completed', {
+      file_name: name,
+      file_extension: extension,
+      file_size: size,
+      elapsedTimeMs: progress.elapsedTime,
+    });
+
+    broadcastToWindows('sync-info-update', {
+      action: 'UPLOADED',
+      name: nameWithExtension,
+    });
+  }
+
+  async error(name: string, extension: string): Promise<void> {
+    const nameWithExtension = this.nameWithExtension(name, extension);
+
+    // TODO: finish this
+    trackError('Upload Error', new Error(), {
+      itemType: 'File',
+      root: '',
+      from: name,
+      action: 'Upload',
+    });
+
+    broadcastToWindows('sync-info-update', {
+      action: 'DOWNLOAD_ERROR',
+      name: nameWithExtension,
+    });
+  }
+}
diff --git a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
index dc0efca53..75563363e 100644
--- a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
+++ b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
@@ -1,6 +1,7 @@
-import { broadcastToWindows } from '../../../../apps/main/windows';
+import { DownloadProgressTracker } from '../../../shared/domain/DownloadProgressTracker';
 import { File } from '../../files/domain/File';
 import { EventBus } from '../../shared/domain/EventBus';
+import { ContentsId } from '../domain/ContentsId';
 import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
 import { LocalFileContents } from '../domain/LocalFileContents';
 import { LocalFileSystem } from '../domain/LocalFileSystem';
@@ -10,43 +11,45 @@ import Logger from 'electron-log';
 export class DownloadContentsToPlainFile {
   constructor(
     private readonly managerFactory: ContentsManagersFactory,
-    private readonly localWriter: LocalFileSystem,
-    private readonly eventBus: EventBus
+    private readonly local: LocalFileSystem,
+    private readonly eventBus: EventBus,
+    private readonly tracker: DownloadProgressTracker
   ) {}
 
   private async registerEvents(downloader: ContentFileDownloader, file: File) {
     downloader.on('start', () => {
-      broadcastToWindows('sync-info-update', {
-        action: 'DOWNLOADING',
-        name: file.nameWithExtension,
-        progress: 0,
-      });
+      this.tracker.downloadStarted(file.name, file.type, file.size);
     });
 
-    downloader.on('progress', (progress: number) => {
-      broadcastToWindows('sync-info-update', {
-        action: 'DOWNLOADING',
-        name: file.nameWithExtension,
-        progress: progress,
+    downloader.on('progress', (progress: number, elapsedTime: number) => {
+      this.tracker.downloadUpdate(file.name, file.type, file.size, {
+        elapsedTime,
+        percentage: progress,
       });
     });
 
     downloader.on('error', () => {
-      broadcastToWindows('sync-info-update', {
-        action: 'DOWNLOAD_ERROR',
-        name: file.nameWithExtension,
-      });
+      this.tracker.error(file.name, file.type);
     });
 
-    downloader.on('finish', () => {
-      broadcastToWindows('sync-info-update', {
-        action: 'DOWNLOADED',
-        name: file.nameWithExtension,
+    downloader.on('finish', (elapsedTime: number) => {
+      this.tracker.downloadFinished(file.name, file.type, file.size, {
+        elapsedTime,
       });
     });
   }
 
-  async run(file: File): Promise<string> {
+  async run(file: File): Promise<void> {
+    const contentsId = new ContentsId(file.contentsId);
+
+    const metadata = await this.local.metadata(contentsId);
+
+    if (metadata) {
+      if (metadata.isUpToDate(file.updatedAt)) {
+        return;
+      }
+    }
+
     Logger.debug(`downloading "${file.nameWithExtension}"`);
 
     const downloader = this.managerFactory.downloader();
@@ -60,11 +63,9 @@ export class DownloadContentsToPlainFile {
       downloader.elapsedTime()
     );
 
-    const write = await this.localWriter.write(localContents, file.contentsId);
+    await this.local.write(localContents, file.contentsId);
 
     const events = localContents.pullDomainEvents();
     await this.eventBus.publish(events);
-
-    return write;
   }
 }
diff --git a/src/context/virtual-drive/contents/domain/ContentsMetadata.ts b/src/context/virtual-drive/contents/domain/ContentsMetadata.ts
new file mode 100644
index 000000000..16e51005f
--- /dev/null
+++ b/src/context/virtual-drive/contents/domain/ContentsMetadata.ts
@@ -0,0 +1,30 @@
+import { AggregateRoot } from '../../../shared/domain/AggregateRoot';
+import { DateValueObject } from '../../../shared/domain/value-objects/DateValueObject';
+
+type ContentsMetadataAttributes = {
+  modificationDate: Date;
+};
+
+export class ContentsMetadata extends AggregateRoot {
+  private constructor(readonly modificationDate: DateValueObject) {
+    super();
+  }
+
+  static from(attributes: ContentsMetadataAttributes): ContentsMetadata {
+    return new ContentsMetadata(
+      new DateValueObject(attributes.modificationDate)
+    );
+  }
+
+  attributes(): ContentsMetadataAttributes {
+    return {
+      modificationDate: this.modificationDate.value,
+    };
+  }
+
+  isUpToDate(date: Date): boolean {
+    return (
+      this.modificationDate.same(date) || this.modificationDate.isAfter(date)
+    );
+  }
+}
diff --git a/src/context/virtual-drive/contents/domain/LocalFileSystem.ts b/src/context/virtual-drive/contents/domain/LocalFileSystem.ts
index 4fc8ece13..73eb7b6ce 100644
--- a/src/context/virtual-drive/contents/domain/LocalFileSystem.ts
+++ b/src/context/virtual-drive/contents/domain/LocalFileSystem.ts
@@ -1,3 +1,4 @@
+import { ContentsMetadata } from './ContentsMetadata';
 import { ContentsId } from './ContentsId';
 import { LocalFileContents } from './LocalFileContents';
 
@@ -10,6 +11,11 @@ export interface LocalFileSystem {
 
   exists(contentsId: ContentsId): Promise<boolean>;
 
+  /**
+   * @return the FileMetadata of the file or undefined if does not exits
+   */
+  metadata(contentsId: ContentsId): Promise<ContentsMetadata | undefined>;
+
   add(contentsId: ContentsId, source: string): Promise<void>;
 
   listExistentFiles(): Promise<Array<ContentsId>>;
diff --git a/src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader.ts b/src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader.ts
index 586057f85..89dcf62ff 100644
--- a/src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader.ts
+++ b/src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader.ts
@@ -3,7 +3,7 @@ import { File, FileAttributes } from '../../../files/domain/File';
 
 export type FileDownloadEvents = {
   start: () => void;
-  progress: (progress: number) => void;
+  progress: (progress: number, elapsedTime: number) => void;
   finish: (fileId: FileAttributes['contentsId']) => void;
   error: (error: Error) => void;
 };
diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
index 24ff100f2..6dceecc58 100644
--- a/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
@@ -6,6 +6,7 @@ import { LocalFileSystem } from '../domain/LocalFileSystem';
 import path from 'path';
 import fs from 'fs/promises';
 import { ContentsId } from '../domain/ContentsId';
+import { ContentsMetadata } from '../domain/ContentsMetadata';
 
 export class FSLocalFileSystem implements LocalFileSystem {
   constructor(
@@ -52,6 +53,16 @@ export class FSLocalFileSystem implements LocalFileSystem {
     }
   }
 
+  async metadata(contentsId: ContentsId) {
+    const folder = await this.baseFolder();
+
+    const absolutePath = path.join(folder, contentsId.value);
+
+    const { mtimeMs } = await fs.stat(absolutePath);
+
+    return ContentsMetadata.from({ modificationDate: new Date(mtimeMs) });
+  }
+
   async add(contentsId: ContentsId, source: string): Promise<void> {
     const folder = await this.baseFolder();
 
diff --git a/src/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.ts b/src/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
index 5744672bd..d9dea7b72 100644
--- a/src/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
+++ b/src/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.ts
@@ -44,7 +44,7 @@ export class EnvironmentContentFileDownloader implements ContentFileDownloader {
         file.contentsId,
         {
           progressCallback: (progress: number) => {
-            this.eventEmitter.emit('progress', progress);
+            this.eventEmitter.emit('progress', progress, this.elapsedTime());
           },
           finishedCallback: async (err: Error, stream: Readable) => {
             this.stopwatch.finish();
@@ -53,7 +53,7 @@ export class EnvironmentContentFileDownloader implements ContentFileDownloader {
               this.eventEmitter.emit('error', err);
               return reject(err);
             }
-            this.eventEmitter.emit('finish');
+            this.eventEmitter.emit('finish', this.elapsedTime());
 
             resolve(stream);
           },
diff --git a/tests/context/shared/domain/DateMother.ts b/tests/context/shared/domain/DateMother.ts
new file mode 100644
index 000000000..34df55d70
--- /dev/null
+++ b/tests/context/shared/domain/DateMother.ts
@@ -0,0 +1,25 @@
+export class DateMother {
+  static previousNDay(original: Date, n: number): Date {
+    const clone = new Date(original.toDateString());
+
+    clone.setDate(original.getDate() - n);
+
+    return clone;
+  }
+
+  static previousDay = (original: Date) => DateMother.previousNDay(original, 1);
+
+  static nextNDay(original: Date, n: number): Date {
+    const clone = new Date(original.toDateString());
+
+    clone.setDate(original.getDate() + n);
+
+    return clone;
+  }
+
+  static nextDay = (original: Date) => DateMother.nextNDay(original, 1);
+
+  static clone(original: Date): Date {
+    return new Date(original.getTime());
+  }
+}
diff --git a/tests/context/shared/domain/value-objects/DateValueObject.test.ts b/tests/context/shared/domain/value-objects/DateValueObject.test.ts
new file mode 100644
index 000000000..53808280e
--- /dev/null
+++ b/tests/context/shared/domain/value-objects/DateValueObject.test.ts
@@ -0,0 +1,78 @@
+import { DateValueObject } from '../../../../../src/context/shared/domain/value-objects/DateValueObject';
+import MockDate from 'mockdate';
+
+describe('Date Value Object', () => {
+  describe('creation', () => {
+    it('creates DateValueObject from string', () => {
+      const dateString = '2024-01-30T12:34:56.789Z';
+      const dateValueObject = DateValueObject.fromString(dateString);
+
+      expect(dateValueObject).toBeInstanceOf(DateValueObject);
+      expect(dateValueObject.value.toISOString()).toBe(dateString);
+    });
+
+    it('creates DateValueObject with current date', () => {
+      const currentDate = new Date();
+
+      MockDate.set(currentDate);
+
+      const dateValueObject = DateValueObject.now();
+
+      expect(dateValueObject).toBeInstanceOf(DateValueObject);
+      expect(dateValueObject.same(currentDate)).toBeTruthy();
+    });
+  });
+
+  describe('equality', () => {
+    it('correctly checks if the date is the same', () => {
+      const date = new Date('2024-01-30T12:34:56.000Z');
+      const sameDate = new Date('2024-01-30T12:34:56.000Z');
+      const differentDate = new Date('2000-01-30T12:34:57.000Z');
+
+      const dateValueObject = new DateValueObject(date);
+
+      expect(dateValueObject.same(sameDate)).toBeTruthy();
+      expect(dateValueObject.same(differentDate)).toBeFalsy();
+    });
+
+    it('correctly checks if is equals to another date VO', () => {
+      const date = new Date('2024-01-30T12:34:56.000Z');
+      const sameDate = new Date('2024-01-30T12:34:56.000Z');
+      const differentDate = new Date('2000-01-30T12:34:57.000Z');
+
+      const dateValueObject = new DateValueObject(date);
+      const sameValueObject = new DateValueObject(sameDate);
+      const differentValueObject = new DateValueObject(differentDate);
+
+      expect(dateValueObject.equals(sameValueObject)).toBeTruthy();
+      expect(dateValueObject.equals(differentValueObject)).toBeFalsy();
+    });
+  });
+
+  describe('comparison', () => {
+    it('correctly checks if the date is previous', () => {
+      const earlierDate = new Date('2023-01-30T12:34:56.000Z');
+      const laterDate = new Date('2024-01-30T12:34:57.000Z');
+      const dateValueObject = new DateValueObject(earlierDate);
+
+      expect(dateValueObject.isPrevious(laterDate)).toBeTruthy();
+      expect(dateValueObject.isPrevious(earlierDate)).toBeFalsy();
+    });
+
+    it('correctly checks if the date is after', () => {
+      const earlierDate = new Date('2023-01-30T12:34:56.000Z');
+      const laterDate = new Date('2024-01-30T12:34:57.000Z');
+      const dateValueObject = new DateValueObject(laterDate);
+
+      expect(dateValueObject.isAfter(earlierDate)).toBeTruthy();
+      expect(dateValueObject.isAfter(laterDate)).toBeFalsy();
+    });
+  });
+
+  it('correctly converts to ISO string', () => {
+    const dateString = '2024-01-30T12:34:56.789Z';
+    const dateValueObject = new DateValueObject(new Date(dateString));
+
+    expect(dateValueObject.toISOString()).toBe(dateString);
+  });
+});
diff --git a/tests/context/virtual-drive/contents/__mocks__/ContentFileDownloaderMock.ts b/tests/context/virtual-drive/contents/__mocks__/ContentFileDownloaderMock.ts
index 5fa88c343..59a2f125f 100644
--- a/tests/context/virtual-drive/contents/__mocks__/ContentFileDownloaderMock.ts
+++ b/tests/context/virtual-drive/contents/__mocks__/ContentFileDownloaderMock.ts
@@ -5,12 +5,12 @@ import {
 } from '../../../../../src/context/virtual-drive/contents/domain/contentHandlers/ContentFileDownloader';
 
 export class ContentFileDownloaderMock implements ContentFileDownloader {
-  mock = jest.fn();
+  downloadMock = jest.fn();
   onMock = jest.fn();
   elapsedTimeMock = jest.fn();
 
   download(): Promise<Readable> {
-    return this.mock();
+    return this.downloadMock();
   }
 
   forceStop(): void {
diff --git a/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts b/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
index 3fb24d4a8..34890bcbd 100644
--- a/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
+++ b/tests/context/virtual-drive/contents/__mocks__/LocalFileWriterMock.ts
@@ -6,6 +6,7 @@ export class LocalFileSystemMock implements LocalFileSystem {
   public writeMock = jest.fn();
   public removeMock = jest.fn();
   public existsMock = jest.fn();
+  public metadataMock = jest.fn();
   public addMock = jest.fn();
   public listExistentFilesMock = jest.fn();
 
@@ -21,6 +22,10 @@ export class LocalFileSystemMock implements LocalFileSystem {
     return this.existsMock(contentId);
   }
 
+  metadata(contentsId: ContentsId) {
+    return this.metadataMock(contentsId);
+  }
+
   add(contentsId: ContentsId, source: string): Promise<void> {
     return this.addMock(contentsId, source);
   }
diff --git a/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts b/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
index fbad10b7d..c7c3fafb1 100644
--- a/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
+++ b/tests/context/virtual-drive/contents/application/ContentsDownloader._test.ts
@@ -39,7 +39,7 @@ describe.skip('Contents Downloader', () => {
   >)(
     'tracks all the manager events ',
     async (event: keyof FileDownloadEvents) => {
-      factory.mockDownloader.mock.mockResolvedValueOnce(
+      factory.mockDownloader.downloadMock.mockResolvedValueOnce(
         new ReadableHelloWorld()
       );
 
@@ -56,7 +56,9 @@ describe.skip('Contents Downloader', () => {
   );
 
   it('writes the downloaded content a local file', async () => {
-    factory.mockDownloader.mock.mockResolvedValueOnce(new ReadableHelloWorld());
+    factory.mockDownloader.downloadMock.mockResolvedValueOnce(
+      new ReadableHelloWorld()
+    );
 
     const file = FileMother.any();
     await SUT.run(file, async () => {
diff --git a/tests/context/virtual-drive/contents/application/DownloadContentsToPlainFile.test.ts b/tests/context/virtual-drive/contents/application/DownloadContentsToPlainFile.test.ts
new file mode 100644
index 000000000..ec7266322
--- /dev/null
+++ b/tests/context/virtual-drive/contents/application/DownloadContentsToPlainFile.test.ts
@@ -0,0 +1,74 @@
+import { DownloadContentsToPlainFile } from '../../../../../src/context/virtual-drive/contents/application/DownloadContentsToPlainFile';
+import { ContentsMetadata } from '../../../../../src/context/virtual-drive/contents/domain/ContentsMetadata';
+import { DateMother } from '../../../shared/domain/DateMother';
+import { FileMother } from '../../files/domain/FileMother';
+import { DownloadProgressTrackerMock } from '../../shared/__mock__/DownloadProgressTrackerMock';
+import { EventBusMock } from '../../shared/__mock__/EventBusMock';
+import { LocalFileSystemMock } from '../__mocks__/LocalFileWriterMock';
+import { RemoteFileContentsManagersFactoryMock } from '../__mocks__/RemoteFileContentsManagersFactoryMock';
+
+describe('Download Contents To Plain File', () => {
+  let managerFactory: RemoteFileContentsManagersFactoryMock;
+  let local: LocalFileSystemMock;
+  let eventBus: EventBusMock;
+  let tracker: DownloadProgressTrackerMock;
+
+  let SUT: DownloadContentsToPlainFile;
+
+  beforeEach(() => {
+    managerFactory = new RemoteFileContentsManagersFactoryMock();
+    local = new LocalFileSystemMock();
+    eventBus = new EventBusMock();
+    tracker = new DownloadProgressTrackerMock();
+
+    SUT = new DownloadContentsToPlainFile(
+      managerFactory,
+      local,
+      eventBus,
+      tracker
+    );
+  });
+
+  describe('cache strategy', () => {
+    it('downloads the file if not exits on local', async () => {
+      const file = FileMother.any();
+
+      local.metadataMock.mockResolvedValueOnce(undefined);
+
+      await SUT.run(file);
+
+      expect(managerFactory.mockDownloader.downloadMock).toBeCalled();
+      expect(local.writeMock).toBeCalled();
+    });
+
+    it('downloads the file if exists on local but its not up to date', async () => {
+      const file = FileMother.any();
+
+      local.metadataMock.mockResolvedValueOnce(
+        ContentsMetadata.from({
+          modificationDate: DateMother.previousDay(file.updatedAt),
+        })
+      );
+
+      await SUT.run(file);
+
+      expect(managerFactory.mockDownloader.downloadMock).toBeCalled();
+      expect(local.writeMock).toBeCalled();
+    });
+
+    it('does not download the file if exists on local and its up to date', async () => {
+      const file = FileMother.any();
+
+      local.metadataMock.mockResolvedValueOnce(
+        ContentsMetadata.from({
+          modificationDate: file.updatedAt,
+        })
+      );
+
+      await SUT.run(file);
+
+      expect(managerFactory.mockDownloader.downloadMock).not.toBeCalled();
+      expect(local.writeMock).not.toBeCalled();
+    });
+  });
+});
diff --git a/tests/context/virtual-drive/contents/domain/ContentsMetadata.test.ts b/tests/context/virtual-drive/contents/domain/ContentsMetadata.test.ts
new file mode 100644
index 000000000..504b0a361
--- /dev/null
+++ b/tests/context/virtual-drive/contents/domain/ContentsMetadata.test.ts
@@ -0,0 +1,17 @@
+import { ContentsMetadata } from '../../../../../src/context/virtual-drive/contents/domain/ContentsMetadata';
+import { DateMother } from '../../../shared/domain/DateMother';
+
+describe('Contents Metadata', () => {
+  it('is up to date when the modification date is the same as or later than the given date', () => {
+    const date = new Date();
+    const sameDate = DateMother.clone(date);
+    const previousDayDate = DateMother.previousDay(date);
+    const nextDayDate = DateMother.nextDay(date);
+
+    const metadata = ContentsMetadata.from({ modificationDate: date });
+
+    expect(metadata.isUpToDate(sameDate)).toBeTruthy();
+    expect(metadata.isUpToDate(previousDayDate)).toBeTruthy();
+    expect(metadata.isUpToDate(nextDayDate)).toBeFalsy();
+  });
+});
diff --git a/tests/context/virtual-drive/shared/__mock__/DownloadProgressTrackerMock.ts b/tests/context/virtual-drive/shared/__mock__/DownloadProgressTrackerMock.ts
new file mode 100644
index 000000000..ec43c5397
--- /dev/null
+++ b/tests/context/virtual-drive/shared/__mock__/DownloadProgressTrackerMock.ts
@@ -0,0 +1,38 @@
+import { DownloadProgressTracker } from '../../../../../src/context/shared/domain/DownloadProgressTracker';
+
+export class DownloadProgressTrackerMock implements DownloadProgressTracker {
+  readonly downloadStartedMock = jest.fn();
+  readonly downloadUpdateMock = jest.fn();
+  readonly downloadFinishedMock = jest.fn();
+  readonly errorMock = jest.fn();
+
+  downloadStarted(
+    name: string,
+    extension: string,
+    size: number
+  ): Promise<void> {
+    return this.downloadStartedMock(name, extension, size);
+  }
+
+  downloadUpdate(
+    name: string,
+    extension: string,
+    size: number,
+    progress: { elapsedTime: number; percentage: number }
+  ): Promise<void> {
+    return this.downloadUpdateMock(name, extension, size, progress);
+  }
+
+  downloadFinished(
+    name: string,
+    extension: string,
+    size: number,
+    progress: { elapsedTime: number }
+  ): Promise<void> {
+    return this.downloadFinishedMock(name, extension, size, progress);
+  }
+
+  error(name: string, extension: string): Promise<void> {
+    return this.errorMock(name, extension);
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index d88da0508..a09e3384c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1520,6 +1520,13 @@
   dependencies:
     "@sinclair/typebox" "^0.25.16"
 
+"@jest/schemas@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
+  integrity sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==
+  dependencies:
+    "@sinclair/typebox" "^0.27.8"
+
 "@jest/source-map@^27.5.1":
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz#6608391e465add4205eae073b55e7f279e04e8cf"
@@ -1593,6 +1600,18 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
+"@jest/types@^29.6.3":
+  version "29.6.3"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.6.3.tgz#1131f8cf634e7e84c5e77bab12f052af585fba59"
+  integrity sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==
+  dependencies:
+    "@jest/schemas" "^29.6.3"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
+
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
@@ -2165,6 +2184,11 @@
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718"
   integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==
 
+"@sinclair/typebox@^0.27.8":
+  version "0.27.8"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
+  integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
+
 "@sindresorhus/is@^0.14.0":
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -5384,12 +5408,10 @@ electron-updater@^4.6.4:
     lodash.isequal "^4.5.0"
     semver "^7.3.5"
 
-
-electron@^25.8.4:
-  version "25.8.4"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-25.8.4.tgz#b50877aac7d96323920437baf309ad86382cb455"
-  integrity sha512-hUYS3RGdaa6E1UWnzeGnsdsBYOggwMMg4WGxNGvAoWtmRrr6J1BsjFW/yRq4WsJHJce2HdzQXtz4OGXV6yUCLg==
-
+electron@^19.1.9:
+  version "19.1.9"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.9.tgz#01995eea4014f7cdb2f616f5f3492d4ed6f5e4f0"
+  integrity sha512-XT5LkTzIHB+ZtD3dTmNnKjVBWrDWReCKt9G1uAFLz6uJMEVcIUiYO+fph5pLXETiBw/QZBx8egduMEfIccLx+g==
   dependencies:
     "@electron/get" "^1.14.1"
     "@types/node" "^16.11.26"
@@ -7897,7 +7919,7 @@ jest-snapshot@^27.5.1:
     pretty-format "^27.5.1"
     semver "^7.3.2"
 
-jest-util@^27.0.0, jest-util@^27.5.1:
+jest-util@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz#3ba9771e8e31a0b85da48fe0b0891fb86c01c2f9"
   integrity sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==
@@ -7909,6 +7931,18 @@ jest-util@^27.0.0, jest-util@^27.5.1:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
+jest-util@^29.0.0:
+  version "29.7.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.7.0.tgz#23c2b62bfb22be82b44de98055802ff3710fc0bc"
+  integrity sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==
+  dependencies:
+    "@jest/types" "^29.6.3"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
+
 jest-util@^29.5.0:
   version "29.5.0"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f"
@@ -8072,11 +8106,6 @@ json-stringify-safe@^5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
-json5@2.x, json5@^2.1.2, json5@^2.2.0, json5@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
-  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
-
 json5@^1.0.1, json5@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
@@ -8084,6 +8113,11 @@ json5@^1.0.1, json5@^1.0.2:
   dependencies:
     minimist "^1.2.0"
 
+json5@^2.1.2, json5@^2.2.0, json5@^2.2.2, json5@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
+
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -8846,6 +8880,11 @@ mkdirp@^1.0.3:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
+mockdate@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/mockdate/-/mockdate-3.0.5.tgz#789be686deb3149e7df2b663d2bc4392bc3284fb"
+  integrity sha512-iniQP4rj1FhBdBYS/+eQv7j1tadJ9lJtdzgOpvsOHng/GbcDh2Fhdeq+ZRldrPYdXvCyfFUmFeEwEGXZB5I/AQ==
+
 mrmime@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27"
@@ -10549,13 +10588,6 @@ semver@7.3.8:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@7.x, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
-  dependencies:
-    lru-cache "^6.0.0"
-
 semver@^5.6.0, semver@^5.7.1:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
@@ -10566,6 +10598,13 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
+semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@~7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
@@ -11436,19 +11475,19 @@ ts-interface-checker@^0.1.9:
   resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699"
   integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==
 
-ts-jest@^27.1.2:
-  version "27.1.5"
-  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-27.1.5.tgz#0ddf1b163fbaae3d5b7504a1e65c914a95cff297"
-  integrity sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==
+ts-jest@^29.1.2:
+  version "29.1.2"
+  resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.1.2.tgz#7613d8c81c43c8cb312c6904027257e814c40e09"
+  integrity sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==
   dependencies:
     bs-logger "0.x"
     fast-json-stable-stringify "2.x"
-    jest-util "^27.0.0"
-    json5 "2.x"
+    jest-util "^29.0.0"
+    json5 "^2.2.3"
     lodash.memoize "4.x"
     make-error "1.x"
-    semver "7.x"
-    yargs-parser "20.x"
+    semver "^7.5.3"
+    yargs-parser "^21.0.1"
 
 ts-loader@^9.2.6:
   version "9.4.3"
@@ -12229,12 +12268,12 @@ yaml@^2.1.1:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
   integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
 
-yargs-parser@20.x, yargs-parser@^20.2.2, yargs-parser@^20.2.9:
+yargs-parser@^20.2.2, yargs-parser@^20.2.9:
   version "20.2.9"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.1.1:
+yargs-parser@^21.0.1, yargs-parser@^21.1.1:
   version "21.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==

From a1d46fe083b095f904d91c770ac11bc310bee7d3 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Thu, 1 Feb 2024 12:05:12 +0100
Subject: [PATCH 173/188] chore: run test on both platforms

---
 .github/workflows/test.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cf8d99f13..38919cefa 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,7 +5,13 @@ on: [pull_request]
 jobs:
   test:
     name: 🧪 Lint and test
-    runs-on: windows-latest
+    strategy:
+      matrix:
+        os:
+          - macos-latest
+          - windows-latest
+
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Check out Git repository

From 4e60722cb6fd515d496218d229c50e0e85312dc6 Mon Sep 17 00:00:00 2001
From: Joan Vicens <joanvicens@proton.me>
Date: Thu, 1 Feb 2024 16:19:55 +0000
Subject: [PATCH 174/188] [PB-1413] feat: separate isues from updates in ipc
 messages (#443)

---
 src/apps/fuse/callbacks/FuseCallback.ts       |  53 +++-
 src/apps/fuse/callbacks/FuseErrors.ts         |  46 +---
 .../fuse/callbacks/GetAttributesCallback.ts   |   8 +-
 .../fuse/callbacks/MakeDirectoryCallback.ts   |  32 +--
 src/apps/fuse/callbacks/OpenCallback.ts       |  16 +-
 src/apps/fuse/callbacks/ReaddirCallback.ts    |  27 +-
 src/apps/fuse/callbacks/ReleaseCallback.ts    |  12 +-
 .../fuse/callbacks/RenameOrMoveCallback.ts    |  24 +-
 src/apps/fuse/callbacks/RenameOrMoveFile.ts   |  56 ++--
 src/apps/fuse/callbacks/RenameOrMoveFolder.ts |  52 ++--
 src/apps/fuse/callbacks/TrashFileCallback.ts  |   8 +-
 .../fuse/callbacks/TrashFolderCallback.ts     |  23 +-
 .../dependency-injection/common/traverser.ts  |   2 +-
 .../virtual-drive/tree/TreeContainer.ts       |   2 +-
 .../virtual-drive/tree/builder.ts             |   8 +-
 src/apps/fuse/ipcRendererFuse.ts              |   7 -
 .../dependency-injection/common/traverser.ts  |   2 +-
 .../tree/TreeContainer.ts                     |   2 +-
 .../dependency-injection/tree/builder.ts      |   8 +-
 src/apps/main/MainProcessSyncEngineIPC.ts     |  12 +
 src/apps/main/analytics/drive-handlers.ts     |  46 ++--
 .../background-processes/process-issues.ts    |  99 -------
 src/apps/main/bug-report/ErrorDetails.ts      |  30 ++
 src/apps/main/bug-report/ProcessError.ts      |  12 +
 src/apps/main/bug-report/service.ts           |   2 +-
 src/apps/main/device/service.ts               |  15 +-
 src/apps/main/fordwardToWindows.ts            |  81 +-----
 src/apps/main/ipcs/ipcMainSyncEngine.ts       |   8 -
 src/apps/main/ipcs/mainDrive.ts               |   8 -
 src/apps/main/ipcs/mainVirtualDrive.ts        |  14 -
 src/apps/main/issues/app.ts                   |  34 +++
 src/apps/main/issues/virtual-drive.ts         |  78 ++++++
 src/apps/main/main.ts                         |   2 +-
 src/apps/main/preload.d.ts                    |  16 +-
 src/apps/main/preload.js                      |   4 +-
 src/apps/main/tray/handlers.ts                |  44 ++-
 src/apps/renderer/App.tsx                     |   4 +-
 .../renderer/actions/sync-error-actions.ts    |   2 +-
 src/apps/renderer/actions/types.ts            |   4 +-
 .../components/Backups/FatalError.tsx         |   8 +-
 src/apps/renderer/hooks/GeneralIssues.tsx     |   4 +-
 src/apps/renderer/hooks/ProcessIssues.tsx     |  17 +-
 .../renderer/hooks/useDriveInfoHistory.tsx    |  55 ++++
 .../renderer/hooks/useSyncInfoSubscriber.tsx  |  66 -----
 src/apps/renderer/localize/locales/en.json    |  10 +-
 src/apps/renderer/localize/locales/es.json    |  10 +-
 src/apps/renderer/localize/locales/fr.json    |  10 +-
 .../messages/backups/backups-actions-map.ts   |   6 +-
 .../messages/backups/backups-fatal-errors.ts  |   8 +-
 ...{process-fatal-error.ts => fatal-error.ts} |   8 +-
 src/apps/renderer/messages/general-error.ts   |  12 +-
 ...rocess-error.ts => virtual-drive-error.ts} |  10 +-
 src/apps/renderer/pages/Issues/Accordion.tsx  |  71 +++++
 .../Issues/GeneralIssuesByErrorAccordion.tsx  | 129 +++++++++
 .../pages/Issues/IssuesAccordions.tsx         |  32 +++
 src/apps/renderer/pages/Issues/IssuesPage.tsx |  44 +++
 src/apps/renderer/pages/Issues/IssuesTabs.tsx |  89 ++++++
 src/apps/renderer/pages/Issues/NoIssues.tsx   |  13 +
 src/apps/renderer/pages/Issues/Section.ts     |   1 +
 .../Issues/SyncIssuesByErrorAccordion.tsx     | 143 ++++++++++
 .../renderer/pages/ProcessIssues/List.tsx     | 259 ------------------
 .../pages/ProcessIssues/ReportModal.tsx       | 205 --------------
 .../renderer/pages/ProcessIssues/index.tsx    | 134 ---------
 src/apps/renderer/pages/Widget/Header.tsx     |   4 +-
 src/apps/renderer/pages/Widget/Item.tsx       |  56 +---
 .../renderer/pages/Widget/SyncErrorBanner.tsx |  12 +-
 src/apps/renderer/pages/Widget/SyncInfo.tsx   |  14 +-
 src/apps/renderer/pages/Widget/index.tsx      |  28 +-
 src/apps/shared/IPC/IPCs.ts                   |   4 +-
 .../ipcs => shared/IPC/events}/NoEvents.ts    |   0
 src/apps/shared/IPC/events/drive.ts           |  83 ------
 src/apps/shared/IPC/events/sync-engine.ts     | 124 ---------
 src/apps/shared/IPC/events/virtual-drive.ts   |  13 -
 .../BackgroundProcessVirtualDriveEvents.ts    |   7 +
 .../MainProcessVirtualDriveEvents.ts          |  11 +
 .../virtualDrive/backgroundEvents/files.ts    |  81 ++++++
 .../virtualDrive/backgroundEvents/folders.ts  |  13 +
 .../virtualDrive/backgroundEvents/tree.ts     |  17 ++
 src/apps/shared/types.ts                      | 251 +----------------
 src/apps/sync-engine/BindingManager.ts        |  21 +-
 src/apps/sync-engine/SyncEngineIpc.ts         |  11 +
 .../dependency-injection/common/traverser.ts  |   2 +-
 .../dependency-injection/contents/builder.ts  |  13 +-
 .../dependency-injection/files/builder.ts     |   4 +-
 .../dependency-injection/folders/builder.ts   |   4 +-
 .../items/ItemsContainer.ts                   |   2 +-
 .../dependency-injection/items/builder.ts     |  14 +-
 src/apps/sync-engine/ipcRendererSyncEngine.ts |   7 -
 src/apps/utils/reporting.ts                   |  22 --
 .../desktop/sync/domain/SyncStoppedPayload.ts |   4 +-
 ...onmentRemoteFileContentsManagersFactory.ts |   2 +-
 .../files/domain/OfflineFilePath.ts           |   2 +-
 .../shared/domain/DownloadProgressTracker.ts  |   1 -
 .../shared/domain/UploadProgressTracker.ts    |  15 +-
 .../shared/domain/errors/DriveDesktopError.ts |   7 +
 .../{ => errors}/InvalidArgumentError.ts      |   0
 src/context/shared/domain/issues/Issue.ts     |   4 +
 .../shared/domain/value-objects/NumericId.ts  |   2 +-
 .../shared/domain/{ => value-objects}/Path.ts |   4 +-
 .../shared/domain/value-objects/Uuid.ts       |   2 +-
 .../domain/value-objects/ValueObject.ts       |   2 +-
 .../MainProcessDownloadProgressTracker.ts     |  16 +-
 .../MainProcessUploadProgressTracker.ts       |   6 +-
 .../application/ContentsDownloader.ts         |  10 +-
 .../contents/application/ContentsUploader.ts  |   2 +-
 .../DownloadContentsToPlainFile.ts            |   2 +-
 .../NotifyMainProcessHydrationFinished.ts     |   2 +-
 .../contents/domain/ContentsId.ts             |   2 +-
 ...onmentRemoteFileContentsManagersFactory.ts |   8 +
 .../infrastructure/FSLocalFileSystem.ts       |   8 +-
 .../FuseEnvironmentContentFileDownloader.ts   |  87 ++++++
 .../BackgroundProcessUploadProgressTracker.ts |  71 +++++
 .../files/application/FileCreator.ts          |  12 +-
 .../files/application/FileDeleter.ts          |  15 +-
 .../virtual-drive/files/domain/FilePath.ts    |   2 +-
 .../virtual-drive/files/domain/FileStatus.ts  |   2 +-
 .../files/domain/SyncFileMessenger.ts         |   8 +-
 .../domain/errors/FileAlreadyExistsError.ts   |   6 +-
 .../BackgroundProcessSyncFileMessenger.ts     |  15 +-
 .../MainProcessSyncFileMessenger.ts           |  16 +-
 .../folders/domain/FolderPath.ts              |   2 +-
 .../folders/domain/FolderStatus.ts            |   2 +-
 .../folders/domain/FolderUuid.ts              |   2 +-
 .../folders/domain/SyncFolderMessenger.ts     |   2 +-
 .../domain/errors/ActionNotPermittedError.ts  |   6 +-
 .../BackgroundProcessSyncFolderMessenger.ts   |   6 +-
 .../MainProcessSyncFolderMessenger.ts         |   4 +
 .../shared/domain/BucketEntryId.ts            |   2 +-
 .../application/FileCreatorFromServerFile.ts  |   0
 .../FolderCreatorFromServerFolder.ts          |   0
 .../application/ItemsSearcher.ts              |   0
 .../{items => tree}/application/Traverser.ts  |   0
 .../application/TreeBuilder.ts                |   0
 .../{items => tree}/domain/FileNode.ts        |   0
 .../{items => tree}/domain/FolderNode.ts      |   0
 .../domain/ItemsIndexedByPath.ts              |   0
 .../{items => tree}/domain/NameDecrypt.ts     |   0
 .../{items => tree}/domain/Node.ts            |   0
 .../domain/RemoteItemsGenerator.ts            |   0
 .../{items => tree}/domain/Tree.ts            |   0
 .../tree/domain/TreeBuilderMessenger.ts       |   3 +
 .../infrastructure/CryptoJsNameDecrypt.ts     |   0
 .../infrastructure/IpcRemoteItemsGenerator.ts |   2 +-
 .../SQLiteRemoteItemsGenerator.ts             |   0
 .../BackgroundProcessTreeBuilderMessenger.ts  |  15 +
 .../MainProcessTreeBuilderMessenger.ts        |  12 +
 src/shared/issues/AppError.ts                 |   3 +
 .../app/domain => shared/issues}/AppIssue.ts  |   7 +-
 src/shared/issues/FatalError.ts               |  12 +
 src/shared/issues/SyncErrorCause.ts           |  32 +++
 src/shared/issues/VirtualDriveError.ts        |  14 +
 src/shared/issues/VirtualDriveIssue.ts        |   8 +
 .../__mocks__/SycnFolderMessengerMock.ts      |   4 +
 ...agerMock.ts => SyncFolderMessengerMock.ts} |   7 +-
 .../FolderCreatorFromOfflineFolder.test.ts    |  12 +-
 .../SynchronizeOfflineModifications.test.ts   |   8 +-
 .../__mock__/DownloadProgressTrackerMock.ts   |   3 +-
 .../__mock__/IpcRendererSyncEngineMock.ts     |  19 +-
 .../virtual-drive/shared/domain/Path.test.ts  |   2 +-
 .../application/Traverser.test.ts             |   2 +-
 .../infrastructure/FakeNameDecrypt.ts         |   2 +-
 .../persistance/ServerFolderMother.ts         |   0
 tests/fixtures/errors.ts                      |  33 +--
 tests/issues.e2e.ts                           |  14 +-
 164 files changed, 1654 insertions(+), 1986 deletions(-)
 delete mode 100644 src/apps/fuse/ipcRendererFuse.ts
 create mode 100644 src/apps/main/MainProcessSyncEngineIPC.ts
 delete mode 100644 src/apps/main/background-processes/process-issues.ts
 create mode 100644 src/apps/main/bug-report/ErrorDetails.ts
 create mode 100644 src/apps/main/bug-report/ProcessError.ts
 delete mode 100644 src/apps/main/ipcs/ipcMainSyncEngine.ts
 delete mode 100644 src/apps/main/ipcs/mainDrive.ts
 delete mode 100644 src/apps/main/ipcs/mainVirtualDrive.ts
 create mode 100644 src/apps/main/issues/app.ts
 create mode 100644 src/apps/main/issues/virtual-drive.ts
 create mode 100644 src/apps/renderer/hooks/useDriveInfoHistory.tsx
 delete mode 100644 src/apps/renderer/hooks/useSyncInfoSubscriber.tsx
 rename src/apps/renderer/messages/{process-fatal-error.ts => fatal-error.ts} (69%)
 rename src/apps/renderer/messages/{process-error.ts => virtual-drive-error.ts} (75%)
 create mode 100644 src/apps/renderer/pages/Issues/Accordion.tsx
 create mode 100644 src/apps/renderer/pages/Issues/GeneralIssuesByErrorAccordion.tsx
 create mode 100644 src/apps/renderer/pages/Issues/IssuesAccordions.tsx
 create mode 100644 src/apps/renderer/pages/Issues/IssuesPage.tsx
 create mode 100644 src/apps/renderer/pages/Issues/IssuesTabs.tsx
 create mode 100644 src/apps/renderer/pages/Issues/NoIssues.tsx
 create mode 100644 src/apps/renderer/pages/Issues/Section.ts
 create mode 100644 src/apps/renderer/pages/Issues/SyncIssuesByErrorAccordion.tsx
 delete mode 100644 src/apps/renderer/pages/ProcessIssues/List.tsx
 delete mode 100644 src/apps/renderer/pages/ProcessIssues/ReportModal.tsx
 delete mode 100644 src/apps/renderer/pages/ProcessIssues/index.tsx
 rename src/apps/{main/ipcs => shared/IPC/events}/NoEvents.ts (100%)
 delete mode 100644 src/apps/shared/IPC/events/drive.ts
 delete mode 100644 src/apps/shared/IPC/events/virtual-drive.ts
 create mode 100644 src/apps/shared/IPC/events/virtualDrive/BackgroundProcessVirtualDriveEvents.ts
 create mode 100644 src/apps/shared/IPC/events/virtualDrive/MainProcessVirtualDriveEvents.ts
 create mode 100644 src/apps/shared/IPC/events/virtualDrive/backgroundEvents/files.ts
 create mode 100644 src/apps/shared/IPC/events/virtualDrive/backgroundEvents/folders.ts
 create mode 100644 src/apps/shared/IPC/events/virtualDrive/backgroundEvents/tree.ts
 create mode 100644 src/apps/sync-engine/SyncEngineIpc.ts
 delete mode 100644 src/apps/sync-engine/ipcRendererSyncEngine.ts
 delete mode 100644 src/apps/utils/reporting.ts
 create mode 100644 src/context/shared/domain/errors/DriveDesktopError.ts
 rename src/context/shared/domain/{ => errors}/InvalidArgumentError.ts (100%)
 create mode 100644 src/context/shared/domain/issues/Issue.ts
 rename src/context/shared/domain/{ => value-objects}/Path.ts (92%)
 create mode 100644 src/context/virtual-drive/contents/infrastructure/download/FuseEnvironmentContentFileDownloader.ts
 create mode 100644 src/context/virtual-drive/contents/infrastructure/upload/BackgroundProcessUploadProgressTracker.ts
 rename src/context/virtual-drive/{items => tree}/application/FileCreatorFromServerFile.ts (100%)
 rename src/context/virtual-drive/{items => tree}/application/FolderCreatorFromServerFolder.ts (100%)
 rename src/context/virtual-drive/{items => tree}/application/ItemsSearcher.ts (100%)
 rename src/context/virtual-drive/{items => tree}/application/Traverser.ts (100%)
 rename src/context/virtual-drive/{items => tree}/application/TreeBuilder.ts (100%)
 rename src/context/virtual-drive/{items => tree}/domain/FileNode.ts (100%)
 rename src/context/virtual-drive/{items => tree}/domain/FolderNode.ts (100%)
 rename src/context/virtual-drive/{items => tree}/domain/ItemsIndexedByPath.ts (100%)
 rename src/context/virtual-drive/{items => tree}/domain/NameDecrypt.ts (100%)
 rename src/context/virtual-drive/{items => tree}/domain/Node.ts (100%)
 rename src/context/virtual-drive/{items => tree}/domain/RemoteItemsGenerator.ts (100%)
 rename src/context/virtual-drive/{items => tree}/domain/Tree.ts (100%)
 create mode 100644 src/context/virtual-drive/tree/domain/TreeBuilderMessenger.ts
 rename src/context/virtual-drive/{items => tree}/infrastructure/CryptoJsNameDecrypt.ts (100%)
 rename src/context/virtual-drive/{items => tree}/infrastructure/IpcRemoteItemsGenerator.ts (95%)
 rename src/context/virtual-drive/{items => tree}/infrastructure/SQLiteRemoteItemsGenerator.ts (100%)
 create mode 100644 src/context/virtual-drive/tree/infrastructure/TreeBuilderMessengers/BackgroundProcessTreeBuilderMessenger.ts
 create mode 100644 src/context/virtual-drive/tree/infrastructure/TreeBuilderMessengers/MainProcessTreeBuilderMessenger.ts
 create mode 100644 src/shared/issues/AppError.ts
 rename src/{context/desktop/app/domain => shared/issues}/AppIssue.ts (59%)
 create mode 100644 src/shared/issues/FatalError.ts
 create mode 100644 src/shared/issues/SyncErrorCause.ts
 create mode 100644 src/shared/issues/VirtualDriveError.ts
 create mode 100644 src/shared/issues/VirtualDriveIssue.ts
 rename tests/context/virtual-drive/folders/__mocks__/{FolderSyncManagerMock.ts => SyncFolderMessengerMock.ts} (82%)
 rename tests/context/virtual-drive/{items => tree}/application/Traverser.test.ts (99%)
 rename tests/context/virtual-drive/{items => tree}/infrastructure/FakeNameDecrypt.ts (91%)
 rename tests/context/virtual-drive/{items => tree}/persistance/ServerFolderMother.ts (100%)

diff --git a/src/apps/fuse/callbacks/FuseCallback.ts b/src/apps/fuse/callbacks/FuseCallback.ts
index b0cb3e386..3f3df93b4 100644
--- a/src/apps/fuse/callbacks/FuseCallback.ts
+++ b/src/apps/fuse/callbacks/FuseCallback.ts
@@ -1,6 +1,6 @@
 import { Either, right, left } from '../../../context/shared/domain/Either';
 import { Stopwatch } from '../../shared/types/Stopwatch';
-import { FuseError } from './FuseErrors';
+import { FuseError, FuseUnknownError } from './FuseErrors';
 import Logger from 'electron-log';
 import { PathsToIgnore } from './PathsToIgnore';
 import { FuseCodes } from './FuseCodes';
@@ -27,17 +27,32 @@ export abstract class FuseCallback<T> {
     }
   ) {}
 
-  private async logTime(fun: () => Promise<Either<FuseError, T>>) {
-    const stopwatch = new Stopwatch();
-    stopwatch.start();
-
-    const result = await fun();
+  protected async executeAndCatch(
+    params: any[]
+  ): Promise<Either<FuseError, T>> {
+    // Ensure that an Either is always returned
 
-    if (this.debug.elapsedTime) {
-      Logger.debug(`Elapsed time for ${this.name}: `, stopwatch.elapsedTime());
+    const stopwatch = new Stopwatch();
+    try {
+      stopwatch.start();
+
+      const result = await this.execute(...params);
+
+      return result;
+    } catch (throwed: unknown) {
+      if (throwed instanceof FuseError) {
+        return this.left(throwed);
+      }
+
+      return this.left(new FuseUnknownError());
+    } finally {
+      if (this.debug.elapsedTime) {
+        Logger.debug(
+          `Elapsed time for ${this.name}: `,
+          stopwatch.elapsedTime()
+        );
+      }
     }
-
-    return result;
   }
 
   protected right(value: T): Either<FuseError, T> {
@@ -50,9 +65,16 @@ export abstract class FuseCallback<T> {
     return right(value);
   }
 
-  protected left(error: FuseError): Either<FuseError, T> {
-    Logger.error(`${this.name} Error: ${error.message}.`, error.description);
-    return left(error);
+  protected left(error: FuseError): Either<FuseError, T>;
+  protected left(error: unknown): Either<FuseError, T>;
+
+  protected left(error: FuseError | unknown): Either<FuseError, T> {
+    if (error instanceof FuseError) {
+      return left(error);
+    }
+
+    Logger.error(`${this.name} Error: Unknown.`);
+    return left(new FuseUnknownError());
   }
 
   async handle(...params: any[]): Promise<void> {
@@ -66,7 +88,7 @@ export abstract class FuseCallback<T> {
       Logger.debug(`${this.name}: `, ...params);
     }
 
-    const result = await this.logTime(() => this.execute(...params));
+    const result = await this.executeAndCatch(params);
 
     if (result.isLeft()) {
       const error = result.getLeft();
@@ -93,10 +115,11 @@ export abstract class NotifyFuseCallback extends FuseCallback<undefined> {
   async handle(...params: any[]): Promise<void> {
     const callback = params.pop() as Callback;
 
-    const result = await this.execute(...params);
+    const result = await this.executeAndCatch(params);
 
     if (result.isLeft()) {
       const error = result.getLeft();
+
       return callback(error.code);
     }
 
diff --git a/src/apps/fuse/callbacks/FuseErrors.ts b/src/apps/fuse/callbacks/FuseErrors.ts
index 123bfab2d..33bf146c8 100644
--- a/src/apps/fuse/callbacks/FuseErrors.ts
+++ b/src/apps/fuse/callbacks/FuseErrors.ts
@@ -2,62 +2,46 @@ import { FuseCodes } from './FuseCodes';
 
 export class FuseError extends Error {
   public readonly code: number;
-  public readonly description: string;
 
-  constructor(code: FuseCodes, message: string, description: string) {
+  constructor(code: FuseCodes, message: string) {
     super(message);
 
     this.code = code;
-    this.description = description;
   }
 }
 
 export class FuseNoSuchFileOrDirectoryError extends FuseError {
-  constructor(description: string) {
-    super(FuseCodes.ENOENT, 'No such file or directory', description);
-  }
-
-  static translate(error: Error): FuseNoSuchFileOrDirectoryError {
-    return new FuseNoSuchFileOrDirectoryError(error.message);
+  constructor() {
+    super(FuseCodes.ENOENT, 'No such file or directory');
   }
 }
 
 export class FuseFileOrDirectoryAlreadyExistsError extends FuseError {
-  constructor(description: string) {
-    super(FuseCodes.EEXIST, 'File or directory already exists', description);
-  }
-
-  static translate(error: Error): FuseFileOrDirectoryAlreadyExistsError {
-    return new FuseFileOrDirectoryAlreadyExistsError(error.message);
+  constructor() {
+    super(FuseCodes.EEXIST, 'File or directory already exists');
   }
 }
 
 export class FuseIOError extends FuseError {
-  constructor(description: string) {
-    super(FuseCodes.EIO, 'Input/output error', description);
-  }
-
-  static translate(error: Error): FuseIOError {
-    return new FuseIOError(error.message);
+  constructor() {
+    super(FuseCodes.EIO, 'Input/output error');
   }
 }
 
 export class FuseInvalidArgumentError extends FuseError {
-  constructor(description: string) {
-    super(FuseCodes.EINVAL, 'Invalid argument', description);
-  }
-
-  static translate(error: Error): FuseInvalidArgumentError {
-    return new FuseInvalidArgumentError(error.message);
+  constructor() {
+    super(FuseCodes.EINVAL, 'Invalid argument');
   }
 }
 
 export class FusePermissionDeniedError extends FuseError {
-  constructor(description: string) {
-    super(FuseCodes.EACCES, 'Permission denied', description);
+  constructor() {
+    super(FuseCodes.EACCES, 'Permission denied');
   }
+}
 
-  static translate(error: Error): FusePermissionDeniedError {
-    return new FusePermissionDeniedError(error.message);
+export class FuseUnknownError extends FuseError {
+  constructor() {
+    super(FuseCodes.EIO, 'Unknown error');
   }
 }
diff --git a/src/apps/fuse/callbacks/GetAttributesCallback.ts b/src/apps/fuse/callbacks/GetAttributesCallback.ts
index a2ddf100c..0fd1186ea 100644
--- a/src/apps/fuse/callbacks/GetAttributesCallback.ts
+++ b/src/apps/fuse/callbacks/GetAttributesCallback.ts
@@ -29,7 +29,7 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
   ): Either<FuseError, GetAttributesCallbackData> {
     // When the OS wants to check if a node exists will try to get the attributes of it
     // so not founding them is not an error
-    Logger.info(`Attributes of ${this.name}:.`, error.description);
+    Logger.info(`Attributes of ${this.name}:.`);
     return left(error);
   }
 
@@ -83,10 +83,6 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
       });
     }
 
-    return this.left(
-      new FuseNoSuchFileOrDirectoryError(
-        `"${path}" not founded on when retrieving it's attributes`
-      )
-    );
+    return this.left(new FuseNoSuchFileOrDirectoryError());
   }
 }
diff --git a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
index d4aaed803..191d7c36a 100644
--- a/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
+++ b/src/apps/fuse/callbacks/MakeDirectoryCallback.ts
@@ -1,36 +1,12 @@
-import { FolderAlreadyExists } from '../../../context/virtual-drive/folders/domain/errors/FolderAlreadyExists';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { NotifyFuseCallback } from './FuseCallback';
-import {
-  FuseFileOrDirectoryAlreadyExistsError,
-  FuseError,
-  FuseIOError,
-  FuseInvalidArgumentError,
-} from './FuseErrors';
-import { FolderNotFoundError } from '../../../context/virtual-drive/folders/domain/errors/FolderNotFoundError';
 
 export class MakeDirectoryCallback extends NotifyFuseCallback {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
     super('Make Directory');
   }
 
-  private resolveError(
-    input: { path: string; mode: number },
-    err: unknown
-  ): FuseError {
-    if (err instanceof FolderAlreadyExists) {
-      return new FuseFileOrDirectoryAlreadyExistsError(input.path);
-    }
-    if (err instanceof FolderNotFoundError) {
-      return new FuseInvalidArgumentError(input.path);
-    }
-
-    return new FuseIOError(
-      `Unknown error while creating the folder: ${input.path}`
-    );
-  }
-
-  async execute(path: string, mode: number) {
+  async execute(path: string, _mode: number) {
     try {
       await this.container.syncFolderMessenger.creating(path);
 
@@ -39,15 +15,13 @@ export class MakeDirectoryCallback extends NotifyFuseCallback {
       await this.container.syncFolderMessenger.created(path);
 
       return this.right();
-    } catch (err: unknown) {
-      const error = this.resolveError({ path, mode }, err);
-
+    } catch (throwed: unknown) {
       this.container.syncFolderMessenger.errorWhileCreating(
         path,
         'unknown error'
       );
 
-      return this.left(error);
+      return this.left(throwed);
     }
   }
 }
diff --git a/src/apps/fuse/callbacks/OpenCallback.ts b/src/apps/fuse/callbacks/OpenCallback.ts
index e69ab9c1d..eccc39078 100644
--- a/src/apps/fuse/callbacks/OpenCallback.ts
+++ b/src/apps/fuse/callbacks/OpenCallback.ts
@@ -12,11 +12,7 @@ export class OpenCallback extends FuseCallback<number> {
     const file = await this.container.filesSearcher.run({ path });
 
     if (!file) {
-      return this.left(
-        new FuseNoSuchFileOrDirectoryError(
-          `${path} not founded on when trying to open it`
-        )
-      );
+      return this.left(new FuseNoSuchFileOrDirectoryError());
     }
 
     try {
@@ -25,16 +21,10 @@ export class OpenCallback extends FuseCallback<number> {
       return this.right(file.id);
     } catch (err: unknown) {
       Logger.error('Error downloading file: ', err);
-
       if (err instanceof Error) {
-        return this.left(
-          new FuseIOError(`${err.message} when opening ${path}`)
-        );
+        return this.left(new FuseIOError());
       }
-
-      return this.left(
-        new FuseIOError(`unknown error when opening ${path}: ${err}`)
-      );
+      return this.left(new FuseIOError());
     }
   }
 }
diff --git a/src/apps/fuse/callbacks/ReaddirCallback.ts b/src/apps/fuse/callbacks/ReaddirCallback.ts
index a2cd77d69..c508190c2 100644
--- a/src/apps/fuse/callbacks/ReaddirCallback.ts
+++ b/src/apps/fuse/callbacks/ReaddirCallback.ts
@@ -1,6 +1,5 @@
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { FuseCallback } from './FuseCallback';
-import { FuseNoSuchFileOrDirectoryError } from './FuseErrors';
 
 export class ReaddirCallback extends FuseCallback<Array<string>> {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
@@ -8,25 +7,17 @@ export class ReaddirCallback extends FuseCallback<Array<string>> {
   }
 
   async execute(path: string) {
-    try {
-      const filesNamesPromise =
-        this.container.filesByFolderPathNameLister.run(path);
+    const filesNamesPromise =
+      this.container.filesByFolderPathNameLister.run(path);
 
-      const folderNamesPromise =
-        this.container.foldersByParentPathLister.run(path);
+    const folderNamesPromise =
+      this.container.foldersByParentPathLister.run(path);
 
-      const [filesNames, foldersNames] = await Promise.all([
-        filesNamesPromise,
-        folderNamesPromise,
-      ]);
+    const [filesNames, foldersNames] = await Promise.all([
+      filesNamesPromise,
+      folderNamesPromise,
+    ]);
 
-      return this.right(['.', '..', ...filesNames, ...foldersNames]);
-    } catch (error) {
-      return this.left(
-        new FuseNoSuchFileOrDirectoryError(
-          'Could not retrieve the files and folder of the system'
-        )
-      );
-    }
+    return this.right(['.', '..', ...filesNames, ...foldersNames]);
   }
 }
diff --git a/src/apps/fuse/callbacks/ReleaseCallback.ts b/src/apps/fuse/callbacks/ReleaseCallback.ts
index 15619b8fe..0e898a5e5 100644
--- a/src/apps/fuse/callbacks/ReleaseCallback.ts
+++ b/src/apps/fuse/callbacks/ReleaseCallback.ts
@@ -7,7 +7,7 @@ export class ReleaseCallback extends NotifyFuseCallback {
     super('Release');
   }
 
-  async execute(path: string, fd: number) {
+  async execute(path: string, _fd: number) {
     const file = await this.container.offlineFileSearcher.run({ path });
 
     if (!file) {
@@ -19,16 +19,10 @@ export class ReleaseCallback extends NotifyFuseCallback {
       return this.right();
     } catch (err: unknown) {
       if (err instanceof Error) {
-        return this.left(
-          new FuseIOError(
-            `${err.message} when uploading ${path} and with flag: ${fd}`
-          )
-        );
+        return this.left(new FuseIOError());
       }
 
-      return this.left(
-        new FuseIOError(`Error when uploading ${path} with flag ${fd}: ${err}`)
-      );
+      return this.left(new FuseIOError());
     }
   }
 }
diff --git a/src/apps/fuse/callbacks/RenameOrMoveCallback.ts b/src/apps/fuse/callbacks/RenameOrMoveCallback.ts
index 1d54d919b..53f2a2be8 100644
--- a/src/apps/fuse/callbacks/RenameOrMoveCallback.ts
+++ b/src/apps/fuse/callbacks/RenameOrMoveCallback.ts
@@ -1,6 +1,6 @@
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { NotifyFuseCallback } from './FuseCallback';
-import { FuseError, FuseNoSuchFileOrDirectoryError } from './FuseErrors';
+import { FuseNoSuchFileOrDirectoryError } from './FuseErrors';
 import { RenameOrMoveFile } from './RenameOrMoveFile';
 import { RenameOrMoveFolder } from './RenameOrMoveFolder';
 
@@ -16,30 +16,26 @@ export class RenameOrMoveCallback extends NotifyFuseCallback {
   }
 
   async execute(src: string, dest: string) {
-    const fileResult = await this.updateFile.execute(src, dest);
+    const fileEither = await this.updateFile.execute(src, dest);
 
-    if (fileResult instanceof FuseError) {
-      return this.left(fileResult);
+    if (fileEither.isLeft()) {
+      return this.left(fileEither.getLeft());
     }
 
-    if (fileResult === 'success') {
+    if (fileEither.getRight() === 'success') {
       return this.right();
     }
 
-    const folderResult = await this.updateFolder.execute(src, dest);
+    const folderEither = await this.updateFolder.execute(src, dest);
 
-    if (folderResult instanceof FuseError) {
-      return this.left(folderResult);
+    if (folderEither.isLeft()) {
+      return this.left(folderEither.getLeft());
     }
 
-    if (folderResult === 'success') {
+    if (folderEither.getRight() === 'success') {
       return this.right();
     }
 
-    return this.left(
-      new FuseNoSuchFileOrDirectoryError(
-        `File or folder not found when trying to change a path, src: ${src}, dest: ${dest}`
-      )
-    );
+    return this.left(new FuseNoSuchFileOrDirectoryError());
   }
 }
diff --git a/src/apps/fuse/callbacks/RenameOrMoveFile.ts b/src/apps/fuse/callbacks/RenameOrMoveFile.ts
index 6f562e528..89b91287c 100644
--- a/src/apps/fuse/callbacks/RenameOrMoveFile.ts
+++ b/src/apps/fuse/callbacks/RenameOrMoveFile.ts
@@ -1,42 +1,27 @@
 import path from 'path';
 import { FilePath } from '../../../context/virtual-drive/files/domain/FilePath';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
-import { FileAlreadyExistsError } from '../../../context/virtual-drive/files/domain/errors/FileAlreadyExistsError';
-import { ActionNotPermittedError } from '../../../context/virtual-drive/folders/domain/errors/ActionNotPermittedError';
-import {
-  FuseError,
-  FuseInvalidArgumentError,
-  FuseFileOrDirectoryAlreadyExistsError,
-  FuseIOError,
-} from './FuseErrors';
+import { DriveDesktopError } from '../../../context/shared/domain/errors/DriveDesktopError';
+import { SyncErrorCause } from '../../../shared/issues/SyncErrorCause';
+import { Either, left, right } from '../../../context/shared/domain/Either';
+import { FuseError, FuseUnknownError } from './FuseErrors';
 
-export class RenameOrMoveFile {
-  constructor(private readonly container: VirtualDriveDependencyContainer) {}
+type RenameOrMoveRight = 'no-op' | 'success';
 
-  private resolveError(
-    input: { src: string; dest: string },
-    err: unknown
-  ): FuseError {
-    if (err instanceof ActionNotPermittedError) {
-      return new FuseInvalidArgumentError(input.src);
-    }
-    if (err instanceof FileAlreadyExistsError) {
-      return new FuseFileOrDirectoryAlreadyExistsError(input.src);
-    }
+export class RenameOrMoveFile {
+  private static readonly NO_OP: RenameOrMoveRight = 'no-op';
+  private static readonly SUCCESS: RenameOrMoveRight = 'success';
 
-    return new FuseIOError(
-      `Unknown error while updating the path from ${input.src} to ${input.dest}`
-    );
-  }
+  constructor(private readonly container: VirtualDriveDependencyContainer) {}
 
   async execute(
     src: string,
     dest: string
-  ): Promise<FuseError | 'no-op' | 'success'> {
+  ): Promise<Either<FuseError, RenameOrMoveRight>> {
     const file = await this.container.filesSearcher.run({ path: src });
 
     if (!file) {
-      return 'no-op';
+      return right(RenameOrMoveFile.NO_OP);
     }
 
     try {
@@ -54,20 +39,27 @@ export class RenameOrMoveFile {
         desiredPath.nameWithExtension()
       );
 
-      return 'success';
-    } catch (err: unknown) {
-      const error = this.resolveError({ src, dest }, err);
-
+      return right(RenameOrMoveFile.SUCCESS);
+    } catch (throwed: unknown) {
       const current = path.basename(src);
       const desired = path.basename(dest);
 
+      const cause: SyncErrorCause =
+        throwed instanceof DriveDesktopError
+          ? throwed.syncErrorCause
+          : 'UNKNOWN';
+
       await this.container.syncFileMessenger.errorWhileRenaming(
         current,
         desired,
-        error.message
+        cause
       );
 
-      return error;
+      if (throwed instanceof FuseError) {
+        return left(throwed);
+      }
+
+      return left(new FuseUnknownError());
     }
   }
 }
diff --git a/src/apps/fuse/callbacks/RenameOrMoveFolder.ts b/src/apps/fuse/callbacks/RenameOrMoveFolder.ts
index 579837ebf..f0891d077 100644
--- a/src/apps/fuse/callbacks/RenameOrMoveFolder.ts
+++ b/src/apps/fuse/callbacks/RenameOrMoveFolder.ts
@@ -1,45 +1,25 @@
 import path from 'path';
 import { FolderPath } from '../../../context/virtual-drive/folders/domain/FolderPath';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
-import {
-  FuseError,
-  FuseIOError,
-  FuseInvalidArgumentError,
-  FuseNoSuchFileOrDirectoryError,
-} from './FuseErrors';
-import { InvalidArgumentError } from '../../../context/shared/domain/InvalidArgumentError';
-import { FolderNotFoundError } from '../../../context/virtual-drive/folders/domain/errors/FolderNotFoundError';
-import { PathHasNotChangedError } from '../../../context/virtual-drive/folders/domain/errors/PathHasNotChangedError';
+import { FuseError, FuseUnknownError } from './FuseErrors';
+import { Either, left, right } from '../../../context/shared/domain/Either';
 
-export class RenameOrMoveFolder {
-  constructor(private readonly container: VirtualDriveDependencyContainer) {}
-
-  private resolverError(input: { src: string; dest: string }, err: unknown) {
-    if (err instanceof InvalidArgumentError) {
-      return FuseInvalidArgumentError.translate(err);
-    }
-
-    if (err instanceof FolderNotFoundError) {
-      return FuseNoSuchFileOrDirectoryError.translate(err);
-    }
+type RenameOrMoveRight = 'no-op' | 'success';
 
-    if (err instanceof PathHasNotChangedError) {
-      return FuseInvalidArgumentError.translate(err);
-    }
+export class RenameOrMoveFolder {
+  private static readonly NO_OP: RenameOrMoveRight = 'no-op';
+  private static readonly SUCCESS: RenameOrMoveRight = 'success';
 
-    return new FuseIOError(
-      `Unknown error while updating the path from ${input.src} to ${input.dest}`
-    );
-  }
+  constructor(private readonly container: VirtualDriveDependencyContainer) {}
 
   async execute(
     src: string,
     dest: string
-  ): Promise<FuseError | 'no-op' | 'success'> {
+  ): Promise<Either<FuseError, RenameOrMoveRight>> {
     const folder = await this.container.folderSearcher.run({ path: src });
 
     if (!folder) {
-      return 'no-op';
+      return right(RenameOrMoveFolder.NO_OP);
     }
 
     try {
@@ -57,20 +37,22 @@ export class RenameOrMoveFolder {
         desiredPath.name()
       );
 
-      return 'success';
-    } catch (err: unknown) {
-      const error = this.resolverError({ src, dest }, err);
-
+      return right(RenameOrMoveFolder.SUCCESS);
+    } catch (throwed: unknown) {
       const current = path.basename(src);
       const desired = path.basename(dest);
 
       await this.container.syncFolderMessenger.errorWhileRenaming(
         current,
         desired,
-        error.message
+        'message '
       );
 
-      return error;
+      if (throwed instanceof FuseError) {
+        return left(throwed);
+      }
+
+      return left(new FuseUnknownError());
     }
   }
 }
diff --git a/src/apps/fuse/callbacks/TrashFileCallback.ts b/src/apps/fuse/callbacks/TrashFileCallback.ts
index 7b423e9df..63187dec5 100644
--- a/src/apps/fuse/callbacks/TrashFileCallback.ts
+++ b/src/apps/fuse/callbacks/TrashFileCallback.ts
@@ -11,11 +11,7 @@ export class TrashFileCallback extends NotifyFuseCallback {
     const file = await this.container.filesSearcher.run({ path });
 
     if (!file) {
-      return this.left(
-        new FuseNoSuchFileOrDirectoryError(
-          `${path} not founded when trying to trash it`
-        )
-      );
+      return this.left(new FuseNoSuchFileOrDirectoryError());
     }
 
     try {
@@ -23,7 +19,7 @@ export class TrashFileCallback extends NotifyFuseCallback {
 
       return this.right();
     } catch {
-      return this.left(new FuseIOError(`trying to trash ${path}`));
+      return this.left(new FuseIOError());
     }
   }
 }
diff --git a/src/apps/fuse/callbacks/TrashFolderCallback.ts b/src/apps/fuse/callbacks/TrashFolderCallback.ts
index 7456906e8..007b5d39e 100644
--- a/src/apps/fuse/callbacks/TrashFolderCallback.ts
+++ b/src/apps/fuse/callbacks/TrashFolderCallback.ts
@@ -1,6 +1,7 @@
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { NotifyFuseCallback } from './FuseCallback';
-import { FuseIOError, FuseNoSuchFileOrDirectoryError } from './FuseErrors';
+import { FuseNoSuchFileOrDirectoryError } from './FuseErrors';
+import { basename } from 'path';
 
 export class TrashFolderCallback extends NotifyFuseCallback {
   constructor(private readonly container: VirtualDriveDependencyContainer) {
@@ -11,27 +12,19 @@ export class TrashFolderCallback extends NotifyFuseCallback {
     const folder = await this.container.folderSearcher.run({ path });
 
     if (!folder) {
-      return this.left(
-        new FuseNoSuchFileOrDirectoryError(
-          `folder not found when trying to delete it ${path}`
-        )
-      );
+      return this.left(new FuseNoSuchFileOrDirectoryError());
     }
 
     try {
       await this.container.folderDeleter.run(folder.uuid);
 
       return this.right();
-    } catch (err: unknown) {
-      if (err instanceof Error) {
-        return this.left(
-          new FuseIOError(`${err.message} when trashing ${path}`)
-        );
-      }
+    } catch (throwed: unknown) {
+      const name = basename(path);
 
-      return this.left(
-        new FuseIOError(`error when trying to trash the folder ${path}: ${err}`)
-      );
+      this.container.syncFolderMessenger.errorWhileTrashing(name);
+
+      return this.left(throwed);
     }
   }
 }
diff --git a/src/apps/fuse/dependency-injection/common/traverser.ts b/src/apps/fuse/dependency-injection/common/traverser.ts
index b25de6491..32ce91f1d 100644
--- a/src/apps/fuse/dependency-injection/common/traverser.ts
+++ b/src/apps/fuse/dependency-injection/common/traverser.ts
@@ -1,5 +1,5 @@
 import crypt from '../../../../context/shared/infrastructure/crypt';
-import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
+import { Traverser } from '../../../../context/virtual-drive/tree/application/Traverser';
 import { DependencyInjectionUserProvider } from './user';
 
 export class DependencyInjectionTraverserProvider {
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/tree/TreeContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/tree/TreeContainer.ts
index 6f4f3e7dc..9a81bfe5a 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/tree/TreeContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/tree/TreeContainer.ts
@@ -1,4 +1,4 @@
-import { TreeBuilder } from '../../../../../context/virtual-drive/items/application/TreeBuilder';
+import { TreeBuilder } from '../../../../../context/virtual-drive/tree/application/TreeBuilder';
 
 export interface TreeContainer {
   existingNodesTreeBuilder: TreeBuilder;
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/tree/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/tree/builder.ts
index ae2c42812..c9fdeacbf 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/tree/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/tree/builder.ts
@@ -1,7 +1,7 @@
-import { Traverser } from '../../../../../context/virtual-drive/items/application/Traverser';
-import { TreeBuilder } from '../../../../../context/virtual-drive/items/application/TreeBuilder';
-import { CryptoJsNameDecrypt } from '../../../../../context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt';
-import { SQLiteRemoteItemsGenerator } from '../../../../../context/virtual-drive/items/infrastructure/SQLiteRemoteItemsGenerator';
+import { Traverser } from '../../../../../context/virtual-drive/tree/application/Traverser';
+import { TreeBuilder } from '../../../../../context/virtual-drive/tree/application/TreeBuilder';
+import { CryptoJsNameDecrypt } from '../../../../../context/virtual-drive/tree/infrastructure/CryptoJsNameDecrypt';
+import { SQLiteRemoteItemsGenerator } from '../../../../../context/virtual-drive/tree/infrastructure/SQLiteRemoteItemsGenerator';
 import { getUser } from '../../../../main/auth/service';
 import { TreeContainer } from './TreeContainer';
 
diff --git a/src/apps/fuse/ipcRendererFuse.ts b/src/apps/fuse/ipcRendererFuse.ts
deleted file mode 100644
index 5ac455415..000000000
--- a/src/apps/fuse/ipcRendererFuse.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { CustomIpc } from '../shared/IPC/IPCs';
-import { FromProcess, FromMain } from '../shared/IPC/events/sync-engine';
-import { ipcRenderer } from 'electron';
-
-export type FuseIpc = CustomIpc<FromProcess, FromMain>;
-
-export const ipcRenderFuse = ipcRenderer as unknown as FuseIpc;
diff --git a/src/apps/hydration-api/dependency-injection/common/traverser.ts b/src/apps/hydration-api/dependency-injection/common/traverser.ts
index b25de6491..32ce91f1d 100644
--- a/src/apps/hydration-api/dependency-injection/common/traverser.ts
+++ b/src/apps/hydration-api/dependency-injection/common/traverser.ts
@@ -1,5 +1,5 @@
 import crypt from '../../../../context/shared/infrastructure/crypt';
-import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
+import { Traverser } from '../../../../context/virtual-drive/tree/application/Traverser';
 import { DependencyInjectionUserProvider } from './user';
 
 export class DependencyInjectionTraverserProvider {
diff --git a/src/apps/hydration-api/dependency-injection/tree/TreeContainer.ts b/src/apps/hydration-api/dependency-injection/tree/TreeContainer.ts
index 599d00b4e..b2d8aa077 100644
--- a/src/apps/hydration-api/dependency-injection/tree/TreeContainer.ts
+++ b/src/apps/hydration-api/dependency-injection/tree/TreeContainer.ts
@@ -1,4 +1,4 @@
-import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
+import { TreeBuilder } from '../../../../context/virtual-drive/tree/application/TreeBuilder';
 
 export interface TreeContainer {
   existingNodesTreeBuilder: TreeBuilder;
diff --git a/src/apps/hydration-api/dependency-injection/tree/builder.ts b/src/apps/hydration-api/dependency-injection/tree/builder.ts
index 018c5a2be..a5182e67e 100644
--- a/src/apps/hydration-api/dependency-injection/tree/builder.ts
+++ b/src/apps/hydration-api/dependency-injection/tree/builder.ts
@@ -1,9 +1,9 @@
-import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
-import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
-import { CryptoJsNameDecrypt } from '../../../../context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt';
+import { Traverser } from '../../../../context/virtual-drive/tree/application/Traverser';
+import { TreeBuilder } from '../../../../context/virtual-drive/tree/application/TreeBuilder';
+import { CryptoJsNameDecrypt } from '../../../../context/virtual-drive/tree/infrastructure/CryptoJsNameDecrypt';
 import { getUser } from '../../../main/auth/service';
 import { TreeContainer } from './TreeContainer';
-import { SQLiteRemoteItemsGenerator } from '../../../../context/virtual-drive/items/infrastructure/SQLiteRemoteItemsGenerator';
+import { SQLiteRemoteItemsGenerator } from '../../../../context/virtual-drive/tree/infrastructure/SQLiteRemoteItemsGenerator';
 
 export function buildTreeContainer(): TreeContainer {
   const user = getUser();
diff --git a/src/apps/main/MainProcessSyncEngineIPC.ts b/src/apps/main/MainProcessSyncEngineIPC.ts
new file mode 100644
index 000000000..5b6663ffb
--- /dev/null
+++ b/src/apps/main/MainProcessSyncEngineIPC.ts
@@ -0,0 +1,12 @@
+import { ipcMain } from 'electron';
+import { TypedIPC } from '../shared/IPC/IPCs';
+import { MainProcessVirtualDriveEvents } from '../shared/IPC/events/virtualDrive/MainProcessVirtualDriveEvents';
+import { BackgroundProcessVirtualDriveEvents } from '../shared/IPC/events/virtualDrive/BackgroundProcessVirtualDriveEvents';
+
+export type MainProcessSyncEngineIPC = TypedIPC<
+  MainProcessVirtualDriveEvents,
+  BackgroundProcessVirtualDriveEvents
+>;
+
+export const MainProcessSyncEngineIPC =
+  ipcMain as unknown as MainProcessSyncEngineIPC;
diff --git a/src/apps/main/analytics/drive-handlers.ts b/src/apps/main/analytics/drive-handlers.ts
index f0ed61122..a3afb3377 100644
--- a/src/apps/main/analytics/drive-handlers.ts
+++ b/src/apps/main/analytics/drive-handlers.ts
@@ -1,7 +1,7 @@
-import { ipcMainDrive } from '../ipcs/mainDrive';
+import { MainProcessSyncEngineIPC } from '../MainProcessSyncEngineIPC';
 import { trackError, trackEvent } from './service';
 
-ipcMainDrive.on('FILE_DELETED', (_, payload) => {
+MainProcessSyncEngineIPC.on('FILE_DELETED', (_, payload) => {
   const { name, extension, size } = payload;
 
   trackEvent('Delete Completed', {
@@ -11,7 +11,7 @@ ipcMainDrive.on('FILE_DELETED', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_DOWNLOADING', (_, payload) => {
+MainProcessSyncEngineIPC.on('FILE_DOWNLOADING', (_, payload) => {
   const { name, size, extension, processInfo } = payload;
 
   if (!processInfo.progress) {
@@ -24,7 +24,7 @@ ipcMainDrive.on('FILE_DOWNLOADING', (_, payload) => {
   }
 });
 
-ipcMainDrive.on('FILE_DOWNLOADED', (_, payload) => {
+MainProcessSyncEngineIPC.on('FILE_DOWNLOADED', (_, payload) => {
   const { name, extension, size, processInfo } = payload;
 
   trackEvent('Download Completed', {
@@ -35,19 +35,7 @@ ipcMainDrive.on('FILE_DOWNLOADED', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_CLONNED', (_, payload) => {
-  const { name, extension, size, processInfo } = payload;
-
-  trackEvent('Upload Completed', {
-    file_name: name,
-    file_extension: extension,
-    file_size: size,
-    cloned: true,
-    elapsedTimeMs: processInfo.elapsedTime,
-  });
-});
-
-ipcMainDrive.on('FILE_UPLOADING', (_, payload) => {
+MainProcessSyncEngineIPC.on('FILE_UPLOADING', (_, payload) => {
   const { name, size, extension, processInfo } = payload;
 
   if (!processInfo.progress) {
@@ -60,7 +48,7 @@ ipcMainDrive.on('FILE_UPLOADING', (_, payload) => {
   }
 });
 
-ipcMainDrive.on('FILE_UPLOADED', (_, payload) => {
+MainProcessSyncEngineIPC.on('FILE_UPLOADED', (_, payload) => {
   const { name, extension, size, processInfo } = payload;
 
   trackEvent('Upload Completed', {
@@ -71,8 +59,8 @@ ipcMainDrive.on('FILE_UPLOADED', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_UPLOAD_ERROR', (_, payload) => {
-  const { name, error } = payload;
+MainProcessSyncEngineIPC.on('FILE_UPLOAD_ERROR', (_, payload) => {
+  const { name, cause: error } = payload;
 
   trackError('Upload Error', new Error(error), {
     itemType: 'File',
@@ -82,10 +70,10 @@ ipcMainDrive.on('FILE_UPLOAD_ERROR', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_DOWNLOAD_ERROR', (_, payload) => {
-  const { name, error } = payload;
+MainProcessSyncEngineIPC.on('FILE_DOWNLOAD_ERROR', (_, payload) => {
+  const { name, cause } = payload;
 
-  trackError('Download Error', new Error(error), {
+  trackError('Download Error', new Error(cause), {
     itemType: 'File',
     root: '',
     from: name,
@@ -93,10 +81,10 @@ ipcMainDrive.on('FILE_DOWNLOAD_ERROR', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_RENAME_ERROR', (_, payload) => {
-  const { name, error } = payload;
+MainProcessSyncEngineIPC.on('FILE_RENAME_ERROR', (_, payload) => {
+  const { name, cause } = payload;
 
-  trackError('Rename Error', new Error(error), {
+  trackError('Rename Error', new Error(cause), {
     itemType: 'File',
     root: '',
     from: name,
@@ -104,10 +92,10 @@ ipcMainDrive.on('FILE_RENAME_ERROR', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_DELETION_ERROR', (_, payload) => {
-  const { name, error } = payload;
+MainProcessSyncEngineIPC.on('FILE_DELETION_ERROR', (_, payload) => {
+  const { name, cause } = payload;
 
-  trackError('Delete Error', new Error(error), {
+  trackError('Delete Error', new Error(cause), {
     itemType: 'File',
     root: '',
     from: name,
diff --git a/src/apps/main/background-processes/process-issues.ts b/src/apps/main/background-processes/process-issues.ts
deleted file mode 100644
index fbbcd4570..000000000
--- a/src/apps/main/background-processes/process-issues.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { ipcMain } from 'electron';
-
-import eventBus from '../event-bus';
-import { broadcastToWindows } from '../windows';
-import {
-  ProcessIssue,
-  GeneralIssue,
-  ProcessInfoUpdatePayload,
-} from '../../shared/types';
-
-let processIssues: ProcessIssue[] = [];
-let generalIssues: GeneralIssue[] = [];
-
-ipcMain.handle('get-process-issues', getProcessIssues);
-ipcMain.handle('get-general-issues', getGeneralIssues);
-
-function onProcessIssuesChanged() {
-  broadcastToWindows('process-issues-changed', processIssues);
-}
-
-function onGeneralIssuesChanged() {
-  broadcastToWindows('general-issues-changed', generalIssues);
-}
-
-function getProcessIssues() {
-  return processIssues;
-}
-
-export function getSyncIssues() {
-  return processIssues.filter((issue) => issue.process === 'SYNC');
-}
-
-export function getGeneralIssues() {
-  return generalIssues;
-}
-
-export function clearSyncIssues() {
-  processIssues = processIssues.filter((issue) => issue.process === 'BACKUPS');
-  onProcessIssuesChanged();
-}
-export function clearBackupsIssues() {
-  processIssues = processIssues.filter((issue) => issue.process === 'SYNC');
-  onProcessIssuesChanged();
-}
-
-export function clearGeneralIssues() {
-  generalIssues = [];
-  onGeneralIssuesChanged();
-}
-
-export function addProcessIssue(issue: ProcessIssue) {
-  processIssues.push(issue);
-  onProcessIssuesChanged();
-}
-
-export function addGeneralIssue(issue: GeneralIssue) {
-  generalIssues.push(issue);
-  onGeneralIssuesChanged();
-}
-
-ipcMain.on('SYNC_INFO_UPDATE', (_, payload: ProcessInfoUpdatePayload) => {
-  if (
-    [
-      'PULL_ERROR',
-      'RENAME_ERROR',
-      'DELETE_ERROR',
-      'METADATA_READ_ERROR',
-      'UPLOAD_ERROR',
-    ].includes(payload.action)
-  ) {
-    addProcessIssue(payload as ProcessIssue);
-  }
-});
-
-ipcMain.on('SYNC_PROBLEM', (_, payload) => {
-  addProcessIssue({
-    action: 'GENERATE_TREE',
-    process: 'SYNC',
-    errorName: 'DUPLICATED_NODE',
-    kind: 'LOCAL',
-    name: payload.additionalData.name,
-  });
-});
-
-ipcMain.on('BACKUP_ISSUE', (_, issue: ProcessIssue) => {
-  addProcessIssue(issue);
-});
-
-eventBus.on('USER_LOGGED_OUT', () => {
-  clearSyncIssues();
-  clearBackupsIssues();
-  clearGeneralIssues();
-});
-
-eventBus.on('USER_WAS_UNAUTHORIZED', () => {
-  clearSyncIssues();
-  clearBackupsIssues();
-  clearGeneralIssues();
-});
diff --git a/src/apps/main/bug-report/ErrorDetails.ts b/src/apps/main/bug-report/ErrorDetails.ts
new file mode 100644
index 000000000..156c6c975
--- /dev/null
+++ b/src/apps/main/bug-report/ErrorDetails.ts
@@ -0,0 +1,30 @@
+/**
+ * Only for error reporting purposes, should not be used
+ * to adjust UI to specific errors for example.
+ * That's what SyncError and SyncFatalError classes are for
+ */
+export type ErrorDetails = {
+  /* Describes in natural language what was being
+   done when this error was thrown */
+  action: string;
+
+  // Message of the original error instance
+  message: string;
+  // Error code of the original error instance
+  code: string;
+  // Stack of the original error instance
+  stack: string;
+
+  /* SYSTEM ERROR SPECIFICS */
+
+  // Error number
+  errno?: number;
+  // System call name
+  syscall?: string;
+  // Extra details about the error
+  info?: Record<string, any>;
+
+  // Aditional info that could be helpful
+  // to debug
+  additionalInfo?: string;
+};
diff --git a/src/apps/main/bug-report/ProcessError.ts b/src/apps/main/bug-report/ProcessError.ts
new file mode 100644
index 000000000..ee81fa241
--- /dev/null
+++ b/src/apps/main/bug-report/ProcessError.ts
@@ -0,0 +1,12 @@
+import { SyncErrorCause } from '../../../shared/issues/SyncErrorCause';
+import { ErrorDetails } from './ErrorDetails';
+
+export class ProcessError extends Error {
+  details: ErrorDetails;
+
+  constructor(name: SyncErrorCause, details: ErrorDetails) {
+    super();
+    this.name = name;
+    this.details = details;
+  }
+}
diff --git a/src/apps/main/bug-report/service.ts b/src/apps/main/bug-report/service.ts
index be6a87c3e..052cf73f8 100644
--- a/src/apps/main/bug-report/service.ts
+++ b/src/apps/main/bug-report/service.ts
@@ -11,7 +11,7 @@ import { BugReportResult } from './BugReportResult';
 import * as Sentry from '@sentry/electron/main';
 import { User } from '../types';
 import Logger from 'electron-log';
-import { ErrorDetails } from '../../shared/types';
+import { ErrorDetails } from './ErrorDetails';
 
 /**
  * Reports an error to Sentry from the main process
diff --git a/src/apps/main/device/service.ts b/src/apps/main/device/service.ts
index 0cbf41836..5224b9310 100644
--- a/src/apps/main/device/service.ts
+++ b/src/apps/main/device/service.ts
@@ -6,26 +6,15 @@ import os from 'os';
 import path from 'path';
 
 import { getHeaders } from '../auth/service';
-import { addGeneralIssue } from '../background-processes/process-issues';
 import configStore from '../config';
+import { addAppIssue } from '../issues/app';
 
 export type Device = { name: string; id: number; bucket: string };
 
 export const addUnknownDeviceIssue = (error: Error) => {
-  addGeneralIssue({
+  addAppIssue({
     errorName: 'UNKNOWN_DEVICE_NAME',
     action: 'GET_DEVICE_NAME_ERROR',
-    process: 'GENERAL',
-    errorDetails: {
-      name: error.name,
-      message: error.message,
-      stack: error.stack || '',
-    },
-  });
-  addGeneralIssue({
-    errorName: 'UNKNOWN_DEVICE_NAME',
-    action: 'GET_DEVICE_NAME_ERROR',
-    process: 'GENERAL',
     errorDetails: {
       name: error.name,
       message: error.message,
diff --git a/src/apps/main/fordwardToWindows.ts b/src/apps/main/fordwardToWindows.ts
index a592cef9a..09fd18198 100644
--- a/src/apps/main/fordwardToWindows.ts
+++ b/src/apps/main/fordwardToWindows.ts
@@ -1,9 +1,7 @@
 import { broadcastToWindows } from './windows';
-import { ipcMainDrive } from './ipcs/mainDrive';
-import { ipcMainSyncEngine } from './ipcs/ipcMainSyncEngine';
-import { FileErrorInfo } from '../shared/IPC/events/drive';
+import { MainProcessSyncEngineIPC } from './MainProcessSyncEngineIPC';
 
-ipcMainDrive.on('FILE_DELETED', (_, payload) => {
+MainProcessSyncEngineIPC.on('FILE_DELETED', (_, payload) => {
   const { nameWithExtension } = payload;
 
   broadcastToWindows('sync-info-update', {
@@ -12,7 +10,7 @@ ipcMainDrive.on('FILE_DELETED', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_DOWNLOADING', (_, payload) => {
+MainProcessSyncEngineIPC.on('FILE_DOWNLOADING', (_, payload) => {
   const { nameWithExtension, processInfo } = payload;
 
   broadcastToWindows('sync-info-update', {
@@ -22,7 +20,7 @@ ipcMainDrive.on('FILE_DOWNLOADING', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_DOWNLOADED', (_, payload) => {
+MainProcessSyncEngineIPC.on('FILE_DOWNLOADED', (_, payload) => {
   const { nameWithExtension } = payload;
 
   broadcastToWindows('sync-info-update', {
@@ -31,7 +29,7 @@ ipcMainDrive.on('FILE_DOWNLOADED', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_MOVED', (_, payload) => {
+MainProcessSyncEngineIPC.on('FILE_MOVED', (_, payload) => {
   const { nameWithExtension } = payload;
 
   broadcastToWindows('sync-info-update', {
@@ -40,16 +38,7 @@ ipcMainDrive.on('FILE_MOVED', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_OVERWRITED', (_, payload) => {
-  const { nameWithExtension } = payload;
-
-  broadcastToWindows('sync-info-update', {
-    action: 'MOVED',
-    name: nameWithExtension,
-  });
-});
-
-ipcMainDrive.on('FILE_RENAMING', (_, payload) => {
+MainProcessSyncEngineIPC.on('FILE_RENAMING', (_, payload) => {
   const { nameWithExtension, oldName } = payload;
 
   broadcastToWindows('sync-info-update', {
@@ -59,7 +48,7 @@ ipcMainDrive.on('FILE_RENAMING', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_RENAMED', (_, payload) => {
+MainProcessSyncEngineIPC.on('FILE_RENAMED', (_, payload) => {
   const { nameWithExtension } = payload;
 
   broadcastToWindows('sync-info-update', {
@@ -68,16 +57,7 @@ ipcMainDrive.on('FILE_RENAMED', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_CLONNED', (_, payload) => {
-  const { nameWithExtension } = payload;
-
-  broadcastToWindows('sync-info-update', {
-    action: 'UPLOADED',
-    name: nameWithExtension,
-  });
-});
-
-ipcMainDrive.on('FILE_UPLOADING', (_, payload) => {
+MainProcessSyncEngineIPC.on('FILE_UPLOADING', (_, payload) => {
   const { nameWithExtension, processInfo } = payload;
 
   broadcastToWindows('sync-info-update', {
@@ -87,7 +67,7 @@ ipcMainDrive.on('FILE_UPLOADING', (_, payload) => {
   });
 });
 
-ipcMainDrive.on('FILE_CREATED', (_, payload) => {
+MainProcessSyncEngineIPC.on('FILE_CREATED', (_, payload) => {
   const { nameWithExtension } = payload;
 
   broadcastToWindows('sync-info-update', {
@@ -95,46 +75,3 @@ ipcMainDrive.on('FILE_CREATED', (_, payload) => {
     name: nameWithExtension,
   });
 });
-
-ipcMainDrive.on('FILE_UPLOAD_ERROR', (_, payload) => {
-  const { nameWithExtension } = payload;
-
-  broadcastToWindows('sync-info-update', {
-    action: 'UPLOAD_ERROR',
-    name: nameWithExtension,
-  });
-});
-
-ipcMainDrive.on('FILE_DOWNLOAD_ERROR', (_, payload) => {
-  const { nameWithExtension } = payload;
-
-  broadcastToWindows('sync-info-update', {
-    action: 'DOWNLOAD_ERROR',
-    name: nameWithExtension,
-  });
-});
-
-ipcMainDrive.on('FILE_RENAME_ERROR', (_, payload) => {
-  const { nameWithExtension } = payload;
-
-  broadcastToWindows('sync-info-update', {
-    action: 'RENAME_ERROR',
-    name: nameWithExtension,
-  });
-});
-
-ipcMainDrive.on('FILE_DELETION_ERROR', (_, payload: FileErrorInfo) => {
-  const { nameWithExtension } = payload;
-
-  broadcastToWindows('sync-info-update', {
-    action: 'DELETE_ERROR',
-    name: nameWithExtension,
-  });
-});
-
-ipcMainSyncEngine.on('SYNC_PROBLEM', (_, payload) => {
-  broadcastToWindows('sync-info-update', {
-    action: 'SYNC_PROBLEM',
-    name: payload.additionalData.name,
-  });
-});
diff --git a/src/apps/main/ipcs/ipcMainSyncEngine.ts b/src/apps/main/ipcs/ipcMainSyncEngine.ts
deleted file mode 100644
index fa6158b5c..000000000
--- a/src/apps/main/ipcs/ipcMainSyncEngine.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { ipcMain } from 'electron';
-import { FromProcess, FromMain } from '../../shared/IPC/events/sync-engine';
-import { CustomIpc } from '../../shared/IPC/IPCs';
-
-export const ipcMainSyncEngine = ipcMain as unknown as CustomIpc<
-  FromMain,
-  FromProcess
->;
diff --git a/src/apps/main/ipcs/mainDrive.ts b/src/apps/main/ipcs/mainDrive.ts
deleted file mode 100644
index ffd4169ff..000000000
--- a/src/apps/main/ipcs/mainDrive.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { ipcMain } from 'electron';
-import { NoEvents } from './NoEvents';
-import { CustomIpc } from '../../shared/IPC/IPCs';
-import { DriveEvents } from '../../shared/IPC/events/drive';
-
-export type IpcMainDrive = CustomIpc<NoEvents, DriveEvents>;
-
-export const ipcMainDrive = ipcMain as unknown as IpcMainDrive;
diff --git a/src/apps/main/ipcs/mainVirtualDrive.ts b/src/apps/main/ipcs/mainVirtualDrive.ts
deleted file mode 100644
index 34614a8c4..000000000
--- a/src/apps/main/ipcs/mainVirtualDrive.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { ipcMain } from 'electron';
-import {
-  VirtualDriveHandlers,
-  VirtualDriveEvents,
-} from '../../shared/IPC/events/virtual-drive';
-import { CustomIpc } from '../../shared/IPC/IPCs';
-import { NoEvents } from './NoEvents';
-
-export type IpcVirtualDrive = CustomIpc<
-  NoEvents,
-  VirtualDriveEvents & VirtualDriveHandlers
->;
-
-export const ipcMainVirtualDrive = ipcMain as unknown as IpcVirtualDrive;
diff --git a/src/apps/main/issues/app.ts b/src/apps/main/issues/app.ts
new file mode 100644
index 000000000..a684b2bd9
--- /dev/null
+++ b/src/apps/main/issues/app.ts
@@ -0,0 +1,34 @@
+import { ipcMain } from 'electron';
+import eventBus from '../event-bus';
+import { broadcastToWindows } from '../windows';
+import { AppIssue } from '../../../shared/issues/AppIssue';
+
+let issues: AppIssue[] = [];
+
+function getAppIssues() {
+  return issues;
+}
+
+function onGeneralIssuesChanged() {
+  broadcastToWindows('general-issues-changed', issues);
+}
+
+export function addAppIssue(issue: AppIssue) {
+  issues.push(issue);
+  onGeneralIssuesChanged();
+}
+
+function clearAppIssues() {
+  issues = [];
+  onGeneralIssuesChanged();
+}
+
+ipcMain.handle('get-general-issues', getAppIssues);
+
+eventBus.on('USER_LOGGED_OUT', () => {
+  clearAppIssues();
+});
+
+eventBus.on('USER_WAS_UNAUTHORIZED', () => {
+  clearAppIssues();
+});
diff --git a/src/apps/main/issues/virtual-drive.ts b/src/apps/main/issues/virtual-drive.ts
new file mode 100644
index 000000000..55f2136bd
--- /dev/null
+++ b/src/apps/main/issues/virtual-drive.ts
@@ -0,0 +1,78 @@
+import eventBus from '../event-bus';
+import { broadcastToWindows } from '../windows';
+import { VirtualDriveIssue } from '../../../shared/issues/VirtualDriveIssue';
+import { MainProcessSyncEngineIPC } from '../MainProcessSyncEngineIPC';
+import { ipcMain } from 'electron';
+
+let virtualDriveIssues: VirtualDriveIssue[] = [];
+
+function getVirtualDriveIssues() {
+  return virtualDriveIssues;
+}
+
+function onProcessIssuesChanged() {
+  broadcastToWindows('process-issues-changed', getVirtualDriveIssues());
+}
+
+export function clearSyncIssues() {
+  virtualDriveIssues = [];
+  onProcessIssuesChanged();
+}
+export function clearBackupsIssues() {
+  // no-op
+}
+
+export function addVirtualDriveIssue(issue: VirtualDriveIssue) {
+  virtualDriveIssues.push(issue);
+  onProcessIssuesChanged();
+}
+
+MainProcessSyncEngineIPC.on('FILE_UPLOAD_ERROR', (_, payload) => {
+  addVirtualDriveIssue({
+    error: 'UPLOAD_ERROR',
+    cause: payload.cause,
+    name: payload.nameWithExtension,
+  });
+});
+
+MainProcessSyncEngineIPC.on('FILE_DOWNLOAD_ERROR', (_, payload) => {
+  const { nameWithExtension } = payload;
+
+  addVirtualDriveIssue({
+    error: 'DOWNLOAD_ERROR',
+    cause: payload.cause,
+    name: nameWithExtension,
+  });
+});
+
+MainProcessSyncEngineIPC.on('FILE_RENAME_ERROR', (_, payload) => {
+  const { nameWithExtension } = payload;
+
+  addVirtualDriveIssue({
+    error: 'RENAME_ERROR',
+    cause: payload.cause,
+    name: nameWithExtension,
+  });
+});
+
+MainProcessSyncEngineIPC.on('FILE_DELETION_ERROR', (_, payload) => {
+  const { nameWithExtension } = payload;
+
+  addVirtualDriveIssue({
+    error: 'DELETE_ERROR',
+    cause: payload.cause,
+    name: nameWithExtension,
+  });
+});
+
+ipcMain.handle('get.issues.virtual-drive', getVirtualDriveIssues);
+
+eventBus.on('USER_LOGGED_OUT', () => {
+  clearSyncIssues();
+  clearBackupsIssues();
+});
+
+eventBus.on('USER_WAS_UNAUTHORIZED', () => {
+  clearSyncIssues();
+  clearBackupsIssues();
+});
diff --git a/src/apps/main/main.ts b/src/apps/main/main.ts
index dfe7f98c1..c11edff3c 100644
--- a/src/apps/main/main.ts
+++ b/src/apps/main/main.ts
@@ -16,7 +16,7 @@ import './auth/handlers';
 import './windows/settings';
 import './windows/process-issues';
 import './windows';
-import './background-processes/process-issues';
+import './issues/virtual-drive';
 import './device/handlers';
 import './usage/handlers';
 import './realtime';
diff --git a/src/apps/main/preload.d.ts b/src/apps/main/preload.d.ts
index bd484f6ab..92dca7eaf 100644
--- a/src/apps/main/preload.d.ts
+++ b/src/apps/main/preload.d.ts
@@ -12,11 +12,11 @@ declare interface Window {
     pathChanged(path: string): void;
 
     getGeneralIssues: () => Promise<
-      import('../../apps/shared/types').GeneralIssue[]
+      import('../../shared/issues/AppIssue').AppIssue[]
     >;
 
     onGeneralIssuesChanged: (
-      func: (value: import('../../apps/shared/types').GeneralIssue[]) => void
+      func: (value: import('../../shared/issues/AppIssue').AppIssue[]) => void
     ) => () => void;
 
     onSyncStopped: (
@@ -25,16 +25,18 @@ declare interface Window {
       ) => void
     ) => () => void;
 
-    getProcessIssues(): Promise<import('apps/shared/types').ProcessIssue[]>;
+    getVirtualDriveIssues(): Promise<
+      import('../../shared/issues/VirtualDriveIssue').VirtualDriveIssue[]
+    >;
 
     onProcessIssuesChanged(
-      func: (value: import('apps/shared/types').ProcessIssue[]) => void
+      func: (
+        value: import('../../shared/issues/VirtualDriveIssue').VirtualDriveIssue[]
+      ) => void
     ): () => void;
 
     onSyncInfoUpdate(
-      func: (
-        value: import('apps/shared/types').ProcessInfoUpdatePayload
-      ) => void
+      func: (value: import('../shared/types').DriveInfo) => void
     ): () => void;
 
     userIsUnauthorized(): void;
diff --git a/src/apps/main/preload.js b/src/apps/main/preload.js
index e988efa87..1f43ebb9f 100644
--- a/src/apps/main/preload.js
+++ b/src/apps/main/preload.js
@@ -91,8 +91,8 @@ contextBridge.exposeInMainWorld('electron', {
     ipcRenderer.on(eventName, callback);
     return () => ipcRenderer.removeListener(eventName, callback);
   },
-  getProcessIssues() {
-    return ipcRenderer.invoke('get-process-issues');
+  getVirtualDriveIssues() {
+    return ipcRenderer.invoke('get.issues.virtual-drive');
   },
   onProcessIssuesChanged(func) {
     const eventName = 'process-issues-changed';
diff --git a/src/apps/main/tray/handlers.ts b/src/apps/main/tray/handlers.ts
index 40ee32769..0cc05647b 100644
--- a/src/apps/main/tray/handlers.ts
+++ b/src/apps/main/tray/handlers.ts
@@ -1,77 +1,69 @@
-import { ipcMainDrive } from '../ipcs/mainDrive';
+import { MainProcessSyncEngineIPC } from '../MainProcessSyncEngineIPC';
 import { setTrayStatus } from './tray';
 
-ipcMainDrive.on('FOLDER_CREATING', () => {
+MainProcessSyncEngineIPC.on('FOLDER_CREATING', () => {
   setTrayStatus('SYNCING');
 });
 
-ipcMainDrive.on('FOLDER_CREATED', () => {
+MainProcessSyncEngineIPC.on('FOLDER_CREATED', () => {
   setTrayStatus('IDLE');
 });
 
-ipcMainDrive.on('FOLDER_RENAMING', () => {
+MainProcessSyncEngineIPC.on('FOLDER_RENAMING', () => {
   setTrayStatus('SYNCING');
 });
 
-ipcMainDrive.on('FOLDER_RENAMED', () => {
+MainProcessSyncEngineIPC.on('FOLDER_RENAMED', () => {
   setTrayStatus('IDLE');
 });
 
-ipcMainDrive.on('FILE_DELETING', () => {
+MainProcessSyncEngineIPC.on('FILE_DELETING', () => {
   setTrayStatus('SYNCING');
 });
-ipcMainDrive.on('FILE_DELETED', () => {
+MainProcessSyncEngineIPC.on('FILE_DELETED', () => {
   setTrayStatus('IDLE');
 });
 
-ipcMainDrive.on('FILE_DOWNLOADING', () => {
+MainProcessSyncEngineIPC.on('FILE_DOWNLOADING', () => {
   setTrayStatus('SYNCING');
 });
 
-ipcMainDrive.on('FILE_DOWNLOADED', () => {
+MainProcessSyncEngineIPC.on('FILE_DOWNLOADED', () => {
   setTrayStatus('IDLE');
 });
 
-ipcMainDrive.on('FILE_MOVED', () => {
+MainProcessSyncEngineIPC.on('FILE_MOVED', () => {
   setTrayStatus('IDLE');
 });
 
-ipcMainDrive.on('FILE_OVERWRITED', () => {
-  setTrayStatus('IDLE');
-});
-
-ipcMainDrive.on('FILE_RENAMING', () => {
+MainProcessSyncEngineIPC.on('FILE_RENAMING', () => {
   setTrayStatus('SYNCING');
 });
 
-ipcMainDrive.on('FILE_RENAMED', () => {
-  setTrayStatus('IDLE');
-});
-
-ipcMainDrive.on('FILE_CLONNED', () => {
+MainProcessSyncEngineIPC.on('FILE_RENAMED', () => {
   setTrayStatus('IDLE');
 });
 
-ipcMainDrive.on('FILE_UPLOADING', () => {
+MainProcessSyncEngineIPC.on('FILE_UPLOADING', () => {
   setTrayStatus('SYNCING');
 });
 
-ipcMainDrive.on('FILE_UPLOADED', () => {
+MainProcessSyncEngineIPC.on('FILE_UPLOADED', () => {
   setTrayStatus('IDLE');
 });
 
-ipcMainDrive.on('FILE_UPLOAD_ERROR', () => {
+MainProcessSyncEngineIPC.on('FILE_UPLOAD_ERROR', () => {
   setTrayStatus('ALERT');
 });
 
-ipcMainDrive.on('FILE_DOWNLOAD_ERROR', () => {
+MainProcessSyncEngineIPC.on('FILE_DOWNLOAD_ERROR', () => {
   setTrayStatus('ALERT');
 });
 
-ipcMainDrive.on('FILE_RENAME_ERROR', () => {
+MainProcessSyncEngineIPC.on('FILE_RENAME_ERROR', () => {
   setTrayStatus('ALERT');
 });
 
-ipcMainDrive.on('FILE_DELETION_ERROR', () => {
+MainProcessSyncEngineIPC.on('FILE_DELETION_ERROR', () => {
   setTrayStatus('ALERT');
 });
diff --git a/src/apps/renderer/App.tsx b/src/apps/renderer/App.tsx
index 5bc724196..8617753e4 100644
--- a/src/apps/renderer/App.tsx
+++ b/src/apps/renderer/App.tsx
@@ -15,7 +15,7 @@ import { TranslationProvider } from './context/LocalContext';
 import useLanguageChangedListener from './hooks/useLanguage';
 import Login from './pages/Login';
 import Onboarding from './pages/Onboarding';
-import ProcessIssues from './pages/ProcessIssues';
+import IssuesPage from './pages/Issues/IssuesPage';
 import Settings from './pages/Settings';
 import Widget from './pages/Widget';
 import Migration from './pages/Migration';
@@ -66,7 +66,7 @@ export default function App() {
             <LoggedInWrapper>
               <Routes>
                 <Route path="/login" element={<Login />} />
-                <Route path="/process-issues" element={<ProcessIssues />} />
+                <Route path="/process-issues" element={<IssuesPage />} />
                 <Route path="/onboarding" element={<Onboarding />} />
                 <Route path="/migration" element={<Migration />} />
                 <Route path="/feedback" element={<Feedback />} />
diff --git a/src/apps/renderer/actions/sync-error-actions.ts b/src/apps/renderer/actions/sync-error-actions.ts
index 80886f910..1fdd07f52 100644
--- a/src/apps/renderer/actions/sync-error-actions.ts
+++ b/src/apps/renderer/actions/sync-error-actions.ts
@@ -21,6 +21,6 @@ export const syncErrorActions: FatalErrorActionMap = {
     name: 'issues.actions.select-folder',
     func: selectRootSyncFolder,
   },
-  INSUFICIENT_PERMISION_ACCESSING_BASE_DIRECTORY: tryAgain,
+  INSUFFICIENT_PERMISSION_ACCESSING_BASE_DIRECTORY: tryAgain,
   UNKNOWN: tryAgain,
 };
diff --git a/src/apps/renderer/actions/types.ts b/src/apps/renderer/actions/types.ts
index 3bb177c6e..2a2f7ed80 100644
--- a/src/apps/renderer/actions/types.ts
+++ b/src/apps/renderer/actions/types.ts
@@ -1,8 +1,8 @@
-import { ProcessFatalErrorName } from '../../shared/types';
+import { FatalError } from '../../../shared/issues/FatalError';
 
 export interface Action {
   name: string;
   func: (() => void) | ((error: undefined) => Promise<void>);
 }
 
-export type FatalErrorActionMap = Record<ProcessFatalErrorName, Action>;
+export type FatalErrorActionMap = Record<FatalError, Action>;
diff --git a/src/apps/renderer/components/Backups/FatalError.tsx b/src/apps/renderer/components/Backups/FatalError.tsx
index 887ca9084..809c7897a 100644
--- a/src/apps/renderer/components/Backups/FatalError.tsx
+++ b/src/apps/renderer/components/Backups/FatalError.tsx
@@ -1,10 +1,10 @@
-import { ProcessFatalErrorName } from '../../../shared/types';
+import { FatalError } from '../../../../shared/issues/FatalError';
 import ErrorIcon from '../../assets/error.svg';
 import { useTranslationContext } from '../../context/LocalContext';
-import messages from '../../messages/process-fatal-error';
+import messages from '../../messages/fatal-error';
 import Button from '../Button';
 
-export function FatalError({
+export function FatalErrorComponent({
   errorName,
   path,
   onActionClick,
@@ -12,7 +12,7 @@ export function FatalError({
   showIcon,
   className,
 }: {
-  errorName: ProcessFatalErrorName;
+  errorName: FatalError;
   path: string;
   actionName: string;
   onActionClick: () => void;
diff --git a/src/apps/renderer/hooks/GeneralIssues.tsx b/src/apps/renderer/hooks/GeneralIssues.tsx
index 986445c6b..72df3d844 100644
--- a/src/apps/renderer/hooks/GeneralIssues.tsx
+++ b/src/apps/renderer/hooks/GeneralIssues.tsx
@@ -1,8 +1,8 @@
 import { useEffect, useState } from 'react';
-import { GeneralIssue } from '../../shared/types';
+import { AppIssue } from '../../../shared/issues/AppIssue';
 
 export default function useGeneralIssues() {
-  const [generalIssues, setGeneralIssues] = useState<GeneralIssue[]>([]);
+  const [generalIssues, setGeneralIssues] = useState<AppIssue[]>([]);
 
   useEffect(() => {
     window.electron.getGeneralIssues().then(setGeneralIssues);
diff --git a/src/apps/renderer/hooks/ProcessIssues.tsx b/src/apps/renderer/hooks/ProcessIssues.tsx
index 581fcacb5..ac05fcb29 100644
--- a/src/apps/renderer/hooks/ProcessIssues.tsx
+++ b/src/apps/renderer/hooks/ProcessIssues.tsx
@@ -1,16 +1,19 @@
 import { useEffect, useState } from 'react';
-import { ProcessIssue } from '../../shared/types';
+import { VirtualDriveIssue } from '../../../shared/issues/VirtualDriveIssue';
 
-export default function useProcessIssues() {
-  const [processIssues, setProcessIssues] = useState<ProcessIssue[]>([]);
+export default function useVirtualDriveIssues() {
+  const [virtualDriveIssues, setVirtualDriveIssues] = useState<
+    VirtualDriveIssue[]
+  >([]);
 
   useEffect(() => {
-    window.electron.getProcessIssues().then(setProcessIssues);
-    const removeListener =
-      window.electron.onProcessIssuesChanged(setProcessIssues);
+    window.electron.getVirtualDriveIssues().then(setVirtualDriveIssues);
+    const removeListener = window.electron.onProcessIssuesChanged(
+      setVirtualDriveIssues
+    );
 
     return removeListener;
   }, []);
 
-  return processIssues;
+  return virtualDriveIssues;
 }
diff --git a/src/apps/renderer/hooks/useDriveInfoHistory.tsx b/src/apps/renderer/hooks/useDriveInfoHistory.tsx
new file mode 100644
index 000000000..7b5973e2d
--- /dev/null
+++ b/src/apps/renderer/hooks/useDriveInfoHistory.tsx
@@ -0,0 +1,55 @@
+import { useEffect, useState } from 'react';
+import { DriveInfo } from '../../shared/types';
+import throttle from 'lodash/throttle';
+
+export function useDriveInfoHistory() {
+  const [driveHistory, setDriveHistory] = useState<DriveInfo[]>([]);
+
+  const addItemToHistoryDebounced = throttle((item: DriveInfo) => {
+    const MAX_ITEMS = 50;
+
+    setDriveHistory((prevList) => {
+      const prevListWithoutItem = prevList.filter(
+        ({ name }) => name !== item.name
+      );
+
+      const newList = [item, ...prevListWithoutItem.slice(0, MAX_ITEMS - 1)];
+
+      const result = newList.length <= MAX_ITEMS ? newList : newList.slice(1);
+
+      return result;
+    });
+  }, 1000);
+
+  function addItemToHistory(item: DriveInfo) {
+    addItemToHistoryDebounced(item);
+  }
+
+  function clearHistory() {
+    setDriveHistory([]);
+  }
+
+  function removeDriveOperationsInProgress() {
+    setDriveHistory((currentItems) => {
+      return currentItems.filter(
+        (item) =>
+          item.action !== 'UPLOADING' &&
+          item.action !== 'DOWNLOADING' &&
+          item.action !== 'RENAMING' &&
+          item.action !== 'DELETING'
+      );
+    });
+  }
+
+  useEffect(() => {
+    const removeListener = window.electron.onSyncInfoUpdate(addItemToHistory);
+
+    return removeListener;
+  }, []);
+
+  return {
+    driveHistory,
+    clearHistory,
+    removeDriveOperationsInProgress,
+  };
+}
diff --git a/src/apps/renderer/hooks/useSyncInfoSubscriber.tsx b/src/apps/renderer/hooks/useSyncInfoSubscriber.tsx
deleted file mode 100644
index d8b2049ee..000000000
--- a/src/apps/renderer/hooks/useSyncInfoSubscriber.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { useEffect, useState } from 'react';
-import { ProcessInfoUpdatePayload } from '../../shared/types';
-
-export function useSyncInfoSubscriber() {
-  const [processInfoUpdatedPayload, setProcessInfoUpdatedPayload] = useState<
-    ProcessInfoUpdatePayload[]
-  >([]);
-
-  function onSyncItem(item: ProcessInfoUpdatePayload) {
-    const MAX_ITEMS = 50;
-
-    setProcessInfoUpdatedPayload((currentItems) => {
-      const itemsWithoutGivenItem = currentItems.filter(
-        (i) => i.name !== item.name
-      );
-
-      const itemIsAnError = [
-        'UPLOAD_ERROR',
-        'DOWNLOAD_ERROR',
-        'RENAME_ERROR',
-        'DELETE_ERROR',
-        'METADATA_READ_ERROR',
-      ].includes(item.action);
-
-      const newItems = itemIsAnError
-        ? itemsWithoutGivenItem
-        : [item, ...itemsWithoutGivenItem].slice(0, MAX_ITEMS);
-
-      return newItems;
-    });
-  }
-
-  function clearItems() {
-    setProcessInfoUpdatedPayload((current) =>
-      current.filter((item) =>
-        ['UPLOADING', 'DOWNLOADING', 'RENAMING', 'DELETING'].includes(
-          item.action
-        )
-      )
-    );
-  }
-
-  function removeOnProgressItems() {
-    setProcessInfoUpdatedPayload((currentItems) => {
-      return currentItems.filter(
-        (item) =>
-          item.action !== 'UPLOADING' &&
-          item.action !== 'DOWNLOADING' &&
-          item.action !== 'RENAMING' &&
-          item.action !== 'DELETING'
-      );
-    });
-  }
-
-  useEffect(() => {
-    const removeListener = window.electron.onSyncInfoUpdate(onSyncItem);
-
-    return removeListener;
-  }, []);
-
-  return {
-    processInfoUpdatedPayload,
-    clearItems,
-    removeOnProgressItems,
-  };
-}
diff --git a/src/apps/renderer/localize/locales/en.json b/src/apps/renderer/localize/locales/en.json
index d5d0c02a4..d99509bcb 100644
--- a/src/apps/renderer/localize/locales/en.json
+++ b/src/apps/renderer/localize/locales/en.json
@@ -322,14 +322,16 @@
       "file-does-not-exist": "File doesn't exist",
       "file-too-big": "Max upload size is 20GB. Please try smaller files.",
       "file-non-extension": "Files without extensions are not supported.",
-      "duplicated-node": "It appears that there are duplicate file or folder names in this directory. Please rename one of them to ensure synchronization"
+      "duplicated-node": "It appears that there are duplicate file or folder names in this directory. Please rename one of them to ensure synchronization",
+      "action-not-permitted": "Unable to complete the operation.",
+      "file-already-exists": "Unable to complete the operation. The file already exists on Internxt servers"
     },
     "error-messages": {
       "no-internet": "Looks like you are not connected to the internet, we'll try again later",
       "no-remote-connection": "We could not connect to Internxt servers, we'll try again later",
       "cannot-get-current-listings": "We could not get the status of your current files, we'll try again later",
       "base-directory-does-not-exist": "Unable to find your sync folder",
-      "insuficient-permision-accessing-base-directory": "Internxt App does not have permission to access your sync folder",
+      "insufficient-permission-accessing-base-directory": "Internxt App does not have permission to access your sync folder",
       "cannot-access-base-directory": "We could not access your local folder",
       "cannot-access-tmp-directory": "We could not access your  local folder",
       "unknown": "An unknown error ocurred while trying to sync your files",
@@ -338,7 +340,9 @@
       "file-does-not-exist": "This file was present when we compared your local folder with your Internxt drive but disappeared when we tried to access it. If you deleted this file, don't worry, this error should dissapear the next time the sync process starts.",
       "file-too-big": "Max upload size is 20GB. Please try smaller files.",
       "file-non-extension": "Files without extensions are not supported. Not synchronized.",
-      "duplicated-node": "There are two elements (file or folder) with the same name on a folder. Rename one of them to sync them both"
+      "duplicated-node": "There are two elements (file or folder) with the same name on a folder. Rename one of them to sync them both",
+      "action-not-permitted": "The operation could not be completed, possibly due to a conflict with another file.",
+      "file-already-exists": "Unable to complete the operation. The file already exists on Internxt servers"
     },
     "report-modal": {
       "actions": {
diff --git a/src/apps/renderer/localize/locales/es.json b/src/apps/renderer/localize/locales/es.json
index e66dd663f..4b258a441 100644
--- a/src/apps/renderer/localize/locales/es.json
+++ b/src/apps/renderer/localize/locales/es.json
@@ -321,14 +321,16 @@
       "file-does-not-exist": "El archivo no existe",
       "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños.",
       "file-non-extension": "Archivos sin extensión no son soportados",
-      "duplicated-node": "Hay un conflicto con el elemento"
+      "duplicated-node": "Hay un conflicto con el elemento",
+      "action-not-permitted": "La operación no pudo completarse.",
+      "file-already-exists": "No se puede completar la operación. El archivo ya existe en los servidores de Internxt."
     },
     "error-messages": {
       "no-internet": "No estás conectado a Internet, lo intentaremos más tarde",
       "no-remote-connection": "No hemos podido conectar con los servidores de Internxt, lo intentaremos más tarde",
       "cannot-get-current-listings": "No pudimos obtener el estado de tus archivos actuales, lo intentaremos más tarde",
       "base-directory-does-not-exist": "No se pudo encontrar su carpeta de sincronización",
-      "insuficient-permision-accessing-base-directory": "Internxt App no tiene permiso para acceder a su carpeta de sincronización",
+      "insufficient-permission-accessing-base-directory": "Internxt App no tiene permiso para acceder a su carpeta de sincronización",
       "cannot-access-base-directory": "No hemos podido acceder a su carpeta local",
       "cannot-access-tmp-directory": "No hemos podido acceder a su carpeta local",
       "unknown": "Error desconocido al intentar sincronizar sus archivos",
@@ -337,7 +339,9 @@
       "file-does-not-exist": "Este archivo estaba presente cuando comparamos su carpeta local con su unidad Internxt, pero desapareció cuando intentamos acceder a él. Si has eliminado este archivo, no te preocupes, este error debería desaparecer la próxima vez que se inicie el proceso de sincronización",
       "file-too-big": "El tamaño máximo de carga es de 20GB. Por favor, intenta con archivos más pequeños.",
       "file-non-extension": "Los archivos sin extensiones no son soportados. No sincronizado",
-      "duplicated-node": "Hay dos elementos (archivo o carpeta) con el mismo nombre en una carpeta. Cambia el nombre de uno de ellos para sincronizar ambos."
+      "duplicated-node": "Hay dos elementos (archivo o carpeta) con el mismo nombre en una carpeta. Cambia el nombre de uno de ellos para sincronizar ambos.",
+      "action-not-permitted": "La operación no pudo completarse, posiblemente debido a un conflicto con otro archivo.",
+      "file-already-exists": "No se puede completar la operación. El archivo ya existe en los servidores de Internxt."
     },
     "report-modal": {
       "actions": {
diff --git a/src/apps/renderer/localize/locales/fr.json b/src/apps/renderer/localize/locales/fr.json
index b57c8821c..d4d93a8bf 100644
--- a/src/apps/renderer/localize/locales/fr.json
+++ b/src/apps/renderer/localize/locales/fr.json
@@ -315,14 +315,16 @@
       "no-permission": "Permissions insuffisantes",
       "file-does-not-exist": "Le fichier n'existe pas",
       "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits.",
-      "duplicated-node": "Il y a un conflit avec l'élément."
+      "duplicated-node": "Il y a un conflit avec l'élément.",
+      "action-not-permitted": "L'opération n'a pas pu être complétée.",
+      "file-already-exists": "Impossible de terminer l'opération. Le fichier existe déjà sur les serveurs Internxt."
     },
     "error-messages": {
       "no-internet": "Il semble que vous ne soyez pas connecté à l'internet, nous réessayerons plus tard",
       "no-remote-connection": "Nous n'avons pas pu nous connecter aux serveurs Internxt, nous réessayerons plus tard",
       "cannot-get-current-listings": "Nous n'avons pas pu obtenir l'état de vos fichiers actuels, nous réessayerons plus tard",
       "base-directory-does-not-exist": "Impossible de trouver votre dossier de synchronisation",
-      "insuficient-permision-accessing-base-directory": "Internxt App n'a pas la permission d'accéder à votre dossier de synchronisation",
+      "insufficient-permission-accessing-base-directory": "Internxt App n'a pas la permission d'accéder à votre dossier de synchronisation",
       "cannot-access-base-directory": "Nous n'avons pas pu accéder à votre dossier local",
       "cannot-access-tmp-directory": "Nous n'avons pas pu accéder à votre dossier local",
       "unknown": "Une erreur inconnue s'est produite lors de la synchronisation de vos fichiers",
@@ -331,7 +333,9 @@
       "file-does-not-exist": "Ce fichier était présent lorsque nous avons comparé votre dossier local avec votre disque interne, mais il a disparu lorsque nous avons essayé d'y accéder. Si vous avez supprimé ce fichier, ne vous inquiétez pas, cette erreur devrait disparaître au prochain démarrage du processus de synchronisation.",
       "file-too-big": "La taille maximale de téléchargement est de 20 GB. Veuillez essayer des fichiers plus petits.",
       "file-non-extension": "Les archives sans extensions ne sont pas supportées. Non synchronisées",
-      "duplicated-node": "Il y a deux éléments (fichier ou dossier) avec le même nom dans un dossier. Renommez l'un d'eux pour les synchroniser tous les deux."
+      "duplicated-node": "Il y a deux éléments (fichier ou dossier) avec le même nom dans un dossier. Renommez l'un d'eux pour les synchroniser tous les deux.",
+      "action-not-permitted": "L'opération n'a pas pu être complétée, probablement en raison d'un conflit avec un autre fichier.",
+      "file-already-exists": "Impossible de terminer l'opération. Le fichier existe déjà sur les serveurs Internxt."
     },
     "report-modal": {
       "actions": {
diff --git a/src/apps/renderer/messages/backups/backups-actions-map.ts b/src/apps/renderer/messages/backups/backups-actions-map.ts
index 54c98dd93..36eb5f858 100644
--- a/src/apps/renderer/messages/backups/backups-actions-map.ts
+++ b/src/apps/renderer/messages/backups/backups-actions-map.ts
@@ -1,8 +1,8 @@
-import { ProcessFatalErrorName } from '../../../shared/types';
+import { FatalError } from '../../../../shared/issues/FatalError';
 
 export type FaltalErrorAction = { name: string; fn: () => void };
 
-const map: Partial<Record<ProcessFatalErrorName, FaltalErrorAction>> = {
+const map: Partial<Record<FatalError, FaltalErrorAction>> = {
   BASE_DIRECTORY_DOES_NOT_EXIST: {
     name: 'View Error',
     fn: window.electron.openProcessIssuesWindow,
@@ -10,7 +10,7 @@ const map: Partial<Record<ProcessFatalErrorName, FaltalErrorAction>> = {
 } as const;
 
 function obtainErrorAction(
-  errorName: ProcessFatalErrorName
+  errorName: FatalError
 ): FaltalErrorAction | undefined {
   return map[errorName];
 }
diff --git a/src/apps/renderer/messages/backups/backups-fatal-errors.ts b/src/apps/renderer/messages/backups/backups-fatal-errors.ts
index ba0a0e946..755fd31f1 100644
--- a/src/apps/renderer/messages/backups/backups-fatal-errors.ts
+++ b/src/apps/renderer/messages/backups/backups-fatal-errors.ts
@@ -1,12 +1,12 @@
-import { ProcessFatalErrorName } from '../../../shared/types';
-import processFatalErrors from '../process-fatal-error';
+import { FatalError } from '../../../../shared/issues/FatalError';
+import processFatalErrors from '../fatal-error';
 
-const messages: Partial<Record<ProcessFatalErrorName, string>> = {
+const messages: Partial<Record<FatalError, string>> = {
   BASE_DIRECTORY_DOES_NOT_EXIST:
     'widget.body.errors.backups.folder-not-found.text',
 };
 
-function obtainErrorMessage(errorName: ProcessFatalErrorName): string {
+function obtainErrorMessage(errorName: FatalError): string {
   const specificBackupErrorName = messages[errorName];
 
   if (specificBackupErrorName) {
diff --git a/src/apps/renderer/messages/process-fatal-error.ts b/src/apps/renderer/messages/fatal-error.ts
similarity index 69%
rename from src/apps/renderer/messages/process-fatal-error.ts
rename to src/apps/renderer/messages/fatal-error.ts
index 06b493ec8..46fc53fe2 100644
--- a/src/apps/renderer/messages/process-fatal-error.ts
+++ b/src/apps/renderer/messages/fatal-error.ts
@@ -1,14 +1,14 @@
-import { ProcessFatalErrorName } from '../../shared/types';
+import { FatalError } from '../../../shared/issues/FatalError';
 
-const messages: Record<ProcessFatalErrorName, string> = {
+const messages: Record<FatalError, string> = {
   NO_INTERNET: 'issues.error-messages.no-internet',
   NO_REMOTE_CONNECTION: 'issues.error-messages.no-remote-connection',
   CANNOT_GET_CURRENT_LISTINGS:
     'issues.error-messages.cannot-get-current-listings',
   BASE_DIRECTORY_DOES_NOT_EXIST:
     'issues.error-messages.base-directory-does-not-exist',
-  INSUFICIENT_PERMISION_ACCESSING_BASE_DIRECTORY:
-    'issues.error-messages.insuficient-permision-accessing-base-directory',
+  INSUFFICIENT_PERMISSION_ACCESSING_BASE_DIRECTORY:
+    'issues.error-messages.insufficient-permission-accessing-base-directory',
   CANNOT_ACCESS_BASE_DIRECTORY:
     'issues.error-messages.cannot-access-base-directory',
   CANNOT_ACCESS_TMP_DIRECTORY:
diff --git a/src/apps/renderer/messages/general-error.ts b/src/apps/renderer/messages/general-error.ts
index d0e98fec8..794a5b503 100644
--- a/src/apps/renderer/messages/general-error.ts
+++ b/src/apps/renderer/messages/general-error.ts
@@ -1,18 +1,18 @@
-import { GeneralErrorName } from '../../shared/types';
+import { AppError } from '../../../shared/issues/AppError';
 
-type GeneralErrorMessages = Record<GeneralErrorName, string>;
+type AppErrorMessages = Record<AppError, string>;
 
-export const shortMessages: GeneralErrorMessages = {
+export const shortMessages: AppErrorMessages = {
   UNKNOWN_DEVICE_NAME: 'Could not retrieve your device’s name.',
 };
 
-export const longMessages: GeneralErrorMessages = {
+export const longMessages: AppErrorMessages = {
   UNKNOWN_DEVICE_NAME: 'Please restart the app.',
 };
 
 export const generalErrors: {
-  longMessages: GeneralErrorMessages;
-  shortMessages: GeneralErrorMessages;
+  longMessages: AppErrorMessages;
+  shortMessages: AppErrorMessages;
 } = {
   shortMessages,
   longMessages,
diff --git a/src/apps/renderer/messages/process-error.ts b/src/apps/renderer/messages/virtual-drive-error.ts
similarity index 75%
rename from src/apps/renderer/messages/process-error.ts
rename to src/apps/renderer/messages/virtual-drive-error.ts
index d381f4d8c..a25f9f1ba 100644
--- a/src/apps/renderer/messages/process-error.ts
+++ b/src/apps/renderer/messages/virtual-drive-error.ts
@@ -1,6 +1,6 @@
-import { ProcessErrorName } from '../../shared/types';
+import { SyncErrorCause } from '../../../shared/issues/SyncErrorCause';
 
-type ProcessErrorMessages = Record<ProcessErrorName, string>;
+type ProcessErrorMessages = Record<SyncErrorCause, string>;
 
 export const shortMessages: ProcessErrorMessages = {
   NOT_EXISTS: 'issues.short-error-messages.file-does-not-exist',
@@ -13,12 +13,14 @@ export const shortMessages: ProcessErrorMessages = {
   FILE_TOO_BIG: 'issues.short-error-messages.file-too-big',
   FILE_NON_EXTENSION: 'issues.short-error-messages.file-non-extension',
   DUPLICATED_NODE: 'issues.short-error-messages.duplicated-node',
+  ACTION_NOT_PERMITTED: 'issues.short-error-messages.action-not-permitted',
+  FILE_ALREADY_EXISTS: 'issues.short-error-messages.file-already-exists',
 };
 
 export const longMessages: ProcessErrorMessages = {
   NOT_EXISTS: 'issues.error-messages.file-does-not-exist',
   NO_PERMISSION:
-    'issues.error-messages.insuficient-permision-accessing-base-directory',
+    'issues.error-messages.insufficient-permission-accessing-base-directory',
   NO_INTERNET: 'issues.error-messages.no-internet',
   NO_REMOTE_CONNECTION: 'issues.error-messages.no-remote-connection',
   BAD_RESPONSE: 'issues.error-messages.bad-response',
@@ -27,4 +29,6 @@ export const longMessages: ProcessErrorMessages = {
   FILE_TOO_BIG: 'issues.error-messages.file-too-big',
   FILE_NON_EXTENSION: 'issues.error-messages.file-non-extension',
   DUPLICATED_NODE: 'issues.error-messages.duplicated-node',
+  ACTION_NOT_PERMITTED: '',
+  FILE_ALREADY_EXISTS: '',
 };
diff --git a/src/apps/renderer/pages/Issues/Accordion.tsx b/src/apps/renderer/pages/Issues/Accordion.tsx
new file mode 100644
index 000000000..d3e35bd21
--- /dev/null
+++ b/src/apps/renderer/pages/Issues/Accordion.tsx
@@ -0,0 +1,71 @@
+import { AnimatePresence, motion } from 'framer-motion';
+import { CaretDown } from 'phosphor-react';
+import FileIcon from '../../assets/file.svg';
+import WarnIcon from '../../assets/warn.svg';
+import { getBaseName } from '../../utils/path';
+
+type AccordionProps = {
+  title: string;
+  collapsed: boolean;
+  elements: Array<string>;
+};
+
+export function Accordion({ title, collapsed, elements }: AccordionProps) {
+  return (
+    <>
+      <div className="flex space-x-2.5">
+        <WarnIcon className="h-5 w-5" />
+
+        <div className="flex grow flex-col space-y-1">
+          <h1
+            className="flex flex-1 flex-col text-base font-medium leading-5 text-gray-100"
+            data-test="sync-issue-name"
+          >
+            {title}
+          </h1>
+
+          <p className="text-gray-60" data-test="number-sync-issues">
+            {elements.length} files
+          </p>
+        </div>
+
+        <div className="flex items-center">
+          <CaretDown
+            className={`transform transition-all duration-200 ${
+              collapsed ? 'rotate-0' : 'rotate-180'
+            }`}
+            size={20}
+          />
+        </div>
+      </div>
+
+      <AnimatePresence>
+        {!collapsed && (
+          <motion.div
+            initial="collapsed"
+            animate="open"
+            exit="collapsed"
+            variants={{
+              open: { height: 'auto' },
+              collapsed: { height: 0 },
+            }}
+            transition={{ ease: 'easeInOut' }}
+            className="space-y-2 overflow-hidden rounded-lg border-gray-20 bg-surface p-3"
+          >
+            {elements.map((element, index) => (
+              <div
+                className="flex min-w-0 items-center space-x-2.5 overflow-hidden"
+                key={element + index}
+              >
+                <FileIcon className="h-5 w-5 shrink-0" />
+                <p className="flex flex-1 text-gray-60">
+                  {getBaseName(element)}
+                </p>
+              </div>
+            ))}
+          </motion.div>
+        )}
+      </AnimatePresence>
+    </>
+  );
+}
diff --git a/src/apps/renderer/pages/Issues/GeneralIssuesByErrorAccordion.tsx b/src/apps/renderer/pages/Issues/GeneralIssuesByErrorAccordion.tsx
new file mode 100644
index 000000000..b318b0b30
--- /dev/null
+++ b/src/apps/renderer/pages/Issues/GeneralIssuesByErrorAccordion.tsx
@@ -0,0 +1,129 @@
+import { AnimatePresence, motion } from 'framer-motion';
+import { CaretDown } from 'phosphor-react';
+import { generalErrors } from '../../messages/general-error';
+import FileIcon from '../../assets/file.svg';
+import WarnIcon from '../../assets/warn.svg';
+import { AppError } from '../../../../shared/issues/AppError';
+import { AppIssue as GeneralIssue } from '../../../../shared/issues/AppIssue';
+import { useState } from 'react';
+
+function groupAppIssuesByErrorName(issues: GeneralIssue[]) {
+  const appIssuesGroupedByErrorName = issues.reduce((acc, current) => {
+    const key = current.errorName;
+
+    if (!acc[key]) {
+      acc[key] = [];
+    }
+
+    acc[key].push(current);
+
+    return acc;
+  }, {} as Record<AppError, GeneralIssue[]>);
+
+  return Object.entries(appIssuesGroupedByErrorName) as Array<
+    [AppError, Array<GeneralIssue>]
+  >;
+}
+
+function GeneralIssueAccordion({
+  extend,
+  errorName,
+  issues,
+}: {
+  errorName: AppError;
+  extend: boolean;
+  issues: Array<GeneralIssue>;
+}) {
+  return (
+    <>
+      <div className="flex space-x-2.5" key={errorName}>
+        <WarnIcon className="h-5 w-5" />
+
+        <h1
+          className="flex flex-1 flex-col truncate text-base font-medium leading-5 text-gray-100"
+          data-test="sync-issue-name"
+        >
+          {generalErrors.shortMessages[errorName]}
+        </h1>
+
+        <CaretDown
+          className={`transform transition-all duration-200 ${
+            extend ? 'rotate-180' : 'rotate-0'
+          }`}
+          size={20}
+        />
+      </div>
+
+      <AnimatePresence>
+        {extend && (
+          <motion.div
+            initial="collapsed"
+            animate="open"
+            exit="collapsed"
+            variants={{
+              open: { height: 'auto' },
+              collapsed: { height: 0 },
+            }}
+            transition={{ ease: 'easeInOut' }}
+            className="space-y-2 overflow-hidden rounded-lg border-gray-20 bg-surface p-3"
+          >
+            {issues.map((issue, index) => (
+              <div
+                className="flex min-w-0 items-center space-x-2.5 overflow-hidden"
+                key={issue.errorName + index}
+              >
+                <FileIcon className="h-5 w-5 shrink-0" />
+                <p className="flex flex-1 text-gray-60">
+                  {generalErrors.longMessages[issue.errorName]}
+                </p>
+              </div>
+            ))}
+          </motion.div>
+        )}
+      </AnimatePresence>
+    </>
+  );
+}
+
+type AppIssueElementProps = {
+  issues: Array<GeneralIssue>;
+};
+
+export function GeneralIssuesByErrorAccordion({
+  issues,
+}: AppIssueElementProps) {
+  const [selected, setSelected] = useState<AppError | null>(null);
+
+  const issuesByErrorNameArray = groupAppIssuesByErrorName(issues);
+
+  const isSelected = (errorName: AppError) => {
+    return errorName === selected;
+  };
+
+  const toggleOrSelectError = (clickedError: AppError) => () => {
+    if (clickedError === selected) {
+      setSelected(null);
+      return;
+    }
+
+    setSelected(clickedError);
+  };
+
+  return (
+    <ul>
+      {issuesByErrorNameArray.map(([errorName, issues]) => (
+        <li
+          className="flex flex-col space-y-2.5 p-3 hover:bg-gray-5"
+          onClick={toggleOrSelectError(errorName)}
+          key={errorName}
+        >
+          <GeneralIssueAccordion
+            extend={isSelected(errorName)}
+            errorName={errorName}
+            issues={issues}
+          />
+        </li>
+      ))}
+    </ul>
+  );
+}
diff --git a/src/apps/renderer/pages/Issues/IssuesAccordions.tsx b/src/apps/renderer/pages/Issues/IssuesAccordions.tsx
new file mode 100644
index 000000000..d6ef32d13
--- /dev/null
+++ b/src/apps/renderer/pages/Issues/IssuesAccordions.tsx
@@ -0,0 +1,32 @@
+import { SyncIssuesByErrorAccordion } from './SyncIssuesByErrorAccordion';
+import { NoIssues } from './NoIssues';
+import { Section } from './Section';
+import { VirtualDriveIssue } from '../../../../shared/issues/VirtualDriveIssue';
+import { GeneralIssuesByErrorAccordion } from './GeneralIssuesByErrorAccordion';
+
+import { AppIssue } from '../../../../shared/issues/AppIssue';
+
+type IssuesAccordionsProps = {
+  selectedTab: Section;
+  issues: {
+    app: AppIssue[];
+    virtualDrive: VirtualDriveIssue[];
+  };
+};
+
+export default function IssuesAccordions({
+  selectedTab,
+  issues,
+}: IssuesAccordionsProps) {
+  return (
+    <ul className="relative m-5 mt-2 flex flex-1 flex-col divide-y divide-gray-5 overflow-y-auto rounded-lg border border-gray-20 bg-surface shadow-sm">
+      {issues[selectedTab].length === 0 ? <NoIssues /> : null}
+      {selectedTab === 'virtualDrive' && (
+        <SyncIssuesByErrorAccordion issues={issues.virtualDrive} />
+      )}
+      {selectedTab === 'app' && (
+        <GeneralIssuesByErrorAccordion issues={issues.app} />
+      )}
+    </ul>
+  );
+}
diff --git a/src/apps/renderer/pages/Issues/IssuesPage.tsx b/src/apps/renderer/pages/Issues/IssuesPage.tsx
new file mode 100644
index 000000000..55f9b84ac
--- /dev/null
+++ b/src/apps/renderer/pages/Issues/IssuesPage.tsx
@@ -0,0 +1,44 @@
+import { useEffect, useState } from 'react';
+import WindowTopBar from '../../components/WindowTopBar';
+import { useTranslationContext } from '../../context/LocalContext';
+import useBackupFatalErrors from '../../hooks/BackupFatalErrors';
+import useGeneralIssues from '../../hooks/GeneralIssues';
+import useVirtualDriveIssues from '../../hooks/ProcessIssues';
+import IssuesAccordions from './IssuesAccordions';
+import { IssuesTabs } from './IssuesTabs';
+import { Section } from './Section';
+
+export default function IssuesPage() {
+  const { translate } = useTranslationContext();
+  const virtualDriveIssues = useVirtualDriveIssues();
+  const appIssues = useGeneralIssues();
+  const { backupFatalErrors } = useBackupFatalErrors();
+
+  const [activeSection, setActiveSection] = useState<Section>('virtualDrive');
+
+  useEffect(() => {
+    if (activeSection === 'virtualDrive' && appIssues.length > 0) {
+      setActiveSection('app');
+    } else if (
+      backupFatalErrors.length === 0 &&
+      virtualDriveIssues.length > 0
+    ) {
+      setActiveSection('virtualDrive');
+    }
+  }, [virtualDriveIssues, appIssues]);
+
+  return (
+    <div className="flex h-screen flex-col overflow-hidden">
+      <WindowTopBar title={translate('issues.title')} />
+
+      <div className="draggable flex items-center justify-center py-2">
+        <IssuesTabs active={activeSection} onChangeTab={setActiveSection} />
+      </div>
+
+      <IssuesAccordions
+        selectedTab={activeSection}
+        issues={{ app: appIssues, virtualDrive: virtualDriveIssues }}
+      />
+    </div>
+  );
+}
diff --git a/src/apps/renderer/pages/Issues/IssuesTabs.tsx b/src/apps/renderer/pages/Issues/IssuesTabs.tsx
new file mode 100644
index 000000000..1191c06f5
--- /dev/null
+++ b/src/apps/renderer/pages/Issues/IssuesTabs.tsx
@@ -0,0 +1,89 @@
+import { motion } from 'framer-motion';
+import { useState, useEffect } from 'react';
+import { useTranslationContext } from '../../context/LocalContext';
+import { Section } from './Section';
+
+function TabPill({
+  value,
+  name,
+  active,
+  setAsActive,
+}: {
+  value: Section;
+  name: string;
+  active: boolean;
+  setAsActive: () => void;
+}) {
+  return (
+    <li
+      id={`tab-${value}`}
+      onClick={setAsActive}
+      className={`relative flex cursor-pointer items-center px-4 transition-colors duration-200 ease-out ${
+        active ? 'text-gray-100' : 'text-gray-60'
+      }`}
+    >
+      {name}
+    </li>
+  );
+}
+
+export function IssuesTabs({
+  active,
+  onChangeTab,
+}: {
+  active: Section;
+  onChangeTab: (section: Section) => void;
+}) {
+  const { translate, language } = useTranslationContext();
+  const [tabsWidth, setTabsWidth] = useState<[number, number]>([0, 0]);
+
+  useEffect(() => {
+    setTabsWidth([
+      (document.querySelector('#tab-virtualDrive') as HTMLElement).offsetWidth,
+      (document.querySelector('#tab-app') as HTMLElement).offsetWidth,
+    ]);
+  }, [language, active]);
+
+  const tabs: { value: Section; name: string }[] = [
+    {
+      value: 'virtualDrive',
+      name: translate('issues.tabs.sync'),
+    },
+    {
+      value: 'app',
+      name: translate('issues.tabs.general'),
+    },
+  ];
+
+  return (
+    <div className="non-draggable flex h-10 items-stretch rounded-xl bg-gray-5 p-1">
+      <div className="relative flex items-stretch">
+        <motion.div
+          variants={{
+            virtualDrive: { left: 0, right: 'unset', width: tabsWidth[0] },
+            app: {
+              left: tabsWidth[0],
+              right: 'unset',
+              width: tabsWidth[1],
+            },
+          }}
+          animate={active}
+          transition={{ ease: 'easeOut', duration: 0.2 }}
+          className="absolute h-full rounded-lg bg-surface shadow dark:bg-gray-20"
+          style={{ width: tabsWidth[0] }}
+        />
+
+        {tabs.map((tab) => (
+          <TabPill
+            key={tab.value}
+            {...tab}
+            active={active === tab.value}
+            setAsActive={() => {
+              onChangeTab(tab.value);
+            }}
+          />
+        ))}
+      </div>
+    </div>
+  );
+}
diff --git a/src/apps/renderer/pages/Issues/NoIssues.tsx b/src/apps/renderer/pages/Issues/NoIssues.tsx
new file mode 100644
index 000000000..7e4bdd333
--- /dev/null
+++ b/src/apps/renderer/pages/Issues/NoIssues.tsx
@@ -0,0 +1,13 @@
+import { useTranslationContext } from '../../context/LocalContext';
+
+export function NoIssues() {
+  const { translate } = useTranslationContext();
+
+  return (
+    <div className="flex flex-1 items-center justify-center">
+      <p className="text-sm font-medium text-gray-100">
+        {translate('issues.no-issues')}
+      </p>
+    </div>
+  );
+}
diff --git a/src/apps/renderer/pages/Issues/Section.ts b/src/apps/renderer/pages/Issues/Section.ts
new file mode 100644
index 000000000..bfb67ed44
--- /dev/null
+++ b/src/apps/renderer/pages/Issues/Section.ts
@@ -0,0 +1 @@
+export type Section = 'virtualDrive' | 'app';
diff --git a/src/apps/renderer/pages/Issues/SyncIssuesByErrorAccordion.tsx b/src/apps/renderer/pages/Issues/SyncIssuesByErrorAccordion.tsx
new file mode 100644
index 000000000..d59c68275
--- /dev/null
+++ b/src/apps/renderer/pages/Issues/SyncIssuesByErrorAccordion.tsx
@@ -0,0 +1,143 @@
+import { AnimatePresence, motion } from 'framer-motion';
+import { CaretDown } from 'phosphor-react';
+import FileIcon from '../../assets/file.svg';
+import WarnIcon from '../../assets/warn.svg';
+import { useTranslationContext } from '../../context/LocalContext';
+import { getBaseName } from '../../utils/path';
+import { shortMessages } from '../../messages/virtual-drive-error';
+import { VirtualDriveIssue } from '../../../../shared/issues/VirtualDriveIssue';
+import { SyncErrorCause } from '../../../../shared/issues/SyncErrorCause';
+import { useState } from 'react';
+import { Accordion } from './Accordion';
+
+function groupAppIssuesByErrorName(issues: VirtualDriveIssue[]) {
+  const appIssuesGroupedByErrorName = issues.reduce((acc, current) => {
+    const key = current.cause;
+
+    if (!acc[key]) {
+      acc[key] = [];
+    }
+
+    acc[key].push(current);
+
+    return acc;
+  }, {} as Record<SyncErrorCause, VirtualDriveIssue[]>);
+
+  return Object.entries(appIssuesGroupedByErrorName) as Array<
+    [SyncErrorCause, Array<VirtualDriveIssue>]
+  >;
+}
+
+function VirtualDriveIssue({
+  errorName,
+  issues,
+  extend,
+}: {
+  errorName: SyncErrorCause;
+  issues: VirtualDriveIssue[];
+  extend: boolean;
+}) {
+  const { translate } = useTranslationContext();
+
+  return (
+    <>
+      <div className="flex space-x-2.5">
+        <WarnIcon className="h-5 w-5" />
+
+        <div className="flex flex-col space-y-1">
+          <h1
+            className="flex flex-1 flex-col text-base font-medium leading-5 text-gray-100"
+            data-test="sync-issue-name"
+          >
+            {translate(shortMessages[errorName])}
+          </h1>
+
+          <p className="text-gray-60" data-test="number-sync-issues">
+            {issues.length} files
+          </p>
+        </div>
+
+        <div className="flex items-center space-x-2">
+          <CaretDown
+            className={`transform transition-all duration-200 ${
+              extend ? 'rotate-180' : 'rotate-0'
+            }`}
+            size={20}
+          />
+        </div>
+      </div>
+
+      <AnimatePresence>
+        {extend && (
+          <motion.div
+            initial="collapsed"
+            animate="open"
+            exit="collapsed"
+            variants={{
+              open: { height: 'auto' },
+              collapsed: { height: 0 },
+            }}
+            transition={{ ease: 'easeInOut' }}
+            className="space-y-2 overflow-hidden rounded-lg border-gray-20 bg-surface p-3"
+          >
+            {issues.map((issue) => (
+              <div
+                className="flex min-w-0 items-center space-x-2.5 overflow-hidden"
+                key={issue.name}
+              >
+                <FileIcon className="h-5 w-5 shrink-0" />
+                <p className="flex flex-1 text-gray-60">
+                  {getBaseName(issue.name)}
+                </p>
+              </div>
+            ))}
+          </motion.div>
+        )}
+      </AnimatePresence>
+    </>
+  );
+}
+
+type VirtualDriveIssuesByErrorAccordionProps = {
+  issues: Array<VirtualDriveIssue>;
+};
+
+export function SyncIssuesByErrorAccordion({
+  issues,
+}: VirtualDriveIssuesByErrorAccordionProps) {
+  const { translate } = useTranslationContext();
+  const [selected, setSelected] = useState<SyncErrorCause | null>(null);
+
+  const issuesByCauseArray = groupAppIssuesByErrorName(issues);
+
+  const isSelected = (cause: SyncErrorCause) => {
+    return cause === selected;
+  };
+
+  const toggleOrSelectCause = (clickedCause: SyncErrorCause) => () => {
+    if (clickedCause === selected) {
+      setSelected(null);
+      return;
+    }
+
+    setSelected(clickedCause);
+  };
+
+  return (
+    <ul>
+      {issuesByCauseArray.map(([cause, issues]) => (
+        <li
+          className="flex flex-col space-y-2.5 p-3 hover:bg-gray-5"
+          onClick={toggleOrSelectCause(cause)}
+          key={cause}
+        >
+          <Accordion
+            title={translate(shortMessages[cause])}
+            collapsed={!isSelected(cause)}
+            elements={issues.map((issue) => getBaseName(issue.name))}
+          />
+        </li>
+      ))}
+    </ul>
+  );
+}
diff --git a/src/apps/renderer/pages/ProcessIssues/List.tsx b/src/apps/renderer/pages/ProcessIssues/List.tsx
deleted file mode 100644
index eee9a0e82..000000000
--- a/src/apps/renderer/pages/ProcessIssues/List.tsx
+++ /dev/null
@@ -1,259 +0,0 @@
-import { CaretDown } from '@phosphor-icons/react';
-import { AnimatePresence, motion } from 'framer-motion';
-import { useState } from 'react';
-import FileIcon from '../../assets/file.svg';
-import Spinner from '../../assets/spinner.svg';
-import WarnIcon from '../../assets/warn.svg';
-import { generalErrors } from '../../messages/general-error';
-import { shortMessages } from '../../messages/process-error';
-import { getBaseName } from '../../utils/path';
-import {
-  GeneralIssue,
-  ProcessIssue,
-  ProcessErrorName,
-  GeneralErrorName,
-} from '../../../shared/types';
-import { useTranslationContext } from '../../context/LocalContext';
-
-export default function ProcessIssuesList({
-  selectedTab,
-  processIssues,
-  onClickOnErrorInfo,
-  generalIssues,
-}: {
-  generalIssues: GeneralIssue[];
-  processIssues: ProcessIssue[];
-  selectedTab: 'SYNC' | 'BACKUPS' | 'GENERAL';
-  onClickOnErrorInfo: (errorClicked: Pick<ProcessIssue, 'errorName'>) => void;
-}) {
-  const [selectedErrorName, setSelectedErrorName] = useState<
-    ProcessErrorName | GeneralErrorName | null
-  >(null);
-
-  const errors = [...new Set(processIssues.map((issue) => issue.errorName))];
-
-  function onInfoClick(errorName: ProcessErrorName) {
-    onClickOnErrorInfo({
-      errorName,
-    });
-  }
-
-  const renderItems = () => {
-    if (selectedTab === 'GENERAL') {
-      return generalIssues.map((issue) => {
-        const error = issue.errorName;
-
-        return (
-          <GeneralIssueItem
-            onClick={() =>
-              selectedErrorName === error
-                ? setSelectedErrorName(null)
-                : setSelectedErrorName(error)
-            }
-            key={error}
-            errorName={error}
-            isSelected={selectedErrorName === error}
-            issues={generalIssues.filter((i) => i.errorName === error)}
-          />
-        );
-      });
-    }
-
-    return errors.map((error) => (
-      <Item
-        key={error}
-        onClick={() =>
-          selectedErrorName === error
-            ? setSelectedErrorName(null)
-            : setSelectedErrorName(error)
-        }
-        onInfoClick={() => onInfoClick(error)}
-        errorName={error}
-        issues={processIssues.filter((i) => i.errorName === error)}
-        isSelected={selectedErrorName === error}
-      />
-    ));
-  };
-
-  const issuesIsEmpty = () => {
-    switch (selectedTab) {
-      case 'GENERAL':
-        return generalIssues.length === 0;
-      case 'SYNC':
-        return processIssues.length === 0;
-      default:
-        return true;
-    }
-  };
-
-  return (
-    <ul className="relative m-5 mt-2 flex flex-1 flex-col divide-y divide-gray-5 overflow-y-auto rounded-lg border border-gray-20 bg-surface shadow-sm">
-      {renderItems()}
-
-      {issuesIsEmpty() ? <Empty /> : null}
-      {false && (
-        <div className="absolute flex h-full w-full items-center justify-center bg-surface/75">
-          <Spinner className="h-5 w-5 animate-spin text-gray-100" />
-        </div>
-      )}
-    </ul>
-  );
-}
-
-function Empty() {
-  const { translate } = useTranslationContext();
-
-  return (
-    <div className="flex flex-1 items-center justify-center">
-      <p className="text-sm font-medium text-gray-100">
-        {translate('issues.no-issues')}
-      </p>
-    </div>
-  );
-}
-
-function GeneralIssueItem({
-  issues,
-  isSelected,
-  errorName,
-  onClick,
-}: {
-  errorName: GeneralErrorName;
-  issues: GeneralIssue[];
-  isSelected: boolean;
-  onClick: () => void;
-}) {
-  const { translate } = useTranslationContext();
-
-  return (
-    <li
-      className="flex flex-col space-y-2.5 p-3 hover:bg-gray-5"
-      onClick={onClick}
-    >
-      <div className="flex space-x-2.5">
-        <WarnIcon className="h-5 w-5" />
-
-        <h1
-          className="flex flex-1 flex-col truncate text-base font-medium leading-5 text-gray-100"
-          data-test="sync-issue-name"
-        >
-          {translate(generalErrors.shortMessages[errorName])}
-        </h1>
-
-        <CaretDown
-          className={`transform transition-all duration-200 ${
-            isSelected ? 'rotate-180' : 'rotate-0'
-          }`}
-          size={20}
-        />
-      </div>
-
-      <AnimatePresence>
-        {isSelected && (
-          <motion.div
-            initial="collapsed"
-            animate="open"
-            exit="collapsed"
-            variants={{
-              open: { height: 'auto' },
-              collapsed: { height: 0 },
-            }}
-            transition={{ ease: 'easeInOut' }}
-            className="space-y-2 overflow-hidden rounded-lg border-gray-20 bg-surface p-3"
-          >
-            {issues.map((issue) => (
-              <div
-                className="flex min-w-0 items-center space-x-2.5 overflow-hidden"
-                key={issue.errorDetails.name}
-              >
-                <FileIcon className="h-5 w-5 shrink-0" />
-                <p className="flex flex-1 text-gray-60">
-                  {translate(generalErrors.longMessages[issue.errorName])}
-                </p>
-              </div>
-            ))}
-          </motion.div>
-        )}
-      </AnimatePresence>
-    </li>
-  );
-}
-function Item({
-  errorName,
-  issues,
-  isSelected,
-  onClick,
-}: {
-  errorName: ProcessErrorName;
-  issues: ProcessIssue[];
-  isSelected: boolean;
-  onClick: () => void;
-  onInfoClick: () => void;
-}) {
-  const { translate } = useTranslationContext();
-
-  return (
-    <li
-      onClick={onClick}
-      className="flex flex-col space-y-2.5 p-3 hover:bg-gray-5"
-    >
-      <div className="flex space-x-2.5">
-        <WarnIcon className="h-5 w-5" />
-
-        <div className="flex flex-col space-y-1">
-          <h1
-            className="flex flex-1 flex-col text-base font-medium leading-5 text-gray-100"
-            data-test="sync-issue-name"
-          >
-            {translate(shortMessages[errorName])}
-          </h1>
-
-          <p className="text-gray-60" data-test="number-sync-issues">
-            {issues.length} files
-          </p>
-        </div>
-
-        <div className="flex items-center space-x-2">
-          {/* <Button variant="secondary" size="sm" onClick={onInfoClick}>
-            Report
-          </Button> */}
-
-          <CaretDown
-            className={`transform transition-all duration-200 ${
-              isSelected ? 'rotate-180' : 'rotate-0'
-            }`}
-            size={20}
-          />
-        </div>
-      </div>
-
-      <AnimatePresence>
-        {isSelected && (
-          <motion.div
-            initial="collapsed"
-            animate="open"
-            exit="collapsed"
-            variants={{
-              open: { height: 'auto' },
-              collapsed: { height: 0 },
-            }}
-            transition={{ ease: 'easeInOut' }}
-            className="space-y-2 overflow-hidden rounded-lg border-gray-20 bg-surface p-3"
-          >
-            {issues.map((issue) => (
-              <div
-                className="flex min-w-0 items-center space-x-2.5 overflow-hidden"
-                key={issue.name}
-              >
-                <FileIcon className="h-5 w-5 shrink-0" />
-                <p className="flex flex-1 text-gray-60">
-                  {getBaseName(issue.name)}
-                </p>
-              </div>
-            ))}
-          </motion.div>
-        )}
-      </AnimatePresence>
-    </li>
-  );
-}
diff --git a/src/apps/renderer/pages/ProcessIssues/ReportModal.tsx b/src/apps/renderer/pages/ProcessIssues/ReportModal.tsx
deleted file mode 100644
index ab421c785..000000000
--- a/src/apps/renderer/pages/ProcessIssues/ReportModal.tsx
+++ /dev/null
@@ -1,205 +0,0 @@
-import { Dialog, Transition } from '@headlessui/react';
-import { Fragment, useState } from 'react';
-import { ProcessIssue, ErrorDetails } from '../../../shared/types';
-import Button from '../../components/Button';
-import Checkbox from '../../components/Checkbox';
-import TextArea from '../../components/TextArea';
-import { useTranslationContext } from '../../context/LocalContext';
-import { shortMessages, longMessages } from '../../messages/general-error';
-
-const posibleErrorStates = ['ERROR', 'TOO_MANY_REPORTS'] as const;
-type ErrorReportRequestState = (typeof posibleErrorStates)[number];
-type ReportRequestState = 'READY' | 'SENDING' | ErrorReportRequestState;
-
-const stateIsError = (maybe: unknown): maybe is ErrorReportRequestState =>
-  typeof maybe === 'string' &&
-  posibleErrorStates.includes(maybe as ErrorReportRequestState);
-
-const errorMessages: Record<ErrorReportRequestState, string> = {
-  ERROR:
-    'We could not send your request, make sure you are connected to the internet',
-  TOO_MANY_REPORTS: 'Reached reporting errors day limit',
-};
-
-export function ReportModal({
-  data,
-  onClose,
-}: {
-  data: Pick<ProcessIssue, 'errorName'> | null;
-  onClose: () => void;
-}) {
-  const { translate } = useTranslationContext();
-
-  const [phase, setPhase] = useState<'INITIAL' | 'REPORTING'>('INITIAL');
-
-  const [requestState, setRequestState] = useState<ReportRequestState>('READY');
-
-  const [includeLogs, setIncludeLogs] = useState(true);
-  const [userComment, setUserComment] = useState('');
-
-
-  //@ts-ignore
-  const dialogTitle = data ? translate(shortMessages[data.errorName]) : undefined;
-
-  //@ts-ignore
-  const errorDescription = data ? translate(longMessages[data.errorName]) : undefined;
-
-  const handleOpenURL = async (URL: string) => {
-    try {
-      await window.electron.openUrl(URL);
-    } catch (error) {
-      reportError(error);
-    }
-  };
-
-  const supportParagraph = (
-    <>
-      {translate('issues.report-modal.help-url')}{' '}
-      <span
-        className="cursor-pointer text-primary"
-        onClick={() => handleOpenURL('https://help.internxt.com')}
-      >
-        help.internxt.com
-      </span>
-      .&nbsp; {translate('issues.report-modal.report')}
-    </>
-  );
-
-  async function handleSubmit() {
-    setRequestState('SENDING');
-    // Send reports throw the issues windows was disabled
-    const result = await window.electron.sendReport({
-      errorDetails: {} as ErrorDetails,
-      userComment,
-      includeLogs,
-    });
-
-    if (result.state === 'OK') {
-      onClose();
-
-      return;
-    }
-
-    if (result.state === 'TOO_MANY_REPORTS') {
-      setRequestState('TOO_MANY_REPORTS');
-
-      return;
-    }
-
-    setRequestState('ERROR');
-  }
-
-  return (
-    <Transition appear show={data !== null} as={Fragment}>
-      <Dialog
-        as="div"
-        className="fixed inset-0 z-10 overflow-y-auto"
-        onClose={onClose}
-      >
-        <div className="min-h-screen px-4 text-center">
-          <Transition.Child
-            as={Fragment}
-            enter="ease-out duration-300"
-            enterFrom="opacity-0"
-            enterTo="opacity-100"
-            leave="ease-in duration-200"
-            leaveFrom="opacity-100"
-            leaveTo="opacity-0"
-          >
-            <Dialog.Overlay className="fixed inset-0 bg-black/40 dark:bg-gray-50/40" />
-          </Transition.Child>
-
-          {/* This element is to trick the browser into centering the modal contents. */}
-          <span
-            className="inline-block h-screen align-middle"
-            aria-hidden="true"
-          >
-            &#8203;
-          </span>
-          <Transition.Child
-            as={Fragment}
-            enter="ease-out duration-300"
-            enterFrom="opacity-0 scale-95"
-            enterTo="opacity-100 scale-100"
-            leave="ease-in duration-200"
-            leaveFrom="opacity-100 scale-100"
-            leaveTo="opacity-0 scale-95"
-          >
-            <div className="my-6 inline-block w-full max-w-md transform overflow-hidden rounded-xl bg-surface p-5 text-left align-middle shadow-xl transition-all dark:bg-gray-1">
-              <div className="flex flex-col space-y-2">
-                <Dialog.Title
-                  as="h3"
-                  className="font-medium leading-6 text-gray-100"
-                >
-                  {dialogTitle}
-                </Dialog.Title>
-
-                <p className="text-sm text-gray-60">
-                  {phase === 'INITIAL' ? errorDescription : supportParagraph}
-                </p>
-
-                {phase === 'REPORTING' && (
-                  <div className="flex h-40 flex-col space-y-1.5">
-                    <p className="text-sm font-medium text-gray-100">
-                      {translate('issues.report-modal.user-comments')}
-                    </p>
-
-                    <TextArea
-                      value={userComment}
-                      onChange={(e) => setUserComment(e.target.value)}
-                      customClassName="flex-1"
-                      resize="none"
-                    />
-
-                    {stateIsError(requestState) && (
-                      <p className="text-sm text-red">
-                        {errorMessages[requestState]}
-                      </p>
-                    )}
-
-                    <Checkbox
-                      checked={includeLogs}
-                      onClick={() => setIncludeLogs(!includeLogs)}
-                      label={translate('issues.report-modal.include-logs')}
-                    />
-                  </div>
-                )}
-
-                <div className="flex shrink-0 items-center justify-end space-x-2">
-                  <Button
-                    variant="secondary"
-                    size="sm"
-                    onClick={() =>
-                      phase === 'INITIAL' ? onClose() : setPhase('INITIAL')
-                    }
-                  >
-                    {translate(
-                      phase === 'INITIAL'
-                        ? 'issues.report-modal.actions.close'
-                        : 'issues.report-modal.actions.cancel'
-                    )}
-                  </Button>
-
-                  <Button
-                    disabled={requestState === 'SENDING'}
-                    variant="primary"
-                    size="sm"
-                    onClick={() =>
-                      phase === 'INITIAL'
-                        ? setPhase('REPORTING')
-                        : handleSubmit()
-                    }
-                  >
-                    {phase === 'INITIAL'
-                      ? translate('issues.report-modal.actions.report')
-                      : translate('issues.report-modal.actions.send')}
-                  </Button>
-                </div>
-              </div>
-            </div>
-          </Transition.Child>
-        </div>
-      </Dialog>
-    </Transition>
-  );
-}
diff --git a/src/apps/renderer/pages/ProcessIssues/index.tsx b/src/apps/renderer/pages/ProcessIssues/index.tsx
deleted file mode 100644
index c145787ad..000000000
--- a/src/apps/renderer/pages/ProcessIssues/index.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import { motion } from 'framer-motion';
-import { useEffect, useState } from 'react';
-import WindowTopBar from '../../components/WindowTopBar';
-import { useTranslationContext } from '../../context/LocalContext';
-import useBackupFatalErrors from '../../hooks/BackupFatalErrors';
-import useGeneralIssues from '../../hooks/GeneralIssues';
-import useProcessIssues from '../../hooks/ProcessIssues';
-import ProcessIssuesList from './List';
-import { ReportModal } from './ReportModal';
-import { ProcessIssue } from '../../../shared/types';
-
-type Section = 'SYNC' | 'GENERAL';
-
-export default function ProcessIssues() {
-  const { translate } = useTranslationContext();
-  const processIssues = useProcessIssues();
-  const generalIssues = useGeneralIssues();
-  const { backupFatalErrors } = useBackupFatalErrors();
-  const [reportData, setReportData] = useState<Pick<
-    ProcessIssue,
-    'errorName'
-  > | null>(null);
-
-  const [activeSection, setActiveSection] = useState<Section>('SYNC');
-
-  const processIssuesFilteredByActiveSection = processIssues.filter(
-    (issue) => issue.process === activeSection
-  );
-
-  useEffect(() => {
-    if (
-      activeSection === 'SYNC' &&
-      processIssuesFilteredByActiveSection.length === 0 &&
-      generalIssues.length
-    ) {
-      setActiveSection('GENERAL');
-    } else if (
-      processIssuesFilteredByActiveSection.length === 0 &&
-      backupFatalErrors.length === 0 &&
-      processIssues.length
-    ) {
-      setActiveSection('SYNC');
-    }
-  }, [processIssues, backupFatalErrors, generalIssues]);
-
-  return (
-    <div className="flex h-screen flex-col overflow-hidden">
-      <WindowTopBar title={translate('issues.title')} />
-
-      <div className="draggable flex items-center justify-center py-2">
-        <Tabs active={activeSection} onChangeTab={setActiveSection} />
-      </div>
-
-      <ProcessIssuesList
-        selectedTab={activeSection}
-        generalIssues={generalIssues}
-        processIssues={processIssuesFilteredByActiveSection}
-        onClickOnErrorInfo={setReportData}
-      />
-
-      <ReportModal
-        key={reportData?.errorName}
-        data={reportData}
-        onClose={() => setReportData(null)}
-      />
-    </div>
-  );
-}
-
-function Tabs({
-  active,
-  onChangeTab,
-}: {
-  active: Section;
-  onChangeTab: (section: Section) => void;
-}) {
-  const { translate, language } = useTranslationContext();
-  const [tabsWidth, setTabsWidth] = useState<[number, number]>([0, 0]);
-
-  useEffect(() => {
-    setTabsWidth([
-      (document.querySelector('#tab-SYNC') as HTMLElement).offsetWidth,
-      (document.querySelector('#tab-GENERAL') as HTMLElement).offsetWidth,
-    ]);
-  }, [language, active]);
-
-  const tabs: { value: Section; name: string }[] = [
-    {
-      value: 'SYNC',
-      name: translate('issues.tabs.sync'),
-    },
-    {
-      value: 'GENERAL',
-      name: translate('issues.tabs.general'),
-    },
-  ];
-
-  const Tab = ({ value, name }: { value: Section; name: string }) => (
-    <li
-      id={`tab-${value}`}
-      onClick={() => onChangeTab(value)}
-      className={`relative flex cursor-pointer items-center px-4 transition-colors duration-200 ease-out ${
-        active === value ? 'text-gray-100' : 'text-gray-60'
-      }`}
-    >
-      {name}
-    </li>
-  );
-
-  return (
-    <div className="non-draggable flex h-10 items-stretch rounded-xl bg-gray-5 p-1">
-      <div className="relative flex items-stretch">
-        <motion.div
-          variants={{
-            SYNC: { left: 0, right: 'unset', width: tabsWidth[0] },
-            GENERAL: {
-              left: tabsWidth[0],
-              right: 'unset',
-              width: tabsWidth[1],
-            },
-          }}
-          animate={active}
-          transition={{ ease: 'easeOut', duration: 0.2 }}
-          className="absolute h-full rounded-lg bg-surface shadow dark:bg-gray-20"
-          style={{ width: tabsWidth[0] }}
-        />
-
-        {tabs.map((tab) => (
-          <Tab {...tab} />
-        ))}
-      </div>
-    </div>
-  );
-}
diff --git a/src/apps/renderer/pages/Widget/Header.tsx b/src/apps/renderer/pages/Widget/Header.tsx
index 33dca6632..f87cbda7c 100644
--- a/src/apps/renderer/pages/Widget/Header.tsx
+++ b/src/apps/renderer/pages/Widget/Header.tsx
@@ -7,7 +7,7 @@ import { User } from '../../../main/types';
 import { useTranslationContext } from '../../context/LocalContext';
 import useBackupFatalErrors from '../../hooks/BackupFatalErrors';
 import useGeneralIssues from '../../hooks/GeneralIssues';
-import useProcessIssues from '../../hooks/ProcessIssues';
+import useVirtualDriveIssues from '../../hooks/ProcessIssues';
 import useUsage from '../../hooks/useUsage';
 import useVirtualDriveStatus from '../../hooks/VirtualDriveStatus';
 import { reportError } from '../../utils/errors';
@@ -15,7 +15,7 @@ import { reportError } from '../../utils/errors';
 export default function Header() {
   const { translate } = useTranslationContext();
   const { virtualDriveCanBeOpened } = useVirtualDriveStatus();
-  const processIssues = useProcessIssues();
+  const processIssues = useVirtualDriveIssues();
   const generalIssues = useGeneralIssues();
   const { backupFatalErrors } = useBackupFatalErrors();
 
diff --git a/src/apps/renderer/pages/Widget/Item.tsx b/src/apps/renderer/pages/Widget/Item.tsx
index f1397d12a..7b68bc5a0 100644
--- a/src/apps/renderer/pages/Widget/Item.tsx
+++ b/src/apps/renderer/pages/Widget/Item.tsx
@@ -1,23 +1,11 @@
-import { Check, WarningCircle } from '@phosphor-icons/react';
+import { Check } from '@phosphor-icons/react';
 import { CircularProgressbar, buildStyles } from 'react-circular-progressbar';
 import { useTranslationContext } from '../../context/LocalContext';
-import { shortMessages } from '../../messages/process-error';
 import { getBaseName, getExtension } from '../../utils/path';
-import {
-  ProcessInfoUpdatePayload,
-  ProcessErrorName,
-} from '../../../shared/types';
+import { DriveInfo } from '../../../shared/types';
 import { fileIcon } from '../../assets/icons/getIcon';
 
-export function Item({
-  name,
-  action,
-  progress,
-  errorName,
-}: ProcessInfoUpdatePayload & {
-  progress?: number;
-  errorName?: ProcessErrorName;
-}) {
+export function Item({ name, action, progress }: DriveInfo) {
   const { translate } = useTranslationContext();
   const progressDisplay = progress ? `${Math.ceil(progress * 100)}%` : '';
 
@@ -43,8 +31,6 @@ export function Item({
     description = translate('widget.body.activity.operation.renaming');
   } else if (action === 'RENAMED') {
     description = translate('widget.body.activity.operation.renamed');
-  } else if (errorName) {
-    description = shortMessages[errorName];
   }
 
   return (
@@ -61,30 +47,7 @@ export function Item({
           >
             {getBaseName(name)}
           </p>
-          <p
-            className={`truncate text-xs text-gray-50 ${
-              action &&
-              (action === 'DELETE_ERROR' ||
-                action === 'DOWNLOAD_ERROR' ||
-                action === 'UPLOAD_ERROR' ||
-                action === 'RENAME_ERROR' ||
-                action === 'METADATA_READ_ERROR' ||
-                action === 'GENERATE_TREE')
-                ? 'text-red'
-                : undefined
-            }`}
-            title={
-              action &&
-              (action === 'DELETE_ERROR' ||
-                action === 'DOWNLOAD_ERROR' ||
-                action === 'UPLOAD_ERROR' ||
-                action === 'RENAME_ERROR' ||
-                action === 'METADATA_READ_ERROR' ||
-                action === 'GENERATE_TREE')
-                ? description
-                : undefined
-            }
-          >
+          <p className={'truncate text-xs text-gray-50'}>
             {`${description} ${progressDisplay}`}
           </p>
         </div>
@@ -118,17 +81,6 @@ export function Item({
               action === 'RENAMED') && (
               <Check size={24} className="text-green" weight="bold" />
             )}
-
-          {/* ERROR */}
-          {action &&
-            (action === 'DELETE_ERROR' ||
-              action === 'DOWNLOAD_ERROR' ||
-              action === 'UPLOAD_ERROR' ||
-              action === 'RENAME_ERROR' ||
-              action === 'METADATA_READ_ERROR' ||
-              action === 'GENERATE_TREE') && (
-              <WarningCircle size={24} className="text-red" weight="regular" />
-            )}
         </div>
       </div>
     </div>
diff --git a/src/apps/renderer/pages/Widget/SyncErrorBanner.tsx b/src/apps/renderer/pages/Widget/SyncErrorBanner.tsx
index 2e668580c..e7583f0c2 100644
--- a/src/apps/renderer/pages/Widget/SyncErrorBanner.tsx
+++ b/src/apps/renderer/pages/Widget/SyncErrorBanner.tsx
@@ -1,14 +1,16 @@
 import { SyncStatus } from '../../../../context/desktop/sync/domain/SyncStatus';
-import { ProcessFatalErrorName } from '../../../shared/types';
+import { FatalError } from '../../../../shared/issues/FatalError';
 import Error from '../../assets/error.svg';
 import Warn from '../../assets/warn.svg';
 import { useTranslationContext } from '../../context/LocalContext';
 import useSyncStatus from '../../hooks/useSyncStatus';
 import useSyncStopped from '../../hooks/useSyncStopped';
-import SyncFatalErrorMessages from '../../messages/process-fatal-error';
+import SyncFatalErrorMessages from '../../messages/fatal-error';
+
+type ErrorSeverity = 'FATAL' | 'WARN';
 
 const fatalErrorActionMap: Record<
-  ProcessFatalErrorName,
+  FatalError,
   { name: string; func: () => void } | undefined
 > = {
   BASE_DIRECTORY_DOES_NOT_EXIST: {
@@ -20,7 +22,7 @@ const fatalErrorActionMap: Record<
       }
     },
   },
-  INSUFICIENT_PERMISION_ACCESSING_BASE_DIRECTORY: {
+  INSUFFICIENT_PERMISSION_ACCESSING_BASE_DIRECTORY: {
     name: 'Change folder',
     func: async () => {
       const result = await window.electron.chooseSyncRootWithDialog();
@@ -49,7 +51,7 @@ export default function SyncErrorBanner() {
 
   useSyncStatus(onSyncStatusChanged);
 
-  const severity: 'FATAL' | 'WARN' = 'FATAL' as 'FATAL' | 'WARN';
+  const severity = 'FATAL' as ErrorSeverity;
   const show = stopReason !== null && stopReason?.reason !== 'STOPPED_BY_USER';
 
   const Icon = severity === 'FATAL' ? Error : Warn;
diff --git a/src/apps/renderer/pages/Widget/SyncInfo.tsx b/src/apps/renderer/pages/Widget/SyncInfo.tsx
index 15216c1c5..491c7c7a5 100644
--- a/src/apps/renderer/pages/Widget/SyncInfo.tsx
+++ b/src/apps/renderer/pages/Widget/SyncInfo.tsx
@@ -1,24 +1,24 @@
 import { AnimatePresence } from 'framer-motion';
 import { useOnSyncRunning } from '../../hooks/useOnSyncRunning';
 import { useOnSyncStopped } from '../../hooks/useOnSyncStopped';
-import { useSyncInfoSubscriber } from '../../hooks/useSyncInfoSubscriber';
+import { useDriveInfoHistory } from '../../hooks/useDriveInfoHistory';
 import { AnimationWrapper } from './AnimationWrapper';
 import { Item } from './Item';
 import { NoInfoToShow } from './NoInfoToShow';
 
 export default function SyncInfo() {
-  const { processInfoUpdatedPayload, clearItems, removeOnProgressItems } =
-    useSyncInfoSubscriber();
+  const { driveHistory, clearHistory, removeDriveOperationsInProgress } =
+    useDriveInfoHistory();
 
-  useOnSyncStopped(removeOnProgressItems);
-  useOnSyncRunning(clearItems);
+  useOnSyncStopped(removeDriveOperationsInProgress);
+  useOnSyncRunning(clearHistory);
 
   return (
     <div className="no-scrollbar relative flex flex-1 flex-col overflow-y-auto">
-      {processInfoUpdatedPayload.length === 0 && <NoInfoToShow />}
+      {driveHistory.length === 0 && <NoInfoToShow />}
       <div className="flex-1">
         <AnimatePresence>
-          {processInfoUpdatedPayload.map((item, i) => (
+          {driveHistory.map((item, i) => (
             <AnimationWrapper key={item.name} i={i}>
               <Item {...item} />
             </AnimationWrapper>
diff --git a/src/apps/renderer/pages/Widget/index.tsx b/src/apps/renderer/pages/Widget/index.tsx
index edc2d44bd..b0d4aee20 100644
--- a/src/apps/renderer/pages/Widget/index.tsx
+++ b/src/apps/renderer/pages/Widget/index.tsx
@@ -4,30 +4,28 @@ import SyncErrorBanner from './SyncErrorBanner';
 import SyncInfo from './SyncInfo';
 import useSyncStatus from '../../hooks/useSyncStatus';
 import { SyncFailed } from './SyncFailed';
+import { useEffect, useState } from 'react';
+
+const handleRetrySync = () => {
+  window.electron.startRemoteSync().catch((err) => {
+    reportError(err);
+  });
+};
 
 export default function Widget() {
   const { syncStatus } = useSyncStatus();
+  const [displayErrorInWidget, setDisplayErrorInWidget] = useState(false);
 
-  const handleRetrySync = () => {
-    window.electron.startRemoteSync().catch((err) => {
-      reportError(err);
-    });
-  };
-
-  const displayErrorInWidget = syncStatus && syncStatus === 'FAILED';
-
-  const renderWidgetError = () => {
-    if (syncStatus === 'FAILED') {
-      return <SyncFailed onRetrySync={handleRetrySync} />;
-    }
-    return <></>;
-  };
+  useEffect(() => {
+    setDisplayErrorInWidget(syncStatus && syncStatus === 'FAILED');
+  }, [syncStatus]);
 
   return (
     <div className="flex h-screen flex-col overflow-hidden">
       <Header />
       <SyncErrorBanner />
-      {displayErrorInWidget ? renderWidgetError() : <SyncInfo />}
+      {displayErrorInWidget && <SyncFailed onRetrySync={handleRetrySync} />}
+      {!displayErrorInWidget && <SyncInfo />}
       <SyncAction syncStatus={syncStatus} />
     </div>
   );
diff --git a/src/apps/shared/IPC/IPCs.ts b/src/apps/shared/IPC/IPCs.ts
index 1940719c1..77c76b722 100644
--- a/src/apps/shared/IPC/IPCs.ts
+++ b/src/apps/shared/IPC/IPCs.ts
@@ -2,7 +2,7 @@ import { IpcMainEvent } from 'electron';
 
 type EventHandler = (...args: any) => any;
 
-export type CustomIPCEvents = Record<string, EventHandler>;
+type CustomIPCEvents = Record<string, EventHandler>;
 
 type NonVoidReturnHandler<T extends CustomIPCEvents> = {
   [Property in keyof T as ReturnType<T[Property]> extends void
@@ -22,7 +22,7 @@ type VoidParamsHandler<T extends CustomIPCEvents> = {
     : never]: T[Property];
 };
 
-export interface CustomIpc<
+export interface TypedIPC<
   EmittedEvents extends CustomIPCEvents,
   ListenedEvents extends CustomIPCEvents
 > {
diff --git a/src/apps/main/ipcs/NoEvents.ts b/src/apps/shared/IPC/events/NoEvents.ts
similarity index 100%
rename from src/apps/main/ipcs/NoEvents.ts
rename to src/apps/shared/IPC/events/NoEvents.ts
diff --git a/src/apps/shared/IPC/events/drive.ts b/src/apps/shared/IPC/events/drive.ts
deleted file mode 100644
index 2475f1008..000000000
--- a/src/apps/shared/IPC/events/drive.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-type FolderEvents = {
-  FOLDER_CREATING: (payload: { name: string }) => void;
-  FOLDER_CREATED: (payload: { name: string }) => void;
-  FOLDER_RENAMING: (payload: { oldName: string; newName: string }) => void;
-  FOLDER_RENAMED: (payload: { oldName: string; newName: string }) => void;
-};
-
-export type FileInfo = {
-  name: string;
-  extension: string;
-  nameWithExtension: string;
-  size: number;
-};
-
-export type FileProgressInfo = FileInfo & {
-  processInfo: {
-    elapsedTime: number;
-    progress?: number;
-  };
-};
-
-export type FileErrorInfo = {
-  name: string;
-  extension: string;
-  nameWithExtension: string;
-  error: string;
-};
-
-type UploadEvents = {
-  FILE_UPLOADING: (payload: FileProgressInfo) => void;
-  FILE_UPLOADED: (payload: FileProgressInfo) => void;
-  FILE_CREATED: (payload: { nameWithExtension: string }) => void;
-  FILE_UPLOAD_ERROR: (payload: FileErrorInfo) => void;
-};
-
-type DownloadEvents = {
-  FILE_DOWNLOADING: (payload: FileProgressInfo) => void;
-  FILE_DOWNLOADED: (payload: FileProgressInfo) => void;
-  FILE_DOWNLOAD_ERROR: (payload: FileErrorInfo) => void;
-};
-
-type TrashEvents = {
-  FILE_DELETED: (payload: FileInfo) => void;
-  FILE_DELETING: (payload: FileInfo) => void;
-  FILE_DELETION_ERROR: (payload: FileErrorInfo) => void;
-};
-
-type RenameEvents = {
-  FILE_RENAMING: (payload: {
-    nameWithExtension: string;
-    oldName: string;
-  }) => void;
-  FILE_RENAMED: (payload: {
-    nameWithExtension: string;
-    oldName: string;
-  }) => void;
-  FILE_RENAME_ERROR: (payload: FileErrorInfo) => void;
-};
-
-type OverwriteEvents = {
-  FILE_OVERWRITED: (payload: { nameWithExtension: string }) => void;
-};
-
-type MoveEvents = {
-  FILE_MOVED: (payload: {
-    nameWithExtension: string;
-    folderName: string;
-  }) => void;
-};
-
-type CloneEvents = {
-  FILE_CLONNED: (payload: FileProgressInfo) => void;
-};
-
-type FileEvents = UploadEvents &
-  DownloadEvents &
-  TrashEvents &
-  RenameEvents &
-  OverwriteEvents &
-  MoveEvents &
-  CloneEvents;
-
-export type DriveEvents = FolderEvents & FileEvents;
diff --git a/src/apps/shared/IPC/events/sync-engine.ts b/src/apps/shared/IPC/events/sync-engine.ts
index 9cbf931bb..4b3bd9251 100644
--- a/src/apps/shared/IPC/events/sync-engine.ts
+++ b/src/apps/shared/IPC/events/sync-engine.ts
@@ -1,7 +1,3 @@
-import { DriveFile } from '../../../main/database/entities/DriveFile';
-import { DriveFolder } from '../../../main/database/entities/DriveFolder';
-import { ProcessInfoUpdatePayload } from '../../types';
-
 const trackedEvents = [
   'delete',
   'upload',
@@ -28,123 +24,3 @@ export type ErrorContext = {
   from: string;
   root: string;
 };
-
-type ProcessInfo = {
-  elapsedTime: number;
-  progress?: number;
-};
-
-type FileUpdatePayload = {
-  name: string;
-  extension: string;
-  nameWithExtension: string;
-  size: number;
-  processInfo: ProcessInfo;
-};
-
-export type FolderEvents = {
-  FOLDER_CREATING: (payload: { name: string }) => void;
-  FOLDER_CREATED: (payload: { name: string }) => void;
-  FOLDER_CREATION_ERROR: (payload: { name: string; error: string }) => void;
-
-  FOLDER_RENAMING: (payload: { oldName: string; newName: string }) => void;
-  FOLDER_RENAMED: (payload: { oldName: string; newName: string }) => void;
-  FOLDER_RENAME_ERROR: (payload: {
-    oldName: string;
-    newName: string;
-    error: string;
-  }) => void;
-};
-
-export type FilesEvents = {
-  FILE_UPLOADING: (payload: FileUpdatePayload) => void;
-  FILE_UPLOADED: (payload: FileUpdatePayload) => void;
-  FILE_CREATED: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-  }) => void;
-  FILE_DOWNLOAD_ERROR: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    error: string;
-  }) => void;
-
-  FILE_DOWNLOADING: (payload: FileUpdatePayload) => void;
-  FILE_DOWNLOADED: (payload: FileUpdatePayload) => void;
-  FILE_UPLOAD_ERROR: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    error: string;
-  }) => void;
-
-  FILE_DELETING: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    size: number;
-  }) => void;
-  FILE_DELETED: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    size: number;
-  }) => void;
-  FILE_DELETION_ERROR: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    error: string;
-  }) => void;
-
-  FILE_RENAMING: (payload: {
-    nameWithExtension: string;
-    oldName: string;
-  }) => void;
-  FILE_RENAMED: (payload: {
-    nameWithExtension: string;
-    oldName: string;
-  }) => void;
-  FILE_MOVED: (payload: {
-    nameWithExtension: string;
-    folderName: string;
-  }) => void;
-  FILE_RENAME_ERROR: (payload: {
-    name: string;
-    extension: string;
-    nameWithExtension: string;
-    error: string;
-  }) => void;
-
-  FILE_OVERWRITTEN: (payload: { nameWithExtension: string }) => void;
-
-  FILE_CLONED: (payload: FileUpdatePayload) => void;
-};
-
-export type SyncEngineInvocableFunctions = {
-  GET_UPDATED_REMOTE_ITEMS: () => Promise<{
-    files: DriveFile[];
-    folders: DriveFolder[];
-  }>;
-  START_REMOTE_SYNC: () => Promise<void>;
-};
-
-// TODO: change how errors are reported to the ui
-export type ProcessInfoUpdate = {
-  SYNC_INFO_UPDATE: (payload: ProcessInfoUpdatePayload) => void;
-  SYNC_PROBLEM: (payload: {
-    key: string;
-    additionalData: Record<string, any>;
-  }) => void;
-};
-
-export type FromProcess = FilesEvents &
-  FolderEvents &
-  SyncEngineInvocableFunctions &
-  ProcessInfoUpdate;
-
-export type FromMain = {
-  [key: string]: (...args: Array<any>) => any;
-};
diff --git a/src/apps/shared/IPC/events/virtual-drive.ts b/src/apps/shared/IPC/events/virtual-drive.ts
deleted file mode 100644
index e8333e8d0..000000000
--- a/src/apps/shared/IPC/events/virtual-drive.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { VirtualDriveStatus } from '../../../shared/types/VirtualDriveStatus';
-
-export type VirtualDriveEvents = {
-  VIRTUAL_DRIVE_RETRYING_MOUNT: () => void;
-  VIRTUAL_DRIVE_STARTING: () => void;
-  VIRTUAL_DRIVE_MOUNTED_SUCCESSFULLY: () => void;
-  VIRTUAL_DRIVE_MOUNT_ERROR: (err: Error) => void;
-  VIRTUAL_DRIVE_UNMOUNT_ERROR: (err: Error) => void;
-};
-
-export type VirtualDriveHandlers = {
-  'get-virtual-drive-status': () => VirtualDriveStatus;
-};
diff --git a/src/apps/shared/IPC/events/virtualDrive/BackgroundProcessVirtualDriveEvents.ts b/src/apps/shared/IPC/events/virtualDrive/BackgroundProcessVirtualDriveEvents.ts
new file mode 100644
index 000000000..f7bad084b
--- /dev/null
+++ b/src/apps/shared/IPC/events/virtualDrive/BackgroundProcessVirtualDriveEvents.ts
@@ -0,0 +1,7 @@
+import { FilesEvents } from './backgroundEvents/files';
+import { FolderEvents } from './backgroundEvents/folders';
+import { TreeEvents } from './backgroundEvents/tree';
+
+export type BackgroundProcessVirtualDriveEvents = FilesEvents &
+  FolderEvents &
+  TreeEvents;
diff --git a/src/apps/shared/IPC/events/virtualDrive/MainProcessVirtualDriveEvents.ts b/src/apps/shared/IPC/events/virtualDrive/MainProcessVirtualDriveEvents.ts
new file mode 100644
index 000000000..8fe252a2d
--- /dev/null
+++ b/src/apps/shared/IPC/events/virtualDrive/MainProcessVirtualDriveEvents.ts
@@ -0,0 +1,11 @@
+import { DriveFile } from '../../../../main/database/entities/DriveFile';
+import { DriveFolder } from '../../../../main/database/entities/DriveFolder';
+
+type TreeEvents = {
+  GET_UPDATED_REMOTE_ITEMS: () => Promise<{
+    files: DriveFile[];
+    folders: DriveFolder[];
+  }>;
+};
+
+export type MainProcessVirtualDriveEvents = TreeEvents;
diff --git a/src/apps/shared/IPC/events/virtualDrive/backgroundEvents/files.ts b/src/apps/shared/IPC/events/virtualDrive/backgroundEvents/files.ts
new file mode 100644
index 000000000..a03fc4796
--- /dev/null
+++ b/src/apps/shared/IPC/events/virtualDrive/backgroundEvents/files.ts
@@ -0,0 +1,81 @@
+import { SyncErrorCause } from '../../../../../../shared/issues/SyncErrorCause';
+
+type ProcessInfo = {
+  elapsedTime: number;
+  progress?: number;
+};
+
+type FileUpdatePayload = {
+  name: string;
+  extension: string;
+  nameWithExtension: string;
+  size: number;
+  processInfo: ProcessInfo;
+};
+
+export type FilesEvents = {
+  FILE_UPLOADING: (payload: FileUpdatePayload) => void;
+  FILE_UPLOADED: (payload: FileUpdatePayload) => void;
+  FILE_CREATED: (payload: {
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+  }) => void;
+  FILE_DOWNLOAD_ERROR: (payload: {
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    cause: SyncErrorCause;
+  }) => void;
+
+  FILE_DOWNLOADING: (payload: FileUpdatePayload) => void;
+  FILE_DOWNLOADED: (payload: FileUpdatePayload) => void;
+  FILE_UPLOAD_ERROR: (payload: {
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    cause: SyncErrorCause;
+  }) => void;
+
+  FILE_DELETING: (payload: {
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    size: number;
+  }) => void;
+  FILE_DELETED: (payload: {
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    size: number;
+  }) => void;
+  FILE_DELETION_ERROR: (payload: {
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    cause: SyncErrorCause;
+  }) => void;
+
+  FILE_RENAMING: (payload: {
+    nameWithExtension: string;
+    oldName: string;
+  }) => void;
+  FILE_RENAMED: (payload: {
+    nameWithExtension: string;
+    oldName: string;
+  }) => void;
+  FILE_MOVED: (payload: {
+    nameWithExtension: string;
+    folderName: string;
+  }) => void;
+  FILE_RENAME_ERROR: (payload: {
+    name: string;
+    extension: string;
+    nameWithExtension: string;
+    cause: SyncErrorCause;
+  }) => void;
+
+  FILE_OVERWRITTEN: (payload: { nameWithExtension: string }) => void;
+
+  FILE_CLONED: (payload: FileUpdatePayload) => void;
+};
diff --git a/src/apps/shared/IPC/events/virtualDrive/backgroundEvents/folders.ts b/src/apps/shared/IPC/events/virtualDrive/backgroundEvents/folders.ts
new file mode 100644
index 000000000..80e730721
--- /dev/null
+++ b/src/apps/shared/IPC/events/virtualDrive/backgroundEvents/folders.ts
@@ -0,0 +1,13 @@
+export type FolderEvents = {
+  FOLDER_CREATING: (payload: { name: string }) => void;
+  FOLDER_CREATED: (payload: { name: string }) => void;
+  FOLDER_CREATION_ERROR: (payload: { name: string; error: string }) => void;
+
+  FOLDER_RENAMING: (payload: { oldName: string; newName: string }) => void;
+  FOLDER_RENAMED: (payload: { oldName: string; newName: string }) => void;
+  FOLDER_RENAME_ERROR: (payload: {
+    oldName: string;
+    newName: string;
+    error: string;
+  }) => void;
+};
diff --git a/src/apps/shared/IPC/events/virtualDrive/backgroundEvents/tree.ts b/src/apps/shared/IPC/events/virtualDrive/backgroundEvents/tree.ts
new file mode 100644
index 000000000..b3bab7650
--- /dev/null
+++ b/src/apps/shared/IPC/events/virtualDrive/backgroundEvents/tree.ts
@@ -0,0 +1,17 @@
+import { DriveFile } from '../../../../../main/database/entities/DriveFile';
+import { DriveFolder } from '../../../../../main/database/entities/DriveFolder';
+
+type TreeError = {
+  error: 'DUPLICATED_NODE';
+  name: string; // Name of the affected node
+};
+
+export type TreeEvents = {
+  TREE_BUILD_ERROR: (payload: TreeError) => void;
+
+  // invocable
+  GET_UPDATED_REMOTE_ITEMS: () => Promise<{
+    files: DriveFile[];
+    folders: DriveFolder[];
+  }>;
+};
diff --git a/src/apps/shared/types.ts b/src/apps/shared/types.ts
index d77562c62..d80148b00 100644
--- a/src/apps/shared/types.ts
+++ b/src/apps/shared/types.ts
@@ -1,249 +1,12 @@
-import { Readable } from 'stream';
-
-export interface FileSystem {
-  /**
-   * The kind of filesystem, it's emitted
-   * in some fs events
-   */
-  kind: FileSystemKind;
-
-  /**
-   * Returns the listing of the current files
-   * in this FileSystem
-   */
-  getCurrentListing(): Promise<{
-    listing: Listing;
-    readingMetaErrors: ReadingMetaErrorEntry[];
-  }>;
-
-  /**
-   * Renames a file in the FileSystem
-   * @param oldName
-   * @param newName
-   */
-  renameFile(oldName: string, newName: string): Promise<void>;
-
-  /**
-   * Deletes a file in the FileSystem,
-   * doesn't throw if the file doesn't exist anymore
-   * @param name
-   */
-  deleteFile(name: string): Promise<void>;
-
-  /**
-   * Pulls a file from other FileSystem into this FileSystem,
-   * overwriting it if already exists
-   * @param name
-   * @param source
-   * @param progressCallback
-   */
-  pullFile(
-    name: string,
-    source: Source,
-    progressCallback: FileSystemProgressCallback
-  ): Promise<number | void>;
-
-  /**
-   * Checks if a folder exists in the filesystem
-   * @param name
-   */
-  existsFolder(name: string): Promise<boolean>;
-
-  /**
-   * Deletes a folder in the filesystem
-   * doesn't throw if the folder doesn't exist anymore
-   * @param name
-   */
-  deleteFolder(name: string): Promise<void>;
-
-  /**
-   * Returns an object source that contains
-   * anything that another filesystem would need
-   * to pull it
-   * @param name
-   * @param progressCallback
-   */
-  getSource(
-    name: string,
-    progressCallback: FileSystemProgressCallback
-  ): Promise<Source>;
-
-  /**
-   * Check critical resources of this filesystem
-   * and throw an error if it's not operative
-   */
-  smokeTest(): Promise<void>;
-}
-
-export type FileSystemKind = 'LOCAL' | 'REMOTE';
-
-export type ReadingMetaErrorEntry = {
+type DriveOperationInProgress = {
+  action: 'UPLOADING' | 'DOWNLOADING' | 'RENAMING' | 'DELETING';
+  progress: number;
   name: string;
-  errorName: ProcessErrorName;
-  errorDetails: ErrorDetails;
-};
-
-export type FileSystemProgressCallback = (progress: number) => void;
-
-export type Source = {
-  stream: Readable;
-  modTime: number;
-  size: number;
-};
-
-/**
- * Represents a list of files, each with
- * its modTime that is set as seconds since epoch
- * and size in bytes
- *
- * The name of each file can be namespaced by
- * his ancestors such as: folderA/folderB/fileName
- * It cannot start or end with "/"
- */
-export type Listing = Record<string, { modtime: number; size: number }>;
-
-export type ProcessFatalErrorName =
-  | 'NO_INTERNET'
-  | 'NO_REMOTE_CONNECTION'
-  | 'CANNOT_ACCESS_BASE_DIRECTORY'
-  | 'BASE_DIRECTORY_DOES_NOT_EXIST'
-  | 'INSUFICIENT_PERMISION_ACCESSING_BASE_DIRECTORY'
-  | 'CANNOT_ACCESS_TMP_DIRECTORY'
-  | 'CANNOT_GET_CURRENT_LISTINGS'
-  | 'UNKNOWN';
-
-export class ProcessFatalError extends Error {
-  details: ErrorDetails;
-
-  constructor(name: ProcessFatalErrorName, details: ErrorDetails) {
-    super();
-    this.name = name;
-    this.details = details;
-  }
-}
-
-export type GeneralErrorName = 'UNKNOWN_DEVICE_NAME';
-export type ProcessErrorName =
-  // File or folder does not exist
-  | 'NOT_EXISTS'
-
-  // No permission to read or write file or folder
-  | 'NO_PERMISSION'
-
-  // No internet connection
-  | 'NO_INTERNET'
-
-  // Could not connect to Internxt servers
-  | 'NO_REMOTE_CONNECTION'
-
-  // Had a bad response (not in the 200 status range) from the server
-  | 'BAD_RESPONSE'
-
-  // The file has a size of 0 bytes
-  | 'EMPTY_FILE'
-
-  // The file is bigger than the current upload limit
-  | 'FILE_TOO_BIG'
-
-  // The file don't have an extension
-  | 'FILE_NON_EXTENSION'
-
-  // Unknown error
-  | 'UNKNOWN'
-
-  // Duplicated node path
-  | 'DUPLICATED_NODE';
-
-export class ProcessError extends Error {
-  details: ErrorDetails;
-
-  constructor(name: ProcessErrorName, details: ErrorDetails) {
-    super();
-    this.name = name;
-    this.details = details;
-  }
-}
-
-/**
- * Only for error reporting purposes, should not be used
- * to adjust UI to specific errors for example.
- * That's what SyncError and SyncFatalError classes are for
- */
-export type ErrorDetails = {
-  /* Describes in natural language what was being
-   done when this error was thrown */
-  action: string;
-
-  // Message of the original error instance
-  message: string;
-  // Error code of the original error instance
-  code: string;
-  // Stack of the original error instance
-  stack: string;
-
-  /* SYSTEM ERROR SPECIFICS */
-
-  // Error number
-  errno?: number;
-  // System call name
-  syscall?: string;
-  // Extra details about the error
-  info?: Record<string, any>;
-
-  // Aditional info that could be helpful
-  // to debug
-  additionalInfo?: string;
 };
-
-type ProcessInfoBase = {
-  kind: FileSystemKind;
+type DriveOperationCompleted = {
+  action: 'UPLOADED' | 'DOWNLOADED' | 'RENAMED' | 'DELETED';
   name: string;
+  progress: undefined; // Needed so ts does not complain with the union type
 };
 
-export type GeneralIssue = {
-  action: 'GET_DEVICE_NAME_ERROR';
-  errorName: GeneralErrorName;
-  process: 'GENERAL';
-  errorDetails: {
-    name: string;
-    message: string;
-    stack: string;
-  };
-};
-export type ProcessIssue = ProcessInfoBase & {
-  action:
-    | 'UPLOAD_ERROR'
-    | 'DOWNLOAD_ERROR'
-    | 'RENAME_ERROR'
-    | 'DELETE_ERROR'
-    | 'METADATA_READ_ERROR'
-    | 'GENERATE_TREE';
-
-  errorName: ProcessErrorName;
-  process: 'SYNC' | 'BACKUPS';
-};
-
-export type ProcessInfoUpdatePayload =
-  | (ProcessInfoBase &
-      (
-        | {
-            action: 'UPLOADING' | 'DOWNLOADING' | 'RENAMING' | 'DELETING';
-            progress: number;
-          }
-        | {
-            action: 'UPLOADED' | 'DOWNLOADED' | 'RENAMED' | 'DELETED';
-          }
-      ))
-  | ProcessIssue;
-
-type SyncActionName =
-  | 'renameInLocal'
-  | 'renameInRemote'
-  | 'pullFromLocal'
-  | 'pullFromRemote'
-  | 'deleteInLocal'
-  | 'deleteInRemote';
-
-type SyncAction = Array<[string, string]> | Array<string>;
-
-export type EnqueuedSyncActions = Partial<Record<SyncActionName, SyncAction>>;
+export type DriveInfo = DriveOperationInProgress | DriveOperationCompleted;
diff --git a/src/apps/sync-engine/BindingManager.ts b/src/apps/sync-engine/BindingManager.ts
index 64274b781..8a00b08ce 100644
--- a/src/apps/sync-engine/BindingManager.ts
+++ b/src/apps/sync-engine/BindingManager.ts
@@ -3,13 +3,13 @@ import * as fs from 'fs';
 // @ts-ignore
 import { VirtualDrive } from 'virtual-drive/dist';
 import { FilePlaceholderId } from '../../context/virtual-drive/files/domain/PlaceholderId';
-import { ItemsSearcher } from '../../context/virtual-drive/items/application/ItemsSearcher';
 import { PlatformPathConverter } from '../../context/virtual-drive/shared/application/PlatformPathConverter';
 import { buildControllers } from './callbacks-controllers/buildControllers';
 import { executeControllerWithFallback } from './callbacks-controllers/middlewares/executeControllerWithFallback';
 import { SyncEngineDependencyContainer } from './dependency-injection/SyncEngineDependencyContainer';
-import { ipcRendererSyncEngine } from './ipcRendererSyncEngine';
-import { ProcessIssue } from '../shared/types';
+import { SyncEngineIPC } from './SyncEngineIpc';
+import { VirtualDriveIssue } from '../../shared/issues/VirtualDriveIssue';
+import { ItemsSearcher } from '../../context/virtual-drive/tree/application/ItemsSearcher';
 
 export type CallbackDownload = (
   success: boolean,
@@ -110,7 +110,7 @@ export class BindingsManager {
               this.progressBuffer = result.progress;
             }
             Logger.debug('condition', finished);
-            ipcRendererSyncEngine.send('FILE_DOWNLOADING', {
+            SyncEngineIPC.send('FILE_DOWNLOADING', {
               name: file.name,
               extension: file.type,
               nameWithExtension: file.nameWithExtension,
@@ -147,18 +147,17 @@ export class BindingsManager {
       },
       notifyMessageCallback: (
         message: string,
-        action: ProcessIssue['action'],
-        errorName: ProcessIssue['errorName'],
+        _error: VirtualDriveIssue['error'],
+        cause: VirtualDriveIssue['cause'],
         callback: (response: boolean) => void
       ) => {
         try {
           callback(true);
-          ipcRendererSyncEngine.send('SYNC_INFO_UPDATE', {
+          SyncEngineIPC.send('FILE_UPLOAD_ERROR', {
             name: message,
-            action: action,
-            errorName,
-            process: 'SYNC',
-            kind: 'LOCAL',
+            cause,
+            extension: '',
+            nameWithExtension: '',
           });
         } catch (error) {
           Logger.error(error);
diff --git a/src/apps/sync-engine/SyncEngineIpc.ts b/src/apps/sync-engine/SyncEngineIpc.ts
new file mode 100644
index 000000000..841765a81
--- /dev/null
+++ b/src/apps/sync-engine/SyncEngineIpc.ts
@@ -0,0 +1,11 @@
+import { TypedIPC } from '../shared/IPC/IPCs';
+import { BackgroundProcessVirtualDriveEvents } from '../shared/IPC/events/virtualDrive/BackgroundProcessVirtualDriveEvents';
+import { MainProcessVirtualDriveEvents } from '../shared/IPC/events/virtualDrive/MainProcessVirtualDriveEvents';
+import { ipcRenderer } from 'electron';
+
+export type SyncEngineIpc = TypedIPC<
+  BackgroundProcessVirtualDriveEvents,
+  MainProcessVirtualDriveEvents
+>;
+
+export const SyncEngineIPC = ipcRenderer as unknown as SyncEngineIpc;
diff --git a/src/apps/sync-engine/dependency-injection/common/traverser.ts b/src/apps/sync-engine/dependency-injection/common/traverser.ts
index b25de6491..32ce91f1d 100644
--- a/src/apps/sync-engine/dependency-injection/common/traverser.ts
+++ b/src/apps/sync-engine/dependency-injection/common/traverser.ts
@@ -1,5 +1,5 @@
 import crypt from '../../../../context/shared/infrastructure/crypt';
-import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
+import { Traverser } from '../../../../context/virtual-drive/tree/application/Traverser';
 import { DependencyInjectionUserProvider } from './user';
 
 export class DependencyInjectionTraverserProvider {
diff --git a/src/apps/sync-engine/dependency-injection/contents/builder.ts b/src/apps/sync-engine/dependency-injection/contents/builder.ts
index e6b66140a..e6ab4a6a5 100644
--- a/src/apps/sync-engine/dependency-injection/contents/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/contents/builder.ts
@@ -12,9 +12,9 @@ import { RetryContentsUploader } from '../../../../context/virtual-drive/content
 import { EnvironmentRemoteFileContentsManagersFactory } from '../../../../context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory';
 import { FSLocalFileProvider } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileProvider';
 import { FSLocalFileSystem } from '../../../../context/virtual-drive/contents/infrastructure/FSLocalFileSystem';
-import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
+import { SyncEngineIPC } from '../../SyncEngineIpc';
 import { IPCLocalFileContentsDirectoryProvider } from '../../../../context/virtual-drive/shared/infrastructure/LocalFileContentsDirectoryProviders/IPCLocalFileContentsDirectoryProvider';
-import { MainProcessUploadProgressTracker } from '../../../../context/shared/infrastructure/MainProcessUploadProgressTracker';
+import { BackgroundProcessUploadProgressTracker } from '../../../../context/virtual-drive/contents/infrastructure/upload/BackgroundProcessUploadProgressTracker';
 
 export async function buildContentsContainer(
   sharedContainer: SharedContainer
@@ -31,7 +31,7 @@ export async function buildContentsContainer(
     encryptionKey: mnemonic,
   });
 
-  const notifier = new MainProcessUploadProgressTracker();
+  const notifier = new BackgroundProcessUploadProgressTracker(SyncEngineIPC);
 
   const contentsManagerFactory =
     new EnvironmentRemoteFileContentsManagersFactory(environment, user.bucket);
@@ -58,16 +58,13 @@ export async function buildContentsContainer(
   const contentsDownloader = new ContentsDownloader(
     contentsManagerFactory,
     localWriter,
-    ipcRendererSyncEngine,
+    SyncEngineIPC,
     localFileContentsDirectoryProvider,
     eventBus
   );
 
   const notifyMainProcessHydrationFinished =
-    new NotifyMainProcessHydrationFinished(
-      eventRepository,
-      ipcRendererSyncEngine
-    );
+    new NotifyMainProcessHydrationFinished(eventRepository, SyncEngineIPC);
 
   return {
     contentsUploader: retryContentsUploader,
diff --git a/src/apps/sync-engine/dependency-injection/files/builder.ts b/src/apps/sync-engine/dependency-injection/files/builder.ts
index 455faa89f..9bf0a057e 100644
--- a/src/apps/sync-engine/dependency-injection/files/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/files/builder.ts
@@ -15,7 +15,7 @@ import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/files/
 import { SDKRemoteFileSystem } from '../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
 import { BackgroundProcessSyncFileMessenger } from '../../../../context/virtual-drive/files/infrastructure/SyncFileMessengers/BackgroundProcessSyncFileMessenger';
 import { LocalFileIdProvider } from '../../../../context/virtual-drive/shared/application/LocalFileIdProvider';
-import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
+import { SyncEngineIPC } from '../../SyncEngineIpc';
 import { DependencyInjectionHttpClientsProvider } from '../common/clients';
 import { DependencyInjectionEventBus } from '../common/eventBus';
 import { DependencyInjectionEventRepository } from '../common/eventRepository';
@@ -53,7 +53,7 @@ export async function buildFilesContainer(
   );
 
   const syncFileMessenger = new BackgroundProcessSyncFileMessenger(
-    ipcRendererSyncEngine
+    SyncEngineIPC
   );
 
   const repository = new InMemoryFileRepository();
diff --git a/src/apps/sync-engine/dependency-injection/folders/builder.ts b/src/apps/sync-engine/dependency-injection/folders/builder.ts
index 051d1bd99..a5e2a783e 100644
--- a/src/apps/sync-engine/dependency-injection/folders/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/folders/builder.ts
@@ -21,7 +21,7 @@ import { InMemoryFolderRepository } from '../../../../context/virtual-drive/fold
 import { InMemoryOfflineFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryOfflineFolderRepository';
 import { NodeWinLocalFileSystem } from '../../../../context/virtual-drive/folders/infrastructure/NodeWinLocalFileSystem';
 import { BackgroundProcessSyncFolderMessenger } from '../../../../context/virtual-drive/folders/infrastructure/SyncMessengers/BackgroundProcessSyncFolderMessenger';
-import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
+import { SyncEngineIPC } from '../../SyncEngineIpc';
 import { DependencyInjectionHttpClientsProvider } from '../common/clients';
 import { DependencyInjectionEventBus } from '../common/eventBus';
 import { DependencyInjectionEventRepository } from '../common/eventRepository';
@@ -40,7 +40,7 @@ export async function buildFoldersContainer(
   const repository = new InMemoryFolderRepository();
 
   const syncFolderMessenger = new BackgroundProcessSyncFolderMessenger(
-    ipcRendererSyncEngine
+    SyncEngineIPC
   );
 
   const localFileSystem = new NodeWinLocalFileSystem(virtualDrive);
diff --git a/src/apps/sync-engine/dependency-injection/items/ItemsContainer.ts b/src/apps/sync-engine/dependency-injection/items/ItemsContainer.ts
index 973ce57ca..c3bf1c2cd 100644
--- a/src/apps/sync-engine/dependency-injection/items/ItemsContainer.ts
+++ b/src/apps/sync-engine/dependency-injection/items/ItemsContainer.ts
@@ -1,4 +1,4 @@
-import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
+import { TreeBuilder } from '../../../../context/virtual-drive/tree/application/TreeBuilder';
 
 export interface ItemsContainer {
   existingItemsTreeBuilder: TreeBuilder;
diff --git a/src/apps/sync-engine/dependency-injection/items/builder.ts b/src/apps/sync-engine/dependency-injection/items/builder.ts
index 2c8652807..ec387e506 100644
--- a/src/apps/sync-engine/dependency-injection/items/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/items/builder.ts
@@ -1,9 +1,9 @@
-import { IpcRemoteItemsGenerator } from '../../../../context/virtual-drive/items/infrastructure/IpcRemoteItemsGenerator';
-import { Traverser } from '../../../../context/virtual-drive/items/application/Traverser';
-import { TreeBuilder } from '../../../../context/virtual-drive/items/application/TreeBuilder';
-import { CryptoJsNameDecrypt } from '../../../../context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt';
+import { IpcRemoteItemsGenerator } from '../../../../context/virtual-drive/tree/infrastructure/IpcRemoteItemsGenerator';
+import { Traverser } from '../../../../context/virtual-drive/tree/application/Traverser';
+import { TreeBuilder } from '../../../../context/virtual-drive/tree/application/TreeBuilder';
+import { CryptoJsNameDecrypt } from '../../../../context/virtual-drive/tree/infrastructure/CryptoJsNameDecrypt';
 import { getUser } from '../../../main/auth/service';
-import { ipcRendererSyncEngine } from '../../ipcRendererSyncEngine';
+import { SyncEngineIPC } from '../../SyncEngineIpc';
 import { ItemsContainer } from './ItemsContainer';
 
 export function buildItemsContainer(): ItemsContainer {
@@ -13,9 +13,7 @@ export function buildItemsContainer(): ItemsContainer {
     throw new Error('Could not get user when building Items dependencies');
   }
 
-  const remoteItemsGenerator = new IpcRemoteItemsGenerator(
-    ipcRendererSyncEngine
-  );
+  const remoteItemsGenerator = new IpcRemoteItemsGenerator(SyncEngineIPC);
 
   const nameDecrypt = new CryptoJsNameDecrypt();
 
diff --git a/src/apps/sync-engine/ipcRendererSyncEngine.ts b/src/apps/sync-engine/ipcRendererSyncEngine.ts
deleted file mode 100644
index 4aca87223..000000000
--- a/src/apps/sync-engine/ipcRendererSyncEngine.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { CustomIpc } from '../shared/IPC/IPCs';
-import { FromProcess, FromMain } from '../shared/IPC/events/sync-engine';
-import { ipcRenderer } from 'electron';
-
-export type SyncEngineIpc = CustomIpc<FromProcess, FromMain>;
-
-export const ipcRendererSyncEngine = ipcRenderer as unknown as SyncEngineIpc;
diff --git a/src/apps/utils/reporting.ts b/src/apps/utils/reporting.ts
deleted file mode 100644
index b0ae28f83..000000000
--- a/src/apps/utils/reporting.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { ErrorDetails } from '../shared/types';
-
-export function createErrorDetails(
-  originalError: any,
-  action: string,
-  additionalInfo?: string
-): ErrorDetails {
-  const { message, code, stack, errno, syscall, info } = originalError;
-
-  return { message, code, stack, errno, syscall, info, action, additionalInfo };
-}
-
-export async function serializeRes(
-  res: Pick<Response, 'status' | 'text'>
-): Promise<string> {
-  const data = {
-    status: res.status,
-    body: await res.text(),
-  };
-
-  return JSON.stringify(data, null, 2);
-}
diff --git a/src/context/desktop/sync/domain/SyncStoppedPayload.ts b/src/context/desktop/sync/domain/SyncStoppedPayload.ts
index 6e4155556..eb15b42f6 100644
--- a/src/context/desktop/sync/domain/SyncStoppedPayload.ts
+++ b/src/context/desktop/sync/domain/SyncStoppedPayload.ts
@@ -1,8 +1,8 @@
-import { ProcessFatalErrorName } from '../../../../apps/shared/types';
+import { FatalError } from '../../../../shared/issues/FatalError';
 
 export type SyncStoppedPayload =
   | { reason: 'STOPPED_BY_USER' }
   | {
       reason: 'FATAL_ERROR';
-      errorName: ProcessFatalErrorName;
+      errorName: FatalError;
     };
diff --git a/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts b/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
index 1aac34998..e6a884a73 100644
--- a/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
+++ b/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
@@ -52,7 +52,7 @@ export class EnvironmentOfflineContentsManagersFactory
     uploader.on('progress', (progress: number) => {
       this.progressTracker.uploadProgress(name, extension, contents.size, {
         elapsedTime: uploader.elapsedTime(),
-        progress,
+        percentage: progress,
       });
     });
 
diff --git a/src/context/offline-drive/files/domain/OfflineFilePath.ts b/src/context/offline-drive/files/domain/OfflineFilePath.ts
index 52ae96f54..454fd2125 100644
--- a/src/context/offline-drive/files/domain/OfflineFilePath.ts
+++ b/src/context/offline-drive/files/domain/OfflineFilePath.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import { Path } from '../../../shared/domain/Path';
+import { Path } from '../../../shared/domain/value-objects/Path';
 
 export class OfflineFilePath extends Path {
   constructor(value: string) {
diff --git a/src/context/shared/domain/DownloadProgressTracker.ts b/src/context/shared/domain/DownloadProgressTracker.ts
index 277a7cd57..e59f3475b 100644
--- a/src/context/shared/domain/DownloadProgressTracker.ts
+++ b/src/context/shared/domain/DownloadProgressTracker.ts
@@ -3,7 +3,6 @@ export interface DownloadProgressTracker {
   downloadUpdate(
     name: string,
     extension: string,
-    size: number,
     progress: {
       elapsedTime: number;
       percentage: number;
diff --git a/src/context/shared/domain/UploadProgressTracker.ts b/src/context/shared/domain/UploadProgressTracker.ts
index 48df4eacf..d97f24380 100644
--- a/src/context/shared/domain/UploadProgressTracker.ts
+++ b/src/context/shared/domain/UploadProgressTracker.ts
@@ -1,24 +1,21 @@
+import { SyncErrorCause } from '../../../shared/issues/SyncErrorCause';
+
 export interface UploadProgressTracker {
-  uploadStarted(
-    name: string,
-    extension: string,
-    size: number,
-    processInfo: { elapsedTime: number }
-  ): void;
+  uploadStarted(name: string, extension: string, size: number): void;
 
   uploadProgress(
     name: string,
     extension: string,
     size: number,
-    processInfo: { elapsedTime: number; progress: number }
+    progress: { elapsedTime: number; percentage: number }
   ): void;
 
-  uploadError(name: string, extension: string, error: string): void;
+  uploadError(name: string, extension: string, cause: SyncErrorCause): void;
 
   uploadCompleted(
     name: string,
     extension: string,
     size: number,
-    processInfo: { elapsedTime: number }
+    progress: { elapsedTime: number }
   ): void;
 }
diff --git a/src/context/shared/domain/errors/DriveDesktopError.ts b/src/context/shared/domain/errors/DriveDesktopError.ts
new file mode 100644
index 000000000..e217dfacf
--- /dev/null
+++ b/src/context/shared/domain/errors/DriveDesktopError.ts
@@ -0,0 +1,7 @@
+import { SyncErrorCause } from '../../../../shared/issues/SyncErrorCause';
+
+export class DriveDesktopError extends Error {
+  constructor(public readonly syncErrorCause: SyncErrorCause, message: string) {
+    super(message);
+  }
+}
diff --git a/src/context/shared/domain/InvalidArgumentError.ts b/src/context/shared/domain/errors/InvalidArgumentError.ts
similarity index 100%
rename from src/context/shared/domain/InvalidArgumentError.ts
rename to src/context/shared/domain/errors/InvalidArgumentError.ts
diff --git a/src/context/shared/domain/issues/Issue.ts b/src/context/shared/domain/issues/Issue.ts
new file mode 100644
index 000000000..e0c691783
--- /dev/null
+++ b/src/context/shared/domain/issues/Issue.ts
@@ -0,0 +1,4 @@
+export type Issue = {
+  nodeName: string;
+  issue: string;
+};
diff --git a/src/context/shared/domain/value-objects/NumericId.ts b/src/context/shared/domain/value-objects/NumericId.ts
index e1ab5e61b..dae0d792d 100644
--- a/src/context/shared/domain/value-objects/NumericId.ts
+++ b/src/context/shared/domain/value-objects/NumericId.ts
@@ -1,4 +1,4 @@
-import { InvalidArgumentError } from '../InvalidArgumentError';
+import { InvalidArgumentError } from '../errors/InvalidArgumentError';
 import { ValueObject } from './ValueObject';
 
 export class NumericId extends ValueObject<number> {
diff --git a/src/context/shared/domain/Path.ts b/src/context/shared/domain/value-objects/Path.ts
similarity index 92%
rename from src/context/shared/domain/Path.ts
rename to src/context/shared/domain/value-objects/Path.ts
index f63942631..f481a22f9 100644
--- a/src/context/shared/domain/Path.ts
+++ b/src/context/shared/domain/value-objects/Path.ts
@@ -1,6 +1,6 @@
 import path from 'path';
-import { InvalidArgumentError } from './InvalidArgumentError';
-import { ValueObject } from './value-objects/ValueObject';
+import { InvalidArgumentError } from '../errors/InvalidArgumentError';
+import { ValueObject } from './ValueObject';
 
 const isWindowsRootDirectory = /[a-zA-Z]:[\\/]/;
 const containsNullCharacter = /\0/g;
diff --git a/src/context/shared/domain/value-objects/Uuid.ts b/src/context/shared/domain/value-objects/Uuid.ts
index 133998105..887b88e7a 100644
--- a/src/context/shared/domain/value-objects/Uuid.ts
+++ b/src/context/shared/domain/value-objects/Uuid.ts
@@ -1,5 +1,5 @@
 import * as uuid from 'uuid';
-import { InvalidArgumentError } from '../InvalidArgumentError';
+import { InvalidArgumentError } from '../errors/InvalidArgumentError';
 import { ValueObject } from './ValueObject';
 
 export class Uuid extends ValueObject<string> {
diff --git a/src/context/shared/domain/value-objects/ValueObject.ts b/src/context/shared/domain/value-objects/ValueObject.ts
index 837d21025..9c5f5ffe7 100644
--- a/src/context/shared/domain/value-objects/ValueObject.ts
+++ b/src/context/shared/domain/value-objects/ValueObject.ts
@@ -1,4 +1,4 @@
-import { InvalidArgumentError } from '../InvalidArgumentError';
+import { InvalidArgumentError } from '../errors/InvalidArgumentError';
 
 export type Primitives = string | number | boolean | Date | undefined;
 
diff --git a/src/context/shared/infrastructure/MainProcessDownloadProgressTracker.ts b/src/context/shared/infrastructure/MainProcessDownloadProgressTracker.ts
index f3fd7a0e0..a58796801 100644
--- a/src/context/shared/infrastructure/MainProcessDownloadProgressTracker.ts
+++ b/src/context/shared/infrastructure/MainProcessDownloadProgressTracker.ts
@@ -15,7 +15,7 @@ export class MainProcessDownloadProgressTracker
   ): Promise<void> {
     setTrayStatus('SYNCING');
 
-    trackEvent('Upload Started', {
+    trackEvent('Download Started', {
       file_name: name,
       file_extension: extension,
       file_size: size,
@@ -32,16 +32,8 @@ export class MainProcessDownloadProgressTracker
   async downloadUpdate(
     name: string,
     extension: string,
-    size: number,
     progress: { elapsedTime: number; percentage: number }
   ): Promise<void> {
-    trackEvent('Upload Started', {
-      file_name: name,
-      file_extension: extension,
-      file_size: size,
-      elapsedTimeMs: progress.elapsedTime,
-    });
-
     broadcastToWindows('sync-info-update', {
       action: 'DOWNLOADING',
       name: this.nameWithExtension(name, extension),
@@ -61,7 +53,7 @@ export class MainProcessDownloadProgressTracker
 
     setTrayStatus('IDLE');
 
-    trackEvent('Upload Completed', {
+    trackEvent('Download Completed', {
       file_name: name,
       file_extension: extension,
       file_size: size,
@@ -69,7 +61,7 @@ export class MainProcessDownloadProgressTracker
     });
 
     broadcastToWindows('sync-info-update', {
-      action: 'UPLOADED',
+      action: 'DOWNLOADED',
       name: nameWithExtension,
     });
   }
@@ -78,7 +70,7 @@ export class MainProcessDownloadProgressTracker
     const nameWithExtension = this.nameWithExtension(name, extension);
 
     // TODO: finish this
-    trackError('Upload Error', new Error(), {
+    trackError('Download Error', new Error(), {
       itemType: 'File',
       root: '',
       from: name,
diff --git a/src/context/shared/infrastructure/MainProcessUploadProgressTracker.ts b/src/context/shared/infrastructure/MainProcessUploadProgressTracker.ts
index a4b607727..8d95c8bd4 100644
--- a/src/context/shared/infrastructure/MainProcessUploadProgressTracker.ts
+++ b/src/context/shared/infrastructure/MainProcessUploadProgressTracker.ts
@@ -29,7 +29,7 @@ export class MainProcessUploadProgressTracker
     name: string,
     extension: string,
     size: number,
-    processInfo: { elapsedTime: number; progress: number }
+    progress: { elapsedTime: number; percentage: number }
   ): void {
     const nameWithExtension = this.nameWithExtension(name, extension);
 
@@ -37,13 +37,13 @@ export class MainProcessUploadProgressTracker
       file_name: name,
       file_extension: extension,
       file_size: size,
-      elapsedTimeMs: processInfo.elapsedTime,
+      elapsedTimeMs: progress.elapsedTime,
     });
 
     broadcastToWindows('sync-info-update', {
       action: 'UPLOADING',
       name: nameWithExtension,
-      progress: processInfo.progress,
+      progress: progress.percentage,
     });
   }
 
diff --git a/src/context/virtual-drive/contents/application/ContentsDownloader.ts b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
index c3610f577..9798cd251 100644
--- a/src/context/virtual-drive/contents/application/ContentsDownloader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsDownloader.ts
@@ -3,7 +3,7 @@ import path from 'path';
 import { Readable } from 'stream';
 import { ensureFolderExists } from '../../../../apps/shared/fs/ensure-folder-exists';
 import { CallbackDownload } from '../../../../apps/sync-engine/BindingManager';
-import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/SyncEngineIpc';
 import { File } from '../../files/domain/File';
 import { EventBus } from '../../shared/domain/EventBus';
 import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
@@ -11,6 +11,7 @@ import { LocalFileContents } from '../domain/LocalFileContents';
 import { ContentFileDownloader } from '../domain/contentHandlers/ContentFileDownloader';
 import { LocalFileSystem } from '../domain/LocalFileSystem';
 import { LocalFileContentsDirectoryProvider } from '../../shared/domain/LocalFileContentsDirectoryProvider';
+import { DriveDesktopError } from '../../../shared/domain/errors/DriveDesktopError';
 
 export class ContentsDownloader {
   private readableDownloader: Readable | null;
@@ -75,16 +76,19 @@ export class ContentsDownloader {
     });
 
     downloader.on('error', (error: Error) => {
+      const cause =
+        error instanceof DriveDesktopError ? error.syncErrorCause : 'UNKNOWN';
+
       this.ipc.send('FILE_DOWNLOAD_ERROR', {
         name: file.name,
         extension: file.type,
         nameWithExtension: file.nameWithExtension,
-        error: error.message,
+        cause,
       });
     });
 
     downloader.on('finish', () => {
-      // The file download being finished does not mean it has been hidratated
+      // The file download being finished does not mean it has been hydrated
       // TODO: We might want to track this time instead of the whole completion time
     });
   }
diff --git a/src/context/virtual-drive/contents/application/ContentsUploader.ts b/src/context/virtual-drive/contents/application/ContentsUploader.ts
index d4d6a0a2f..ee131214a 100644
--- a/src/context/virtual-drive/contents/application/ContentsUploader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsUploader.ts
@@ -35,7 +35,7 @@ export class ContentsUploader {
         localFileContents.name,
         localFileContents.extension,
         localFileContents.size,
-        { elapsedTime: uploader.elapsedTime(), progress }
+        { elapsedTime: uploader.elapsedTime(), percentage: progress }
       );
     });
 
diff --git a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
index 75563363e..2c064e15f 100644
--- a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
+++ b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
@@ -22,7 +22,7 @@ export class DownloadContentsToPlainFile {
     });
 
     downloader.on('progress', (progress: number, elapsedTime: number) => {
-      this.tracker.downloadUpdate(file.name, file.type, file.size, {
+      this.tracker.downloadUpdate(file.name, file.type, {
         elapsedTime,
         percentage: progress,
       });
diff --git a/src/context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished.ts b/src/context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished.ts
index faff126b9..79acdc9c3 100644
--- a/src/context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished.ts
+++ b/src/context/virtual-drive/contents/application/NotifyMainProcessHydrationFinished.ts
@@ -1,4 +1,4 @@
-import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/SyncEngineIpc';
 import { EventRepository } from '../../shared/domain/EventRepository';
 import { ContentsDownloadedDomainEvent } from '../domain/events/ContentsDownloadedDomainEvent';
 import Logger from 'electron-log';
diff --git a/src/context/virtual-drive/contents/domain/ContentsId.ts b/src/context/virtual-drive/contents/domain/ContentsId.ts
index 1e6249835..e077c6b8f 100644
--- a/src/context/virtual-drive/contents/domain/ContentsId.ts
+++ b/src/context/virtual-drive/contents/domain/ContentsId.ts
@@ -1,4 +1,4 @@
-import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { InvalidArgumentError } from '../../../shared/domain/errors/InvalidArgumentError';
 import { ValueObject } from '../../../shared/domain/value-objects/ValueObject';
 
 export class ContentsId extends ValueObject<string> {
diff --git a/src/context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts b/src/context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
index 621cc0e70..fc2773f3d 100644
--- a/src/context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
+++ b/src/context/virtual-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
@@ -5,6 +5,7 @@ import { ContentsManagersFactory } from '../domain/ContentsManagersFactory';
 import { EnvironmentContentFileDownloader } from './download/EnvironmentContentFileDownloader';
 import { EnvironmentContentFileUploader } from './upload/EnvironmentContentFileUploader';
 import { LocalFileContents } from '../domain/LocalFileContents';
+import { FuseEnvironmentContentFileDownloader } from './download/FuseEnvironmentContentFileDownloader';
 
 export class EnvironmentRemoteFileContentsManagersFactory
   implements ContentsManagersFactory
@@ -17,6 +18,13 @@ export class EnvironmentRemoteFileContentsManagersFactory
   ) {}
 
   downloader(): ContentFileDownloader {
+    if (process.platform === 'linux') {
+      return new FuseEnvironmentContentFileDownloader(
+        this.environment.download,
+        this.bucket
+      );
+    }
+
     return new EnvironmentContentFileDownloader(
       this.environment.download,
       this.bucket
diff --git a/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts b/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
index 6dceecc58..88c2c264b 100644
--- a/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
+++ b/src/context/virtual-drive/contents/infrastructure/FSLocalFileSystem.ts
@@ -58,9 +58,13 @@ export class FSLocalFileSystem implements LocalFileSystem {
 
     const absolutePath = path.join(folder, contentsId.value);
 
-    const { mtimeMs } = await fs.stat(absolutePath);
+    try {
+      const { mtimeMs } = await fs.stat(absolutePath);
 
-    return ContentsMetadata.from({ modificationDate: new Date(mtimeMs) });
+      return ContentsMetadata.from({ modificationDate: new Date(mtimeMs) });
+    } catch {
+      return undefined;
+    }
   }
 
   async add(contentsId: ContentsId, source: string): Promise<void> {
diff --git a/src/context/virtual-drive/contents/infrastructure/download/FuseEnvironmentContentFileDownloader.ts b/src/context/virtual-drive/contents/infrastructure/download/FuseEnvironmentContentFileDownloader.ts
new file mode 100644
index 000000000..3f1b07e6b
--- /dev/null
+++ b/src/context/virtual-drive/contents/infrastructure/download/FuseEnvironmentContentFileDownloader.ts
@@ -0,0 +1,87 @@
+import { DownloadStrategyFunction } from '@internxt/inxt-js/build/lib/core/download/strategy';
+import { EventEmitter, Readable } from 'stream';
+import {
+  ContentFileDownloader,
+  FileDownloadEvents,
+} from '../../domain/contentHandlers/ContentFileDownloader';
+import { File } from '../../../files/domain/File';
+import { DownloadOneShardStrategy } from '@internxt/inxt-js/build/lib/core';
+import { ActionState } from '@internxt/inxt-js/build/api';
+import { Stopwatch } from '../../../../../apps/shared/types/Stopwatch';
+
+export class FuseEnvironmentContentFileDownloader
+  implements ContentFileDownloader
+{
+  private eventEmitter: EventEmitter;
+  private stopwatch: Stopwatch;
+
+  private state: ActionState | null;
+
+  constructor(
+    private readonly fn: DownloadStrategyFunction<DownloadOneShardStrategy>,
+    private readonly bucket: string
+  ) {
+    this.eventEmitter = new EventEmitter();
+    this.stopwatch = new Stopwatch();
+    this.state = null;
+  }
+
+  forceStop(): void {
+    //@ts-ignore
+    // Logger.debug('Finish emitter type', this.state?.type);
+    // Logger.debug('Finish emitter stop method', this.state?.stop);
+    this.state?.stop();
+    // this.eventEmitter.emit('error');
+    // this.eventEmitter.emit('finish');
+  }
+
+  download(file: File): Promise<Readable> {
+    this.stopwatch.start();
+
+    this.eventEmitter.emit('start');
+
+    return new Promise((resolve, reject) => {
+      this.state = this.fn(
+        this.bucket,
+        file.contentsId,
+        {
+          progressCallback: (progress: number) => {
+            this.eventEmitter.emit('progress', progress, this.elapsedTime());
+          },
+          finishedCallback: async (err: Error, stream: Readable) => {
+            this.stopwatch.finish();
+
+            if (err) {
+              this.eventEmitter.emit('error', err);
+              return reject(err);
+            }
+            this.eventEmitter.emit('finish', this.elapsedTime());
+
+            resolve(stream);
+          },
+        },
+        {
+          label: 'Dynamic',
+          params: {
+            useProxy: false,
+            chunkSize: 4096 * 1024,
+          },
+        }
+      );
+    });
+  }
+
+  on(
+    event: keyof FileDownloadEvents,
+    handler: FileDownloadEvents[keyof FileDownloadEvents]
+  ): void {
+    this.eventEmitter.on(event, handler);
+    this.eventEmitter.on('finish', () => {
+      this.eventEmitter.removeAllListeners();
+    });
+  }
+
+  elapsedTime(): number {
+    return this.stopwatch.elapsedTime();
+  }
+}
diff --git a/src/context/virtual-drive/contents/infrastructure/upload/BackgroundProcessUploadProgressTracker.ts b/src/context/virtual-drive/contents/infrastructure/upload/BackgroundProcessUploadProgressTracker.ts
new file mode 100644
index 000000000..1f46e91a7
--- /dev/null
+++ b/src/context/virtual-drive/contents/infrastructure/upload/BackgroundProcessUploadProgressTracker.ts
@@ -0,0 +1,71 @@
+import { SyncEngineIpc } from '../../../../../apps/sync-engine/SyncEngineIpc';
+import { SyncErrorCause } from '../../../../../shared/issues/SyncErrorCause';
+import { SyncMessenger } from '../../../../shared/domain/SyncMessenger';
+import { UploadProgressTracker } from '../../../../shared/domain/UploadProgressTracker';
+
+export class BackgroundProcessUploadProgressTracker
+  extends SyncMessenger
+  implements UploadProgressTracker
+{
+  constructor(private readonly ipc: SyncEngineIpc) {
+    super();
+  }
+
+  uploadStarted(name: string, extension: string, size: number): void {
+    this.ipc.send('FILE_UPLOADING', {
+      name,
+      extension,
+      nameWithExtension: this.nameWithExtension(name, extension),
+      size,
+      processInfo: {
+        elapsedTime: 0,
+        progress: 0,
+      },
+    });
+  }
+
+  uploadProgress(
+    name: string,
+    extension: string,
+    size: number,
+    processInfo: { elapsedTime: number; percentage: number }
+  ): void {
+    this.ipc.send('FILE_UPLOADING', {
+      name,
+      extension,
+      nameWithExtension: this.nameWithExtension(name, extension),
+      size,
+      processInfo: {
+        elapsedTime: processInfo.elapsedTime,
+        progress: processInfo.percentage,
+      },
+    });
+  }
+
+  uploadError(name: string, extension: string, cause: SyncErrorCause): void {
+    this.ipc.send('FILE_UPLOAD_ERROR', {
+      name,
+      extension,
+      nameWithExtension: this.nameWithExtension(name, extension),
+      cause,
+    });
+  }
+
+  uploadCompleted(
+    name: string,
+    extension: string,
+    size: number,
+    processInfo: { elapsedTime: number }
+  ): void {
+    this.ipc.send('FILE_UPLOADED', {
+      name,
+      extension,
+      nameWithExtension: this.nameWithExtension(name, extension),
+      size,
+      processInfo: {
+        elapsedTime: processInfo.elapsedTime,
+        progress: 100,
+      },
+    });
+  }
+}
diff --git a/src/context/virtual-drive/files/application/FileCreator.ts b/src/context/virtual-drive/files/application/FileCreator.ts
index a6e236895..64ceac690 100644
--- a/src/context/virtual-drive/files/application/FileCreator.ts
+++ b/src/context/virtual-drive/files/application/FileCreator.ts
@@ -10,6 +10,8 @@ import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 import { OfflineFile } from '../domain/OfflineFile';
 import { SyncFileMessenger } from '../domain/SyncFileMessenger';
 import { FileStatuses } from '../domain/FileStatus';
+import { DriveDesktopError } from '../../../shared/domain/errors/DriveDesktopError';
+import Logger from 'electron-log';
 
 export class FileCreator {
   constructor(
@@ -57,13 +59,17 @@ export class FileCreator {
 
       return file;
     } catch (error: unknown) {
-      const message =
-        error instanceof Error ? error.message : '[File Creator] unknown error';
+      const message = error instanceof Error ? error.message : 'unknown error';
+
+      Logger.error('[File Creator]', message);
+
+      const cause =
+        error instanceof DriveDesktopError ? error.syncErrorCause : 'UNKNOWN';
 
       await this.notifier.errorWhileCreating(
         filePath.name(),
         filePath.extension(),
-        message
+        cause
       );
 
       throw error;
diff --git a/src/context/virtual-drive/files/application/FileDeleter.ts b/src/context/virtual-drive/files/application/FileDeleter.ts
index cad8c9e68..53465cfce 100644
--- a/src/context/virtual-drive/files/application/FileDeleter.ts
+++ b/src/context/virtual-drive/files/application/FileDeleter.ts
@@ -6,6 +6,7 @@ import { FileStatuses } from '../domain/FileStatus';
 import { SyncFileMessenger } from '../domain/SyncFileMessenger';
 import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { DriveDesktopError } from '../../../shared/domain/errors/DriveDesktopError';
 
 export class FileDeleter {
   constructor(
@@ -47,14 +48,16 @@ export class FileDeleter {
       await this.repository.update(file);
       await this.notifier.trashed(file.name, file.type, file.size);
     } catch (error: unknown) {
-      Logger.error(
-        `Error deleting the file ${file.nameWithExtension}: `,
-        error
-      );
-
       const message = error instanceof Error ? error.message : 'Unknown error';
 
-      this.notifier.errorWhileTrashing(file.name, file.type, message);
+      Logger.error('[File Deleter]', message);
+
+      const cause =
+        error instanceof DriveDesktopError ? error.syncErrorCause : 'UNKNOWN';
+
+      this.notifier.errorWhileTrashing(file.name, file.type, cause);
+
+      // TODO: add an event and an event handler to recreate placeholders if needed
       this.local.createPlaceHolder(file);
 
       throw error;
diff --git a/src/context/virtual-drive/files/domain/FilePath.ts b/src/context/virtual-drive/files/domain/FilePath.ts
index 6c82e82d9..8d736b7f1 100644
--- a/src/context/virtual-drive/files/domain/FilePath.ts
+++ b/src/context/virtual-drive/files/domain/FilePath.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import { Path } from '../../../shared/domain/Path';
+import { Path } from '../../../shared/domain/value-objects/Path';
 
 export class FilePath extends Path {
   constructor(value: string) {
diff --git a/src/context/virtual-drive/files/domain/FileStatus.ts b/src/context/virtual-drive/files/domain/FileStatus.ts
index 685d9d314..5374a9194 100644
--- a/src/context/virtual-drive/files/domain/FileStatus.ts
+++ b/src/context/virtual-drive/files/domain/FileStatus.ts
@@ -1,5 +1,5 @@
 import { EnumValueObject } from '../../../shared/domain/value-objects/EnumValueObject';
-import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { InvalidArgumentError } from '../../../shared/domain/errors/InvalidArgumentError';
 import { ActionNotPermittedError } from './errors/ActionNotPermittedError';
 
 export enum FileStatuses {
diff --git a/src/context/virtual-drive/files/domain/SyncFileMessenger.ts b/src/context/virtual-drive/files/domain/SyncFileMessenger.ts
index ba61bf910..feadb51c4 100644
--- a/src/context/virtual-drive/files/domain/SyncFileMessenger.ts
+++ b/src/context/virtual-drive/files/domain/SyncFileMessenger.ts
@@ -1,22 +1,24 @@
+import { SyncErrorCause } from '../../../../shared/issues/SyncErrorCause';
+
 export interface SyncFileMessenger {
   created(name: string, extension: string): Promise<void>;
   errorWhileCreating(
     name: string,
     extension: string,
-    message: string
+    cause: SyncErrorCause
   ): Promise<void>;
   trashing(name: string, extension: string, size: number): Promise<void>;
   trashed(name: string, extension: string, size: number): Promise<void>;
   errorWhileTrashing(
     name: string,
     extension: string,
-    message: string
+    cause: SyncErrorCause
   ): Promise<void>;
   renaming(current: string, desired: string): Promise<void>;
   renamed(current: string, desired: string): Promise<void>;
   errorWhileRenaming(
     current: string,
     desired: string,
-    message: string
+    cause: SyncErrorCause
   ): Promise<void>;
 }
diff --git a/src/context/virtual-drive/files/domain/errors/FileAlreadyExistsError.ts b/src/context/virtual-drive/files/domain/errors/FileAlreadyExistsError.ts
index 930941dfa..c8b7ef39e 100644
--- a/src/context/virtual-drive/files/domain/errors/FileAlreadyExistsError.ts
+++ b/src/context/virtual-drive/files/domain/errors/FileAlreadyExistsError.ts
@@ -1,5 +1,7 @@
-export class FileAlreadyExistsError extends Error {
+import { DriveDesktopError } from '../../../../shared/domain/errors/DriveDesktopError';
+
+export class FileAlreadyExistsError extends DriveDesktopError {
   constructor(path: string) {
-    super(`File ${path} already exists`);
+    super('FILE_ALREADY_EXISTS', `File ${path} already exists`);
   }
 }
diff --git a/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/BackgroundProcessSyncFileMessenger.ts b/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/BackgroundProcessSyncFileMessenger.ts
index a5499f4e9..4749133d8 100644
--- a/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/BackgroundProcessSyncFileMessenger.ts
+++ b/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/BackgroundProcessSyncFileMessenger.ts
@@ -1,7 +1,8 @@
 import path from 'path';
-import { SyncEngineIpc } from '../../../../../apps/sync-engine/ipcRendererSyncEngine';
+import { SyncEngineIpc } from '../../../../../apps/sync-engine/SyncEngineIpc';
 import { SyncMessenger } from '../../../../shared/domain/SyncMessenger';
 import { SyncFileMessenger } from '../../domain/SyncFileMessenger';
+import { SyncErrorCause } from '../../../../../shared/issues/SyncErrorCause';
 
 export class BackgroundProcessSyncFileMessenger
   extends SyncMessenger
@@ -21,13 +22,13 @@ export class BackgroundProcessSyncFileMessenger
   async errorWhileCreating(
     name: string,
     extension: string,
-    message: string
+    cause: SyncErrorCause
   ): Promise<void> {
     this.ipc.send('FILE_UPLOAD_ERROR', {
       name,
       extension,
       nameWithExtension: this.nameWithExtension(name, extension),
-      error: message,
+      cause,
     });
   }
 
@@ -52,13 +53,13 @@ export class BackgroundProcessSyncFileMessenger
   async errorWhileTrashing(
     name: string,
     extension: string,
-    message: string
+    cause: SyncErrorCause
   ): Promise<void> {
     this.ipc.send('FILE_DELETION_ERROR', {
       name,
       extension,
       nameWithExtension: this.nameWithExtension(name, extension),
-      error: message,
+      cause,
     });
   }
 
@@ -79,7 +80,7 @@ export class BackgroundProcessSyncFileMessenger
   async errorWhileRenaming(
     current: string,
     _desired: string,
-    message: string
+    cause: SyncErrorCause
   ): Promise<void> {
     const extension = path.extname(current);
 
@@ -89,7 +90,7 @@ export class BackgroundProcessSyncFileMessenger
       name,
       extension,
       nameWithExtension: current,
-      error: message,
+      cause,
     });
   }
 }
diff --git a/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/MainProcessSyncFileMessenger.ts b/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/MainProcessSyncFileMessenger.ts
index 9616657e8..b9e97dabd 100644
--- a/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/MainProcessSyncFileMessenger.ts
+++ b/src/context/virtual-drive/files/infrastructure/SyncFileMessengers/MainProcessSyncFileMessenger.ts
@@ -2,10 +2,10 @@ import {
   trackError,
   trackEvent,
 } from '../../../../../apps/main/analytics/service';
-import { addProcessIssue } from '../../../../../apps/main/background-processes/process-issues';
+import { addVirtualDriveIssue } from '../../../../../apps/main/issues/virtual-drive';
 import { setTrayStatus } from '../../../../../apps/main/tray/tray';
 import { broadcastToWindows } from '../../../../../apps/main/windows';
-import { ProcessIssue } from '../../../../../apps/shared/types';
+import { VirtualDriveIssue } from '../../../../../shared/issues/VirtualDriveIssue';
 import { SyncMessenger } from '../../../../shared/domain/SyncMessenger';
 import { SyncFileMessenger } from '../../domain/SyncFileMessenger';
 
@@ -83,15 +83,13 @@ export class MainProcessSyncFileMessenger
       action: 'Delete',
     });
 
-    const issue: ProcessIssue = {
-      kind: 'REMOTE',
-      name,
-      action: 'DELETE_ERROR',
-      errorName: 'UNKNOWN',
-      process: 'SYNC',
+    const issue: VirtualDriveIssue = {
+      name: name,
+      error: 'DELETE_ERROR',
+      cause: 'UNKNOWN',
     };
 
-    addProcessIssue(issue);
+    addVirtualDriveIssue(issue);
   }
 
   async renaming(current: string, desired: string): Promise<void> {
diff --git a/src/context/virtual-drive/folders/domain/FolderPath.ts b/src/context/virtual-drive/folders/domain/FolderPath.ts
index b9e11ae46..9745c2d01 100644
--- a/src/context/virtual-drive/folders/domain/FolderPath.ts
+++ b/src/context/virtual-drive/folders/domain/FolderPath.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import { Path } from '../../../shared/domain/Path';
+import { Path } from '../../../shared/domain/value-objects/Path';
 
 export class FolderPath extends Path {
   constructor(value: string) {
diff --git a/src/context/virtual-drive/folders/domain/FolderStatus.ts b/src/context/virtual-drive/folders/domain/FolderStatus.ts
index dc13c0673..27adb1dcd 100644
--- a/src/context/virtual-drive/folders/domain/FolderStatus.ts
+++ b/src/context/virtual-drive/folders/domain/FolderStatus.ts
@@ -1,5 +1,5 @@
 import { EnumValueObject } from '../../../shared/domain/value-objects/EnumValueObject';
-import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { InvalidArgumentError } from '../../../shared/domain/errors/InvalidArgumentError';
 import { ActionNotPermittedError } from './errors/ActionNotPermittedError';
 
 export enum FolderStatuses {
diff --git a/src/context/virtual-drive/folders/domain/FolderUuid.ts b/src/context/virtual-drive/folders/domain/FolderUuid.ts
index 999581a6b..29b2103ac 100644
--- a/src/context/virtual-drive/folders/domain/FolderUuid.ts
+++ b/src/context/virtual-drive/folders/domain/FolderUuid.ts
@@ -1,5 +1,5 @@
 import * as uuid from 'uuid';
-import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { InvalidArgumentError } from '../../../shared/domain/errors/InvalidArgumentError';
 import { ValueObject } from '../../../shared/domain/value-objects/ValueObject';
 
 export class FolderUuid extends ValueObject<string> {
diff --git a/src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts b/src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts
index c5ab1e607..3368cd6cc 100644
--- a/src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts
+++ b/src/context/virtual-drive/folders/domain/SyncFolderMessenger.ts
@@ -2,7 +2,6 @@ export interface SyncFolderMessenger {
   creating(desiredName: string): Promise<void>;
   created(desiredName: string): Promise<void>;
   errorWhileCreating(desiredName: string, message: string): Promise<void>;
-
   rename(currentName: string, desiredName: string): Promise<void>;
   renamed(currentName: string, desiredName: string): Promise<void>;
   errorWhileRenaming(
@@ -10,4 +9,5 @@ export interface SyncFolderMessenger {
     desiredName: string,
     message: string
   ): Promise<void>;
+  errorWhileTrashing(name: string): Promise<void>;
 }
diff --git a/src/context/virtual-drive/folders/domain/errors/ActionNotPermittedError.ts b/src/context/virtual-drive/folders/domain/errors/ActionNotPermittedError.ts
index aed1f9ece..d2205cede 100644
--- a/src/context/virtual-drive/folders/domain/errors/ActionNotPermittedError.ts
+++ b/src/context/virtual-drive/folders/domain/errors/ActionNotPermittedError.ts
@@ -1,5 +1,7 @@
-export class ActionNotPermittedError extends Error {
+import { DriveDesktopError } from '../../../../shared/domain/errors/DriveDesktopError';
+
+export class ActionNotPermittedError extends DriveDesktopError {
   constructor(action: string) {
-    super(`${action} is not permitted on folders`);
+    super('ACTION_NOT_PERMITTED', `${action} is not permitted on folders`);
   }
 }
diff --git a/src/context/virtual-drive/folders/infrastructure/SyncMessengers/BackgroundProcessSyncFolderMessenger.ts b/src/context/virtual-drive/folders/infrastructure/SyncMessengers/BackgroundProcessSyncFolderMessenger.ts
index f56f3657f..8974dbbb7 100644
--- a/src/context/virtual-drive/folders/infrastructure/SyncMessengers/BackgroundProcessSyncFolderMessenger.ts
+++ b/src/context/virtual-drive/folders/infrastructure/SyncMessengers/BackgroundProcessSyncFolderMessenger.ts
@@ -1,4 +1,4 @@
-import { SyncEngineIpc } from '../../../../../apps/sync-engine/ipcRendererSyncEngine';
+import { SyncEngineIpc } from '../../../../../apps/sync-engine/SyncEngineIpc';
 import { SyncMessenger } from '../../../../shared/domain/SyncMessenger';
 import { SyncFolderMessenger } from '../../domain/SyncFolderMessenger';
 
@@ -53,4 +53,8 @@ export class BackgroundProcessSyncFolderMessenger
       error: message,
     });
   }
+
+  async errorWhileTrashing(_name: string): Promise<void> {
+    // TODO: implement
+  }
 }
diff --git a/src/context/virtual-drive/folders/infrastructure/SyncMessengers/MainProcessSyncFolderMessenger.ts b/src/context/virtual-drive/folders/infrastructure/SyncMessengers/MainProcessSyncFolderMessenger.ts
index 2fbba1950..828478f08 100644
--- a/src/context/virtual-drive/folders/infrastructure/SyncMessengers/MainProcessSyncFolderMessenger.ts
+++ b/src/context/virtual-drive/folders/infrastructure/SyncMessengers/MainProcessSyncFolderMessenger.ts
@@ -3,6 +3,10 @@ import { setTrayStatus } from '../../../../../apps/main/tray/tray';
 import { SyncFolderMessenger } from '../../domain/SyncFolderMessenger';
 
 export class MainProcessSyncFolderMessenger implements SyncFolderMessenger {
+  async errorWhileTrashing(_name: string): Promise<void> {
+    setTrayStatus('ALERT');
+  }
+
   async rename(_name: string, _newName: string): Promise<void> {
     setTrayStatus('SYNCING');
   }
diff --git a/src/context/virtual-drive/shared/domain/BucketEntryId.ts b/src/context/virtual-drive/shared/domain/BucketEntryId.ts
index ac7325fe0..247817e45 100644
--- a/src/context/virtual-drive/shared/domain/BucketEntryId.ts
+++ b/src/context/virtual-drive/shared/domain/BucketEntryId.ts
@@ -1,4 +1,4 @@
-import { InvalidArgumentError } from '../../../shared/domain/InvalidArgumentError';
+import { InvalidArgumentError } from '../../../shared/domain/errors/InvalidArgumentError';
 import { ValueObject } from '../../../shared/domain/value-objects/ValueObject';
 
 export class BucketEntryId extends ValueObject<string> {
diff --git a/src/context/virtual-drive/items/application/FileCreatorFromServerFile.ts b/src/context/virtual-drive/tree/application/FileCreatorFromServerFile.ts
similarity index 100%
rename from src/context/virtual-drive/items/application/FileCreatorFromServerFile.ts
rename to src/context/virtual-drive/tree/application/FileCreatorFromServerFile.ts
diff --git a/src/context/virtual-drive/items/application/FolderCreatorFromServerFolder.ts b/src/context/virtual-drive/tree/application/FolderCreatorFromServerFolder.ts
similarity index 100%
rename from src/context/virtual-drive/items/application/FolderCreatorFromServerFolder.ts
rename to src/context/virtual-drive/tree/application/FolderCreatorFromServerFolder.ts
diff --git a/src/context/virtual-drive/items/application/ItemsSearcher.ts b/src/context/virtual-drive/tree/application/ItemsSearcher.ts
similarity index 100%
rename from src/context/virtual-drive/items/application/ItemsSearcher.ts
rename to src/context/virtual-drive/tree/application/ItemsSearcher.ts
diff --git a/src/context/virtual-drive/items/application/Traverser.ts b/src/context/virtual-drive/tree/application/Traverser.ts
similarity index 100%
rename from src/context/virtual-drive/items/application/Traverser.ts
rename to src/context/virtual-drive/tree/application/Traverser.ts
diff --git a/src/context/virtual-drive/items/application/TreeBuilder.ts b/src/context/virtual-drive/tree/application/TreeBuilder.ts
similarity index 100%
rename from src/context/virtual-drive/items/application/TreeBuilder.ts
rename to src/context/virtual-drive/tree/application/TreeBuilder.ts
diff --git a/src/context/virtual-drive/items/domain/FileNode.ts b/src/context/virtual-drive/tree/domain/FileNode.ts
similarity index 100%
rename from src/context/virtual-drive/items/domain/FileNode.ts
rename to src/context/virtual-drive/tree/domain/FileNode.ts
diff --git a/src/context/virtual-drive/items/domain/FolderNode.ts b/src/context/virtual-drive/tree/domain/FolderNode.ts
similarity index 100%
rename from src/context/virtual-drive/items/domain/FolderNode.ts
rename to src/context/virtual-drive/tree/domain/FolderNode.ts
diff --git a/src/context/virtual-drive/items/domain/ItemsIndexedByPath.ts b/src/context/virtual-drive/tree/domain/ItemsIndexedByPath.ts
similarity index 100%
rename from src/context/virtual-drive/items/domain/ItemsIndexedByPath.ts
rename to src/context/virtual-drive/tree/domain/ItemsIndexedByPath.ts
diff --git a/src/context/virtual-drive/items/domain/NameDecrypt.ts b/src/context/virtual-drive/tree/domain/NameDecrypt.ts
similarity index 100%
rename from src/context/virtual-drive/items/domain/NameDecrypt.ts
rename to src/context/virtual-drive/tree/domain/NameDecrypt.ts
diff --git a/src/context/virtual-drive/items/domain/Node.ts b/src/context/virtual-drive/tree/domain/Node.ts
similarity index 100%
rename from src/context/virtual-drive/items/domain/Node.ts
rename to src/context/virtual-drive/tree/domain/Node.ts
diff --git a/src/context/virtual-drive/items/domain/RemoteItemsGenerator.ts b/src/context/virtual-drive/tree/domain/RemoteItemsGenerator.ts
similarity index 100%
rename from src/context/virtual-drive/items/domain/RemoteItemsGenerator.ts
rename to src/context/virtual-drive/tree/domain/RemoteItemsGenerator.ts
diff --git a/src/context/virtual-drive/items/domain/Tree.ts b/src/context/virtual-drive/tree/domain/Tree.ts
similarity index 100%
rename from src/context/virtual-drive/items/domain/Tree.ts
rename to src/context/virtual-drive/tree/domain/Tree.ts
diff --git a/src/context/virtual-drive/tree/domain/TreeBuilderMessenger.ts b/src/context/virtual-drive/tree/domain/TreeBuilderMessenger.ts
new file mode 100644
index 000000000..6b0fa3b60
--- /dev/null
+++ b/src/context/virtual-drive/tree/domain/TreeBuilderMessenger.ts
@@ -0,0 +1,3 @@
+export interface TreeBuilderMessenger {
+  duplicatedNode(name: string): Promise<void>;
+}
diff --git a/src/context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt.ts b/src/context/virtual-drive/tree/infrastructure/CryptoJsNameDecrypt.ts
similarity index 100%
rename from src/context/virtual-drive/items/infrastructure/CryptoJsNameDecrypt.ts
rename to src/context/virtual-drive/tree/infrastructure/CryptoJsNameDecrypt.ts
diff --git a/src/context/virtual-drive/items/infrastructure/IpcRemoteItemsGenerator.ts b/src/context/virtual-drive/tree/infrastructure/IpcRemoteItemsGenerator.ts
similarity index 95%
rename from src/context/virtual-drive/items/infrastructure/IpcRemoteItemsGenerator.ts
rename to src/context/virtual-drive/tree/infrastructure/IpcRemoteItemsGenerator.ts
index 7c3d23d5c..4f506ad27 100644
--- a/src/context/virtual-drive/items/infrastructure/IpcRemoteItemsGenerator.ts
+++ b/src/context/virtual-drive/tree/infrastructure/IpcRemoteItemsGenerator.ts
@@ -1,4 +1,4 @@
-import { SyncEngineIpc } from '../../../../apps/sync-engine/ipcRendererSyncEngine';
+import { SyncEngineIpc } from '../../../../apps/sync-engine/SyncEngineIpc';
 import {
   ServerFile,
   ServerFileStatus,
diff --git a/src/context/virtual-drive/items/infrastructure/SQLiteRemoteItemsGenerator.ts b/src/context/virtual-drive/tree/infrastructure/SQLiteRemoteItemsGenerator.ts
similarity index 100%
rename from src/context/virtual-drive/items/infrastructure/SQLiteRemoteItemsGenerator.ts
rename to src/context/virtual-drive/tree/infrastructure/SQLiteRemoteItemsGenerator.ts
diff --git a/src/context/virtual-drive/tree/infrastructure/TreeBuilderMessengers/BackgroundProcessTreeBuilderMessenger.ts b/src/context/virtual-drive/tree/infrastructure/TreeBuilderMessengers/BackgroundProcessTreeBuilderMessenger.ts
new file mode 100644
index 000000000..4eb8513eb
--- /dev/null
+++ b/src/context/virtual-drive/tree/infrastructure/TreeBuilderMessengers/BackgroundProcessTreeBuilderMessenger.ts
@@ -0,0 +1,15 @@
+import { SyncEngineIpc } from '../../../../../apps/sync-engine/SyncEngineIpc';
+import { TreeBuilderMessenger } from '../../domain/TreeBuilderMessenger';
+
+export class BackgroundProcessTreeBuilderMessenger
+  implements TreeBuilderMessenger
+{
+  constructor(private readonly ipc: SyncEngineIpc) {}
+
+  async duplicatedNode(name: string): Promise<void> {
+    this.ipc.send('TREE_BUILD_ERROR', {
+      error: 'DUPLICATED_NODE',
+      name,
+    });
+  }
+}
diff --git a/src/context/virtual-drive/tree/infrastructure/TreeBuilderMessengers/MainProcessTreeBuilderMessenger.ts b/src/context/virtual-drive/tree/infrastructure/TreeBuilderMessengers/MainProcessTreeBuilderMessenger.ts
new file mode 100644
index 000000000..d6969b61f
--- /dev/null
+++ b/src/context/virtual-drive/tree/infrastructure/TreeBuilderMessengers/MainProcessTreeBuilderMessenger.ts
@@ -0,0 +1,12 @@
+import { addVirtualDriveIssue } from '../../../../../apps/main/issues/virtual-drive';
+import { TreeBuilderMessenger } from '../../domain/TreeBuilderMessenger';
+
+export class MainProcessTreeBuilderMessenger implements TreeBuilderMessenger {
+  async duplicatedNode(name: string): Promise<void> {
+    addVirtualDriveIssue({
+      error: 'GENERATE_TREE',
+      cause: 'DUPLICATED_NODE',
+      name: name,
+    });
+  }
+}
diff --git a/src/shared/issues/AppError.ts b/src/shared/issues/AppError.ts
new file mode 100644
index 000000000..934a98f33
--- /dev/null
+++ b/src/shared/issues/AppError.ts
@@ -0,0 +1,3 @@
+const AppErrors = ['UNKNOWN_DEVICE_NAME'] as const;
+
+export type AppError = (typeof AppErrors)[number];
diff --git a/src/context/desktop/app/domain/AppIssue.ts b/src/shared/issues/AppIssue.ts
similarity index 59%
rename from src/context/desktop/app/domain/AppIssue.ts
rename to src/shared/issues/AppIssue.ts
index 4b6407508..6e950ffb2 100644
--- a/src/context/desktop/app/domain/AppIssue.ts
+++ b/src/shared/issues/AppIssue.ts
@@ -1,10 +1,11 @@
+import { AppError } from './AppError';
+
 export type AppIssue = {
   action: 'GET_DEVICE_NAME_ERROR';
-  errorName: 'UNKNOWN_DEVICE_NAME';
-  process: 'GENERAL';
+  errorName: AppError;
   errorDetails: {
     name: string;
-    messages: string;
+    message: string;
     stack: string;
   };
 };
diff --git a/src/shared/issues/FatalError.ts b/src/shared/issues/FatalError.ts
new file mode 100644
index 000000000..136937a5a
--- /dev/null
+++ b/src/shared/issues/FatalError.ts
@@ -0,0 +1,12 @@
+export const FatalErrors = [
+  'NO_INTERNET',
+  'NO_REMOTE_CONNECTION',
+  'CANNOT_ACCESS_BASE_DIRECTORY',
+  'BASE_DIRECTORY_DOES_NOT_EXIST',
+  'INSUFFICIENT_PERMISSION_ACCESSING_BASE_DIRECTORY',
+  'CANNOT_ACCESS_TMP_DIRECTORY',
+  'CANNOT_GET_CURRENT_LISTINGS',
+  'UNKNOWN',
+];
+
+export type FatalError = (typeof FatalErrors)[number];
diff --git a/src/shared/issues/SyncErrorCause.ts b/src/shared/issues/SyncErrorCause.ts
new file mode 100644
index 000000000..03fb8d5b8
--- /dev/null
+++ b/src/shared/issues/SyncErrorCause.ts
@@ -0,0 +1,32 @@
+export type SyncErrorCause =
+  // File or folder does not exist
+  | 'NOT_EXISTS'
+
+  // No permission to read or write file or folder
+  | 'NO_PERMISSION'
+
+  // No internet connection
+  | 'NO_INTERNET'
+
+  // Could not connect to Internxt servers
+  | 'NO_REMOTE_CONNECTION'
+
+  // Had a bad response (not in the 200 status range) from the server
+  | 'BAD_RESPONSE'
+
+  // The file has a size of 0 bytes
+  | 'EMPTY_FILE'
+
+  // The file is bigger than the current upload limit
+  | 'FILE_TOO_BIG'
+
+  // The file don't have an extension
+  | 'FILE_NON_EXTENSION'
+
+  // Unknown error
+  | 'UNKNOWN'
+
+  // Duplicated node path
+  | 'DUPLICATED_NODE'
+  | 'ACTION_NOT_PERMITTED'
+  | 'FILE_ALREADY_EXISTS';
diff --git a/src/shared/issues/VirtualDriveError.ts b/src/shared/issues/VirtualDriveError.ts
new file mode 100644
index 000000000..4cbaef8fc
--- /dev/null
+++ b/src/shared/issues/VirtualDriveError.ts
@@ -0,0 +1,14 @@
+const VirtualDriveErrors = [
+  'UPLOAD_ERROR',
+  'DOWNLOAD_ERROR',
+  'RENAME_ERROR',
+  'DELETE_ERROR',
+  'METADATA_READ_ERROR',
+  'GENERATE_TREE',
+] as const;
+
+export type VirtualDriveError = (typeof VirtualDriveErrors)[number];
+
+export function isVirtualDriveError(maybe: string): maybe is VirtualDriveError {
+  return VirtualDriveErrors.includes(maybe as VirtualDriveError);
+}
diff --git a/src/shared/issues/VirtualDriveIssue.ts b/src/shared/issues/VirtualDriveIssue.ts
new file mode 100644
index 000000000..280669683
--- /dev/null
+++ b/src/shared/issues/VirtualDriveIssue.ts
@@ -0,0 +1,8 @@
+import { SyncErrorCause } from './SyncErrorCause';
+import { VirtualDriveError } from './VirtualDriveError';
+
+export type VirtualDriveIssue = {
+  error: VirtualDriveError;
+  cause: SyncErrorCause;
+  name: string;
+};
diff --git a/tests/context/virtual-drive/folders/__mocks__/SycnFolderMessengerMock.ts b/tests/context/virtual-drive/folders/__mocks__/SycnFolderMessengerMock.ts
index 9d765a98c..8836c99dc 100644
--- a/tests/context/virtual-drive/folders/__mocks__/SycnFolderMessengerMock.ts
+++ b/tests/context/virtual-drive/folders/__mocks__/SycnFolderMessengerMock.ts
@@ -7,6 +7,7 @@ export class SyncFolderMessengerMock implements SyncFolderMessenger {
   public readonly renameMock = jest.fn();
   public readonly renamedMock = jest.fn();
   public readonly errorWhileRenamingMock = jest.fn();
+  public readonly errorWhileTrashingMock = jest.fn();
 
   creating(desiredName: string): Promise<void> {
     return this.creatingMock(desiredName);
@@ -30,4 +31,7 @@ export class SyncFolderMessengerMock implements SyncFolderMessenger {
   ): Promise<void> {
     return this.errorWhileRenamingMock(currentName, desiredName, message);
   }
+  errorWhileTrashing(name: string): Promise<void> {
+    return this.errorWhileTrashingMock(name);
+  }
 }
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts b/tests/context/virtual-drive/folders/__mocks__/SyncFolderMessengerMock.ts
similarity index 82%
rename from tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
rename to tests/context/virtual-drive/folders/__mocks__/SyncFolderMessengerMock.ts
index b35b69e78..72b7239b4 100644
--- a/tests/context/virtual-drive/folders/__mocks__/FolderSyncManagerMock.ts
+++ b/tests/context/virtual-drive/folders/__mocks__/SyncFolderMessengerMock.ts
@@ -1,12 +1,13 @@
 import { SyncFolderMessenger } from '../../../../../src/context/virtual-drive/folders/domain/SyncFolderMessenger';
 
-export class FolderSyncNotifierMock implements SyncFolderMessenger {
+export class SyncFolderMessengerMock implements SyncFolderMessenger {
   public creatingMock = jest.fn();
   public createdMock = jest.fn();
   public renameMock = jest.fn();
   public renamedMock = jest.fn();
   public errorWhileCreatingMock = jest.fn();
   public errorWhileRenamingMock = jest.fn();
+  public errorWhileTrashingMock = jest.fn();
 
   creating(name: string): Promise<void> {
     return this.creatingMock(name);
@@ -30,4 +31,8 @@ export class FolderSyncNotifierMock implements SyncFolderMessenger {
   ): Promise<void> {
     return this.errorWhileRenamingMock(currentName, desiredName, message);
   }
+
+  errorWhileTrashing(name: string): Promise<void> {
+    return this.errorWhileTrashingMock(name);
+  }
 }
diff --git a/tests/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.test.ts b/tests/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.test.ts
index c16a6fb4d..ae236bab1 100644
--- a/tests/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.test.ts
+++ b/tests/context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder.test.ts
@@ -2,7 +2,7 @@ import { FolderCreatorFromOfflineFolder } from '../../../../../src/context/virtu
 import { EventBusMock } from '../../shared/__mock__/EventBusMock';
 import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
 import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
-import { FolderSyncNotifierMock } from '../__mocks__/FolderSyncManagerMock';
+import { SyncFolderMessengerMock } from '../__mocks__/SyncFolderMessengerMock';
 import { FolderMother } from '../domain/FolderMother';
 import { OfflineFolderMother } from '../domain/OfflineFolderMother';
 
@@ -12,12 +12,12 @@ describe('Folder Creator from Offline Folder', () => {
   let repository: FolderRepositoryMock;
   let remote: FolderRemoteFileSystemMock;
   let eventBus: EventBusMock;
-  let notifier: FolderSyncNotifierMock;
+  let messenger: SyncFolderMessengerMock;
 
   beforeEach(() => {
     repository = new FolderRepositoryMock();
     remote = new FolderRemoteFileSystemMock();
-    notifier = new FolderSyncNotifierMock();
+    messenger = new SyncFolderMessengerMock();
 
     eventBus = new EventBusMock();
 
@@ -25,7 +25,7 @@ describe('Folder Creator from Offline Folder', () => {
       repository,
       remote,
       eventBus,
-      notifier
+      messenger
     );
   });
 
@@ -58,7 +58,7 @@ describe('Folder Creator from Offline Folder', () => {
 
       await SUT.run(offlineFolder);
 
-      expect(notifier.creatingMock).toBeCalledWith(offlineFolder.name);
+      expect(messenger.creatingMock).toBeCalledWith(offlineFolder.name);
     });
 
     it('sends the message FOLDER_CREATED', async () => {
@@ -76,7 +76,7 @@ describe('Folder Creator from Offline Folder', () => {
 
       await SUT.run(offlineFolder);
 
-      expect(notifier.createdMock).toBeCalledWith(offlineFolder.name);
+      expect(messenger.createdMock).toBeCalledWith(offlineFolder.name);
     });
   });
 });
diff --git a/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts b/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
index 75a2d243f..aa244ba35 100644
--- a/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
+++ b/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
@@ -8,7 +8,7 @@ import { EventBusMock } from '../../shared/__mock__/EventBusMock';
 import { EventRepositoryMock } from '../../shared/__mock__/EventRepositoryMock';
 import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
 import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
-import { FolderSyncNotifierMock } from '../__mocks__/FolderSyncManagerMock';
+import { SyncFolderMessengerMock } from '../__mocks__/SyncFolderMessengerMock';
 import { FolderMother } from '../domain/FolderMother';
 import { OfflineFolderMother } from '../domain/OfflineFolderMother';
 
@@ -18,7 +18,7 @@ describe('Synchronize Offline Modifications', () => {
   let folderRemoteFileSystemMock: FolderRemoteFileSystemMock;
   let renamer: FolderRenamer;
   let eventRepositoryMock: EventRepositoryMock;
-  let notifier: FolderSyncNotifierMock;
+  let messenger: SyncFolderMessengerMock;
 
   let SUT: SynchronizeOfflineModifications;
 
@@ -26,13 +26,13 @@ describe('Synchronize Offline Modifications', () => {
     offlineRepository = new InMemoryOfflineFolderRepository();
     folderRemoteFileSystemMock = new FolderRemoteFileSystemMock();
     repository = new FolderRepositoryMock();
-    notifier = new FolderSyncNotifierMock();
+    messenger = new SyncFolderMessengerMock();
 
     renamer = new FolderRenamer(
       repository,
       folderRemoteFileSystemMock,
       new EventBusMock(),
-      notifier
+      messenger
     );
     eventRepositoryMock = new EventRepositoryMock();
 
diff --git a/tests/context/virtual-drive/shared/__mock__/DownloadProgressTrackerMock.ts b/tests/context/virtual-drive/shared/__mock__/DownloadProgressTrackerMock.ts
index ec43c5397..ea2552f8a 100644
--- a/tests/context/virtual-drive/shared/__mock__/DownloadProgressTrackerMock.ts
+++ b/tests/context/virtual-drive/shared/__mock__/DownloadProgressTrackerMock.ts
@@ -17,10 +17,9 @@ export class DownloadProgressTrackerMock implements DownloadProgressTracker {
   downloadUpdate(
     name: string,
     extension: string,
-    size: number,
     progress: { elapsedTime: number; percentage: number }
   ): Promise<void> {
-    return this.downloadUpdateMock(name, extension, size, progress);
+    return this.downloadUpdateMock(name, extension, progress);
   }
 
   downloadFinished(
diff --git a/tests/context/virtual-drive/shared/__mock__/IpcRendererSyncEngineMock.ts b/tests/context/virtual-drive/shared/__mock__/IpcRendererSyncEngineMock.ts
index c1f6bcf38..c85bd18a1 100644
--- a/tests/context/virtual-drive/shared/__mock__/IpcRendererSyncEngineMock.ts
+++ b/tests/context/virtual-drive/shared/__mock__/IpcRendererSyncEngineMock.ts
@@ -1,8 +1,6 @@
-import {
-  FromMain,
-  FromProcess,
-} from '../../../../../src/apps/shared/IPC/events/sync-engine';
-import { SyncEngineIpc } from '../../../../../src/apps/sync-engine/ipcRendererSyncEngine';
+import { BackgroundProcessVirtualDriveEvents } from '../../../../../src/apps/shared/IPC/events/virtualDrive/BackgroundProcessVirtualDriveEvents';
+import { MainProcessVirtualDriveEvents } from '../../../../../src/apps/shared/IPC/events/virtualDrive/MainProcessVirtualDriveEvents';
+import { SyncEngineIpc } from '../../../../../src/apps/sync-engine/SyncEngineIpc';
 
 export class IpcRendererSyncEngineMock implements SyncEngineIpc {
   sendMock = jest.fn();
@@ -16,7 +14,7 @@ export class IpcRendererSyncEngineMock implements SyncEngineIpc {
     return this.sendMock(event, ...args);
   }
 
-  emit(event: keyof FromProcess): void {
+  emit(event: string): void {
     return this.emitMock(event);
   }
   on(event: string | number): void {
@@ -26,10 +24,7 @@ export class IpcRendererSyncEngineMock implements SyncEngineIpc {
     this.onceMock(event);
   }
 
-  invoke<Event extends never>(
-    event: Event,
-    ...args: never
-  ): Promise<ReturnType<FromProcess[Event]>> {
+  invoke<Event extends never>(event: Event, ...args: never): Promise<any> {
     return this.onInvokeMock(event, args);
   }
 
@@ -37,9 +32,9 @@ export class IpcRendererSyncEngineMock implements SyncEngineIpc {
     event: Event,
     listener: (
       event: Electron.IpcMainEvent,
-      ...args: Parameters<FromProcess[Event]>
+      ...args: Parameters<BackgroundProcessVirtualDriveEvents[Event]>
     ) => void
-  ): Promise<ReturnType<FromMain[Event]>> {
+  ): Promise<ReturnType<MainProcessVirtualDriveEvents[Event]>> {
     return this.handleMock(event, listener);
   }
 }
diff --git a/tests/context/virtual-drive/shared/domain/Path.test.ts b/tests/context/virtual-drive/shared/domain/Path.test.ts
index 16efbb6c5..f0273fdca 100644
--- a/tests/context/virtual-drive/shared/domain/Path.test.ts
+++ b/tests/context/virtual-drive/shared/domain/Path.test.ts
@@ -1,4 +1,4 @@
-import { Path } from '../../../../../src/context/shared/domain/Path';
+import { Path } from '../../../../../src/context/shared/domain/value-objects/Path';
 
 class PathTestClass extends Path {
   constructor(value: string) {
diff --git a/tests/context/virtual-drive/items/application/Traverser.test.ts b/tests/context/virtual-drive/tree/application/Traverser.test.ts
similarity index 99%
rename from tests/context/virtual-drive/items/application/Traverser.test.ts
rename to tests/context/virtual-drive/tree/application/Traverser.test.ts
index 62adf56d4..968cc8754 100644
--- a/tests/context/virtual-drive/items/application/Traverser.test.ts
+++ b/tests/context/virtual-drive/tree/application/Traverser.test.ts
@@ -6,7 +6,7 @@ import {
   ServerFolderStatus,
   ServerFolder,
 } from '../../../../../src/context/shared/domain/ServerFolder';
-import { Traverser } from '../../../../../src/context/virtual-drive/items/application/Traverser';
+import { Traverser } from '../../../../../src/context/virtual-drive/tree/application/Traverser';
 import { ContentsIdMother } from '../../contents/domain/ContentsIdMother';
 import { FakeNameDecrypt } from '../infrastructure/FakeNameDecrypt';
 
diff --git a/tests/context/virtual-drive/items/infrastructure/FakeNameDecrypt.ts b/tests/context/virtual-drive/tree/infrastructure/FakeNameDecrypt.ts
similarity index 91%
rename from tests/context/virtual-drive/items/infrastructure/FakeNameDecrypt.ts
rename to tests/context/virtual-drive/tree/infrastructure/FakeNameDecrypt.ts
index f45d9dc52..94ed81525 100644
--- a/tests/context/virtual-drive/items/infrastructure/FakeNameDecrypt.ts
+++ b/tests/context/virtual-drive/tree/infrastructure/FakeNameDecrypt.ts
@@ -1,4 +1,4 @@
-import { NameDecrypt } from '../../../../../src/context/virtual-drive/items/domain/NameDecrypt';
+import { NameDecrypt } from '../../../../../src/context/virtual-drive/tree/domain/NameDecrypt';
 
 export class FakeNameDecrypt implements NameDecrypt {
   decryptName(
diff --git a/tests/context/virtual-drive/items/persistance/ServerFolderMother.ts b/tests/context/virtual-drive/tree/persistance/ServerFolderMother.ts
similarity index 100%
rename from tests/context/virtual-drive/items/persistance/ServerFolderMother.ts
rename to tests/context/virtual-drive/tree/persistance/ServerFolderMother.ts
diff --git a/tests/fixtures/errors.ts b/tests/fixtures/errors.ts
index 6bf7aa417..bfae8709c 100644
--- a/tests/fixtures/errors.ts
+++ b/tests/fixtures/errors.ts
@@ -1,36 +1,27 @@
-import {
-  ProcessFatalErrorName,
-  ProcessErrorName,
-  ProcessIssue,
-  GeneralErrorName,
-  GeneralIssue,
-} from '../../src/apps/shared/types';
+import { AppError } from '../../src/shared/issues/AppError';
+import { AppIssue } from '../../src/shared/issues/AppIssue';
+import { SyncErrorCause } from '../../src/shared/issues/SyncErrorCause';
+import { FatalError } from '../../src/shared/issues/FatalError';
+import { VirtualDriveIssue } from '../../src/shared/issues/VirtualDriveIssue';
 
-export const createBackupFatalError = (errorName: ProcessFatalErrorName) => ({
+export const createBackupFatalError = (errorName: FatalError) => ({
   path: `folder/file${Date.now()}.txt`,
   folderId: 24816,
   errorName,
 });
 
-export const createSyncError = (
-  processErrorName: ProcessErrorName
-): ProcessIssue => ({
-  kind: 'LOCAL',
+export const createSyncError = (cause: SyncErrorCause): VirtualDriveIssue => ({
   name: 'name',
-  action: 'DELETE_ERROR',
-  errorName: processErrorName,
-  process: 'SYNC',
+  error: 'DELETE_ERROR',
+  cause: cause,
 });
 
-export const createGeneralIssueFixture = (
-  name: GeneralErrorName
-): GeneralIssue => ({
+export const createGeneralIssueFixture = (name: AppError): AppIssue => ({
   action: 'GET_DEVICE_NAME_ERROR',
   errorName: name,
-  process: 'GENERAL',
   errorDetails: {
-    name: 'Device name could not be retrived',
-    message: 'Error retriving the device name',
+    name: 'Device name could not be retrieved',
+    message: 'Error retrieving the device name',
     stack: '',
   },
 });
diff --git a/tests/issues.e2e.ts b/tests/issues.e2e.ts
index a7f05dac1..cfc52cf93 100644
--- a/tests/issues.e2e.ts
+++ b/tests/issues.e2e.ts
@@ -14,11 +14,9 @@ import {
 import { getWindowTopBarTitle } from './selectors';
 import { wait } from './utils';
 import { DEFAULT_LANGUAGE } from '../src/apps/shared/Locale/Language';
-import {
-  ProcessErrorName,
-  ProcessFatalErrorName,
-  GeneralIssue,
-} from '../src/apps/shared/types';
+import { FatalError } from '../src/shared/issues/FatalError';
+import { SyncErrorCause } from '../src/shared/issues/SyncErrorCause';
+import { AppIssue } from '../src/shared/issues/AppIssue';
 
 const activeTabSelector = 'button.text-neutral-500';
 const tabSelector = (name: 'Sync' | 'Backups' | 'General') =>
@@ -29,7 +27,7 @@ test.describe('process issues', () => {
   let electronApp: ElectronApplication;
   let page: Page;
 
-  const addSyncErrors = async (errors: Array<ProcessErrorName>) => {
+  const addSyncErrors = async (errors: Array<SyncErrorCause>) => {
     const emitEvents = errors
       .map(createSyncError)
       .map((error) => ipcMainEmit(electronApp, 'SYNC_INFO_UPDATE', error));
@@ -38,13 +36,13 @@ test.describe('process issues', () => {
   };
 
   const addBackupsErrors = async (
-    errorsName: Array<ProcessFatalErrorName>
+    errorsName: Array<FatalError>
   ): Promise<void> => {
     const errors = errorsName.map(createBackupFatalError);
     await ipcMainEmit(electronApp, 'add-backup-fatal-errors', errors);
   };
 
-  const addGeneralIssues = async (issues: Array<GeneralIssue>) => {
+  const addGeneralIssues = async (issues: Array<AppIssue>) => {
     const eventsEmited = issues.map((issue) =>
       ipcMainEmit(electronApp, 'add-device-issue', issue)
     );

From d10944743d7a6d317e5d887097dd593fdf643ab9 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Fri, 2 Feb 2024 11:34:27 +0100
Subject: [PATCH 175/188] fix: test ci

---
 .github/workflows/test.yml |   2 +-
 yarn.lock                  | 254 +++++++------------------------------
 2 files changed, 46 insertions(+), 210 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 38919cefa..2169cb1ae 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - macos-latest
+          - linux-latest
           - windows-latest
 
     runs-on: ${{ matrix.os }}
diff --git a/yarn.lock b/yarn.lock
index a09e3384c..4d49f0543 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1201,21 +1201,20 @@
     glob "^7.1.6"
     minimatch "^3.0.4"
 
-"@electron/get@^1.14.1":
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
-  integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
+"@electron/get@^2.0.0":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.3.tgz#fba552683d387aebd9f3fcadbcafc8e12ee4f960"
+  integrity sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==
   dependencies:
     debug "^4.1.1"
     env-paths "^2.2.0"
     fs-extra "^8.1.0"
-    got "^9.6.0"
+    got "^11.8.5"
     progress "^2.0.3"
     semver "^6.2.0"
     sumchecker "^3.0.1"
   optionalDependencies:
     global-agent "^3.0.0"
-    global-tunnel-ng "^2.7.1"
 
 "@electron/universal@1.2.1":
   version "1.2.1"
@@ -2189,11 +2188,6 @@
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
   integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
 
-"@sindresorhus/is@^0.14.0":
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
-  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
-
 "@sindresorhus/is@^4.0.0":
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
@@ -2324,13 +2318,6 @@
     "@svgr/plugin-jsx" "^6.5.1"
     "@svgr/plugin-svgo" "^6.5.1"
 
-"@szmarczak/http-timer@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
-  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
-  dependencies:
-    defer-to-connect "^1.0.1"
-
 "@szmarczak/http-timer@^4.0.5":
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
@@ -2748,10 +2735,12 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.32.tgz#5b5becc5da76fc055b2a601c8a3adbf13891227e"
   integrity sha512-zpnXe4dEz6PrWz9u7dqyRoq9VxwCvoXRPy/ewhmMa1CgEyVmtL1NJPQ2MX+4pf97vetquVKkpiMx0MwI8pjNOw==
 
-"@types/node@^16.11.26":
-  version "16.18.59"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.59.tgz#4cdbd631be6d9be266a96fb17b5d0d7ad6bbe26c"
-  integrity sha512-PJ1w2cNeKUEdey4LiPra0ZuxZFOGvetswE8qHRriV/sUkL5Al4tTmPV9D2+Y/TPIxTHHgxTfRjZVKWhPw/ORhQ==
+"@types/node@^18.11.18":
+  version "18.19.14"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.14.tgz#1880ff1b3ac913f3877f711588e5ed227da01886"
+  integrity sha512-EnQ4Us2rmOS64nHDWr0XqAD8DsO6f3XR6lf9UIIrZQpUzPVdN/oPuEzfDWNHSyXLvoGgjuEm/sPwFGSSs35Wtg==
+  dependencies:
+    undici-types "~5.26.4"
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
@@ -2938,6 +2927,13 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@types/yauzl@^2.9.1":
+  version "2.10.3"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999"
+  integrity sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==
+  dependencies:
+    "@types/node" "*"
+
 "@typescript-eslint/eslint-plugin@^5.4.0", "@typescript-eslint/eslint-plugin@^5.51.0", "@typescript-eslint/eslint-plugin@^5.6.0", "@typescript-eslint/eslint-plugin@^5.8.1":
   version "5.59.11"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz#8d466aa21abea4c3f37129997b198d141f09e76f"
@@ -4022,19 +4018,6 @@ cacheable-lookup@^5.0.3:
   resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
   integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
 
-cacheable-request@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
-  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
-  dependencies:
-    clone-response "^1.0.2"
-    get-stream "^5.1.0"
-    http-cache-semantics "^4.0.0"
-    keyv "^3.0.0"
-    lowercase-keys "^2.0.0"
-    normalize-url "^4.1.0"
-    responselike "^1.0.2"
-
 cacheable-request@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817"
@@ -4432,16 +4415,6 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-concat-stream@^1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
 concurrently@^6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-6.5.1.tgz#4518c67f7ac680cf5c34d5adf399a2a2047edc8c"
@@ -4472,14 +4445,6 @@ conf@^10.2.0:
     pkg-up "^3.1.0"
     semver "^7.3.5"
 
-config-chain@^1.1.11:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
-  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
-  dependencies:
-    ini "^1.3.4"
-    proto-list "~1.2.1"
-
 confusing-browser-globals@^1.0.10:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
@@ -4794,7 +4759,7 @@ debounce@^1.2.1:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@2.6.9, debug@^2.6.8, debug@^2.6.9:
+debug@2.6.9, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -4843,13 +4808,6 @@ decode-uri-component@^0.2.2:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
   integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
-decompress-response@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==
-  dependencies:
-    mimic-response "^1.0.0"
-
 decompress-response@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
@@ -4915,11 +4873,6 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-defer-to-connect@^1.0.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
-  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
-
 defer-to-connect@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
@@ -5219,11 +5172,6 @@ duplexer2@^0.1.2:
   dependencies:
     readable-stream "^2.0.2"
 
-duplexer3@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e"
-  integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==
-
 duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -5408,14 +5356,14 @@ electron-updater@^4.6.4:
     lodash.isequal "^4.5.0"
     semver "^7.3.5"
 
-electron@^19.1.9:
-  version "19.1.9"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.9.tgz#01995eea4014f7cdb2f616f5f3492d4ed6f5e4f0"
-  integrity sha512-XT5LkTzIHB+ZtD3dTmNnKjVBWrDWReCKt9G1uAFLz6uJMEVcIUiYO+fph5pLXETiBw/QZBx8egduMEfIccLx+g==
+electron@^25.8.4:
+  version "25.9.8"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-25.9.8.tgz#7c125ccbddad02861736275b0d4a387c59a91469"
+  integrity sha512-PGgp6PH46QVENHuAHc2NT1Su8Q1qov7qIl2jI5tsDpTibwV2zD8539AeWBQySeBU4dhbj9onIl7+1bXQ0wefBg==
   dependencies:
-    "@electron/get" "^1.14.1"
-    "@types/node" "^16.11.26"
-    extract-zip "^1.0.3"
+    "@electron/get" "^2.0.0"
+    "@types/node" "^18.11.18"
+    extract-zip "^2.0.1"
 
 emittery@^0.8.1:
   version "0.8.1"
@@ -5442,7 +5390,7 @@ enabled@2.0.x:
   resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"
   integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==
 
-encodeurl@^1.0.2, encodeurl@~1.0.2:
+encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
@@ -6121,15 +6069,16 @@ express@^4.17.3, express@^4.18.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-extract-zip@^1.0.3:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
-  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
+extract-zip@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
+  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
   dependencies:
-    concat-stream "^1.6.2"
-    debug "^2.6.9"
-    mkdirp "^0.5.4"
+    debug "^4.1.1"
+    get-stream "^5.1.0"
     yauzl "^2.10.0"
+  optionalDependencies:
+    "@types/yauzl" "^2.9.1"
 
 extsprintf@^1.2.0:
   version "1.4.1"
@@ -6494,13 +6443,6 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
-get-stream@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
-
 get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
@@ -6587,16 +6529,6 @@ global-agent@^3.0.0:
     semver "^7.3.2"
     serialize-error "^7.0.1"
 
-global-tunnel-ng@^2.7.1:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
-  integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==
-  dependencies:
-    encodeurl "^1.0.2"
-    lodash "^4.17.10"
-    npm-conf "^1.1.3"
-    tunnel "^0.0.6"
-
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -6666,7 +6598,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-got@^11.7.0:
+got@^11.7.0, got@^11.8.5:
   version "11.8.6"
   resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
   integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
@@ -6683,23 +6615,6 @@ got@^11.7.0:
     p-cancelable "^2.0.0"
     responselike "^2.0.0"
 
-got@^9.6.0:
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
-  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
-  dependencies:
-    "@sindresorhus/is" "^0.14.0"
-    "@szmarczak/http-timer" "^1.1.2"
-    cacheable-request "^6.0.0"
-    decompress-response "^3.3.0"
-    duplexer3 "^0.1.4"
-    get-stream "^4.1.0"
-    lowercase-keys "^1.0.1"
-    mimic-response "^1.0.1"
-    p-cancelable "^1.0.0"
-    to-readable-stream "^1.0.0"
-    url-parse-lax "^3.0.0"
-
 graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
@@ -7109,11 +7024,6 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
-ini@^1.3.4:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
-  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
-
 internal-slot@^1.0.3, internal-slot@^1.0.4, internal-slot@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
@@ -8066,11 +7976,6 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
-json-buffer@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
-  integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==
-
 json-buffer@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
@@ -8200,13 +8105,6 @@ keyboardevents-areequal@^0.2.1:
   resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194"
   integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==
 
-keyv@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
-  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
-  dependencies:
-    json-buffer "3.0.0"
-
 keyv@^4.0.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
@@ -8446,7 +8344,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
-lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
+lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -8512,11 +8410,6 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
-
 lowercase-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
@@ -8735,7 +8628,7 @@ mimic-fn@^3.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74"
   integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==
 
-mimic-response@^1.0.0, mimic-response@^1.0.1:
+mimic-response@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
@@ -8868,7 +8761,7 @@ minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5:
+mkdirp@^0.5.1, mkdirp@^0.5.5:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
@@ -9074,24 +8967,11 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
 
-normalize-url@^4.1.0:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
-  integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
-
 normalize-url@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
-npm-conf@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
-  integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
-  dependencies:
-    config-chain "^1.1.11"
-    pify "^3.0.0"
-
 npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -9290,11 +9170,6 @@ ora@^5.1.0:
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
 
-p-cancelable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
-  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
-
 p-cancelable@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
@@ -9483,11 +9358,6 @@ pify@^2.3.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
-pify@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
-  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
-
 pirates@^4.0.1, pirates@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
@@ -9834,11 +9704,6 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
 
-prepend-http@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-  integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==
-
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
@@ -9917,11 +9782,6 @@ prop-types@^15.6.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
-proto-list@~1.2.1:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
-  integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
-
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -10191,7 +10051,7 @@ read-pkg@^6.0.0:
     parse-json "^5.2.0"
     type-fest "^1.0.1"
 
-readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@~2.3.6:
+readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@~2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -10381,13 +10241,6 @@ resolve@^2.0.0-next.4:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
-responselike@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==
-  dependencies:
-    lowercase-keys "^1.0.0"
-
 responselike@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
@@ -11404,11 +11257,6 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
-to-readable-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
-  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
-
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -11550,11 +11398,6 @@ tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
-tunnel@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
-  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -11623,11 +11466,6 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
-
 typescript@^4.5.2:
   version "4.9.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
@@ -11648,6 +11486,11 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
 undici@^5.5.1:
   version "5.22.1"
   resolved "https://registry.yarnpkg.com/undici/-/undici-5.22.1.tgz#877d512effef2ac8be65e695f3586922e1a57d7b"
@@ -11745,13 +11588,6 @@ url-loader@^4.1.1:
     mime-types "^2.1.27"
     schema-utils "^3.0.0"
 
-url-parse-lax@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-  integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==
-  dependencies:
-    prepend-http "^2.0.0"
-
 url-parse@^1.5.3:
   version "1.5.10"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"

From 0112f1308ac0bdacff317d8a58f872bf291ff6ee Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 5 Feb 2024 11:29:54 +0100
Subject: [PATCH 176/188] [PB-1646] fix: open fuse root directory

---
 src/apps/main/virtual-root-folder/service.ts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/apps/main/virtual-root-folder/service.ts b/src/apps/main/virtual-root-folder/service.ts
index 11187f838..86a6118f3 100644
--- a/src/apps/main/virtual-root-folder/service.ts
+++ b/src/apps/main/virtual-root-folder/service.ts
@@ -1,9 +1,10 @@
 import { app, dialog, shell } from 'electron';
+import Logger from 'electron-log';
 import fs from 'fs/promises';
 import path from 'path';
-
 import configStore from '../config';
 import eventBus from '../event-bus';
+import { exec } from 'child_process';
 
 const ROOT_FOLDER_NAME = 'InternxtDrive';
 const HOME_FOLDER_PATH = app.getPath('home');
@@ -97,6 +98,18 @@ export async function chooseSyncRootWithDialog(): Promise<string | null> {
 export async function openVirtualDriveRootFolder() {
   const syncFolderPath = getRootVirtualDrive();
 
+  if (process.platform === 'linux') {
+    // shell.openPath is not working as intended with the mounted directory
+    // this is only a workaround to fix it
+    return new Promise<void>((resolve, reject) => {
+      exec(`xdg-open ${syncFolderPath} &`, (error) => {
+        if (error) reject(error);
+
+        resolve();
+      });
+    });
+  }
+
   const errorMessage = await shell.openPath(syncFolderPath);
 
   if (errorMessage) throw new Error(errorMessage);

From a54b2c2c426857114d24a93802f753e16d1b3f7c Mon Sep 17 00:00:00 2001
From: Joan Vicens <joanvicens@proton.me>
Date: Mon, 5 Feb 2024 11:12:52 +0000
Subject: [PATCH 177/188] [PB-1516] fix: track download completed (#451)

---
 .../application/DownloadContentsToPlainFile.ts         | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
index 2c064e15f..75894f2da 100644
--- a/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
+++ b/src/context/virtual-drive/contents/application/DownloadContentsToPlainFile.ts
@@ -31,12 +31,6 @@ export class DownloadContentsToPlainFile {
     downloader.on('error', () => {
       this.tracker.error(file.name, file.type);
     });
-
-    downloader.on('finish', (elapsedTime: number) => {
-      this.tracker.downloadFinished(file.name, file.type, file.size, {
-        elapsedTime,
-      });
-    });
   }
 
   async run(file: File): Promise<void> {
@@ -65,6 +59,10 @@ export class DownloadContentsToPlainFile {
 
     await this.local.write(localContents, file.contentsId);
 
+    this.tracker.downloadFinished(file.name, file.type, file.size, {
+      elapsedTime: downloader.elapsedTime(),
+    });
+
     const events = localContents.pullDomainEvents();
     await this.eventBus.publish(events);
   }

From 27e22f9a641e0059e54e9ce9fb25f487b6d5e677 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 5 Feb 2024 12:32:31 +0100
Subject: [PATCH 178/188] chore: simplify use Sync Status

---
 src/apps/renderer/hooks/useSyncStatus.tsx     | 42 +++++++------------
 .../shared/domain/DownloadProgressTracker.ts  |  3 ++
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/apps/renderer/hooks/useSyncStatus.tsx b/src/apps/renderer/hooks/useSyncStatus.tsx
index 1775900ee..8f71e447f 100644
--- a/src/apps/renderer/hooks/useSyncStatus.tsx
+++ b/src/apps/renderer/hooks/useSyncStatus.tsx
@@ -1,40 +1,28 @@
 import { useEffect, useState } from 'react';
 import { SyncStatus } from '../../../context/desktop/sync/domain/SyncStatus';
+import { RemoteSyncStatus } from '../../main/remote-sync/helpers';
+
+const statusesMap: Record<RemoteSyncStatus, SyncStatus> = {
+  SYNCING: 'RUNNING',
+  IDLE: 'STANDBY',
+  SYNCED: 'STANDBY',
+  SYNC_FAILED: 'FAILED',
+};
 
 export default function useSyncStatus(
-  onChange?: (curentState: SyncStatus) => void
+  onChange?: (currentState: SyncStatus) => void
 ) {
   const [syncStatus, setSyncStatus] = useState<SyncStatus>('RUNNING');
 
-  useEffect(() => {
-    window.electron.getRemoteSyncStatus().then((status) => {
-      if (status === 'SYNCING') {
-        setSyncStatus('RUNNING');
-      }
-
-      if (status === 'IDLE' || status === 'SYNCED') {
-        setSyncStatus('STANDBY');
-      }
+  const setSyncStatusFromRemote = (remote: RemoteSyncStatus): void => {
+    setSyncStatus(statusesMap[remote]);
+  };
 
-      if (status === 'SYNC_FAILED') {
-        setSyncStatus('FAILED');
-      }
-    });
+  useEffect(() => {
+    window.electron.getRemoteSyncStatus().then(setSyncStatusFromRemote);
 
     const removeListener = window.electron.onRemoteSyncStatusChange(
-      (newStatus) => {
-        if (newStatus === 'SYNCING') {
-          setSyncStatus('RUNNING');
-        }
-
-        if (newStatus === 'IDLE' || newStatus === 'SYNCED') {
-          setSyncStatus('STANDBY');
-        }
-
-        if (newStatus === 'SYNC_FAILED') {
-          setSyncStatus('FAILED');
-        }
-      }
+      setSyncStatusFromRemote
     );
 
     return removeListener;
diff --git a/src/context/shared/domain/DownloadProgressTracker.ts b/src/context/shared/domain/DownloadProgressTracker.ts
index e59f3475b..eeaf9799d 100644
--- a/src/context/shared/domain/DownloadProgressTracker.ts
+++ b/src/context/shared/domain/DownloadProgressTracker.ts
@@ -1,5 +1,6 @@
 export interface DownloadProgressTracker {
   downloadStarted(name: string, extension: string, size: number): Promise<void>;
+
   downloadUpdate(
     name: string,
     extension: string,
@@ -8,6 +9,7 @@ export interface DownloadProgressTracker {
       percentage: number;
     }
   ): Promise<void>;
+
   downloadFinished(
     name: string,
     extension: string,
@@ -16,5 +18,6 @@ export interface DownloadProgressTracker {
       elapsedTime: number;
     }
   ): Promise<void>;
+
   error(name: string, extension: string): Promise<void>;
 }

From a7b56d99cc1c9e1c05925ea65a5f84c5c0f5d3c7 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 5 Feb 2024 14:27:45 +0100
Subject: [PATCH 179/188] feat: increase max read to 32 bits

---
 src/apps/fuse/FuseApp.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/apps/fuse/FuseApp.ts b/src/apps/fuse/FuseApp.ts
index 14be2db07..fc589f7de 100644
--- a/src/apps/fuse/FuseApp.ts
+++ b/src/apps/fuse/FuseApp.ts
@@ -16,6 +16,7 @@ import { FuseDependencyContainer } from './dependency-injection/FuseDependencyCo
 const fuse = require('@gcas/fuse');
 
 export class FuseApp {
+  private static readonly MAX_INT_32 = 2147483647;
   private _fuse: any;
 
   constructor(
@@ -76,6 +77,7 @@ export class FuseApp {
       debug: false,
       mkdir: true,
       force: true,
+      maxRead: FuseApp.MAX_INT_32,
     });
 
     this._fuse.mount((err: any) => {

From 3ef9db5a95cc8562a090cb8cfd0ae4b820b8b896 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 5 Feb 2024 16:34:36 +0100
Subject: [PATCH 180/188] fix: search only for existing files

---
 src/apps/fuse/callbacks/FuseCallback.ts       | 12 ++++++++----
 .../fuse/callbacks/GetAttributesCallback.ts   |  6 +++++-
 src/apps/fuse/callbacks/RenameOrMoveFile.ts   |  6 +++++-
 .../virtual-drive/files/builder.ts            |  4 ----
 src/apps/main/virtual-root-folder/service.ts  |  1 -
 .../dependency-injection/files/builder.ts     |  1 -
 ...onmentRemoteFileContentsManagersFactory.ts |  9 ++++-----
 .../contents/application/ContentsUploader.ts  |  8 ++++----
 .../application/FileCreatorFromServerFile.ts  |  3 ++-
 .../files/application/FileDeleter.ts          |  5 ++++-
 .../files/application/FilePathUpdater.ts      | 17 ++++++++++++++---
 .../application/FilesByFolderPathSearcher.ts  |  6 +++++-
 .../virtual-drive/files/domain/File.ts        |  2 +-
 .../application/FileCreatorFromServerFile.ts  | 19 -------------------
 .../files/application/FilePathUpdater.test.ts |  4 ----
 15 files changed, 52 insertions(+), 51 deletions(-)
 delete mode 100644 src/context/virtual-drive/tree/application/FileCreatorFromServerFile.ts

diff --git a/src/apps/fuse/callbacks/FuseCallback.ts b/src/apps/fuse/callbacks/FuseCallback.ts
index 3f3df93b4..7ad216e12 100644
--- a/src/apps/fuse/callbacks/FuseCallback.ts
+++ b/src/apps/fuse/callbacks/FuseCallback.ts
@@ -105,16 +105,16 @@ export abstract class FuseCallback<T> {
 
 export abstract class NotifyFuseCallback extends FuseCallback<undefined> {
   protected right(): Either<FuseError, undefined> {
-    if (this.debug.output) {
-      Logger.debug(`${this.name} completed successfully`);
-    }
-
     return right(undefined);
   }
 
   async handle(...params: any[]): Promise<void> {
     const callback = params.pop() as Callback;
 
+    if (this.debug.input) {
+      Logger.debug(`${this.name}: `, ...params);
+    }
+
     const result = await this.executeAndCatch(params);
 
     if (result.isLeft()) {
@@ -123,6 +123,10 @@ export abstract class NotifyFuseCallback extends FuseCallback<undefined> {
       return callback(error.code);
     }
 
+    if (this.debug.output) {
+      Logger.debug(`${this.name} completed successfully`);
+    }
+
     callback(NotifyFuseCallback.OK);
   }
 }
diff --git a/src/apps/fuse/callbacks/GetAttributesCallback.ts b/src/apps/fuse/callbacks/GetAttributesCallback.ts
index 0fd1186ea..a254f5c2d 100644
--- a/src/apps/fuse/callbacks/GetAttributesCallback.ts
+++ b/src/apps/fuse/callbacks/GetAttributesCallback.ts
@@ -1,4 +1,5 @@
 import { Either, left } from '../../../context/shared/domain/Either';
+import { FileStatuses } from '../../../context/virtual-drive/files/domain/FileStatus';
 import { OfflineDriveDependencyContainer } from '../dependency-injection/offline/OfflineDriveDependencyContainer';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { FuseCallback } from './FuseCallback';
@@ -44,7 +45,10 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
       });
     }
 
-    const file = await this.virtualDriveContainer.filesSearcher.run({ path });
+    const file = await this.virtualDriveContainer.filesSearcher.run({
+      path,
+      status: FileStatuses.EXISTS,
+    });
 
     if (file) {
       return this.right({
diff --git a/src/apps/fuse/callbacks/RenameOrMoveFile.ts b/src/apps/fuse/callbacks/RenameOrMoveFile.ts
index 89b91287c..17d4196e1 100644
--- a/src/apps/fuse/callbacks/RenameOrMoveFile.ts
+++ b/src/apps/fuse/callbacks/RenameOrMoveFile.ts
@@ -5,6 +5,7 @@ import { DriveDesktopError } from '../../../context/shared/domain/errors/DriveDe
 import { SyncErrorCause } from '../../../shared/issues/SyncErrorCause';
 import { Either, left, right } from '../../../context/shared/domain/Either';
 import { FuseError, FuseUnknownError } from './FuseErrors';
+import { FileStatuses } from '../../../context/virtual-drive/files/domain/FileStatus';
 
 type RenameOrMoveRight = 'no-op' | 'success';
 
@@ -18,7 +19,10 @@ export class RenameOrMoveFile {
     src: string,
     dest: string
   ): Promise<Either<FuseError, RenameOrMoveRight>> {
-    const file = await this.container.filesSearcher.run({ path: src });
+    const file = await this.container.filesSearcher.run({
+      path: src,
+      status: FileStatuses.EXISTS,
+    });
 
     if (!file) {
       return right(RenameOrMoveFile.NO_OP);
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
index be5c64f87..dbd78451f 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
@@ -2,7 +2,6 @@ import crypt from '../../../../../context/shared/infrastructure/crypt';
 import { CreateFileOnOfflineFileUploaded } from '../../../../../context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded';
 import { FileCreator } from '../../../../../context/virtual-drive/files/application/FileCreator';
 import { FileDeleter } from '../../../../../context/virtual-drive/files/application/FileDeleter';
-import { FileFinderByContentsId } from '../../../../../context/virtual-drive/files/application/FileFinderByContentsId';
 import { FilePathUpdater } from '../../../../../context/virtual-drive/files/application/FilePathUpdater';
 import { FilesByFolderPathSearcher } from '../../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
 import { FilesSearcher } from '../../../../../context/virtual-drive/files/application/FilesSearcher';
@@ -57,13 +56,10 @@ export async function buildFilesContainer(
     sharedContainer.relativePathToAbsoluteConverter
   );
 
-  const fileFinderByContentsId = new FileFinderByContentsId(repository);
-
   const filePathUpdater = new FilePathUpdater(
     remoteFileSystem,
     localFileSystem,
     repository,
-    fileFinderByContentsId,
     folderContainer.folderFinder,
     eventBus
   );
diff --git a/src/apps/main/virtual-root-folder/service.ts b/src/apps/main/virtual-root-folder/service.ts
index 86a6118f3..d308b6230 100644
--- a/src/apps/main/virtual-root-folder/service.ts
+++ b/src/apps/main/virtual-root-folder/service.ts
@@ -1,5 +1,4 @@
 import { app, dialog, shell } from 'electron';
-import Logger from 'electron-log';
 import fs from 'fs/promises';
 import path from 'path';
 import configStore from '../config';
diff --git a/src/apps/sync-engine/dependency-injection/files/builder.ts b/src/apps/sync-engine/dependency-injection/files/builder.ts
index 9bf0a057e..39a8a03c4 100644
--- a/src/apps/sync-engine/dependency-injection/files/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/files/builder.ts
@@ -78,7 +78,6 @@ export async function buildFilesContainer(
     remoteFileSystem,
     localFileSystem,
     repository,
-    fileFinderByContentsId,
     folderContainer.folderFinder,
     eventBus
   );
diff --git a/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts b/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
index e6a884a73..727012d06 100644
--- a/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
+++ b/src/context/offline-drive/contents/infrastructure/EnvironmentRemoteFileContentsManagersFactory.ts
@@ -44,9 +44,7 @@ export class EnvironmentOfflineContentsManagersFactory
     );
 
     uploader.on('start', () => {
-      this.progressTracker.uploadStarted(name, extension, contents.size, {
-        elapsedTime: uploader.elapsedTime(),
-      });
+      this.progressTracker.uploadStarted(name, extension, contents.size);
     });
 
     uploader.on('progress', (progress: number) => {
@@ -56,8 +54,9 @@ export class EnvironmentOfflineContentsManagersFactory
       });
     });
 
-    uploader.on('error', (error: Error) => {
-      this.progressTracker.uploadError(name, extension, error.message);
+    uploader.on('error', (_error: Error) => {
+      // TODO: use error to determine the cause
+      this.progressTracker.uploadError(name, extension, 'UNKNOWN');
     });
 
     uploader.on('finish', () => {
diff --git a/src/context/virtual-drive/contents/application/ContentsUploader.ts b/src/context/virtual-drive/contents/application/ContentsUploader.ts
index ee131214a..300e2685b 100644
--- a/src/context/virtual-drive/contents/application/ContentsUploader.ts
+++ b/src/context/virtual-drive/contents/application/ContentsUploader.ts
@@ -25,8 +25,7 @@ export class ContentsUploader {
       this.notifier.uploadStarted(
         localFileContents.name,
         localFileContents.extension,
-        localFileContents.size,
-        { elapsedTime: uploader.elapsedTime() }
+        localFileContents.size
       );
     });
 
@@ -39,11 +38,12 @@ export class ContentsUploader {
       );
     });
 
-    uploader.on('error', (error: Error) => {
+    uploader.on('error', (_error: Error) => {
+      // TODO: use error to define the cause of the error
       this.notifier.uploadError(
         localFileContents.name,
         localFileContents.extension,
-        error.message
+        'UNKNOWN'
       );
     });
 
diff --git a/src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts b/src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts
index 5978d1970..b7ebf2e6d 100644
--- a/src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts
+++ b/src/context/virtual-drive/files/application/FileCreatorFromServerFile.ts
@@ -1,5 +1,6 @@
 import { ServerFile } from '../../../shared/domain/ServerFile';
 import { File } from '../domain/File';
+import { FileStatuses } from '../domain/FileStatus';
 
 export function createFileFromServerFile(
   server: ServerFile,
@@ -14,6 +15,6 @@ export function createFileFromServerFile(
     createdAt: server.createdAt,
     updatedAt: server.updatedAt,
     path: relativePath,
-    status: server.status,
+    status: FileStatuses[server.status as 'EXISTS' | 'TRASHED' | 'DELETED'],
   });
 }
diff --git a/src/context/virtual-drive/files/application/FileDeleter.ts b/src/context/virtual-drive/files/application/FileDeleter.ts
index 53465cfce..7044ae795 100644
--- a/src/context/virtual-drive/files/application/FileDeleter.ts
+++ b/src/context/virtual-drive/files/application/FileDeleter.ts
@@ -18,7 +18,10 @@ export class FileDeleter {
   ) {}
 
   async run(contentsId: File['contentsId']): Promise<void> {
-    const file = this.repository.searchByPartial({ contentsId });
+    const file = this.repository.searchByPartial({
+      contentsId,
+      status: FileStatuses.EXISTS,
+    });
 
     if (!file) {
       return;
diff --git a/src/context/virtual-drive/files/application/FilePathUpdater.ts b/src/context/virtual-drive/files/application/FilePathUpdater.ts
index 6c6d36ff4..683afa0b2 100644
--- a/src/context/virtual-drive/files/application/FilePathUpdater.ts
+++ b/src/context/virtual-drive/files/application/FilePathUpdater.ts
@@ -3,20 +3,21 @@ import { FileAlreadyExistsError } from '../domain/errors/FileAlreadyExistsError'
 import { FilePath } from '../domain/FilePath';
 import { File } from '../domain/File';
 import { FolderFinder } from '../../folders/application/FolderFinder';
-import { FileFinderByContentsId } from './FileFinderByContentsId';
 import { EventBus } from '../../shared/domain/EventBus';
 import { FileRepository } from '../domain/FileRepository';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
 import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
 import { FileRenameFailedDomainEvent } from '../domain/events/FileRenameFailedDomainEvent';
 import { FileRenameStartedDomainEvent } from '../domain/events/FileRenameStartedDomainEvent';
+import { FileStatuses } from '../domain/FileStatus';
+import { FileNotFoundError } from '../domain/errors/FileNotFoundError';
+import Logger from 'electron-log';
 
 export class FilePathUpdater {
   constructor(
     private readonly remote: RemoteFileSystem,
     private readonly local: LocalFileSystem,
     private readonly repository: FileRepository,
-    private readonly fileFinderByContentsId: FileFinderByContentsId,
     private readonly folderFinder: FolderFinder,
     private readonly eventBus: EventBus
   ) {}
@@ -55,7 +56,16 @@ export class FilePathUpdater {
 
   async run(contentsId: string, posixRelativePath: string) {
     const destination = new FilePath(posixRelativePath);
-    const file = this.fileFinderByContentsId.run(contentsId);
+    const file = this.repository.searchByPartial({
+      contentsId,
+      status: FileStatuses.EXISTS,
+    });
+
+    if (!file) {
+      throw new FileNotFoundError(contentsId);
+    }
+
+    Logger.debug('FILE RENAMER FILE FOUNDED');
 
     if (file.dirname !== destination.dirname()) {
       if (file.nameWithExtension !== destination.nameWithExtension()) {
@@ -68,6 +78,7 @@ export class FilePathUpdater {
 
     const destinationFile = this.repository.searchByPartial({
       path: destination.value,
+      status: FileStatuses.EXISTS,
     });
 
     if (destinationFile) {
diff --git a/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts b/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts
index 978bf149c..b23dc617e 100644
--- a/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts
+++ b/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts
@@ -1,6 +1,7 @@
 import { FolderFinder } from '../../folders/application/FolderFinder';
 import { File } from '../domain/File';
 import { FileRepository } from '../domain/FileRepository';
+import { FileStatuses } from '../domain/FileStatus';
 
 export class FilesByFolderPathSearcher {
   constructor(
@@ -11,7 +12,10 @@ export class FilesByFolderPathSearcher {
   async run(folderPath: string): Promise<Array<File['nameWithExtension']>> {
     const folder = this.folderFinder.run(folderPath);
 
-    const files = await this.repository.listByPartial({ folderId: folder.id });
+    const files = await this.repository.listByPartial({
+      folderId: folder.id,
+      status: FileStatuses.EXISTS,
+    });
 
     return files.map((file) => file.nameWithExtension);
   }
diff --git a/src/context/virtual-drive/files/domain/File.ts b/src/context/virtual-drive/files/domain/File.ts
index c652ab219..b6a142f61 100644
--- a/src/context/virtual-drive/files/domain/File.ts
+++ b/src/context/virtual-drive/files/domain/File.ts
@@ -23,7 +23,7 @@ export type FileAttributes = {
   path: string;
   size: number;
   updatedAt: string;
-  status: string;
+  status: FileStatuses;
 };
 
 export class File extends AggregateRoot {
diff --git a/src/context/virtual-drive/tree/application/FileCreatorFromServerFile.ts b/src/context/virtual-drive/tree/application/FileCreatorFromServerFile.ts
deleted file mode 100644
index b33cdcd3f..000000000
--- a/src/context/virtual-drive/tree/application/FileCreatorFromServerFile.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ServerFile } from '../../../shared/domain/ServerFile';
-import { File } from '../../files/domain/File';
-
-export function createFileFromServerFile(
-  server: ServerFile,
-  relativePath: string
-): File {
-  return File.from({
-    id: server.id,
-    folderId: server.folderId,
-    contentsId: server.fileId,
-    modificationTime: server.modificationTime,
-    size: server.size,
-    createdAt: server.createdAt,
-    updatedAt: server.updatedAt,
-    path: relativePath,
-    status: server.status,
-  });
-}
diff --git a/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts b/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
index 9f8b74125..68de50bd7 100644
--- a/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
+++ b/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
@@ -1,4 +1,3 @@
-import { FileFinderByContentsId } from '../../../../../src/context/virtual-drive/files/application/FileFinderByContentsId';
 import { FilePathUpdater } from '../../../../../src/context/virtual-drive/files/application/FilePathUpdater';
 import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/FilePath';
 import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
@@ -12,7 +11,6 @@ import { FileMother } from '../domain/FileMother';
 
 describe('File path updater', () => {
   let repository: FileRepositoryMock;
-  let fileFinderByContentsId: FileFinderByContentsId;
   let folderFinder: FolderFinderMock;
   let localFileSystem: LocalFileSystemMock;
   let eventBus: EventBusMock;
@@ -22,7 +20,6 @@ describe('File path updater', () => {
   beforeEach(() => {
     repository = new FileRepositoryMock();
     folderFinder = new FolderFinderMock();
-    fileFinderByContentsId = new FileFinderByContentsId(repository);
     eventBus = new EventBusMock();
     remoteFileSystemMock = new RemoteFileSystemMock();
     localFileSystem = new LocalFileSystemMock();
@@ -31,7 +28,6 @@ describe('File path updater', () => {
       remoteFileSystemMock,
       localFileSystem,
       repository,
-      fileFinderByContentsId,
       folderFinder as unknown as FolderFinder,
       eventBus
     );

From 7eec264424f085df1cb8557faff1d7c2bec533b0 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Wed, 7 Feb 2024 14:05:04 +0100
Subject: [PATCH 181/188] chore: delete duplicated code

---
 .../contents/domain/ContentsId.ts              | 18 ++----------------
 .../shared/domain/BucketEntryId.ts             |  4 +++-
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/context/virtual-drive/contents/domain/ContentsId.ts b/src/context/virtual-drive/contents/domain/ContentsId.ts
index e077c6b8f..2fb5c75c8 100644
--- a/src/context/virtual-drive/contents/domain/ContentsId.ts
+++ b/src/context/virtual-drive/contents/domain/ContentsId.ts
@@ -1,17 +1,3 @@
-import { InvalidArgumentError } from '../../../shared/domain/errors/InvalidArgumentError';
-import { ValueObject } from '../../../shared/domain/value-objects/ValueObject';
+import { BucketEntryId } from '../../shared/domain/BucketEntryId';
 
-export class ContentsId extends ValueObject<string> {
-  static readonly VALID_LENGTH = 24;
-
-  constructor(value: string) {
-    super(value);
-    this.ensureIsValid(value);
-  }
-
-  private ensureIsValid(value: string) {
-    if (value.length !== ContentsId.VALID_LENGTH) {
-      throw new InvalidArgumentError('Invalid content id');
-    }
-  }
-}
+export class ContentsId extends BucketEntryId {}
diff --git a/src/context/virtual-drive/shared/domain/BucketEntryId.ts b/src/context/virtual-drive/shared/domain/BucketEntryId.ts
index 247817e45..a38c86826 100644
--- a/src/context/virtual-drive/shared/domain/BucketEntryId.ts
+++ b/src/context/virtual-drive/shared/domain/BucketEntryId.ts
@@ -11,7 +11,9 @@ export class BucketEntryId extends ValueObject<string> {
 
   private ensureIsValid(value: string) {
     if (value.length !== BucketEntryId.VALID_LENGTH) {
-      throw new InvalidArgumentError('Invalid content id');
+      throw new InvalidArgumentError(
+        `${value} is an invalid bucket entry. Expected to have ${BucketEntryId.VALID_LENGTH} characters but it has ${value.length}`
+      );
     }
   }
 }

From 2df96a6dcf1233d33393c998827e200730227f4c Mon Sep 17 00:00:00 2001
From: Joan Vicens <joanvicens@proton.me>
Date: Wed, 14 Feb 2024 11:33:23 +0000
Subject: [PATCH 182/188] fix: catch errors from auto update (#453)

---
 src/apps/main/main.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/apps/main/main.ts b/src/apps/main/main.ts
index c11edff3c..70ce972c7 100644
--- a/src/apps/main/main.ts
+++ b/src/apps/main/main.ts
@@ -69,8 +69,12 @@ if (process.env.SENTRY_DSN) {
 }
 
 function checkForUpdates() {
-  autoUpdater.logger = Logger;
-  autoUpdater.checkForUpdatesAndNotify();
+  try {
+    autoUpdater.logger = Logger;
+    autoUpdater.checkForUpdatesAndNotify();
+  } catch (err: unknown) {
+    Logger.error(err);
+  }
 }
 
 if (process.platform === 'darwin') {

From b90f2fe799a64572ce31e218e218648af3bc7c2c Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 26 Feb 2024 12:10:39 +0100
Subject: [PATCH 183/188] fix: type on event name

---
 src/apps/main/analytics/service.ts | 84 ++++--------------------------
 1 file changed, 11 insertions(+), 73 deletions(-)

diff --git a/src/apps/main/analytics/service.ts b/src/apps/main/analytics/service.ts
index 346f5a2f9..7e625e60e 100644
--- a/src/apps/main/analytics/service.ts
+++ b/src/apps/main/analytics/service.ts
@@ -65,7 +65,7 @@ export function userSignin() {
     () => {
       client.track({
         userId,
-        event: 'User Signin',
+        event: 'User Signing',
         properties: { email },
         context: deviceContext,
       });
@@ -86,7 +86,7 @@ export function userSigninFailed(email?: string) {
     () => {
       client.track({
         anonymousId: clientId,
-        event: 'User Signin Failed',
+        event: 'User Signing Failed',
         properties: { email },
         context: deviceContext,
       });
@@ -103,77 +103,6 @@ export function userLogout() {
   });
 }
 
-export function syncStarted(numberOfItems: number) {
-  const { uuid: userId } = ConfigStore.get('userData');
-
-  client.track({
-    userId,
-    event: 'Sync Started',
-    properties: {
-      number_of_items: numberOfItems,
-    },
-    context: deviceContext,
-  });
-}
-
-export function syncPaused(numberOfItems: number) {
-  const { uuid: userId } = ConfigStore.get('userData');
-
-  client.track({
-    userId,
-    event: 'Sync Paused',
-    properties: {
-      number_of_items: numberOfItems,
-    },
-    context: deviceContext,
-  });
-}
-
-export function syncBlocked(numberOfItems: number) {
-  const { uuid: userId } = ConfigStore.get('userData');
-
-  // Sync can be blocked beacuse the user is unauthorized
-  // In that case we don't have user data to track
-  if (!userId) {
-    return;
-  }
-
-  client.track({
-    userId,
-    event: 'Sync Blocked',
-    properties: {
-      number_of_items: numberOfItems,
-    },
-    context: deviceContext,
-  });
-}
-
-export function syncError(numberOfItems: number) {
-  const { uuid: userId } = ConfigStore.get('userData');
-
-  client.track({
-    userId,
-    event: 'Sync Error',
-    properties: {
-      number_of_items: numberOfItems,
-    },
-    context: deviceContext,
-  });
-}
-
-export function syncFinished(numberOfItems: number) {
-  const { uuid: userId } = ConfigStore.get('userData');
-
-  client.track({
-    userId,
-    event: 'Sync Finished',
-    properties: {
-      number_of_items: numberOfItems,
-    },
-    context: deviceContext,
-  });
-}
-
 export function backupProcessStarted(scheduled: boolean, totalFolders: number) {
   const { uuid: userId } = ConfigStore.get('userData');
 
@@ -269,6 +198,15 @@ export function trackEvent(
   Logger.debug('Tracked event', event);
 
   client.track(payload);
+
+  client.flush((err: Error, batch: Array<any>) => {
+    if (err) {
+      Logger.error(err);
+      return;
+    }
+
+    Logger.debug('Flushed ', JSON.stringify(batch, null, 2));
+  });
 }
 
 export function trackError(

From 4ba6e35d2a98c2132d07acebd7b1ca7bcbbeb9ad Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 26 Feb 2024 12:53:39 +0100
Subject: [PATCH 184/188] chore: remove flush event

---
 src/apps/main/analytics/service.ts | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/apps/main/analytics/service.ts b/src/apps/main/analytics/service.ts
index 7e625e60e..f57b6fedd 100644
--- a/src/apps/main/analytics/service.ts
+++ b/src/apps/main/analytics/service.ts
@@ -198,15 +198,6 @@ export function trackEvent(
   Logger.debug('Tracked event', event);
 
   client.track(payload);
-
-  client.flush((err: Error, batch: Array<any>) => {
-    if (err) {
-      Logger.error(err);
-      return;
-    }
-
-    Logger.debug('Flushed ', JSON.stringify(batch, null, 2));
-  });
 }
 
 export function trackError(

From b7c079bae447eb7ef6a926ebbd2092d0678c7e72 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 26 Feb 2024 14:25:50 +0100
Subject: [PATCH 185/188] fix: search existing files to delete them

---
 src/apps/fuse/callbacks/TrashFileCallback.ts  |  6 +++-
 .../virtual-drive/files/FilesContainer.ts     |  4 +--
 .../virtual-drive/files/builder.ts            |  8 ++---
 .../virtual-drive/folders/FoldersContainer.ts |  4 +--
 .../virtual-drive/folders/builder.ts          |  8 ++---
 src/apps/hydration-api/HydrationApi.ts        |  7 ++--
 src/apps/hydration-api/controllers/files.ts   | 36 +++++++++++++++++++
 .../DependencyContainerFactory.ts             |  9 ++---
 .../files/FilesContainer.ts                   |  2 ++
 .../dependency-injection/files/builder.ts     | 15 ++++----
 .../dependency-injection/folders/builder.ts   | 10 +-----
 src/apps/hydration-api/routes/files.ts        | 13 +++++++
 .../files/InMemoryFileRepositorySingleton.ts  | 13 +++++++
 .../InMemoryFolderRepositorySingleton.ts      | 13 +++++++
 .../files/FilesContainer.ts                   |  4 +--
 .../dependency-injection/files/builder.ts     |  4 +--
 .../folders/FoldersContainer.ts               |  4 +--
 .../dependency-injection/folders/builder.ts   |  4 +--
 .../CreateFileOnOfflineFileUplodaded.ts       |  9 +++--
 ...ulator.ts => FileRepositoryInitializer.ts} |  2 +-
 .../infrastructure/InMemoryFileRepository.ts  |  7 +++-
 ...ator.ts => FolderRepositoryInitializer.ts} |  2 +-
 22 files changed, 130 insertions(+), 54 deletions(-)
 create mode 100644 src/apps/hydration-api/controllers/files.ts
 create mode 100644 src/apps/hydration-api/routes/files.ts
 create mode 100644 src/apps/shared/dependency-injection/virtual-drive/files/InMemoryFileRepositorySingleton.ts
 create mode 100644 src/apps/shared/dependency-injection/virtual-drive/folders/InMemoryFolderRepositorySingleton.ts
 rename src/context/virtual-drive/files/application/{RepositoryPopulator.ts => FileRepositoryInitializer.ts} (89%)
 rename src/context/virtual-drive/folders/application/{FolderRepositoryInitiator.ts => FolderRepositoryInitializer.ts} (89%)

diff --git a/src/apps/fuse/callbacks/TrashFileCallback.ts b/src/apps/fuse/callbacks/TrashFileCallback.ts
index 63187dec5..bf4906421 100644
--- a/src/apps/fuse/callbacks/TrashFileCallback.ts
+++ b/src/apps/fuse/callbacks/TrashFileCallback.ts
@@ -1,3 +1,4 @@
+import { FileStatuses } from '../../../context/virtual-drive/files/domain/FileStatus';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { NotifyFuseCallback } from './FuseCallback';
 import { FuseIOError, FuseNoSuchFileOrDirectoryError } from './FuseErrors';
@@ -8,7 +9,10 @@ export class TrashFileCallback extends NotifyFuseCallback {
   }
 
   async execute(path: string) {
-    const file = await this.container.filesSearcher.run({ path });
+    const file = await this.container.filesSearcher.run({
+      path,
+      status: FileStatuses.EXISTS,
+    });
 
     if (!file) {
       return this.left(new FuseNoSuchFileOrDirectoryError());
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
index 6cc49b9ef..78d6c8072 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
@@ -5,7 +5,7 @@ import { FileCreator } from '../../../../../context/virtual-drive/files/applicat
 import { SameFileWasMoved } from '../../../../../context/virtual-drive/files/application/SameFileWasMoved';
 import { FileDeleter } from '../../../../../context/virtual-drive/files/application/FileDeleter';
 import { CreateFileOnOfflineFileUploaded } from '../../../../../context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded';
-import { RepositoryPopulator } from '../../../../../context/virtual-drive/files/application/RepositoryPopulator';
+import { FileRepositoryInitializer } from '../../../../../context/virtual-drive/files/application/FileRepositoryInitializer';
 import { SyncFileMessenger } from '../../../../../context/virtual-drive/files/domain/SyncFileMessenger';
 
 export interface FilesContainer {
@@ -15,7 +15,7 @@ export interface FilesContainer {
   fileCreator: FileCreator;
   fileDeleter: FileDeleter;
   sameFileWasMoved: SameFileWasMoved;
-  repositoryPopulator: RepositoryPopulator;
+  repositoryPopulator: FileRepositoryInitializer;
   syncFileMessenger: SyncFileMessenger;
   // event handler
   createFileOnOfflineFileUploaded: CreateFileOnOfflineFileUploaded;
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
index dbd78451f..bb4e9f9ad 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
@@ -5,11 +5,10 @@ import { FileDeleter } from '../../../../../context/virtual-drive/files/applicat
 import { FilePathUpdater } from '../../../../../context/virtual-drive/files/application/FilePathUpdater';
 import { FilesByFolderPathSearcher } from '../../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
 import { FilesSearcher } from '../../../../../context/virtual-drive/files/application/FilesSearcher';
-import { RepositoryPopulator } from '../../../../../context/virtual-drive/files/application/RepositoryPopulator';
+import { FileRepositoryInitializer } from '../../../../../context/virtual-drive/files/application/FileRepositoryInitializer';
 import { SameFileWasMoved } from '../../../../../context/virtual-drive/files/application/SameFileWasMoved';
 import { File } from '../../../../../context/virtual-drive/files/domain/File';
 import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/files/infrastructure/FuseLocalFileSystem';
-import { InMemoryFileRepository } from '../../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
 import { MainProcessSyncFileMessenger } from '../../../../../context/virtual-drive/files/infrastructure/SyncFileMessengers/MainProcessSyncFileMessenger';
 import { SDKRemoteFileSystem } from '../../../../../context/virtual-drive/files/infrastructure/SDKRemoteFileSystem';
 import { DependencyInjectionHttpClientsProvider } from '../../common/clients';
@@ -20,20 +19,21 @@ import { DependencyInjectionUserProvider } from '../../common/user';
 import { FoldersContainer } from '../folders/FoldersContainer';
 import { SharedContainer } from '../shared/SharedContainer';
 import { FilesContainer } from './FilesContainer';
+import { InMemoryFileRepositorySingleton } from '../../../../shared/dependency-injection/virtual-drive/files/InMemoryFileRepositorySingleton';
 
 export async function buildFilesContainer(
   initialFiles: Array<File>,
   folderContainer: FoldersContainer,
   sharedContainer: SharedContainer
 ): Promise<FilesContainer> {
-  const repository = new InMemoryFileRepository();
+  const repository = InMemoryFileRepositorySingleton.instance;
   const eventRepository = DependencyInjectionEventRepository.get();
   const user = DependencyInjectionUserProvider.get();
   const sdk = await DependencyInjectionStorageSdk.get();
   const { bus: eventBus } = DependencyInjectionEventBus;
   const clients = DependencyInjectionHttpClientsProvider.get();
 
-  const repositoryPopulator = new RepositoryPopulator(repository);
+  const repositoryPopulator = new FileRepositoryInitializer(repository);
 
   await repositoryPopulator.run(initialFiles);
 
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
index b84e048ed..96f552530 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
@@ -4,7 +4,7 @@ import { FolderCreatorFromOfflineFolder } from '../../../../../context/virtual-d
 import { FolderDeleter } from '../../../../../context/virtual-drive/folders/application/FolderDeleter';
 import { FolderFinder } from '../../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderPathUpdater } from '../../../../../context/virtual-drive/folders/application/FolderPathUpdater';
-import { FolderRepositoryInitiator } from '../../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
+import { FolderRepositoryInitializer } from '../../../../../context/virtual-drive/folders/application/FolderRepositoryInitializer';
 import { FolderSearcher } from '../../../../../context/virtual-drive/folders/application/FolderSearcher';
 import { FoldersByParentPathLister } from '../../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
 import { SyncFolderMessenger } from '../../../../../context/virtual-drive/folders/domain/SyncFolderMessenger';
@@ -18,6 +18,6 @@ export interface FoldersContainer {
   folderCreatorFromOfflineFolder: FolderCreatorFromOfflineFolder;
   folderCreator: FolderCreator;
   folderDeleter: FolderDeleter;
-  folderRepositoryInitiator: FolderRepositoryInitiator;
+  folderRepositoryInitiator: FolderRepositoryInitializer;
   syncFolderMessenger: SyncFolderMessenger;
 }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
index f5c3a0e53..7cf00a97f 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
@@ -6,14 +6,14 @@ import { FolderFinder } from '../../../../../context/virtual-drive/folders/appli
 import { FolderMover } from '../../../../../context/virtual-drive/folders/application/FolderMover';
 import { FolderPathUpdater } from '../../../../../context/virtual-drive/folders/application/FolderPathUpdater';
 import { FolderRenamer } from '../../../../../context/virtual-drive/folders/application/FolderRenamer';
-import { FolderRepositoryInitiator } from '../../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
+import { FolderRepositoryInitializer } from '../../../../../context/virtual-drive/folders/application/FolderRepositoryInitializer';
 import { FolderSearcher } from '../../../../../context/virtual-drive/folders/application/FolderSearcher';
 import { FoldersByParentPathLister } from '../../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
 import { Folder } from '../../../../../context/virtual-drive/folders/domain/Folder';
 import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/FuseLocalFileSystem';
 import { HttpRemoteFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/HttpRemoteFileSystem';
-import { InMemoryFolderRepository } from '../../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
 import { MainProcessSyncFolderMessenger } from '../../../../../context/virtual-drive/folders/infrastructure/SyncMessengers/MainProcessSyncFolderMessenger';
+import { InMemoryFolderRepositorySingleton } from '../../../../shared/dependency-injection/virtual-drive/folders/InMemoryFolderRepositorySingleton';
 import { DependencyInjectionHttpClientsProvider } from '../../common/clients';
 import { DependencyInjectionEventBus } from '../../common/eventBus';
 
@@ -22,7 +22,7 @@ import { FoldersContainer } from './FoldersContainer';
 export async function buildFoldersContainer(
   initialFolders: Array<Folder>
 ): Promise<FoldersContainer> {
-  const repository = new InMemoryFolderRepository();
+  const repository = InMemoryFolderRepositorySingleton.instance;
   const clients = DependencyInjectionHttpClientsProvider.get();
 
   const syncFolderMessenger = new MainProcessSyncFolderMessenger();
@@ -37,7 +37,7 @@ export async function buildFoldersContainer(
 
   const { bus: eventBus } = DependencyInjectionEventBus;
 
-  const folderRepositoryInitiator = new FolderRepositoryInitiator(repository);
+  const folderRepositoryInitiator = new FolderRepositoryInitializer(repository);
 
   await folderRepositoryInitiator.run(initialFolders);
 
diff --git a/src/apps/hydration-api/HydrationApi.ts b/src/apps/hydration-api/HydrationApi.ts
index 746b09297..b0b29f344 100644
--- a/src/apps/hydration-api/HydrationApi.ts
+++ b/src/apps/hydration-api/HydrationApi.ts
@@ -1,8 +1,8 @@
-import express, { Router } from 'express';
 import Logger from 'electron-log';
-
-import { buildContentsRouter } from './routes/contents';
+import express, { Router } from 'express';
 import { DependencyContainerFactory } from './dependency-injection/DependencyContainerFactory';
+import { buildContentsRouter } from './routes/contents';
+import { buildFilesRouter } from './routes/files';
 
 export interface HydrationApiOptions {
   debug: boolean;
@@ -22,6 +22,7 @@ export class HydrationApi {
 
     const routers = {
       contents: buildContentsRouter(container),
+      files: buildFilesRouter(container),
     };
 
     return routers;
diff --git a/src/apps/hydration-api/controllers/files.ts b/src/apps/hydration-api/controllers/files.ts
new file mode 100644
index 000000000..163ec095d
--- /dev/null
+++ b/src/apps/hydration-api/controllers/files.ts
@@ -0,0 +1,36 @@
+import { FileAttributes } from '../../../context/virtual-drive/files/domain/File';
+import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+import { Request, Response } from 'express';
+
+export function buildFilesControllers(container: DependencyContainer) {
+  const getAll = async (_req: Request, res: Response) => {
+    const files = await container.retrieveAllFiles.run();
+
+    res.status(200).send({ files });
+  };
+
+  const getByPartial = async (req: Request, res: Response) => {
+    const filter = Object.entries(req.query)
+
+      .map(([key, param]) => {
+        return { key, value: param };
+      })
+      .reduce((partial: Partial<FileAttributes>, { key, value }: any) => {
+        return {
+          ...partial,
+          [key]: value.toString(),
+        };
+      }, {});
+
+    const file = await container.filesSearcher.run(filter);
+
+    if (!file) {
+      res.sendStatus(404);
+      return;
+    }
+
+    res.status(200).send({ file });
+  };
+
+  return { getAll, getByPartial };
+}
diff --git a/src/apps/hydration-api/dependency-injection/DependencyContainerFactory.ts b/src/apps/hydration-api/dependency-injection/DependencyContainerFactory.ts
index 2235a4030..85f95bd9c 100644
--- a/src/apps/hydration-api/dependency-injection/DependencyContainerFactory.ts
+++ b/src/apps/hydration-api/dependency-injection/DependencyContainerFactory.ts
@@ -24,14 +24,9 @@ export class DependencyContainerFactory {
 
     const treeContainer = buildTreeContainer();
 
-    const tree = await treeContainer.existingNodesTreeBuilder.run();
-
     const contentsContainer = await buildContentsContainer();
-    const foldersContainer = await buildFoldersContainer(tree.folders);
-    const filesContainer = await buildFilesContainer(
-      tree.files,
-      foldersContainer
-    );
+    const foldersContainer = await buildFoldersContainer();
+    const filesContainer = await buildFilesContainer(foldersContainer);
 
     const container = {
       ...treeContainer,
diff --git a/src/apps/hydration-api/dependency-injection/files/FilesContainer.ts b/src/apps/hydration-api/dependency-injection/files/FilesContainer.ts
index f45310bee..062fed065 100644
--- a/src/apps/hydration-api/dependency-injection/files/FilesContainer.ts
+++ b/src/apps/hydration-api/dependency-injection/files/FilesContainer.ts
@@ -1,7 +1,9 @@
 import { FilesSearcher } from '../../../../context/virtual-drive/files/application/FilesSearcher';
 import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
+import { RetrieveAllFiles } from '../../../../context/virtual-drive/files/application/RetrieveAllFiles';
 
 export interface FilesContainer {
   filesByFolderPathNameLister: FilesByFolderPathSearcher;
   filesSearcher: FilesSearcher;
+  retrieveAllFiles: RetrieveAllFiles;
 }
diff --git a/src/apps/hydration-api/dependency-injection/files/builder.ts b/src/apps/hydration-api/dependency-injection/files/builder.ts
index ff222e458..5277af7e0 100644
--- a/src/apps/hydration-api/dependency-injection/files/builder.ts
+++ b/src/apps/hydration-api/dependency-injection/files/builder.ts
@@ -1,20 +1,14 @@
 import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
 import { FilesSearcher } from '../../../../context/virtual-drive/files/application/FilesSearcher';
-import { RepositoryPopulator } from '../../../../context/virtual-drive/files/application/RepositoryPopulator';
-import { File } from '../../../../context/virtual-drive/files/domain/File';
-import { InMemoryFileRepository } from '../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
+import { RetrieveAllFiles } from '../../../../context/virtual-drive/files/application/RetrieveAllFiles';
+import { InMemoryFileRepositorySingleton } from '../../../shared/dependency-injection/virtual-drive/files/InMemoryFileRepositorySingleton';
 import { FoldersContainer } from '../folders/FoldersContainer';
 import { FilesContainer } from './FilesContainer';
 
 export async function buildFilesContainer(
-  initialFiles: Array<File>,
   folderContainer: FoldersContainer
 ): Promise<FilesContainer> {
-  const repository = new InMemoryFileRepository();
-
-  const repositoryPopulator = new RepositoryPopulator(repository);
-
-  await repositoryPopulator.run(initialFiles);
+  const repository = InMemoryFileRepositorySingleton.instance;
 
   const filesByFolderPathNameLister = new FilesByFolderPathSearcher(
     repository,
@@ -23,8 +17,11 @@ export async function buildFilesContainer(
 
   const filesSearcher = new FilesSearcher(repository);
 
+  const retrieveAllFiles = new RetrieveAllFiles(repository);
+
   return {
     filesByFolderPathNameLister,
     filesSearcher,
+    retrieveAllFiles,
   };
 }
diff --git a/src/apps/hydration-api/dependency-injection/folders/builder.ts b/src/apps/hydration-api/dependency-injection/folders/builder.ts
index 46b7c6253..d52c66964 100644
--- a/src/apps/hydration-api/dependency-injection/folders/builder.ts
+++ b/src/apps/hydration-api/dependency-injection/folders/builder.ts
@@ -1,20 +1,12 @@
 import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
-import { FolderRepositoryInitiator } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
 import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
 import { FoldersByParentPathLister } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
-import { Folder } from '../../../../context/virtual-drive/folders/domain/Folder';
 import { InMemoryFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
 import { FoldersContainer } from './FoldersContainer';
 
-export async function buildFoldersContainer(
-  initialFolders: Array<Folder>
-): Promise<FoldersContainer> {
+export async function buildFoldersContainer(): Promise<FoldersContainer> {
   const repository = new InMemoryFolderRepository();
 
-  const folderRepositoryInitiator = new FolderRepositoryInitiator(repository);
-
-  await folderRepositoryInitiator.run(initialFolders);
-
   const folderFinder = new FolderFinder(repository);
 
   const folderSearcher = new FolderSearcher(repository);
diff --git a/src/apps/hydration-api/routes/files.ts b/src/apps/hydration-api/routes/files.ts
new file mode 100644
index 000000000..078481491
--- /dev/null
+++ b/src/apps/hydration-api/routes/files.ts
@@ -0,0 +1,13 @@
+import express, { Router } from 'express';
+import { buildFilesControllers } from '../controllers/files';
+import { DependencyContainer } from '../dependency-injection/DependencyContainer';
+
+export function buildFilesRouter(container: DependencyContainer): Router {
+  const controllers = buildFilesControllers(container);
+  const router = express.Router();
+
+  router.get('/', controllers.getAll);
+  router.get('/filter', controllers.getByPartial);
+
+  return router;
+}
diff --git a/src/apps/shared/dependency-injection/virtual-drive/files/InMemoryFileRepositorySingleton.ts b/src/apps/shared/dependency-injection/virtual-drive/files/InMemoryFileRepositorySingleton.ts
new file mode 100644
index 000000000..728962560
--- /dev/null
+++ b/src/apps/shared/dependency-injection/virtual-drive/files/InMemoryFileRepositorySingleton.ts
@@ -0,0 +1,13 @@
+import { InMemoryFileRepository } from '../../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
+
+export class InMemoryFileRepositorySingleton {
+  private static _repo: InMemoryFileRepository | null = null;
+
+  static get instance(): InMemoryFileRepository {
+    if (!InMemoryFileRepositorySingleton._repo) {
+      InMemoryFileRepositorySingleton._repo = new InMemoryFileRepository();
+    }
+
+    return InMemoryFileRepositorySingleton._repo;
+  }
+}
diff --git a/src/apps/shared/dependency-injection/virtual-drive/folders/InMemoryFolderRepositorySingleton.ts b/src/apps/shared/dependency-injection/virtual-drive/folders/InMemoryFolderRepositorySingleton.ts
new file mode 100644
index 000000000..0b5d73205
--- /dev/null
+++ b/src/apps/shared/dependency-injection/virtual-drive/folders/InMemoryFolderRepositorySingleton.ts
@@ -0,0 +1,13 @@
+import { InMemoryFolderRepository } from '../../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
+
+export class InMemoryFolderRepositorySingleton {
+  private static _repo: InMemoryFolderRepository | null = null;
+
+  static get instance(): InMemoryFolderRepository {
+    if (!InMemoryFolderRepositorySingleton._repo) {
+      InMemoryFolderRepositorySingleton._repo = new InMemoryFolderRepository();
+    }
+
+    return InMemoryFolderRepositorySingleton._repo;
+  }
+}
diff --git a/src/apps/sync-engine/dependency-injection/files/FilesContainer.ts b/src/apps/sync-engine/dependency-injection/files/FilesContainer.ts
index 5ba634247..bf9fcf40a 100644
--- a/src/apps/sync-engine/dependency-injection/files/FilesContainer.ts
+++ b/src/apps/sync-engine/dependency-injection/files/FilesContainer.ts
@@ -6,7 +6,7 @@ import { FilePathUpdater } from '../../../../context/virtual-drive/files/applica
 import { FilePlaceholderCreatorFromContentsId } from '../../../../context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId';
 import { FilesPlaceholderUpdater } from '../../../../context/virtual-drive/files/application/FilesPlaceholderUpdater';
 import { FilesPlaceholderCreator } from '../../../../context/virtual-drive/files/application/FilesPlaceholdersCreator';
-import { RepositoryPopulator } from '../../../../context/virtual-drive/files/application/RepositoryPopulator';
+import { FileRepositoryInitializer } from '../../../../context/virtual-drive/files/application/FileRepositoryInitializer';
 import { RetrieveAllFiles } from '../../../../context/virtual-drive/files/application/RetrieveAllFiles';
 import { SameFileWasMoved } from '../../../../context/virtual-drive/files/application/SameFileWasMoved';
 
@@ -19,7 +19,7 @@ export interface FilesContainer {
   createFilePlaceholderOnDeletionFailed: CreateFilePlaceholderOnDeletionFailed;
   sameFileWasMoved: SameFileWasMoved;
   retrieveAllFiles: RetrieveAllFiles;
-  repositoryPopulator: RepositoryPopulator;
+  repositoryPopulator: FileRepositoryInitializer;
   filesPlaceholderCreator: FilesPlaceholderCreator;
   filesPlaceholderUpdater: FilesPlaceholderUpdater;
 }
diff --git a/src/apps/sync-engine/dependency-injection/files/builder.ts b/src/apps/sync-engine/dependency-injection/files/builder.ts
index 39a8a03c4..ca9acc619 100644
--- a/src/apps/sync-engine/dependency-injection/files/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/files/builder.ts
@@ -7,7 +7,7 @@ import { FilePathUpdater } from '../../../../context/virtual-drive/files/applica
 import { FilePlaceholderCreatorFromContentsId } from '../../../../context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId';
 import { FilesPlaceholderUpdater } from '../../../../context/virtual-drive/files/application/FilesPlaceholderUpdater';
 import { FilesPlaceholderCreator } from '../../../../context/virtual-drive/files/application/FilesPlaceholdersCreator';
-import { RepositoryPopulator } from '../../../../context/virtual-drive/files/application/RepositoryPopulator';
+import { FileRepositoryInitializer } from '../../../../context/virtual-drive/files/application/FileRepositoryInitializer';
 import { RetrieveAllFiles } from '../../../../context/virtual-drive/files/application/RetrieveAllFiles';
 import { SameFileWasMoved } from '../../../../context/virtual-drive/files/application/SameFileWasMoved';
 import { InMemoryFileRepository } from '../../../../context/virtual-drive/files/infrastructure/InMemoryFileRepository';
@@ -102,7 +102,7 @@ export async function buildFilesContainer(
       filePlaceholderCreatorFromContentsId
     );
 
-  const repositoryPopulator = new RepositoryPopulator(repository);
+  const repositoryPopulator = new FileRepositoryInitializer(repository);
 
   const filesPlaceholderCreator = new FilesPlaceholderCreator(localFileSystem);
 
diff --git a/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts b/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
index 749b37ba3..623806105 100644
--- a/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
+++ b/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
@@ -4,7 +4,7 @@ import { FolderCreatorFromOfflineFolder } from '../../../../context/virtual-driv
 import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
 import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
-import { FolderRepositoryInitiator } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
+import { FolderRepositoryInitializer } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitializer';
 import { FoldersPlaceholderCreator } from '../../../../context/virtual-drive/folders/application/FoldersPlaceholderCreator';
 import { OfflineFolderCreator } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
 import { OfflineFolderPathUpdater } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderPathUpdater';
@@ -27,7 +27,7 @@ export interface FoldersContainer {
     synchronizeOfflineModifications: SynchronizeOfflineModifications;
   };
   retrieveAllFolders: RetrieveAllFolders;
-  folderRepositoryInitiator: FolderRepositoryInitiator;
+  folderRepositoryInitiator: FolderRepositoryInitializer;
   folderPlaceholderUpdater: FolderPlaceholderUpdater;
   foldersPlaceholderCreator: FoldersPlaceholderCreator;
 }
diff --git a/src/apps/sync-engine/dependency-injection/folders/builder.ts b/src/apps/sync-engine/dependency-injection/folders/builder.ts
index a5e2a783e..0534aa5ff 100644
--- a/src/apps/sync-engine/dependency-injection/folders/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/folders/builder.ts
@@ -6,7 +6,7 @@ import { FolderFinder } from '../../../../context/virtual-drive/folders/applicat
 import { FolderMover } from '../../../../context/virtual-drive/folders/application/FolderMover';
 import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
 import { FolderRenamer } from '../../../../context/virtual-drive/folders/application/FolderRenamer';
-import { FolderRepositoryInitiator } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitiator';
+import { FolderRepositoryInitializer } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitializer';
 import { FoldersPlaceholderCreator } from '../../../../context/virtual-drive/folders/application/FoldersPlaceholderCreator';
 import { OfflineFolderCreator } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderCreator';
 import { OfflineFolderMover } from '../../../../context/virtual-drive/folders/application/Offline/OfflineFolderMover';
@@ -119,7 +119,7 @@ export async function buildFoldersContainer(
       synchronizeOfflineModifications
     );
 
-  const folderRepositoryInitiator = new FolderRepositoryInitiator(repository);
+  const folderRepositoryInitiator = new FolderRepositoryInitializer(repository);
 
   const foldersPlaceholderCreator = new FoldersPlaceholderCreator(
     localFileSystem
diff --git a/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts b/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts
index 87b4457c8..545c28fb0 100644
--- a/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts
+++ b/src/context/virtual-drive/files/application/CreateFileOnOfflineFileUplodaded.ts
@@ -3,6 +3,7 @@ import { DomainEventClass } from '../../../shared/domain/DomainEvent';
 import { DomainEventSubscriber } from '../../../shared/domain/DomainEventSubscriber';
 import { FilePath } from '../domain/FilePath';
 import { FileCreator } from './FileCreator';
+import Logger from 'electron-log';
 
 export class CreateFileOnOfflineFileUploaded
   implements DomainEventSubscriber<OfflineContentsUploadedDomainEvent>
@@ -14,8 +15,12 @@ export class CreateFileOnOfflineFileUploaded
   }
 
   async on(event: OfflineContentsUploadedDomainEvent): Promise<void> {
-    const filePath = new FilePath(event.path);
+    try {
+      const filePath = new FilePath(event.path);
 
-    await this.creator.run(filePath, event.aggregateId, event.size);
+      await this.creator.run(filePath, event.aggregateId, event.size);
+    } catch (err) {
+      Logger.error('[CreateFileOnOfflineFileUploaded]:', err);
+    }
   }
 }
diff --git a/src/context/virtual-drive/files/application/RepositoryPopulator.ts b/src/context/virtual-drive/files/application/FileRepositoryInitializer.ts
similarity index 89%
rename from src/context/virtual-drive/files/application/RepositoryPopulator.ts
rename to src/context/virtual-drive/files/application/FileRepositoryInitializer.ts
index 711666c74..d1aa9f0ce 100644
--- a/src/context/virtual-drive/files/application/RepositoryPopulator.ts
+++ b/src/context/virtual-drive/files/application/FileRepositoryInitializer.ts
@@ -1,7 +1,7 @@
 import { File } from '../domain/File';
 import { FileRepository } from '../domain/FileRepository';
 
-export class RepositoryPopulator {
+export class FileRepositoryInitializer {
   constructor(private readonly repository: FileRepository) {}
 
   async run(files: Array<File>): Promise<void> {
diff --git a/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts b/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
index eedc59fb8..211bf871e 100644
--- a/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
+++ b/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
@@ -8,8 +8,13 @@ export class InMemoryFileRepository implements FileRepository {
     return Array.from(this.files.values());
   }
 
-  constructor() {
+  constructor(files?: Array<File>) {
     this.files = new Map();
+    if (files) {
+      files.forEach((file) =>
+        this.files.set(file.contentsId, file.attributes())
+      );
+    }
   }
 
   public all(): Promise<Array<File>> {
diff --git a/src/context/virtual-drive/folders/application/FolderRepositoryInitiator.ts b/src/context/virtual-drive/folders/application/FolderRepositoryInitializer.ts
similarity index 89%
rename from src/context/virtual-drive/folders/application/FolderRepositoryInitiator.ts
rename to src/context/virtual-drive/folders/application/FolderRepositoryInitializer.ts
index edf162185..114f3af13 100644
--- a/src/context/virtual-drive/folders/application/FolderRepositoryInitiator.ts
+++ b/src/context/virtual-drive/folders/application/FolderRepositoryInitializer.ts
@@ -1,7 +1,7 @@
 import { Folder } from '../domain/Folder';
 import { FolderRepository } from '../domain/FolderRepository';
 
-export class FolderRepositoryInitiator {
+export class FolderRepositoryInitializer {
   constructor(private readonly repository: FolderRepository) {}
 
   async run(folders: Array<Folder>): Promise<void> {

From 2992059dae1412e2d76c1f6d1109bdf12abd55e8 Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Mon, 26 Feb 2024 14:27:42 +0100
Subject: [PATCH 186/188] chore: rename to fix typo in functions

---
 src/apps/main/analytics/service.ts       | 4 ++--
 src/apps/main/analytics/user-handlers.ts | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/apps/main/analytics/service.ts b/src/apps/main/analytics/service.ts
index f57b6fedd..7a477c1ed 100644
--- a/src/apps/main/analytics/service.ts
+++ b/src/apps/main/analytics/service.ts
@@ -51,7 +51,7 @@ export function applicationOpened() {
   );
 }
 
-export function userSignin() {
+export function userSigning() {
   const { uuid: userId, email } = ConfigStore.get('userData');
 
   client.identify(
@@ -73,7 +73,7 @@ export function userSignin() {
   );
 }
 
-export function userSigninFailed(email?: string) {
+export function userSigningFailed(email?: string) {
   const clientId = ConfigStore.get('clientId');
 
   client.identify(
diff --git a/src/apps/main/analytics/user-handlers.ts b/src/apps/main/analytics/user-handlers.ts
index 2f878d385..0cfa11ac0 100644
--- a/src/apps/main/analytics/user-handlers.ts
+++ b/src/apps/main/analytics/user-handlers.ts
@@ -3,14 +3,14 @@ import eventBus from '../event-bus';
 import {
   sendFeedback,
   userLogout,
-  userSignin,
-  userSigninFailed,
+  userSigning,
+  userSigningFailed,
 } from './service';
 import { clearRemoteSyncStore } from '../remote-sync/helpers';
 import { clearTempFolder } from '../app-info/helpers';
 
 eventBus.on('USER_LOGGED_IN', () => {
-  userSignin();
+  userSigning();
   clearTempFolder();
 });
 
@@ -21,7 +21,7 @@ eventBus.on('USER_LOGGED_OUT', () => {
 });
 
 ipcMain.on('USER_LOGIN_FAILED', (_, email: string) => {
-  userSigninFailed(email);
+  userSigningFailed(email);
 });
 
 ipcMain.handle('send-feedback', (_, feedback: string) => {

From 85b38816f2f265e3c1ac803cafb402a75549d214 Mon Sep 17 00:00:00 2001
From: Joan Vicens <joanvicens@proton.me>
Date: Tue, 27 Feb 2024 15:45:01 +0100
Subject: [PATCH 187/188] [_] chore: better finders (#463)

---
 package.json                                  |   2 +-
 release/app/yarn.lock                         |  20 ++
 .../fuse/callbacks/GetAttributesCallback.ts   |   7 +-
 src/apps/fuse/callbacks/ReaddirCallback.ts    |   7 +-
 src/apps/fuse/callbacks/RenameOrMoveFolder.ts |   6 +-
 .../fuse/callbacks/TrashFolderCallback.ts     |  13 +-
 .../virtual-drive/files/FilesContainer.ts     |   4 +-
 .../virtual-drive/files/builder.ts            |  16 +-
 .../virtual-drive/folders/FoldersContainer.ts |  10 +-
 .../virtual-drive/folders/builder.ts          |  23 +-
 src/apps/hydration-api/controllers/files.ts   |  10 +-
 .../files/FilesContainer.ts                   |   4 +-
 .../dependency-injection/files/builder.ts     |   6 +-
 .../folders/FoldersContainer.ts               |   6 +-
 .../dependency-injection/folders/builder.ts   |  12 +-
 src/apps/sync-engine/BindingManager.ts        |   2 +-
 .../callbacks-controllers/buildControllers.ts |   2 +-
 .../controllers/AddController.ts              |   6 +-
 .../controllers/DownloadFileController.ts     |   8 +-
 .../files/FilesContainer.ts                   |   4 +-
 .../dependency-injection/files/builder.ts     |  17 +-
 .../folders/FoldersContainer.ts               |   6 +-
 .../dependency-injection/folders/builder.ts   |  16 +-
 .../shared/domain/DownloadProgressTracker.ts  |   2 -
 .../files/application/FileCreator.ts          |  16 +-
 .../files/application/FileDeleter.ts          |   7 +-
 .../application/FileFinderByContentsId.ts     |  17 --
 .../files/application/FilePathUpdater.ts      |  30 ++-
 .../FilePlaceholderCreatorFromContentsId.ts   |   8 +-
 .../application/FilesByFolderPathSearcher.ts  |  11 +-
 .../application/FilesPlaceholderUpdater.ts    |   4 +-
 ...FilesSearcher.ts => FirstsFileSearcher.ts} |   8 +-
 .../files/application/SameFileWasMoved.ts     |  12 +-
 .../application/SingleFileMatchingFinder.ts   |  25 ++
 .../application/SingleFileMatchingSearcher.ts |  22 ++
 .../files/domain/FileRepository.ts            |   6 +-
 .../domain/errors/OnlyOneFileExpectedError.ts |   5 +
 .../infrastructure/InMemoryFileRepository.ts  |  52 ++--
 .../AllParentFoldersStatusIsExists.ts         |   4 +-
 .../application/FolderByPartialSearcher.ts    |  10 -
 .../folders/application/FolderCreator.ts      |  34 ++-
 .../folders/application/FolderDeleter.ts      |   4 +-
 .../folders/application/FolderFinder.ts       |  28 --
 .../folders/application/FolderMover.ts        |  14 +-
 .../folders/application/FolderPathUpdater.ts  |   6 +-
 .../folders/application/FolderSearcher.ts     |  12 -
 .../application/FoldersByParentPathLister.ts  |  13 +-
 .../Offline/OfflineFolderCreator.ts           |  10 +-
 .../application/Offline/OfflineFolderMover.ts |   6 +-
 .../folders/application/ParentFolderFinder.ts |  26 ++
 .../application/SingleFolderMatchingFinder.ts |  25 ++
 .../SingleFolderMatchingSearcher.ts           |  22 ++
 .../SynchronizeOfflineModifications.ts        |   2 +-
 .../application/UpdatePlaceholderFolder.ts    |   4 +-
 .../virtual-drive/folders/domain/Folder.ts    |   5 +
 .../folders/domain/FolderRepository.ts        |   6 +-
 .../domain/errors/FolderAlreadyExists.ts      |   7 -
 .../domain/errors/FolderAlreadyTrashed.ts     |   7 +
 .../errors/FolderInPathAlreadyExistsError.ts  |   7 +
 .../errors/OnlyOneFolderExpectedError.ts      |   5 +
 .../InMemoryFolderRepository.ts               |  32 +--
 .../EnvironmentContentFileDownloader.test.ts  |  27 +-
 .../files/__mocks__/FileRepositoryMock.ts     |  23 +-
 .../SingleFileMatchingTestClass.ts            |  18 ++
 .../files/application/FileCreator.test.ts     |  10 +-
 .../files/application/FileDeleter.test.ts     |  20 +-
 .../files/application/FilePathUpdater.test.ts |  20 +-
 .../folders/__mocks__/FolderFinderFactory.ts  |   8 +-
 .../folders/__mocks__/FolderFinderMock.ts     |  14 -
 .../folders/__mocks__/FolderMoverMock.ts      |   8 +-
 .../folders/__mocks__/FolderRepositoryMock.ts |  16 +-
 .../ParentFolderFinderTestClass.ts            |  15 ++
 .../folders/application/FolderCreator.test.ts | 152 +++++++++++
 .../folders/application/FolderDeleter.test.ts |  26 +-
 .../folders/application/FolderMover.test.ts   |  31 ++-
 .../application/FolderPathUpdater.test.ts     |  10 +-
 .../SynchronizeOfflineModifications.test.ts   |  14 +-
 .../folders/domain/FolderMother.ts            |  12 -
 yarn.lock                                     | 254 ++++++++++++++----
 79 files changed, 959 insertions(+), 440 deletions(-)
 delete mode 100644 src/context/virtual-drive/files/application/FileFinderByContentsId.ts
 rename src/context/virtual-drive/files/application/{FilesSearcher.ts => FirstsFileSearcher.ts} (64%)
 create mode 100644 src/context/virtual-drive/files/application/SingleFileMatchingFinder.ts
 create mode 100644 src/context/virtual-drive/files/application/SingleFileMatchingSearcher.ts
 create mode 100644 src/context/virtual-drive/files/domain/errors/OnlyOneFileExpectedError.ts
 delete mode 100644 src/context/virtual-drive/folders/application/FolderByPartialSearcher.ts
 delete mode 100644 src/context/virtual-drive/folders/application/FolderFinder.ts
 delete mode 100644 src/context/virtual-drive/folders/application/FolderSearcher.ts
 create mode 100644 src/context/virtual-drive/folders/application/ParentFolderFinder.ts
 create mode 100644 src/context/virtual-drive/folders/application/SingleFolderMatchingFinder.ts
 create mode 100644 src/context/virtual-drive/folders/application/SingleFolderMatchingSearcher.ts
 delete mode 100644 src/context/virtual-drive/folders/domain/errors/FolderAlreadyExists.ts
 create mode 100644 src/context/virtual-drive/folders/domain/errors/FolderAlreadyTrashed.ts
 create mode 100644 src/context/virtual-drive/folders/domain/errors/FolderInPathAlreadyExistsError.ts
 create mode 100644 src/context/virtual-drive/folders/domain/errors/OnlyOneFolderExpectedError.ts
 create mode 100644 tests/context/virtual-drive/files/__test-class__/SingleFileMatchingTestClass.ts
 delete mode 100644 tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts
 create mode 100644 tests/context/virtual-drive/folders/__test-class__/ParentFolderFinderTestClass.ts
 create mode 100644 tests/context/virtual-drive/folders/application/FolderCreator.test.ts

diff --git a/package.json b/package.json
index 3e92ca65b..c804db203 100644
--- a/package.json
+++ b/package.json
@@ -199,7 +199,7 @@
     "detect-port": "^1.3.0",
     "dotenv": "^10.0.0",
     "dotenv-webpack": "^7.0.3",
-    "electron": "^25.8.4",
+    "electron": "^19.1.9",
     "electron-builder": "^23.6.0",
     "electron-devtools-installer": "^3.2.0",
     "electron-notarize": "^1.1.1",
diff --git a/release/app/yarn.lock b/release/app/yarn.lock
index ebb2bf8c9..abc41fb32 100644
--- a/release/app/yarn.lock
+++ b/release/app/yarn.lock
@@ -30,6 +30,14 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
+"@gcas/fuse@^2.4.2":
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/@gcas/fuse/-/fuse-2.4.2.tgz#149bd97ec8a60988f4868bacd719c7e8a1c41876"
+  integrity sha512-l/vVd2eXAuzKG4QilN1VRa8za5glndSK+jxcLrzMiXRrvbbCJthwqcBZUE3VzoRL0T/l7197tW+MKR9YeQCtZQ==
+  dependencies:
+    nanoresource "^1.3.0"
+    napi-macros "^2.0.0"
+
 "@ioredis/commands@^1.1.1":
   version "1.2.0"
   resolved "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz"
@@ -664,11 +672,23 @@ mz@^2.4.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
+nanoresource@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/nanoresource/-/nanoresource-1.3.0.tgz#823945d9667ab3e81a8b2591ab8d734552878cd0"
+  integrity sha512-OI5dswqipmlYfyL3k/YMm7mbERlh4Bd1KuKdMHpeoVD1iVxqxaTMKleB4qaA2mbQZ6/zMNSxCXv9M9P/YbqTuQ==
+  dependencies:
+    inherits "^2.0.4"
+
 napi-build-utils@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
   integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
 
+napi-macros@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.2.2.tgz#817fef20c3e0e40a963fbf7b37d1600bd0201044"
+  integrity sha512-hmEVtAGYzVQpCKdbQea4skABsdXW4RUh5t5mJ2zzqowJS2OyXZTU1KhDVFhx+NlWZ4ap9mqR9TcDO3LTTttd+g==
+
 node-abi@^3.3.0:
   version "3.51.0"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d"
diff --git a/src/apps/fuse/callbacks/GetAttributesCallback.ts b/src/apps/fuse/callbacks/GetAttributesCallback.ts
index a254f5c2d..6d4f6bf1e 100644
--- a/src/apps/fuse/callbacks/GetAttributesCallback.ts
+++ b/src/apps/fuse/callbacks/GetAttributesCallback.ts
@@ -60,9 +60,10 @@ export class GetAttributesCallback extends FuseCallback<GetAttributesCallbackDat
       });
     }
 
-    const folder = await this.virtualDriveContainer.folderSearcher.run({
-      path,
-    });
+    const folder =
+      await this.virtualDriveContainer.singleFolderMatchingSearcher.run({
+        path,
+      });
 
     if (folder) {
       return this.right({
diff --git a/src/apps/fuse/callbacks/ReaddirCallback.ts b/src/apps/fuse/callbacks/ReaddirCallback.ts
index c508190c2..f37bcd761 100644
--- a/src/apps/fuse/callbacks/ReaddirCallback.ts
+++ b/src/apps/fuse/callbacks/ReaddirCallback.ts
@@ -1,3 +1,4 @@
+import { FolderPath } from '../../../context/virtual-drive/folders/domain/FolderPath';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { FuseCallback } from './FuseCallback';
 
@@ -7,11 +8,13 @@ export class ReaddirCallback extends FuseCallback<Array<string>> {
   }
 
   async execute(path: string) {
+    const folderPath = new FolderPath(path);
+
     const filesNamesPromise =
-      this.container.filesByFolderPathNameLister.run(path);
+      this.container.filesByFolderPathNameLister.run(folderPath);
 
     const folderNamesPromise =
-      this.container.foldersByParentPathLister.run(path);
+      this.container.foldersByParentPathLister.run(folderPath);
 
     const [filesNames, foldersNames] = await Promise.all([
       filesNamesPromise,
diff --git a/src/apps/fuse/callbacks/RenameOrMoveFolder.ts b/src/apps/fuse/callbacks/RenameOrMoveFolder.ts
index f0891d077..bd36f8217 100644
--- a/src/apps/fuse/callbacks/RenameOrMoveFolder.ts
+++ b/src/apps/fuse/callbacks/RenameOrMoveFolder.ts
@@ -3,6 +3,7 @@ import { FolderPath } from '../../../context/virtual-drive/folders/domain/Folder
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { FuseError, FuseUnknownError } from './FuseErrors';
 import { Either, left, right } from '../../../context/shared/domain/Either';
+import { FolderStatuses } from '../../../context/virtual-drive/folders/domain/FolderStatus';
 
 type RenameOrMoveRight = 'no-op' | 'success';
 
@@ -16,7 +17,10 @@ export class RenameOrMoveFolder {
     src: string,
     dest: string
   ): Promise<Either<FuseError, RenameOrMoveRight>> {
-    const folder = await this.container.folderSearcher.run({ path: src });
+    const folder = await this.container.singleFolderMatchingSearcher.run({
+      path: src,
+      status: FolderStatuses.EXISTS,
+    });
 
     if (!folder) {
       return right(RenameOrMoveFolder.NO_OP);
diff --git a/src/apps/fuse/callbacks/TrashFolderCallback.ts b/src/apps/fuse/callbacks/TrashFolderCallback.ts
index 007b5d39e..caaca0b35 100644
--- a/src/apps/fuse/callbacks/TrashFolderCallback.ts
+++ b/src/apps/fuse/callbacks/TrashFolderCallback.ts
@@ -1,6 +1,6 @@
+import { FolderStatuses } from '../../../context/virtual-drive/folders/domain/FolderStatus';
 import { VirtualDriveDependencyContainer } from '../dependency-injection/virtual-drive/VirtualDriveDependencyContainer';
 import { NotifyFuseCallback } from './FuseCallback';
-import { FuseNoSuchFileOrDirectoryError } from './FuseErrors';
 import { basename } from 'path';
 
 export class TrashFolderCallback extends NotifyFuseCallback {
@@ -9,13 +9,12 @@ export class TrashFolderCallback extends NotifyFuseCallback {
   }
 
   async execute(path: string) {
-    const folder = await this.container.folderSearcher.run({ path });
-
-    if (!folder) {
-      return this.left(new FuseNoSuchFileOrDirectoryError());
-    }
-
     try {
+      const folder = await this.container.singleFolderMatchingFinder.run({
+        path,
+        status: FolderStatuses.EXISTS,
+      });
+
       await this.container.folderDeleter.run(folder.uuid);
 
       return this.right();
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
index 78d6c8072..95126b76a 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/FilesContainer.ts
@@ -1,4 +1,4 @@
-import { FilesSearcher } from '../../../../../context/virtual-drive/files/application/FilesSearcher';
+import { FirstsFileSearcher } from '../../../../../context/virtual-drive/files/application/FirstsFileSearcher';
 import { FilesByFolderPathSearcher } from '../../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
 import { FilePathUpdater } from '../../../../../context/virtual-drive/files/application/FilePathUpdater';
 import { FileCreator } from '../../../../../context/virtual-drive/files/application/FileCreator';
@@ -10,7 +10,7 @@ import { SyncFileMessenger } from '../../../../../context/virtual-drive/files/do
 
 export interface FilesContainer {
   filesByFolderPathNameLister: FilesByFolderPathSearcher;
-  filesSearcher: FilesSearcher;
+  filesSearcher: FirstsFileSearcher;
   filePathUpdater: FilePathUpdater;
   fileCreator: FileCreator;
   fileDeleter: FileDeleter;
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
index bb4e9f9ad..cacdc3daf 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/files/builder.ts
@@ -4,7 +4,7 @@ import { FileCreator } from '../../../../../context/virtual-drive/files/applicat
 import { FileDeleter } from '../../../../../context/virtual-drive/files/application/FileDeleter';
 import { FilePathUpdater } from '../../../../../context/virtual-drive/files/application/FilePathUpdater';
 import { FilesByFolderPathSearcher } from '../../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
-import { FilesSearcher } from '../../../../../context/virtual-drive/files/application/FilesSearcher';
+import { FirstsFileSearcher } from '../../../../../context/virtual-drive/files/application/FirstsFileSearcher';
 import { FileRepositoryInitializer } from '../../../../../context/virtual-drive/files/application/FileRepositoryInitializer';
 import { SameFileWasMoved } from '../../../../../context/virtual-drive/files/application/SameFileWasMoved';
 import { File } from '../../../../../context/virtual-drive/files/domain/File';
@@ -20,6 +20,7 @@ import { FoldersContainer } from '../folders/FoldersContainer';
 import { SharedContainer } from '../shared/SharedContainer';
 import { FilesContainer } from './FilesContainer';
 import { InMemoryFileRepositorySingleton } from '../../../../shared/dependency-injection/virtual-drive/files/InMemoryFileRepositorySingleton';
+import { SingleFileMatchingSearcher } from '../../../../../context/virtual-drive/files/application/SingleFileMatchingSearcher';
 
 export async function buildFilesContainer(
   initialFiles: Array<File>,
@@ -41,10 +42,10 @@ export async function buildFilesContainer(
 
   const filesByFolderPathNameLister = new FilesByFolderPathSearcher(
     repository,
-    folderContainer.folderFinder
+    folderContainer.parentFolderFinder
   );
 
-  const filesSearcher = new FilesSearcher(repository);
+  const filesSearcher = new FirstsFileSearcher(repository);
 
   const remoteFileSystem = new SDKRemoteFileSystem(
     sdk,
@@ -56,16 +57,19 @@ export async function buildFilesContainer(
     sharedContainer.relativePathToAbsoluteConverter
   );
 
+  const singleFileMatchingSearcher = new SingleFileMatchingSearcher(repository);
+
   const filePathUpdater = new FilePathUpdater(
     remoteFileSystem,
     localFileSystem,
     repository,
-    folderContainer.folderFinder,
+    singleFileMatchingSearcher,
+    folderContainer.parentFolderFinder,
     eventBus
   );
 
   const sameFileWasMoved = new SameFileWasMoved(
-    repository,
+    singleFileMatchingSearcher,
     localFileSystem,
     eventRepository
   );
@@ -81,7 +85,7 @@ export async function buildFilesContainer(
   const fileCreator = new FileCreator(
     remoteFileSystem,
     repository,
-    folderContainer.folderFinder,
+    folderContainer.parentFolderFinder,
     fileDeleter,
     eventBus,
     syncFileMessenger
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
index 96f552530..9a2f848a9 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/FoldersContainer.ts
@@ -2,16 +2,16 @@ import { AllParentFoldersStatusIsExists } from '../../../../../context/virtual-d
 import { FolderCreator } from '../../../../../context/virtual-drive/folders/application/FolderCreator';
 import { FolderCreatorFromOfflineFolder } from '../../../../../context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder';
 import { FolderDeleter } from '../../../../../context/virtual-drive/folders/application/FolderDeleter';
-import { FolderFinder } from '../../../../../context/virtual-drive/folders/application/FolderFinder';
 import { FolderPathUpdater } from '../../../../../context/virtual-drive/folders/application/FolderPathUpdater';
 import { FolderRepositoryInitializer } from '../../../../../context/virtual-drive/folders/application/FolderRepositoryInitializer';
-import { FolderSearcher } from '../../../../../context/virtual-drive/folders/application/FolderSearcher';
 import { FoldersByParentPathLister } from '../../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
+import { ParentFolderFinder } from '../../../../../context/virtual-drive/folders/application/ParentFolderFinder';
+import { SingleFolderMatchingFinder } from '../../../../../context/virtual-drive/folders/application/SingleFolderMatchingFinder';
+import { SingleFolderMatchingSearcher } from '../../../../../context/virtual-drive/folders/application/SingleFolderMatchingSearcher';
 import { SyncFolderMessenger } from '../../../../../context/virtual-drive/folders/domain/SyncFolderMessenger';
 
 export interface FoldersContainer {
-  folderFinder: FolderFinder;
-  folderSearcher: FolderSearcher;
+  parentFolderFinder: ParentFolderFinder;
   foldersByParentPathLister: FoldersByParentPathLister;
   folderPathUpdater: FolderPathUpdater;
   allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
@@ -20,4 +20,6 @@ export interface FoldersContainer {
   folderDeleter: FolderDeleter;
   folderRepositoryInitiator: FolderRepositoryInitializer;
   syncFolderMessenger: SyncFolderMessenger;
+  singleFolderMatchingFinder: SingleFolderMatchingFinder;
+  singleFolderMatchingSearcher: SingleFolderMatchingSearcher;
 }
diff --git a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
index 7cf00a97f..4488d9625 100644
--- a/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
+++ b/src/apps/fuse/dependency-injection/virtual-drive/folders/builder.ts
@@ -2,12 +2,11 @@ import { AllParentFoldersStatusIsExists } from '../../../../../context/virtual-d
 import { FolderCreator } from '../../../../../context/virtual-drive/folders/application/FolderCreator';
 import { FolderCreatorFromOfflineFolder } from '../../../../../context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder';
 import { FolderDeleter } from '../../../../../context/virtual-drive/folders/application/FolderDeleter';
-import { FolderFinder } from '../../../../../context/virtual-drive/folders/application/FolderFinder';
+import { ParentFolderFinder } from '../../../../../context/virtual-drive/folders/application/ParentFolderFinder';
 import { FolderMover } from '../../../../../context/virtual-drive/folders/application/FolderMover';
 import { FolderPathUpdater } from '../../../../../context/virtual-drive/folders/application/FolderPathUpdater';
 import { FolderRenamer } from '../../../../../context/virtual-drive/folders/application/FolderRenamer';
 import { FolderRepositoryInitializer } from '../../../../../context/virtual-drive/folders/application/FolderRepositoryInitializer';
-import { FolderSearcher } from '../../../../../context/virtual-drive/folders/application/FolderSearcher';
 import { FoldersByParentPathLister } from '../../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
 import { Folder } from '../../../../../context/virtual-drive/folders/domain/Folder';
 import { FuseLocalFileSystem } from '../../../../../context/virtual-drive/folders/infrastructure/FuseLocalFileSystem';
@@ -18,6 +17,8 @@ import { DependencyInjectionHttpClientsProvider } from '../../common/clients';
 import { DependencyInjectionEventBus } from '../../common/eventBus';
 
 import { FoldersContainer } from './FoldersContainer';
+import { SingleFolderMatchingFinder } from '../../../../../context/virtual-drive/folders/application/SingleFolderMatchingFinder';
+import { SingleFolderMatchingSearcher } from '../../../../../context/virtual-drive/folders/application/SingleFolderMatchingSearcher';
 
 export async function buildFoldersContainer(
   initialFolders: Array<Folder>
@@ -41,19 +42,21 @@ export async function buildFoldersContainer(
 
   await folderRepositoryInitiator.run(initialFolders);
 
-  const folderFinder = new FolderFinder(repository);
-
-  const folderSearcher = new FolderSearcher(repository);
+  const parentFolderFinder = new ParentFolderFinder(repository);
+  const singleFolderMatchingFinder = new SingleFolderMatchingFinder(repository);
+  const singleFolderMatchingSearcher = new SingleFolderMatchingSearcher(
+    repository
+  );
 
   const foldersByParentPathSearcher = new FoldersByParentPathLister(
-    folderFinder,
+    parentFolderFinder,
     repository
   );
 
   const folderMover = new FolderMover(
     repository,
     remoteFileSystem,
-    folderFinder
+    parentFolderFinder
   );
 
   const folderRenamer = new FolderRenamer(
@@ -82,6 +85,7 @@ export async function buildFoldersContainer(
 
   const folderCreator = new FolderCreator(
     repository,
+    parentFolderFinder,
     remoteFileSystem,
     eventBus
   );
@@ -94,8 +98,7 @@ export async function buildFoldersContainer(
   );
 
   return {
-    folderFinder,
-    folderSearcher,
+    parentFolderFinder,
     foldersByParentPathLister: foldersByParentPathSearcher,
     folderPathUpdater,
     allParentFoldersStatusIsExists,
@@ -104,5 +107,7 @@ export async function buildFoldersContainer(
     folderDeleter,
     syncFolderMessenger,
     folderRepositoryInitiator,
+    singleFolderMatchingFinder,
+    singleFolderMatchingSearcher,
   };
 }
diff --git a/src/apps/hydration-api/controllers/files.ts b/src/apps/hydration-api/controllers/files.ts
index 163ec095d..026ec6b4f 100644
--- a/src/apps/hydration-api/controllers/files.ts
+++ b/src/apps/hydration-api/controllers/files.ts
@@ -6,10 +6,12 @@ export function buildFilesControllers(container: DependencyContainer) {
   const getAll = async (_req: Request, res: Response) => {
     const files = await container.retrieveAllFiles.run();
 
-    res.status(200).send({ files });
+    const result = files.map((file) => file.attributes());
+
+    res.status(200).send({ files: result });
   };
 
-  const getByPartial = async (req: Request, res: Response) => {
+  const filter = async (req: Request, res: Response) => {
     const filter = Object.entries(req.query)
 
       .map(([key, param]) => {
@@ -29,8 +31,8 @@ export function buildFilesControllers(container: DependencyContainer) {
       return;
     }
 
-    res.status(200).send({ file });
+    res.status(200).send({ file: file.attributes() });
   };
 
-  return { getAll, getByPartial };
+  return { getAll, getByPartial: filter };
 }
diff --git a/src/apps/hydration-api/dependency-injection/files/FilesContainer.ts b/src/apps/hydration-api/dependency-injection/files/FilesContainer.ts
index 062fed065..69536da8d 100644
--- a/src/apps/hydration-api/dependency-injection/files/FilesContainer.ts
+++ b/src/apps/hydration-api/dependency-injection/files/FilesContainer.ts
@@ -1,9 +1,9 @@
-import { FilesSearcher } from '../../../../context/virtual-drive/files/application/FilesSearcher';
+import { FirstsFileSearcher } from '../../../../context/virtual-drive/files/application/FirstsFileSearcher';
 import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
 import { RetrieveAllFiles } from '../../../../context/virtual-drive/files/application/RetrieveAllFiles';
 
 export interface FilesContainer {
   filesByFolderPathNameLister: FilesByFolderPathSearcher;
-  filesSearcher: FilesSearcher;
+  filesSearcher: FirstsFileSearcher;
   retrieveAllFiles: RetrieveAllFiles;
 }
diff --git a/src/apps/hydration-api/dependency-injection/files/builder.ts b/src/apps/hydration-api/dependency-injection/files/builder.ts
index 5277af7e0..3ee93c161 100644
--- a/src/apps/hydration-api/dependency-injection/files/builder.ts
+++ b/src/apps/hydration-api/dependency-injection/files/builder.ts
@@ -1,5 +1,5 @@
 import { FilesByFolderPathSearcher } from '../../../../context/virtual-drive/files/application/FilesByFolderPathSearcher';
-import { FilesSearcher } from '../../../../context/virtual-drive/files/application/FilesSearcher';
+import { FirstsFileSearcher } from '../../../../context/virtual-drive/files/application/FirstsFileSearcher';
 import { RetrieveAllFiles } from '../../../../context/virtual-drive/files/application/RetrieveAllFiles';
 import { InMemoryFileRepositorySingleton } from '../../../shared/dependency-injection/virtual-drive/files/InMemoryFileRepositorySingleton';
 import { FoldersContainer } from '../folders/FoldersContainer';
@@ -12,10 +12,10 @@ export async function buildFilesContainer(
 
   const filesByFolderPathNameLister = new FilesByFolderPathSearcher(
     repository,
-    folderContainer.folderFinder
+    folderContainer.parentFolderFinder
   );
 
-  const filesSearcher = new FilesSearcher(repository);
+  const filesSearcher = new FirstsFileSearcher(repository);
 
   const retrieveAllFiles = new RetrieveAllFiles(repository);
 
diff --git a/src/apps/hydration-api/dependency-injection/folders/FoldersContainer.ts b/src/apps/hydration-api/dependency-injection/folders/FoldersContainer.ts
index 6dd4b46a7..e08ff0b4a 100644
--- a/src/apps/hydration-api/dependency-injection/folders/FoldersContainer.ts
+++ b/src/apps/hydration-api/dependency-injection/folders/FoldersContainer.ts
@@ -1,9 +1,7 @@
-import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
-import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
+import { ParentFolderFinder } from '../../../../context/virtual-drive/folders/application/ParentFolderFinder';
 import { FoldersByParentPathLister } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
 
 export interface FoldersContainer {
-  folderFinder: FolderFinder;
-  folderSearcher: FolderSearcher;
+  parentFolderFinder: ParentFolderFinder;
   foldersByParentPathSearcher: FoldersByParentPathLister;
 }
diff --git a/src/apps/hydration-api/dependency-injection/folders/builder.ts b/src/apps/hydration-api/dependency-injection/folders/builder.ts
index d52c66964..c9247748d 100644
--- a/src/apps/hydration-api/dependency-injection/folders/builder.ts
+++ b/src/apps/hydration-api/dependency-injection/folders/builder.ts
@@ -1,5 +1,4 @@
-import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
-import { FolderSearcher } from '../../../../context/virtual-drive/folders/application/FolderSearcher';
+import { ParentFolderFinder } from '../../../../context/virtual-drive/folders/application/ParentFolderFinder';
 import { FoldersByParentPathLister } from '../../../../context/virtual-drive/folders/application/FoldersByParentPathLister';
 import { InMemoryFolderRepository } from '../../../../context/virtual-drive/folders/infrastructure/InMemoryFolderRepository';
 import { FoldersContainer } from './FoldersContainer';
@@ -7,18 +6,15 @@ import { FoldersContainer } from './FoldersContainer';
 export async function buildFoldersContainer(): Promise<FoldersContainer> {
   const repository = new InMemoryFolderRepository();
 
-  const folderFinder = new FolderFinder(repository);
-
-  const folderSearcher = new FolderSearcher(repository);
+  const parentFolderFinder = new ParentFolderFinder(repository);
 
   const foldersByParentPathSearcher = new FoldersByParentPathLister(
-    folderFinder,
+    parentFolderFinder,
     repository
   );
 
   return {
-    folderFinder,
-    folderSearcher,
+    parentFolderFinder,
     foldersByParentPathSearcher,
   };
 }
diff --git a/src/apps/sync-engine/BindingManager.ts b/src/apps/sync-engine/BindingManager.ts
index 8a00b08ce..8a53f5e7c 100644
--- a/src/apps/sync-engine/BindingManager.ts
+++ b/src/apps/sync-engine/BindingManager.ts
@@ -91,7 +91,7 @@ export class BindingsManager {
             callback
           );
           Logger.debug('Execute Fetch Data Callback, sending path:', path);
-          const file = controllers.downloadFile.fileFinderByContentsId(
+          const file = await controllers.downloadFile.fileFinderByContentsId(
             contentsId
               .replace(
                 // eslint-disable-next-line no-control-regex
diff --git a/src/apps/sync-engine/callbacks-controllers/buildControllers.ts b/src/apps/sync-engine/callbacks-controllers/buildControllers.ts
index c492d32c5..0612327b1 100644
--- a/src/apps/sync-engine/callbacks-controllers/buildControllers.ts
+++ b/src/apps/sync-engine/callbacks-controllers/buildControllers.ts
@@ -27,7 +27,7 @@ export function buildControllers(container: SyncEngineDependencyContainer) {
   );
 
   const downloadFileController = new DownloadFileController(
-    container.fileFinderByContentsId,
+    container.singleFileMatchingFinder,
     container.contentsDownloader
   );
 
diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
index f16a5930d..ac81949c1 100644
--- a/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/AddController.ts
@@ -80,7 +80,9 @@ export class AddController extends CallbackController {
     }
   };
   private async runFolderCreator(posixRelativePath: string): Promise<Folder> {
-    const offlineFolder = this.offlineFolderCreator.run(posixRelativePath);
+    const offlineFolder = await this.offlineFolderCreator.run(
+      posixRelativePath
+    );
     return this.folderCreator.run(offlineFolder);
   }
 
@@ -111,7 +113,7 @@ export class AddController extends CallbackController {
     posixRelativePath: string
   ): Promise<OfflineFolder> {
     try {
-      return this.offlineFolderCreator.run(posixRelativePath);
+      return await this.offlineFolderCreator.run(posixRelativePath);
     } catch (error) {
       if (error instanceof FolderNotFoundError) {
         // father created
diff --git a/src/apps/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts b/src/apps/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts
index 6e5b8bfbc..67f9f12c8 100644
--- a/src/apps/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts
+++ b/src/apps/sync-engine/callbacks-controllers/controllers/DownloadFileController.ts
@@ -1,26 +1,26 @@
 import Logger from 'electron-log';
 import { ContentsDownloader } from '../../../../context/virtual-drive/contents/application/ContentsDownloader';
-import { FileFinderByContentsId } from '../../../../context/virtual-drive/files/application/FileFinderByContentsId';
 import { FilePlaceholderId } from '../../../../context/virtual-drive/files/domain/PlaceholderId';
 import { CallbackDownload } from '../../BindingManager';
 import { CallbackController } from './CallbackController';
+import { SingleFileMatchingFinder } from '../../../../context/virtual-drive/files/application/SingleFileMatchingFinder';
 
 export class DownloadFileController extends CallbackController {
   constructor(
-    private readonly fileFinder: FileFinderByContentsId,
+    private readonly fileFinder: SingleFileMatchingFinder,
     private readonly downloader: ContentsDownloader
   ) {
     super();
   }
 
   private async action(id: string, cb: CallbackDownload): Promise<string> {
-    const file = this.fileFinder.run(id);
+    const file = await this.fileFinder.run({ contentsId: id });
 
     return await this.downloader.run(file, cb);
   }
 
   fileFinderByContentsId(contentsId: string) {
-    return this.fileFinder.run(contentsId);
+    return this.fileFinder.run({ contentsId });
   }
 
   async execute(
diff --git a/src/apps/sync-engine/dependency-injection/files/FilesContainer.ts b/src/apps/sync-engine/dependency-injection/files/FilesContainer.ts
index bf9fcf40a..48a99c5c7 100644
--- a/src/apps/sync-engine/dependency-injection/files/FilesContainer.ts
+++ b/src/apps/sync-engine/dependency-injection/files/FilesContainer.ts
@@ -1,7 +1,6 @@
 import { CreateFilePlaceholderOnDeletionFailed } from '../../../../context/virtual-drive/files/application/CreateFilePlaceholderOnDeletionFailed';
 import { FileCreator } from '../../../../context/virtual-drive/files/application/FileCreator';
 import { FileDeleter } from '../../../../context/virtual-drive/files/application/FileDeleter';
-import { FileFinderByContentsId } from '../../../../context/virtual-drive/files/application/FileFinderByContentsId';
 import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
 import { FilePlaceholderCreatorFromContentsId } from '../../../../context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId';
 import { FilesPlaceholderUpdater } from '../../../../context/virtual-drive/files/application/FilesPlaceholderUpdater';
@@ -9,9 +8,9 @@ import { FilesPlaceholderCreator } from '../../../../context/virtual-drive/files
 import { FileRepositoryInitializer } from '../../../../context/virtual-drive/files/application/FileRepositoryInitializer';
 import { RetrieveAllFiles } from '../../../../context/virtual-drive/files/application/RetrieveAllFiles';
 import { SameFileWasMoved } from '../../../../context/virtual-drive/files/application/SameFileWasMoved';
+import { SingleFileMatchingFinder } from '../../../../context/virtual-drive/files/application/SingleFileMatchingFinder';
 
 export interface FilesContainer {
-  fileFinderByContentsId: FileFinderByContentsId;
   fileDeleter: FileDeleter;
   filePathUpdater: FilePathUpdater;
   fileCreator: FileCreator;
@@ -22,4 +21,5 @@ export interface FilesContainer {
   repositoryPopulator: FileRepositoryInitializer;
   filesPlaceholderCreator: FilesPlaceholderCreator;
   filesPlaceholderUpdater: FilesPlaceholderUpdater;
+  singleFileMatchingFinder: SingleFileMatchingFinder;
 }
diff --git a/src/apps/sync-engine/dependency-injection/files/builder.ts b/src/apps/sync-engine/dependency-injection/files/builder.ts
index ca9acc619..885f45c3a 100644
--- a/src/apps/sync-engine/dependency-injection/files/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/files/builder.ts
@@ -2,7 +2,6 @@ import crypt from '../../../../context/shared/infrastructure/crypt';
 import { CreateFilePlaceholderOnDeletionFailed } from '../../../../context/virtual-drive/files/application/CreateFilePlaceholderOnDeletionFailed';
 import { FileCreator } from '../../../../context/virtual-drive/files/application/FileCreator';
 import { FileDeleter } from '../../../../context/virtual-drive/files/application/FileDeleter';
-import { FileFinderByContentsId } from '../../../../context/virtual-drive/files/application/FileFinderByContentsId';
 import { FilePathUpdater } from '../../../../context/virtual-drive/files/application/FilePathUpdater';
 import { FilePlaceholderCreatorFromContentsId } from '../../../../context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId';
 import { FilesPlaceholderUpdater } from '../../../../context/virtual-drive/files/application/FilesPlaceholderUpdater';
@@ -25,6 +24,8 @@ import { DependencyInjectionVirtualDrive } from '../common/virtualDrive';
 import { FoldersContainer } from '../folders/FoldersContainer';
 import { SharedContainer } from '../shared/SharedContainer';
 import { FilesContainer } from './FilesContainer';
+import { SingleFileMatchingSearcher } from '../../../../context/virtual-drive/files/application/SingleFileMatchingSearcher';
+import { SingleFileMatchingFinder } from '../../../../context/virtual-drive/files/application/SingleFileMatchingFinder';
 
 export async function buildFilesContainer(
   folderContainer: FoldersContainer,
@@ -58,7 +59,8 @@ export async function buildFilesContainer(
 
   const repository = new InMemoryFileRepository();
 
-  const fileFinderByContentsId = new FileFinderByContentsId(repository);
+  const singleFileMatchingSearcher = new SingleFileMatchingSearcher(repository);
+  const singleFileMatchingFinder = new SingleFileMatchingFinder(repository);
 
   const fileDeleter = new FileDeleter(
     remoteFileSystem,
@@ -69,7 +71,7 @@ export async function buildFilesContainer(
   );
 
   const sameFileWasMoved = new SameFileWasMoved(
-    repository,
+    singleFileMatchingSearcher,
     localFileSystem,
     eventHistory
   );
@@ -78,14 +80,15 @@ export async function buildFilesContainer(
     remoteFileSystem,
     localFileSystem,
     repository,
-    folderContainer.folderFinder,
+    singleFileMatchingSearcher,
+    folderContainer.parentFolderFinder,
     eventBus
   );
 
   const fileCreator = new FileCreator(
     remoteFileSystem,
     repository,
-    folderContainer.folderFinder,
+    folderContainer.parentFolderFinder,
     fileDeleter,
     eventBus,
     syncFileMessenger
@@ -93,7 +96,7 @@ export async function buildFilesContainer(
 
   const filePlaceholderCreatorFromContentsId =
     new FilePlaceholderCreatorFromContentsId(
-      fileFinderByContentsId,
+      singleFileMatchingFinder,
       localFileSystem
     );
 
@@ -119,7 +122,6 @@ export async function buildFilesContainer(
   );
 
   const container: FilesContainer = {
-    fileFinderByContentsId,
     fileDeleter,
     filePathUpdater,
     fileCreator,
@@ -131,6 +133,7 @@ export async function buildFilesContainer(
     repositoryPopulator: repositoryPopulator,
     filesPlaceholderCreator,
     filesPlaceholderUpdater,
+    singleFileMatchingFinder,
   };
 
   return { container, subscribers: [] };
diff --git a/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts b/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
index 623806105..127348b21 100644
--- a/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
+++ b/src/apps/sync-engine/dependency-injection/folders/FoldersContainer.ts
@@ -1,8 +1,7 @@
 import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
-import { FolderByPartialSearcher } from '../../../../context/virtual-drive/folders/application/FolderByPartialSearcher';
 import { FolderCreatorFromOfflineFolder } from '../../../../context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder';
 import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
-import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
+import { ParentFolderFinder } from '../../../../context/virtual-drive/folders/application/ParentFolderFinder';
 import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
 import { FolderRepositoryInitializer } from '../../../../context/virtual-drive/folders/application/FolderRepositoryInitializer';
 import { FoldersPlaceholderCreator } from '../../../../context/virtual-drive/folders/application/FoldersPlaceholderCreator';
@@ -15,11 +14,10 @@ import { FolderPlaceholderUpdater } from '../../../../context/virtual-drive/fold
 
 export interface FoldersContainer {
   folderCreator: FolderCreatorFromOfflineFolder;
-  folderFinder: FolderFinder;
+  parentFolderFinder: ParentFolderFinder;
   folderDeleter: FolderDeleter;
   allParentFoldersStatusIsExists: AllParentFoldersStatusIsExists;
   folderPathUpdater: FolderPathUpdater;
-  folderByPartialSearcher: FolderByPartialSearcher;
   synchronizeOfflineModificationsOnFolderCreated: SynchronizeOfflineModificationsOnFolderCreated;
   offline: {
     folderCreator: OfflineFolderCreator;
diff --git a/src/apps/sync-engine/dependency-injection/folders/builder.ts b/src/apps/sync-engine/dependency-injection/folders/builder.ts
index 0534aa5ff..295d11f83 100644
--- a/src/apps/sync-engine/dependency-injection/folders/builder.ts
+++ b/src/apps/sync-engine/dependency-injection/folders/builder.ts
@@ -1,8 +1,7 @@
 import { AllParentFoldersStatusIsExists } from '../../../../context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
-import { FolderByPartialSearcher } from '../../../../context/virtual-drive/folders/application/FolderByPartialSearcher';
 import { FolderCreatorFromOfflineFolder } from '../../../../context/virtual-drive/folders/application/FolderCreatorFromOfflineFolder';
 import { FolderDeleter } from '../../../../context/virtual-drive/folders/application/FolderDeleter';
-import { FolderFinder } from '../../../../context/virtual-drive/folders/application/FolderFinder';
+import { ParentFolderFinder } from '../../../../context/virtual-drive/folders/application/ParentFolderFinder';
 import { FolderMover } from '../../../../context/virtual-drive/folders/application/FolderMover';
 import { FolderPathUpdater } from '../../../../context/virtual-drive/folders/application/FolderPathUpdater';
 import { FolderRenamer } from '../../../../context/virtual-drive/folders/application/FolderRenamer';
@@ -50,7 +49,7 @@ export async function buildFoldersContainer(
     clients.newDrive
   );
 
-  const folderFinder = new FolderFinder(repository);
+  const parentFolderFinder = new ParentFolderFinder(repository);
 
   const allParentFoldersStatusIsExists = new AllParentFoldersStatusIsExists(
     repository
@@ -73,7 +72,7 @@ export async function buildFoldersContainer(
   const folderMover = new FolderMover(
     repository,
     remoteFileSystem,
-    folderFinder
+    parentFolderFinder
   );
   const folderRenamer = new FolderRenamer(
     repository,
@@ -82,8 +81,6 @@ export async function buildFoldersContainer(
     syncFolderMessenger
   );
 
-  const folderByPartialSearcher = new FolderByPartialSearcher(repository);
-
   const folderPathUpdater = new FolderPathUpdater(
     repository,
     folderMover,
@@ -92,14 +89,14 @@ export async function buildFoldersContainer(
 
   const offlineRepository = new InMemoryOfflineFolderRepository();
   const offlineFolderCreator = new OfflineFolderCreator(
-    folderFinder,
+    parentFolderFinder,
     offlineRepository,
     repository
   );
 
   const offlineFolderMover = new OfflineFolderMover(
     offlineRepository,
-    folderFinder
+    parentFolderFinder
   );
   const offlineFolderRenamer = new OfflineFolderRenamer(offlineRepository);
   const offlineFolderPathUpdater = new OfflineFolderPathUpdater(
@@ -133,11 +130,10 @@ export async function buildFoldersContainer(
 
   return {
     folderCreator,
-    folderFinder,
+    parentFolderFinder,
     folderDeleter,
     allParentFoldersStatusIsExists: allParentFoldersStatusIsExists,
     folderPathUpdater,
-    folderByPartialSearcher,
     synchronizeOfflineModificationsOnFolderCreated,
     offline: {
       folderCreator: offlineFolderCreator,
diff --git a/src/context/shared/domain/DownloadProgressTracker.ts b/src/context/shared/domain/DownloadProgressTracker.ts
index eeaf9799d..5a83e3d53 100644
--- a/src/context/shared/domain/DownloadProgressTracker.ts
+++ b/src/context/shared/domain/DownloadProgressTracker.ts
@@ -9,7 +9,6 @@ export interface DownloadProgressTracker {
       percentage: number;
     }
   ): Promise<void>;
-
   downloadFinished(
     name: string,
     extension: string,
@@ -18,6 +17,5 @@ export interface DownloadProgressTracker {
       elapsedTime: number;
     }
   ): Promise<void>;
-
   error(name: string, extension: string): Promise<void>;
 }
diff --git a/src/context/virtual-drive/files/application/FileCreator.ts b/src/context/virtual-drive/files/application/FileCreator.ts
index 64ceac690..b6b7e5220 100644
--- a/src/context/virtual-drive/files/application/FileCreator.ts
+++ b/src/context/virtual-drive/files/application/FileCreator.ts
@@ -1,4 +1,3 @@
-import { FolderFinder } from '../../folders/application/FolderFinder';
 import { FilePath } from '../domain/FilePath';
 import { File } from '../domain/File';
 import { FileSize } from '../domain/FileSize';
@@ -12,12 +11,13 @@ import { SyncFileMessenger } from '../domain/SyncFileMessenger';
 import { FileStatuses } from '../domain/FileStatus';
 import { DriveDesktopError } from '../../../shared/domain/errors/DriveDesktopError';
 import Logger from 'electron-log';
+import { ParentFolderFinder } from '../../folders/application/ParentFolderFinder';
 
 export class FileCreator {
   constructor(
     private readonly remote: RemoteFileSystem,
     private readonly repository: FileRepository,
-    private readonly folderFinder: FolderFinder,
+    private readonly parentFolderFinder: ParentFolderFinder,
     private readonly fileDeleter: FileDeleter,
     private readonly eventBus: EventBus,
     private readonly notifier: SyncFileMessenger
@@ -29,18 +29,22 @@ export class FileCreator {
     size: number
   ): Promise<File> {
     try {
-      const existingFile = this.repository.searchByPartial({
+      const existingFiles = this.repository.matchingPartial({
         path: PlatformPathConverter.winToPosix(filePath.value),
         status: FileStatuses.EXISTS,
       });
 
-      if (existingFile) {
-        await this.fileDeleter.run(existingFile.contentsId);
+      if (existingFiles) {
+        await Promise.all(
+          existingFiles.map((existingFile) =>
+            this.fileDeleter.run(existingFile.contentsId)
+          )
+        );
       }
 
       const fileSize = new FileSize(size);
 
-      const folder = this.folderFinder.findFromFilePath(filePath);
+      const folder = await this.parentFolderFinder.run(filePath);
 
       const offline = OfflineFile.create(
         contentsId,
diff --git a/src/context/virtual-drive/files/application/FileDeleter.ts b/src/context/virtual-drive/files/application/FileDeleter.ts
index 7044ae795..5f4180738 100644
--- a/src/context/virtual-drive/files/application/FileDeleter.ts
+++ b/src/context/virtual-drive/files/application/FileDeleter.ts
@@ -18,10 +18,7 @@ export class FileDeleter {
   ) {}
 
   async run(contentsId: File['contentsId']): Promise<void> {
-    const file = this.repository.searchByPartial({
-      contentsId,
-      status: FileStatuses.EXISTS,
-    });
+    const file = await this.repository.searchByContentsId(contentsId);
 
     if (!file) {
       return;
@@ -32,7 +29,7 @@ export class FileDeleter {
       return;
     }
 
-    const allParentsExists = this.allParentFoldersStatusIsExists.run(
+    const allParentsExists = await this.allParentFoldersStatusIsExists.run(
       file.folderId
     );
 
diff --git a/src/context/virtual-drive/files/application/FileFinderByContentsId.ts b/src/context/virtual-drive/files/application/FileFinderByContentsId.ts
deleted file mode 100644
index e4eb8271d..000000000
--- a/src/context/virtual-drive/files/application/FileFinderByContentsId.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { FileNotFoundError } from '../domain/errors/FileNotFoundError';
-import { File } from '../domain/File';
-import { FileRepository } from '../domain/FileRepository';
-
-export class FileFinderByContentsId {
-  constructor(private readonly repository: FileRepository) {}
-
-  run(contentsId: string): File {
-    const file = this.repository.searchByPartial({ contentsId });
-
-    if (!file) {
-      throw new FileNotFoundError(contentsId);
-    }
-
-    return file;
-  }
-}
diff --git a/src/context/virtual-drive/files/application/FilePathUpdater.ts b/src/context/virtual-drive/files/application/FilePathUpdater.ts
index 683afa0b2..018bd459e 100644
--- a/src/context/virtual-drive/files/application/FilePathUpdater.ts
+++ b/src/context/virtual-drive/files/application/FilePathUpdater.ts
@@ -1,24 +1,26 @@
-import { ActionNotPermittedError } from '../domain/errors/ActionNotPermittedError';
-import { FileAlreadyExistsError } from '../domain/errors/FileAlreadyExistsError';
-import { FilePath } from '../domain/FilePath';
-import { File } from '../domain/File';
-import { FolderFinder } from '../../folders/application/FolderFinder';
+import Logger from 'electron-log';
+import { ParentFolderFinder } from '../../folders/application/ParentFolderFinder';
 import { EventBus } from '../../shared/domain/EventBus';
+import { File } from '../domain/File';
+import { FilePath } from '../domain/FilePath';
 import { FileRepository } from '../domain/FileRepository';
-import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
-import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
-import { FileRenameFailedDomainEvent } from '../domain/events/FileRenameFailedDomainEvent';
-import { FileRenameStartedDomainEvent } from '../domain/events/FileRenameStartedDomainEvent';
 import { FileStatuses } from '../domain/FileStatus';
+import { ActionNotPermittedError } from '../domain/errors/ActionNotPermittedError';
+import { FileAlreadyExistsError } from '../domain/errors/FileAlreadyExistsError';
 import { FileNotFoundError } from '../domain/errors/FileNotFoundError';
-import Logger from 'electron-log';
+import { FileRenameFailedDomainEvent } from '../domain/events/FileRenameFailedDomainEvent';
+import { FileRenameStartedDomainEvent } from '../domain/events/FileRenameStartedDomainEvent';
+import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { SingleFileMatchingSearcher } from './SingleFileMatchingSearcher';
 
 export class FilePathUpdater {
   constructor(
     private readonly remote: RemoteFileSystem,
     private readonly local: LocalFileSystem,
     private readonly repository: FileRepository,
-    private readonly folderFinder: FolderFinder,
+    private readonly singleFileMatching: SingleFileMatchingSearcher,
+    private readonly parentFolderFinder: ParentFolderFinder,
     private readonly eventBus: EventBus
   ) {}
 
@@ -43,7 +45,7 @@ export class FilePathUpdater {
   private async move(file: File, destination: FilePath) {
     const trackerId = await this.local.getLocalFileId(file);
 
-    const destinationFolder = this.folderFinder.run(destination.dirname());
+    const destinationFolder = await this.parentFolderFinder.run(destination);
 
     file.moveTo(destinationFolder, trackerId);
 
@@ -56,7 +58,7 @@ export class FilePathUpdater {
 
   async run(contentsId: string, posixRelativePath: string) {
     const destination = new FilePath(posixRelativePath);
-    const file = this.repository.searchByPartial({
+    const file = await this.singleFileMatching.run({
       contentsId,
       status: FileStatuses.EXISTS,
     });
@@ -76,7 +78,7 @@ export class FilePathUpdater {
       return;
     }
 
-    const destinationFile = this.repository.searchByPartial({
+    const destinationFile = this.repository.matchingPartial({
       path: destination.value,
       status: FileStatuses.EXISTS,
     });
diff --git a/src/context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId.ts b/src/context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId.ts
index 691aa35d0..3eada1c4a 100644
--- a/src/context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId.ts
+++ b/src/context/virtual-drive/files/application/FilePlaceholderCreatorFromContentsId.ts
@@ -1,15 +1,15 @@
 import { File } from '../domain/File';
 import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
-import { FileFinderByContentsId } from './FileFinderByContentsId';
+import { SingleFileMatchingFinder } from './SingleFileMatchingFinder';
 
 export class FilePlaceholderCreatorFromContentsId {
   constructor(
-    private readonly finder: FileFinderByContentsId,
+    private readonly finder: SingleFileMatchingFinder,
     private readonly local: LocalFileSystem
   ) {}
 
-  run(contentsId: File['contentsId']) {
-    const file = this.finder.run(contentsId);
+  async run(contentsId: File['contentsId']) {
+    const file = await this.finder.run({ contentsId });
 
     this.local.createPlaceHolder(file);
   }
diff --git a/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts b/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts
index b23dc617e..9495338bc 100644
--- a/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts
+++ b/src/context/virtual-drive/files/application/FilesByFolderPathSearcher.ts
@@ -1,4 +1,5 @@
-import { FolderFinder } from '../../folders/application/FolderFinder';
+import { ParentFolderFinder } from '../../folders/application/ParentFolderFinder';
+import { FolderPath } from '../../folders/domain/FolderPath';
 import { File } from '../domain/File';
 import { FileRepository } from '../domain/FileRepository';
 import { FileStatuses } from '../domain/FileStatus';
@@ -6,13 +7,13 @@ import { FileStatuses } from '../domain/FileStatus';
 export class FilesByFolderPathSearcher {
   constructor(
     private readonly repository: FileRepository,
-    private readonly folderFinder: FolderFinder
+    private readonly parentFolderFinder: ParentFolderFinder
   ) {}
 
-  async run(folderPath: string): Promise<Array<File['nameWithExtension']>> {
-    const folder = this.folderFinder.run(folderPath);
+  async run(folderPath: FolderPath): Promise<Array<File['nameWithExtension']>> {
+    const folder = await this.parentFolderFinder.run(folderPath);
 
-    const files = await this.repository.listByPartial({
+    const files = this.repository.matchingPartial({
       folderId: folder.id,
       status: FileStatuses.EXISTS,
     });
diff --git a/src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts b/src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts
index a59899534..1f0d782cc 100644
--- a/src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts
+++ b/src/context/virtual-drive/files/application/FilesPlaceholderUpdater.ts
@@ -27,9 +27,7 @@ export class FilesPlaceholderUpdater {
   }
 
   private async update(remote: File): Promise<void> {
-    const local = this.repository.searchByPartial({
-      contentsId: remote.contentsId,
-    });
+    const local = await this.repository.searchByContentsId(remote.contentsId);
 
     if (!local) {
       if (remote.status.is(FileStatuses.EXISTS)) {
diff --git a/src/context/virtual-drive/files/application/FilesSearcher.ts b/src/context/virtual-drive/files/application/FirstsFileSearcher.ts
similarity index 64%
rename from src/context/virtual-drive/files/application/FilesSearcher.ts
rename to src/context/virtual-drive/files/application/FirstsFileSearcher.ts
index 42f9f5f64..94b6e14ca 100644
--- a/src/context/virtual-drive/files/application/FilesSearcher.ts
+++ b/src/context/virtual-drive/files/application/FirstsFileSearcher.ts
@@ -1,12 +1,14 @@
 import { File, FileAttributes } from '../domain/File';
 import { FileRepository } from '../domain/FileRepository';
 
-export class FilesSearcher {
+export class FirstsFileSearcher {
   constructor(private readonly repository: FileRepository) {}
 
   async run(attributes: Partial<FileAttributes>): Promise<File | undefined> {
-    const file = this.repository.searchByPartial(attributes);
+    const files = this.repository.matchingPartial(attributes);
 
-    return file;
+    if (!files) return;
+
+    return files[0];
   }
 }
diff --git a/src/context/virtual-drive/files/application/SameFileWasMoved.ts b/src/context/virtual-drive/files/application/SameFileWasMoved.ts
index 334e8d6e4..19b5f6a5a 100644
--- a/src/context/virtual-drive/files/application/SameFileWasMoved.ts
+++ b/src/context/virtual-drive/files/application/SameFileWasMoved.ts
@@ -1,23 +1,25 @@
+import Logger from 'electron-log';
 import { EventRepository } from '../../shared/domain/EventRepository';
 import { FilePath } from '../domain/FilePath';
-import { FileRepository } from '../domain/FileRepository';
+import { FileStatuses } from '../domain/FileStatus';
 import { FileMovedDomainEvent } from '../domain/events/FileMovedDomainEvent';
-import Logger from 'electron-log';
 import { LocalFileSystem } from '../domain/file-systems/LocalFileSystem';
+import { SingleFileMatchingSearcher } from './SingleFileMatchingSearcher';
 
 // TODO: find a better name
 type WasMovedResult = { result: false } | { result: true; contentsId: string };
 
 export class SameFileWasMoved {
   constructor(
-    private readonly repository: FileRepository,
+    private readonly singleFileSearcher: SingleFileMatchingSearcher,
     private readonly localFileSystem: LocalFileSystem,
     private readonly eventHistory: EventRepository
   ) {}
 
   async run(path: FilePath): Promise<WasMovedResult> {
-    const fileInDestination = this.repository.searchByPartial({
+    const fileInDestination = await this.singleFileSearcher.run({
       path: path.value,
+      status: FileStatuses.EXISTS,
     });
 
     if (!fileInDestination) {
@@ -38,7 +40,7 @@ export class SameFileWasMoved {
       return { result: false };
     }
 
-    const file = this.repository.searchByPartial({
+    const file = await this.singleFileSearcher.run({
       contentsId: movedEvent.aggregateId,
     });
 
diff --git a/src/context/virtual-drive/files/application/SingleFileMatchingFinder.ts b/src/context/virtual-drive/files/application/SingleFileMatchingFinder.ts
new file mode 100644
index 000000000..bd6ff2955
--- /dev/null
+++ b/src/context/virtual-drive/files/application/SingleFileMatchingFinder.ts
@@ -0,0 +1,25 @@
+import { File, FileAttributes } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+import { FileNotFoundError } from '../domain/errors/FileNotFoundError';
+import { OnlyOneFileExpectedError } from '../domain/errors/OnlyOneFileExpectedError';
+
+export class SingleFileMatchingFinder {
+  constructor(private readonly repository: FileRepository) {}
+
+  /**
+   * @param partial a partial object of the attributes of the file in search
+   * @returns the matching file for the given partial attributes or undefined if no one matches
+   * @throws an {@link OnlyOneFileExpectedError} when it finds more than one file
+   * or a {@link FileNotFoundError} when no file is founded
+   */
+  async run(partial: Partial<FileAttributes>): Promise<File> {
+    const files = this.repository.matchingPartial(partial);
+
+    if (files.length === 0)
+      throw new FileNotFoundError(JSON.stringify(partial));
+
+    if (files.length > 1) throw new OnlyOneFileExpectedError();
+
+    return files[0];
+  }
+}
diff --git a/src/context/virtual-drive/files/application/SingleFileMatchingSearcher.ts b/src/context/virtual-drive/files/application/SingleFileMatchingSearcher.ts
new file mode 100644
index 000000000..8cb0ece10
--- /dev/null
+++ b/src/context/virtual-drive/files/application/SingleFileMatchingSearcher.ts
@@ -0,0 +1,22 @@
+import { File, FileAttributes } from '../domain/File';
+import { FileRepository } from '../domain/FileRepository';
+import { OnlyOneFileExpectedError } from '../domain/errors/OnlyOneFileExpectedError';
+
+export class SingleFileMatchingSearcher {
+  constructor(private readonly repository: FileRepository) {}
+
+  /**
+   * @param partial a partial object of the attributes of the file in search
+   * @returns the matching file for the given partial attributes or undefined if no one matches
+   * @throws an {@link OnlyOneFileExpectedError} when it finds more than one file
+   */
+  async run(attributes: Partial<FileAttributes>): Promise<File | undefined> {
+    const files = this.repository.matchingPartial(attributes);
+
+    if (files.length > 1) throw new OnlyOneFileExpectedError();
+
+    if (files.length === 0) return;
+
+    return files[0];
+  }
+}
diff --git a/src/context/virtual-drive/files/domain/FileRepository.ts b/src/context/virtual-drive/files/domain/FileRepository.ts
index e08d455c1..ca5758196 100644
--- a/src/context/virtual-drive/files/domain/FileRepository.ts
+++ b/src/context/virtual-drive/files/domain/FileRepository.ts
@@ -3,9 +3,11 @@ import { File, FileAttributes } from './File';
 export interface FileRepository {
   all(): Promise<Array<File>>;
 
-  searchByPartial(partial: Partial<FileAttributes>): File | undefined;
+  matchingPartial(partial: Partial<FileAttributes>): Array<File>;
 
-  listByPartial(partial: Partial<FileAttributes>): Promise<Array<File>>;
+  searchById(id: File['id']): Promise<File | undefined>;
+
+  searchByContentsId(id: File['contentsId']): Promise<File | undefined>;
 
   delete(id: File['contentsId']): Promise<void>;
 
diff --git a/src/context/virtual-drive/files/domain/errors/OnlyOneFileExpectedError.ts b/src/context/virtual-drive/files/domain/errors/OnlyOneFileExpectedError.ts
new file mode 100644
index 000000000..200325333
--- /dev/null
+++ b/src/context/virtual-drive/files/domain/errors/OnlyOneFileExpectedError.ts
@@ -0,0 +1,5 @@
+export class OnlyOneFileExpectedError extends Error {
+  constructor() {
+    super('Expected to find only one file');
+  }
+}
diff --git a/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts b/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
index 211bf871e..89d9c902a 100644
--- a/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
+++ b/src/context/virtual-drive/files/infrastructure/InMemoryFileRepository.ts
@@ -2,7 +2,7 @@ import { File, FileAttributes } from '../domain/File';
 import { FileRepository } from '../domain/FileRepository';
 
 export class InMemoryFileRepository implements FileRepository {
-  private files: Map<string, FileAttributes>;
+  private files: Map<File['contentsId'], FileAttributes>;
 
   private get values(): Array<FileAttributes> {
     return Array.from(this.files.values());
@@ -17,36 +17,36 @@ export class InMemoryFileRepository implements FileRepository {
     }
   }
 
-  public all(): Promise<Array<File>> {
-    const files = [...this.files.values()].map((attributes) =>
-      File.from(attributes)
-    );
-    return Promise.resolve(files);
-  }
+  async searchById(id: number): Promise<File | undefined> {
+    const files = this.files.values();
 
-  searchByPartial(partial: Partial<FileAttributes>): File | undefined {
-    const keys = Object.keys(partial) as Array<keyof Partial<FileAttributes>>;
+    for (const attributes of files) {
+      if (id === attributes.id) {
+        return File.from(attributes);
+      }
+    }
 
-    const file = this.values.find((attributes) => {
-      return keys.every((key: keyof FileAttributes) => {
-        if (key === 'contentsId') {
-          return (
-            attributes[key].normalize() == (partial[key] as string).normalize()
-          );
-        }
+    return undefined;
+  }
 
-        return attributes[key] == partial[key];
-      });
-    });
+  async searchByContentsId(id: string): Promise<File | undefined> {
+    const attributes = this.files.get(id);
 
-    if (file) {
-      return File.from(file);
+    if (!attributes) {
+      return;
     }
 
-    return undefined;
+    return File.from(attributes);
+  }
+
+  public all(): Promise<Array<File>> {
+    const files = [...this.files.values()].map((attributes) =>
+      File.from(attributes)
+    );
+    return Promise.resolve(files);
   }
 
-  listByPartial(partial: Partial<FileAttributes>): Promise<Array<File>> {
+  matchingPartial(partial: Partial<FileAttributes>): Array<File> {
     const keys = Object.keys(partial) as Array<keyof Partial<FileAttributes>>;
 
     const filesAttributes = this.values.filter((attributes) => {
@@ -61,9 +61,11 @@ export class InMemoryFileRepository implements FileRepository {
       });
     });
 
-    const files = filesAttributes.map((attributes) => File.from(attributes));
+    if (!filesAttributes) {
+      return [];
+    }
 
-    return Promise.resolve(files);
+    return filesAttributes.map((attributes) => File.from(attributes));
   }
 
   async delete(id: File['contentsId']): Promise<void> {
diff --git a/src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists.ts b/src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists.ts
index fe5e1229c..65952a3ac 100644
--- a/src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists.ts
+++ b/src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists.ts
@@ -5,8 +5,8 @@ import { FolderStatuses } from '../domain/FolderStatus';
 export class AllParentFoldersStatusIsExists {
   constructor(private readonly repository: FolderRepository) {}
 
-  run(id: Folder['id']): boolean {
-    const folder = this.repository.searchByPartial({ id });
+  async run(id: Folder['id']): Promise<boolean> {
+    const folder = await this.repository.searchById(id);
 
     if (!folder) {
       // TODO: investigate why when uploading a file in a path than previously existed returns undefined
diff --git a/src/context/virtual-drive/folders/application/FolderByPartialSearcher.ts b/src/context/virtual-drive/folders/application/FolderByPartialSearcher.ts
deleted file mode 100644
index 634d4573a..000000000
--- a/src/context/virtual-drive/folders/application/FolderByPartialSearcher.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Folder, FolderAttributes } from '../domain/Folder';
-import { FolderRepository } from '../domain/FolderRepository';
-
-export class FolderByPartialSearcher {
-  constructor(private readonly repository: FolderRepository) {}
-
-  run(partial: Partial<FolderAttributes>): Folder | undefined {
-    return this.repository.searchByPartial(partial);
-  }
-}
diff --git a/src/context/virtual-drive/folders/application/FolderCreator.ts b/src/context/virtual-drive/folders/application/FolderCreator.ts
index c7874bf5e..04757fa87 100644
--- a/src/context/virtual-drive/folders/application/FolderCreator.ts
+++ b/src/context/virtual-drive/folders/application/FolderCreator.ts
@@ -4,47 +4,43 @@ import { FolderCreatedAt } from '../domain/FolderCreatedAt';
 import { FolderId } from '../domain/FolderId';
 import { FolderPath } from '../domain/FolderPath';
 import { FolderRepository } from '../domain/FolderRepository';
+import { FolderStatuses } from '../domain/FolderStatus';
 import { FolderUpdatedAt } from '../domain/FolderUpdatedAt';
 import { FolderUuid } from '../domain/FolderUuid';
-import { FolderAlreadyExists } from '../domain/errors/FolderAlreadyExists';
-import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
+import { FolderInPathAlreadyExistsError } from '../domain/errors/FolderInPathAlreadyExistsError';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { ParentFolderFinder } from './ParentFolderFinder';
 
 export class FolderCreator {
   constructor(
     private readonly repository: FolderRepository,
+    private readonly parentFolderFinder: ParentFolderFinder,
     private readonly remote: RemoteFileSystem,
     private readonly eventBus: EventBus
   ) {}
 
-  private ensureItDoesNotExists(path: FolderPath): void {
-    const folder = this.repository.searchByPartial({ path: path.value });
-
-    if (!folder) {
-      return;
-    }
-
-    throw new FolderAlreadyExists(folder);
-  }
-
-  private findParentId(path: FolderPath): FolderId {
-    const parent = this.repository.searchByPartial({
-      path: path.dirname(),
+  private async ensureItDoesNotExists(path: FolderPath): Promise<void> {
+    const result = this.repository.matchingPartial({
+      path: path.value,
+      status: FolderStatuses.EXISTS,
     });
 
-    if (!parent) {
-      throw new FolderNotFoundError(path.dirname());
+    if (result.length > 0) {
+      throw new FolderInPathAlreadyExistsError(path);
     }
+  }
 
+  private async findParentId(path: FolderPath): Promise<FolderId> {
+    const parent = await this.parentFolderFinder.run(path);
     return new FolderId(parent.id);
   }
 
   async run(path: string): Promise<void> {
     const folderPath = new FolderPath(path);
 
-    this.ensureItDoesNotExists(folderPath);
+    await this.ensureItDoesNotExists(folderPath);
 
-    const parentId = this.findParentId(folderPath);
+    const parentId = await this.findParentId(folderPath);
 
     const response = await this.remote.persist(folderPath, parentId);
 
diff --git a/src/context/virtual-drive/folders/application/FolderDeleter.ts b/src/context/virtual-drive/folders/application/FolderDeleter.ts
index 67cabbfc3..2c3fe5cc4 100644
--- a/src/context/virtual-drive/folders/application/FolderDeleter.ts
+++ b/src/context/virtual-drive/folders/application/FolderDeleter.ts
@@ -16,7 +16,7 @@ export class FolderDeleter {
   ) {}
 
   async run(uuid: Folder['uuid']): Promise<void> {
-    const folder = this.repository.searchByPartial({ uuid });
+    const folder = await this.repository.searchByUuid(uuid);
 
     if (!folder) {
       throw new FolderNotFoundError(uuid);
@@ -27,7 +27,7 @@ export class FolderDeleter {
         throw new ActionNotPermittedError('Trash root folder');
       }
 
-      const allParentsExists = this.allParentFoldersStatusIsExists.run(
+      const allParentsExists = await this.allParentFoldersStatusIsExists.run(
         // TODO: Create a new aggregate root for root folder so the rest have the parent Id as number
         folder.parentId as number
       );
diff --git a/src/context/virtual-drive/folders/application/FolderFinder.ts b/src/context/virtual-drive/folders/application/FolderFinder.ts
deleted file mode 100644
index 8f50d9b46..000000000
--- a/src/context/virtual-drive/folders/application/FolderFinder.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { FilePath } from '../../files/domain/FilePath';
-import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
-import { Folder } from '../domain/Folder';
-import { FolderRepository } from '../domain/FolderRepository';
-
-export class FolderFinder {
-  constructor(private readonly repository: FolderRepository) {}
-
-  run(path: string): Folder {
-    const folder = this.repository.searchByPartial({ path });
-
-    if (!folder) {
-      throw new FolderNotFoundError(path);
-    }
-
-    return folder;
-  }
-
-  findFromFilePath(path: FilePath): Folder {
-    const folder = this.repository.searchByPartial({ path: path.dirname() });
-
-    if (!folder) {
-      throw new FolderNotFoundError(path.dirname());
-    }
-
-    return folder;
-  }
-}
diff --git a/src/context/virtual-drive/folders/application/FolderMover.ts b/src/context/virtual-drive/folders/application/FolderMover.ts
index f185e9fd8..20c0bc287 100644
--- a/src/context/virtual-drive/folders/application/FolderMover.ts
+++ b/src/context/virtual-drive/folders/application/FolderMover.ts
@@ -1,15 +1,16 @@
 import { ActionNotPermittedError } from '../domain/errors/ActionNotPermittedError';
 import { FolderPath } from '../domain/FolderPath';
 import { Folder } from '../domain/Folder';
-import { FolderFinder } from './FolderFinder';
+import { ParentFolderFinder } from './ParentFolderFinder';
 import { FolderRepository } from '../domain/FolderRepository';
 import { RemoteFileSystem } from '../domain/file-systems/RemoteFileSystem';
+import { FolderStatuses } from '../domain/FolderStatus';
 
 export class FolderMover {
   constructor(
     private readonly repository: FolderRepository,
     private readonly remote: RemoteFileSystem,
-    private readonly folderFinder: FolderFinder
+    private readonly fileParentFolderFinder: ParentFolderFinder
   ) {}
 
   private async move(folder: Folder, parentFolder: Folder) {
@@ -20,17 +21,20 @@ export class FolderMover {
   }
 
   async run(folder: Folder, destination: FolderPath): Promise<void> {
-    const resultFolder = this.repository.searchByPartial({
+    const resultFolder = this.repository.matchingPartial({
       path: destination.value,
+      status: FolderStatuses.EXISTS,
     });
 
-    const shouldBeMerge = resultFolder !== undefined;
+    const shouldBeMerge = resultFolder.length > 0;
 
     if (shouldBeMerge) {
       throw new ActionNotPermittedError('overwrite');
     }
 
-    const destinationFolder = this.folderFinder.run(destination.dirname());
+    const destinationFolder = await this.fileParentFolderFinder.run(
+      destination
+    );
 
     await this.move(folder, destinationFolder);
   }
diff --git a/src/context/virtual-drive/folders/application/FolderPathUpdater.ts b/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
index 5245f593b..9487a0a3c 100644
--- a/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
+++ b/src/context/virtual-drive/folders/application/FolderPathUpdater.ts
@@ -7,6 +7,7 @@ import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
 import { FolderMover } from './FolderMover';
 import { FolderRenamer } from './FolderRenamer';
 import { PathHasNotChangedError } from '../domain/errors/PathHasNotChangedError';
+import { FolderStatuses } from '../domain/FolderStatus';
 
 export class FolderPathUpdater {
   constructor(
@@ -16,7 +17,10 @@ export class FolderPathUpdater {
   ) {}
 
   async run(uuid: Folder['uuid'], posixRelativePath: string) {
-    const folder = this.repository.searchByPartial({ uuid });
+    const folder = this.repository.matchingPartial({
+      uuid,
+      status: FolderStatuses.EXISTS,
+    })[0];
 
     if (!folder) {
       throw new FolderNotFoundError(uuid);
diff --git a/src/context/virtual-drive/folders/application/FolderSearcher.ts b/src/context/virtual-drive/folders/application/FolderSearcher.ts
deleted file mode 100644
index 924a65cb1..000000000
--- a/src/context/virtual-drive/folders/application/FolderSearcher.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Folder, FolderAttributes } from '../domain/Folder';
-import { FolderRepository } from '../domain/FolderRepository';
-
-export class FolderSearcher {
-  constructor(private readonly repository: FolderRepository) {}
-
-  run(partial: Partial<FolderAttributes>): Promise<Folder | undefined> {
-    const folder = this.repository.searchByPartial(partial);
-
-    return Promise.resolve(folder);
-  }
-}
diff --git a/src/context/virtual-drive/folders/application/FoldersByParentPathLister.ts b/src/context/virtual-drive/folders/application/FoldersByParentPathLister.ts
index dee1ba466..737cb3423 100644
--- a/src/context/virtual-drive/folders/application/FoldersByParentPathLister.ts
+++ b/src/context/virtual-drive/folders/application/FoldersByParentPathLister.ts
@@ -1,18 +1,19 @@
 import { Folder } from '../domain/Folder';
+import { FolderPath } from '../domain/FolderPath';
 import { FolderRepository } from '../domain/FolderRepository';
-import { FolderFinder } from './FolderFinder';
+import { ParentFolderFinder } from './ParentFolderFinder';
 
 export class FoldersByParentPathLister {
   constructor(
-    private readonly folderFinder: FolderFinder,
+    private readonly parentFolderFinder: ParentFolderFinder,
     private readonly repository: FolderRepository
   ) {}
 
-  async run(path: string): Promise<Array<Folder['name']>> {
-    const parent = this.folderFinder.run(path);
+  async run(folderPath: FolderPath): Promise<Array<Folder['name']>> {
+    const parent = await this.parentFolderFinder.run(folderPath);
 
-    const folders = await this.repository.listByPartial({
-      parentId: parent?.id,
+    const folders = this.repository.matchingPartial({
+      parentId: parent.id,
     });
 
     return folders.map((folder) => folder.name);
diff --git a/src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts b/src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts
index e1bfad328..5b2638a22 100644
--- a/src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts
+++ b/src/context/virtual-drive/folders/application/Offline/OfflineFolderCreator.ts
@@ -1,21 +1,21 @@
 import { FolderPath } from '../../domain/FolderPath';
 import { OfflineFolder } from '../../domain/OfflineFolder';
 import { OfflineFolderRepository } from '../../domain/OfflineFolderRepository';
-import { FolderFinder } from '../FolderFinder';
+import { ParentFolderFinder } from '../ParentFolderFinder';
 import { FolderRepository } from '../../domain/FolderRepository';
 import { FolderId } from '../../domain/FolderId';
 
 export class OfflineFolderCreator {
   constructor(
-    private readonly folderFinder: FolderFinder,
+    private readonly parentFolderFinder: ParentFolderFinder,
     private readonly offlineRepository: OfflineFolderRepository,
     private readonly repository: FolderRepository
   ) {}
 
-  run(posixRelativePath: string): OfflineFolder {
+  async run(posixRelativePath: string): Promise<OfflineFolder> {
     const folderPath = new FolderPath(posixRelativePath);
 
-    const onlineFolder = this.repository.searchByPartial({
+    const onlineFolder = this.repository.matchingPartial({
       path: folderPath.value,
     });
 
@@ -23,7 +23,7 @@ export class OfflineFolderCreator {
       throw new Error('The folder already exists on remote');
     }
 
-    const parent = this.folderFinder.run(folderPath.dirname());
+    const parent = await this.parentFolderFinder.run(folderPath);
 
     const parentId = new FolderId(parent.id);
 
diff --git a/src/context/virtual-drive/folders/application/Offline/OfflineFolderMover.ts b/src/context/virtual-drive/folders/application/Offline/OfflineFolderMover.ts
index 21694eeeb..ad1c3e32d 100644
--- a/src/context/virtual-drive/folders/application/Offline/OfflineFolderMover.ts
+++ b/src/context/virtual-drive/folders/application/Offline/OfflineFolderMover.ts
@@ -2,12 +2,12 @@ import { FolderPath } from '../../domain/FolderPath';
 import { OfflineFolder } from '../../domain/OfflineFolder';
 import { OfflineFolderRepository } from '../../domain/OfflineFolderRepository';
 import { ActionNotPermittedError } from '../../domain/errors/ActionNotPermittedError';
-import { FolderFinder } from '../FolderFinder';
+import { ParentFolderFinder } from '../ParentFolderFinder';
 
 export class OfflineFolderMover {
   constructor(
     private readonly offlineFolderRepository: OfflineFolderRepository,
-    private readonly folderFinder: FolderFinder
+    private readonly parentFolderFinder: ParentFolderFinder
   ) {}
 
   async run(folder: OfflineFolder, destination: FolderPath) {
@@ -21,7 +21,7 @@ export class OfflineFolderMover {
       throw new ActionNotPermittedError('overwrite');
     }
 
-    const destinationFolder = this.folderFinder.run(destination.dirname());
+    const destinationFolder = await this.parentFolderFinder.run(destination);
 
     folder.moveTo(destinationFolder);
     this.offlineFolderRepository.update(folder);
diff --git a/src/context/virtual-drive/folders/application/ParentFolderFinder.ts b/src/context/virtual-drive/folders/application/ParentFolderFinder.ts
new file mode 100644
index 000000000..e2e35c7e3
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/ParentFolderFinder.ts
@@ -0,0 +1,26 @@
+import { Path } from '../../../shared/domain/value-objects/Path';
+import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
+import { Folder } from '../domain/Folder';
+import { FolderRepository } from '../domain/FolderRepository';
+import { FolderStatuses } from '../domain/FolderStatus';
+
+export class ParentFolderFinder {
+  constructor(private readonly repository: FolderRepository) {}
+
+  async run(path: Path): Promise<Folder> {
+    const result = this.repository.matchingPartial({
+      path: path.dirname(),
+      status: FolderStatuses.EXISTS,
+    });
+
+    if (!result || result.length === 0) {
+      throw new FolderNotFoundError(path.dirname());
+    }
+
+    if (result.length > 1) {
+      throw new Error('A file can only have a parent');
+    }
+
+    return result[0];
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/SingleFolderMatchingFinder.ts b/src/context/virtual-drive/folders/application/SingleFolderMatchingFinder.ts
new file mode 100644
index 000000000..75d8e7aaa
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/SingleFolderMatchingFinder.ts
@@ -0,0 +1,25 @@
+import { Folder, FolderAttributes } from '../domain/Folder';
+import { FolderRepository } from '../domain/FolderRepository';
+import { FolderNotFoundError } from '../domain/errors/FolderNotFoundError';
+import { OnlyOneFolderExpectedError } from '../domain/errors/OnlyOneFolderExpectedError';
+
+export class SingleFolderMatchingFinder {
+  constructor(private readonly repository: FolderRepository) {}
+
+  /**
+   * @param partial a partial object of the attributes of the folder in search
+   * @returns the matching folder for the given partial attributes
+   * @throws an {@link OnlyOneFolderExpectedError} if it finds more than one folder
+   * or a {@link FolderNotFoundError} if no folder is founded
+   */
+  async run(partial: Partial<FolderAttributes>): Promise<Folder> {
+    const folders = this.repository.matchingPartial(partial);
+
+    if (folders.length === 0)
+      throw new FolderNotFoundError(JSON.stringify(partial));
+
+    if (folders.length > 1) throw new OnlyOneFolderExpectedError();
+
+    return folders[0];
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/SingleFolderMatchingSearcher.ts b/src/context/virtual-drive/folders/application/SingleFolderMatchingSearcher.ts
new file mode 100644
index 000000000..a459c6de9
--- /dev/null
+++ b/src/context/virtual-drive/folders/application/SingleFolderMatchingSearcher.ts
@@ -0,0 +1,22 @@
+import { Folder, FolderAttributes } from '../domain/Folder';
+import { FolderRepository } from '../domain/FolderRepository';
+import { OnlyOneFolderExpectedError } from '../domain/errors/OnlyOneFolderExpectedError';
+
+export class SingleFolderMatchingSearcher {
+  constructor(private readonly repository: FolderRepository) {}
+
+  /**
+   * @param partial a partial object of the attributes of the folder in search
+   * @returns the matching folder for the given partial attributes or undefined if no one matches
+   * @throws an {@link OnlyOneFolderExpectedError} when it finds more than one folder
+   */
+  async run(partial: Partial<FolderAttributes>): Promise<Folder | undefined> {
+    const folders = this.repository.matchingPartial(partial);
+
+    if (folders.length > 1) throw new OnlyOneFolderExpectedError();
+
+    if (folders.length === 0) return;
+
+    return folders[0];
+  }
+}
diff --git a/src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts b/src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts
index fd5818b5a..85447c4b0 100644
--- a/src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts
+++ b/src/context/virtual-drive/folders/application/SynchronizeOfflineModifications.ts
@@ -35,7 +35,7 @@ export class SynchronizeOfflineModifications {
 
       const rename = event as FolderRenamedDomainEvent;
 
-      const folder = this.repository.searchByPartial({ uuid });
+      const folder = this.repository.matchingPartial({ uuid })[0];
 
       if (!folder) {
         throw new FolderNotFoundError(uuid);
diff --git a/src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts b/src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts
index 9b06bd1b7..d665cd148 100644
--- a/src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts
+++ b/src/context/virtual-drive/folders/application/UpdatePlaceholderFolder.ts
@@ -78,9 +78,9 @@ export class FolderPlaceholderUpdater {
       return;
     }
 
-    const local = this.repository.searchByPartial({
+    const local = this.repository.matchingPartial({
       uuid: remote.uuid,
-    });
+    })[0];
 
     if (!local) {
       if (remote.hasStatus(FolderStatuses.EXISTS)) {
diff --git a/src/context/virtual-drive/folders/domain/Folder.ts b/src/context/virtual-drive/folders/domain/Folder.ts
index 8c5001bb2..264f37c5b 100644
--- a/src/context/virtual-drive/folders/domain/Folder.ts
+++ b/src/context/virtual-drive/folders/domain/Folder.ts
@@ -9,6 +9,7 @@ import { FolderId } from './FolderId';
 import { FolderCreatedAt } from './FolderCreatedAt';
 import { FolderUpdatedAt } from './FolderUpdatedAt';
 import { FolderMovedDomainEvent } from './events/FolderMovedDomainEvent';
+import { FolderAlreadyTrashed } from './errors/FolderAlreadyTrashed';
 
 export type FolderAttributes = {
   id: number;
@@ -185,6 +186,10 @@ export class Folder extends AggregateRoot {
   }
 
   trash() {
+    if (!this._status.is(FolderStatuses.EXISTS)) {
+      throw new FolderAlreadyTrashed(this.name);
+    }
+
     this._status = this._status.changeTo(FolderStatuses.TRASHED);
     this._updatedAt = FolderUpdatedAt.now();
 
diff --git a/src/context/virtual-drive/folders/domain/FolderRepository.ts b/src/context/virtual-drive/folders/domain/FolderRepository.ts
index fb27c56d0..eb8e701cc 100644
--- a/src/context/virtual-drive/folders/domain/FolderRepository.ts
+++ b/src/context/virtual-drive/folders/domain/FolderRepository.ts
@@ -3,9 +3,11 @@ import { Folder, FolderAttributes } from './Folder';
 export interface FolderRepository {
   all(): Promise<Array<Folder>>;
 
-  searchByPartial(partial: Partial<FolderAttributes>): Folder | undefined;
+  searchById(id: Folder['id']): Promise<Folder | undefined>;
 
-  listByPartial(partial: Partial<FolderAttributes>): Promise<Array<Folder>>;
+  searchByUuid(id: Folder['uuid']): Promise<Folder | undefined>;
+
+  matchingPartial(partial: Partial<FolderAttributes>): Array<Folder>;
 
   add(folder: Folder): Promise<void>;
 
diff --git a/src/context/virtual-drive/folders/domain/errors/FolderAlreadyExists.ts b/src/context/virtual-drive/folders/domain/errors/FolderAlreadyExists.ts
deleted file mode 100644
index 976d6d879..000000000
--- a/src/context/virtual-drive/folders/domain/errors/FolderAlreadyExists.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Folder } from '../Folder';
-
-export class FolderAlreadyExists extends Error {
-  constructor(folder: Folder) {
-    super(`Folder ${folder.path} already exists with id: ${folder.uuid}`);
-  }
-}
diff --git a/src/context/virtual-drive/folders/domain/errors/FolderAlreadyTrashed.ts b/src/context/virtual-drive/folders/domain/errors/FolderAlreadyTrashed.ts
new file mode 100644
index 000000000..37d61b2c4
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/errors/FolderAlreadyTrashed.ts
@@ -0,0 +1,7 @@
+import { DriveDesktopError } from '../../../../shared/domain/errors/DriveDesktopError';
+
+export class FolderAlreadyTrashed extends DriveDesktopError {
+  constructor(name: string) {
+    super('ACTION_NOT_PERMITTED', `Folder ${name} is already in the trash`);
+  }
+}
diff --git a/src/context/virtual-drive/folders/domain/errors/FolderInPathAlreadyExistsError.ts b/src/context/virtual-drive/folders/domain/errors/FolderInPathAlreadyExistsError.ts
new file mode 100644
index 000000000..f482bcb8b
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/errors/FolderInPathAlreadyExistsError.ts
@@ -0,0 +1,7 @@
+import { FolderPath } from '../FolderPath';
+
+export class FolderInPathAlreadyExistsError extends Error {
+  constructor(path: FolderPath) {
+    super(`Folder in ${path.value} already exists`);
+  }
+}
diff --git a/src/context/virtual-drive/folders/domain/errors/OnlyOneFolderExpectedError.ts b/src/context/virtual-drive/folders/domain/errors/OnlyOneFolderExpectedError.ts
new file mode 100644
index 000000000..7dd94f8d2
--- /dev/null
+++ b/src/context/virtual-drive/folders/domain/errors/OnlyOneFolderExpectedError.ts
@@ -0,0 +1,5 @@
+export class OnlyOneFolderExpectedError extends Error {
+  constructor() {
+    super('Expected to find only one folder');
+  }
+}
diff --git a/src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts b/src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts
index e2e2c8a28..4bde24569 100644
--- a/src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts
+++ b/src/context/virtual-drive/folders/infrastructure/InMemoryFolderRepository.ts
@@ -20,36 +20,36 @@ export class InMemoryFolderRepository implements FolderRepository {
     return Promise.resolve(folders);
   }
 
-  searchByPartial(partial: Partial<FolderAttributes>): Folder | undefined {
-    const keys = Object.keys(partial) as Array<keyof Partial<FolderAttributes>>;
+  async searchById(id: Folder['id']): Promise<Folder | undefined> {
+    const attributes = this.folders.get(id);
 
-    const folder = this.values.find((attributes) => {
-      return keys.every(
-        (key: keyof FolderAttributes) => attributes[key] === partial[key]
-      );
-    });
+    if (!attributes) return;
+
+    return Folder.from(attributes);
+  }
+
+  async searchByUuid(id: Folder['uuid']): Promise<Folder | undefined> {
+    const folders = this.folders.values();
 
-    if (folder) {
-      return Folder.from(folder);
+    for (const attributes of folders) {
+      if (id === attributes.uuid) {
+        return Folder.from(attributes);
+      }
     }
 
     return undefined;
   }
 
-  listByPartial(partial: Partial<FolderAttributes>): Promise<Folder[]> {
+  matchingPartial(partial: Partial<FolderAttributes>): Array<Folder> {
     const keys = Object.keys(partial) as Array<keyof Partial<FolderAttributes>>;
 
-    const folderAttributes = this.values.filter((attributes) => {
+    const foldersAttributes = this.values.filter((attributes) => {
       return keys.every(
         (key: keyof FolderAttributes) => attributes[key] === partial[key]
       );
     });
 
-    const folders = folderAttributes.map((attributes) =>
-      Folder.from(attributes)
-    );
-
-    return Promise.resolve(folders);
+    return foldersAttributes.map((attributes) => Folder.from(attributes));
   }
 
   async add(folder: Folder): Promise<void> {
diff --git a/tests/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.test.ts b/tests/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.test.ts
index 250ab819c..9c766c0f4 100644
--- a/tests/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.test.ts
+++ b/tests/context/virtual-drive/contents/infrastructure/download/EnvironmentContentFileDownloader.test.ts
@@ -56,7 +56,13 @@ describe('Environment Content File Downloader', () => {
 
       await downloader.download(file);
 
-      expect(handler.mock.calls).toEqual([[25], [50], [75]]);
+      const firstArgumentsOfProgress = handler.mock.calls.map(
+        (args) => args[0]
+      );
+
+      expect(firstArgumentsOfProgress).toEqual(
+        expect.arrayContaining([25, 50, 75])
+      );
     });
 
     it('emits an event when there is an error', async () => {
@@ -78,5 +84,24 @@ describe('Environment Content File Downloader', () => {
         // no-op
       });
     });
+
+    it('emits the error event before the promises fails', async () => {
+      const errorMsg = 'Error uploading file';
+      const strategy = createDownloadStrategy((callbacks) => {
+        callbacks.finishedCallback(
+          { message: errorMsg } as unknown as Error,
+          Readable.from('')
+        );
+      });
+
+      const downloader = new EnvironmentContentFileDownloader(strategy, bucket);
+
+      const errorCallback = jest.fn();
+      downloader.on('error', errorCallback);
+
+      await downloader.download(file).catch(() => {
+        expect(errorCallback).toBeCalled();
+      });
+    });
   });
 });
diff --git a/tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts b/tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts
index 519b31a89..0a2b7324c 100644
--- a/tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts
+++ b/tests/context/virtual-drive/files/__mocks__/FileRepositoryMock.ts
@@ -1,4 +1,3 @@
-import { Nullable } from '../../../../../src/apps/shared/types/Nullable';
 import {
   File,
   FileAttributes,
@@ -7,8 +6,9 @@ import { FileRepository } from '../../../../../src/context/virtual-drive/files/d
 
 export class FileRepositoryMock implements FileRepository {
   public readonly allMock = jest.fn();
-  public readonly searchByPartialMock = jest.fn();
-  public readonly listByPartialMock = jest.fn();
+  public readonly matchingPartialMock = jest.fn();
+  public readonly searchByIdMock = jest.fn();
+  public readonly searchByContentsIdMock = jest.fn();
   public readonly deleteMock = jest.fn();
   public readonly addMock = jest.fn();
   public readonly updateMock = jest.fn();
@@ -16,18 +16,27 @@ export class FileRepositoryMock implements FileRepository {
   all(): Promise<File[]> {
     return this.allMock();
   }
-  searchByPartial(partial: Partial<FileAttributes>): Nullable<File> {
-    return this.searchByPartialMock(partial);
+
+  matchingPartial(partial: Partial<FileAttributes>): Array<File> {
+    return this.matchingPartialMock(partial);
+  }
+
+  searchById(id: number): Promise<File | undefined> {
+    return this.searchByIdMock(id);
   }
-  listByPartial(partial: Partial<FileAttributes>): Promise<File[]> {
-    return this.listByPartialMock(partial);
+
+  searchByContentsId(id: string): Promise<File | undefined> {
+    return this.searchByContentsIdMock(id);
   }
+
   delete(id: string): Promise<void> {
     return this.deleteMock(id);
   }
+
   add(file: File): Promise<void> {
     return this.addMock(file);
   }
+
   update(file: File): Promise<void> {
     return this.updateMock(file);
   }
diff --git a/tests/context/virtual-drive/files/__test-class__/SingleFileMatchingTestClass.ts b/tests/context/virtual-drive/files/__test-class__/SingleFileMatchingTestClass.ts
new file mode 100644
index 000000000..651be9e72
--- /dev/null
+++ b/tests/context/virtual-drive/files/__test-class__/SingleFileMatchingTestClass.ts
@@ -0,0 +1,18 @@
+import { SingleFileMatchingSearcher } from '../../../../../src/context/virtual-drive/files/application/SingleFileMatchingSearcher';
+import {
+  FileAttributes,
+  File,
+} from '../../../../../src/context/virtual-drive/files/domain/File';
+import { FileRepository } from '../../../../../src/context/virtual-drive/files/domain/FileRepository';
+
+export class SingleFileMatchingTestClass extends SingleFileMatchingSearcher {
+  public readonly mock = jest.fn();
+
+  constructor() {
+    super(undefined as unknown as FileRepository);
+  }
+
+  run(attributes: Partial<FileAttributes>): Promise<File | undefined> {
+    return this.mock(attributes);
+  }
+}
diff --git a/tests/context/virtual-drive/files/application/FileCreator.test.ts b/tests/context/virtual-drive/files/application/FileCreator.test.ts
index 720122295..c1f015117 100644
--- a/tests/context/virtual-drive/files/application/FileCreator.test.ts
+++ b/tests/context/virtual-drive/files/application/FileCreator.test.ts
@@ -24,14 +24,14 @@ describe('File Creator', () => {
     remoteFileSystemMock = new RemoteFileSystemMock();
     fileRepository = new FileRepositoryMock();
     fileDeleter = FileDeleterFactory.deletionSuccess();
-    const folderFinder = FolderFinderFactory.existingFolder();
+    const parentFolderFinder = FolderFinderFactory.existingFolder();
     eventBus = new EventBusMock();
     notifier = new FileSyncNotifierMock();
 
     SUT = new FileCreator(
       remoteFileSystemMock,
       fileRepository,
-      folderFinder,
+      parentFolderFinder,
       fileDeleter,
       eventBus,
       notifier
@@ -95,9 +95,9 @@ describe('File Creator', () => {
       contentsId: contents.id,
     }).attributes();
 
-    fileRepository.searchByPartialMock
-      .mockReturnValueOnce(existingFile)
-      .mockReturnValueOnce(existingFile);
+    fileRepository.matchingPartialMock
+      .mockReturnValueOnce([existingFile])
+      .mockReturnValueOnce([existingFile]);
 
     const deleterSpy = jest
       .spyOn(fileDeleter, 'run')
diff --git a/tests/context/virtual-drive/files/application/FileDeleter.test.ts b/tests/context/virtual-drive/files/application/FileDeleter.test.ts
index d66a8f52f..aa4be0a1c 100644
--- a/tests/context/virtual-drive/files/application/FileDeleter.test.ts
+++ b/tests/context/virtual-drive/files/application/FileDeleter.test.ts
@@ -40,10 +40,10 @@ describe('File Deleter', () => {
   it('does not nothing if the file its not found', async () => {
     const contentsId = ContentsIdMother.raw();
 
-    repository.searchByPartialMock.mockReturnValueOnce(undefined);
+    repository.searchByContentsIdMock.mockReturnValueOnce(undefined);
     jest
       .spyOn(allParentFoldersStatusIsExists, 'run')
-      .mockReturnValueOnce(false);
+      .mockResolvedValueOnce(false);
 
     await SUT.run(contentsId);
 
@@ -53,10 +53,10 @@ describe('File Deleter', () => {
   it('does not delete a file if it has a parent already trashed', async () => {
     const file = FileMother.any();
 
-    repository.searchByPartialMock.mockReturnValueOnce(file);
+    repository.searchByContentsIdMock.mockReturnValueOnce(file);
     jest
       .spyOn(allParentFoldersStatusIsExists, 'run')
-      .mockReturnValueOnce(false);
+      .mockResolvedValueOnce(false);
 
     await SUT.run(file.contentsId);
 
@@ -66,8 +66,10 @@ describe('File Deleter', () => {
   it('trashes the file if it exists and does not have any parent trashed', async () => {
     const file = FileMother.any();
 
-    repository.searchByPartialMock.mockReturnValueOnce(file);
-    jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
+    repository.searchByContentsIdMock.mockReturnValueOnce(file);
+    jest
+      .spyOn(allParentFoldersStatusIsExists, 'run')
+      .mockResolvedValueOnce(true);
 
     await SUT.run(file.contentsId);
 
@@ -77,8 +79,10 @@ describe('File Deleter', () => {
   it('trashes the file with the status trashed', async () => {
     const file = FileMother.any();
 
-    repository.searchByPartialMock.mockReturnValueOnce(file);
-    jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
+    repository.searchByContentsIdMock.mockReturnValueOnce(file);
+    jest
+      .spyOn(allParentFoldersStatusIsExists, 'run')
+      .mockResolvedValueOnce(true);
 
     await SUT.run(file.contentsId);
 
diff --git a/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts b/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
index 68de50bd7..02100a829 100644
--- a/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
+++ b/tests/context/virtual-drive/files/application/FilePathUpdater.test.ts
@@ -1,17 +1,19 @@
 import { FilePathUpdater } from '../../../../../src/context/virtual-drive/files/application/FilePathUpdater';
 import { FilePath } from '../../../../../src/context/virtual-drive/files/domain/FilePath';
-import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
-import { FolderFinderMock } from '../../folders/__mocks__/FolderFinderMock';
+import { ParentFolderFinder } from '../../../../../src/context/virtual-drive/folders/application/ParentFolderFinder';
+import { ParentFolderFinderTestClass } from '../../folders/__test-class__/ParentFolderFinderTestClass';
 import { FolderMother } from '../../folders/domain/FolderMother';
 import { EventBusMock } from '../../shared/__mock__/EventBusMock';
 import { FileRepositoryMock } from '../__mocks__/FileRepositoryMock';
 import { LocalFileSystemMock } from '../__mocks__/LocalFileSystemMock';
 import { RemoteFileSystemMock } from '../__mocks__/RemoteFileSystemMock';
+import { SingleFileMatchingTestClass } from '../__test-class__/SingleFileMatchingTestClass';
 import { FileMother } from '../domain/FileMother';
 
 describe('File path updater', () => {
   let repository: FileRepositoryMock;
-  let folderFinder: FolderFinderMock;
+  let folderFinder: ParentFolderFinderTestClass;
+  let singleFileMatchingTestClass: SingleFileMatchingTestClass;
   let localFileSystem: LocalFileSystemMock;
   let eventBus: EventBusMock;
   let remoteFileSystemMock: RemoteFileSystemMock;
@@ -19,7 +21,8 @@ describe('File path updater', () => {
 
   beforeEach(() => {
     repository = new FileRepositoryMock();
-    folderFinder = new FolderFinderMock();
+    folderFinder = new ParentFolderFinderTestClass();
+    singleFileMatchingTestClass = new SingleFileMatchingTestClass();
     eventBus = new EventBusMock();
     remoteFileSystemMock = new RemoteFileSystemMock();
     localFileSystem = new LocalFileSystemMock();
@@ -28,7 +31,8 @@ describe('File path updater', () => {
       remoteFileSystemMock,
       localFileSystem,
       repository,
-      folderFinder as unknown as FolderFinder,
+      singleFileMatchingTestClass,
+      folderFinder as unknown as ParentFolderFinder,
       eventBus
     );
   });
@@ -37,7 +41,7 @@ describe('File path updater', () => {
     const fileToRename = FileMother.any();
     const fileWithDestinationPath = undefined;
 
-    repository.searchByPartialMock
+    singleFileMatchingTestClass.mock
       .mockReturnValueOnce(fileToRename)
       .mockReturnValueOnce(fileWithDestinationPath);
 
@@ -59,7 +63,7 @@ describe('File path updater', () => {
     const fileToRename = FileMother.any();
     const fileWithDestinationPath = undefined;
 
-    repository.searchByPartialMock
+    singleFileMatchingTestClass.mock
       .mockReturnValueOnce(fileToRename)
       .mockReturnValueOnce(fileWithDestinationPath);
 
@@ -77,7 +81,7 @@ describe('File path updater', () => {
     const fileInDestination = undefined;
     const localFileId = '1-2';
 
-    repository.searchByPartialMock
+    singleFileMatchingTestClass.mock
       .mockReturnValueOnce(fileToMove)
       .mockReturnValueOnce(fileInDestination);
 
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderFinderFactory.ts b/tests/context/virtual-drive/folders/__mocks__/FolderFinderFactory.ts
index d7fd12d79..16de4120c 100644
--- a/tests/context/virtual-drive/folders/__mocks__/FolderFinderFactory.ts
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderFinderFactory.ts
@@ -1,16 +1,16 @@
-import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
+import { ParentFolderFinder } from '../../../../../src/context/virtual-drive/folders/application/ParentFolderFinder';
 import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
 import { FolderMother } from '../domain/FolderMother';
 import { FolderRepositoryMock } from './FolderRepositoryMock';
 
 export class FolderFinderFactory {
-  static existingFolder(folder?: Folder): FolderFinder {
+  static existingFolder(folder?: Folder): ParentFolderFinder {
     const repository = new FolderRepositoryMock();
 
     const resolved = folder || FolderMother.any();
 
-    repository.searchByPartialMock.mockResolvedValueOnce(resolved);
+    repository.matchingPartialMock.mockReturnValueOnce([resolved]);
 
-    return new FolderFinder(repository);
+    return new ParentFolderFinder(repository);
   }
 }
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts
deleted file mode 100644
index e21b4da9b..000000000
--- a/tests/context/virtual-drive/folders/__mocks__/FolderFinderMock.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
-import { FolderRepository } from '../../../../../src/context/virtual-drive/folders/domain/FolderRepository';
-
-export class FolderFinderMock extends FolderFinder {
-  constructor() {
-    super({} as FolderRepository);
-  }
-
-  public mock = jest.fn();
-
-  run(path: string) {
-    return this.mock(path);
-  }
-}
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderMoverMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderMoverMock.ts
index b7cb996ab..e719ea1db 100644
--- a/tests/context/virtual-drive/folders/__mocks__/FolderMoverMock.ts
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderMoverMock.ts
@@ -1,13 +1,17 @@
 import { RemoteFileSystem } from '../../../../../src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem';
-import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
 import { FolderMover } from '../../../../../src/context/virtual-drive/folders/application/FolderMover';
 import { FolderRepository } from '../../../../../src/context/virtual-drive/folders/domain/FolderRepository';
 import { FolderPath } from '../../../../../src/context/virtual-drive/folders/domain/FolderPath';
 import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { ParentFolderFinder } from '../../../../../src/context/virtual-drive/folders/application/ParentFolderFinder';
 
 export class FolderMoverMock extends FolderMover {
   constructor() {
-    super({} as FolderRepository, {} as RemoteFileSystem, {} as FolderFinder);
+    super(
+      {} as FolderRepository,
+      {} as RemoteFileSystem,
+      {} as ParentFolderFinder
+    );
   }
 
   public readonly mock = jest.fn();
diff --git a/tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts b/tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts
index c24ed74d1..3f0508b31 100644
--- a/tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts
+++ b/tests/context/virtual-drive/folders/__mocks__/FolderRepositoryMock.ts
@@ -6,18 +6,28 @@ import { FolderRepository } from '../../../../../src/context/virtual-drive/folde
 
 export class FolderRepositoryMock implements FolderRepository {
   public readonly allMock = jest.fn();
-  public readonly searchByPartialMock = jest.fn();
+  public readonly matchingPartialMock = jest.fn();
   public readonly listByPartialMock = jest.fn();
   public readonly addMock = jest.fn();
   public readonly deleteMock = jest.fn();
   public readonly updateMock = jest.fn();
+  public readonly searchByIdMock = jest.fn();
+  public readonly searchByUuidMock = jest.fn();
 
   all(): Promise<Folder[]> {
     return this.allMock();
   }
 
-  searchByPartial(partial: Partial<FolderAttributes>): Folder | undefined {
-    return this.searchByPartialMock(partial);
+  searchById(id: number): Promise<Folder | undefined> {
+    return this.searchByIdMock(id);
+  }
+
+  searchByUuid(id: string): Promise<Folder | undefined> {
+    return this.searchByUuidMock(id);
+  }
+
+  matchingPartial(partial: Partial<FolderAttributes>): Array<Folder> {
+    return this.matchingPartialMock(partial);
   }
 
   listByPartial(partial: Partial<FolderAttributes>): Promise<Array<Folder>> {
diff --git a/tests/context/virtual-drive/folders/__test-class__/ParentFolderFinderTestClass.ts b/tests/context/virtual-drive/folders/__test-class__/ParentFolderFinderTestClass.ts
new file mode 100644
index 000000000..7f075c59a
--- /dev/null
+++ b/tests/context/virtual-drive/folders/__test-class__/ParentFolderFinderTestClass.ts
@@ -0,0 +1,15 @@
+import { Path } from '../../../../../src/context/shared/domain/value-objects/Path';
+import { ParentFolderFinder } from '../../../../../src/context/virtual-drive/folders/application/ParentFolderFinder';
+import { FolderRepository } from '../../../../../src/context/virtual-drive/folders/domain/FolderRepository';
+
+export class ParentFolderFinderTestClass extends ParentFolderFinder {
+  constructor() {
+    super({} as FolderRepository);
+  }
+
+  public mock = jest.fn();
+
+  run(path: Path) {
+    return this.mock(path);
+  }
+}
diff --git a/tests/context/virtual-drive/folders/application/FolderCreator.test.ts b/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
new file mode 100644
index 000000000..c64d92679
--- /dev/null
+++ b/tests/context/virtual-drive/folders/application/FolderCreator.test.ts
@@ -0,0 +1,152 @@
+import { InvalidArgumentError } from '../../../../../src/context/shared/domain/errors/InvalidArgumentError';
+import { FolderCreator } from '../../../../../src/context/virtual-drive/folders/application/FolderCreator';
+import { ParentFolderFinder } from '../../../../../src/context/virtual-drive/folders/application/ParentFolderFinder';
+import { Folder } from '../../../../../src/context/virtual-drive/folders/domain/Folder';
+import { FolderId } from '../../../../../src/context/virtual-drive/folders/domain/FolderId';
+import { FolderStatuses } from '../../../../../src/context/virtual-drive/folders/domain/FolderStatus';
+import { FolderInPathAlreadyExistsError } from '../../../../../src/context/virtual-drive/folders/domain/errors/FolderInPathAlreadyExistsError';
+import { FolderNotFoundError } from '../../../../../src/context/virtual-drive/folders/domain/errors/FolderNotFoundError';
+import { FolderPersistedDto } from '../../../../../src/context/virtual-drive/folders/domain/file-systems/RemoteFileSystem';
+import { EventBusMock } from '../../shared/__mock__/EventBusMock';
+import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
+import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
+import { FolderMother } from '../domain/FolderMother';
+import { FolderPathMother } from '../domain/FolderPathMother';
+
+describe('Folder Creator', () => {
+  let repository: FolderRepositoryMock;
+  let remote: FolderRemoteFileSystemMock;
+  let eventBus: EventBusMock;
+
+  let SUT: FolderCreator;
+
+  beforeEach(() => {
+    repository = new FolderRepositoryMock();
+    remote = new FolderRemoteFileSystemMock();
+    eventBus = new EventBusMock();
+
+    const parentFolderFinder = new ParentFolderFinder(repository);
+
+    SUT = new FolderCreator(repository, parentFolderFinder, remote, eventBus);
+  });
+
+  const mockCorrectPersistance = (folder: Folder) => {
+    remote.persistMock.mockResolvedValueOnce({
+      id: folder.id,
+      uuid: folder.uuid,
+      createdAt: folder.createdAt.toISOString(),
+      updatedAt: folder.updatedAt.toISOString(),
+      parentId: folder.parentId as number,
+    } satisfies FolderPersistedDto);
+  };
+
+  it('throws an InvalidArgument error if the path is not a valid posix path', async () => {
+    const nonPosixPath = 'C:\\Users\\Internxt';
+
+    try {
+      await SUT.run(nonPosixPath);
+      fail('Expected InvalidArgumentError, but no error was thrown.');
+    } catch (err) {
+      expect(err).toBeInstanceOf(InvalidArgumentError);
+    }
+  });
+
+  it('throws a FolderInPathAlreadyExists error if there is a folder on the desired path', async () => {
+    const path = FolderPathMother.any().value;
+    const folder = FolderMother.fromPartial({
+      path,
+      status: FolderStatuses.EXISTS,
+    });
+
+    repository.matchingPartialMock.mockReturnValueOnce([folder]);
+
+    try {
+      await SUT.run(path);
+      fail('Expected FolderInPathAlreadyExistsError, but no error was thrown.');
+    } catch (err) {
+      expect(err).toBeInstanceOf(FolderInPathAlreadyExistsError);
+    }
+  });
+
+  it('throws a FolderNotFounded error if the parent folder is not founded', async () => {
+    const path = FolderPathMother.any().value;
+
+    repository.matchingPartialMock
+      .mockReturnValueOnce([])
+      .mockReturnValueOnce([]);
+
+    try {
+      await SUT.run(path);
+      fail('Expected FolderNotFoundError, but no error was thrown.');
+    } catch (err) {
+      expect(err).toBeInstanceOf(FolderNotFoundError);
+    }
+  });
+
+  it('persists a folder in the remote fs when the parent folder is found and the path is available', async () => {
+    const path = FolderPathMother.any();
+    const parent = FolderMother.fromPartial({ path: path.dirname() });
+    const folderCreated = FolderMother.fromPartial({
+      path: path.value,
+      parentId: parent.id,
+    });
+
+    mockCorrectPersistance(folderCreated);
+
+    repository.matchingPartialMock
+      .mockReturnValueOnce([])
+      .mockReturnValueOnce([parent]);
+
+    await SUT.run(path.value);
+
+    expect(remote.persistMock).toBeCalledWith(
+      path,
+      new FolderId(parent.id),
+      undefined // optional parameter
+    );
+  });
+
+  it('add the folder to the repository', async () => {
+    const path = FolderPathMother.any();
+    const parent = FolderMother.fromPartial({ path: path.dirname() });
+    const folderCreated = FolderMother.fromPartial({
+      path: path.value,
+      parentId: parent.id,
+    });
+
+    mockCorrectPersistance(folderCreated);
+
+    repository.matchingPartialMock
+      .mockReturnValueOnce([])
+      .mockReturnValueOnce([parent]);
+
+    await SUT.run(path.value);
+
+    expect(repository.addMock).toBeCalledWith(
+      expect.objectContaining(folderCreated)
+    );
+  });
+
+  it('publishes folder created event', async () => {
+    const path = FolderPathMother.any();
+    const parent = FolderMother.fromPartial({ path: path.dirname() });
+    const folderCreated = FolderMother.fromPartial({
+      path: path.value,
+      parentId: parent.id,
+    });
+
+    mockCorrectPersistance(folderCreated);
+
+    repository.matchingPartialMock
+      .mockReturnValueOnce([])
+      .mockReturnValueOnce([parent]);
+
+    await SUT.run(path.value);
+
+    expect(eventBus.publishMock).toBeCalledWith(
+      expect.arrayContaining([
+        expect.objectContaining({ aggregateId: folderCreated.uuid }),
+      ])
+    );
+  });
+});
diff --git a/tests/context/virtual-drive/folders/application/FolderDeleter.test.ts b/tests/context/virtual-drive/folders/application/FolderDeleter.test.ts
index 451086e4a..a459a12f5 100644
--- a/tests/context/virtual-drive/folders/application/FolderDeleter.test.ts
+++ b/tests/context/virtual-drive/folders/application/FolderDeleter.test.ts
@@ -1,5 +1,6 @@
 import { AllParentFoldersStatusIsExists } from '../../../../../src/context/virtual-drive/folders/application/AllParentFoldersStatusIsExists';
 import { FolderDeleter } from '../../../../../src/context/virtual-drive/folders/application/FolderDeleter';
+import { FolderAlreadyTrashed } from '../../../../../src/context/virtual-drive/folders/domain/errors/FolderAlreadyTrashed';
 import { FolderLocalFileSystemMock } from '../__mocks__/FolderLocalFileSystemMock';
 import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
 import { FolderRepositoryMock } from '../__mocks__/FolderRepositoryMock';
@@ -31,8 +32,10 @@ describe('Folder deleter', () => {
   it('trashes an existing folder', async () => {
     const folder = FolderMother.exists();
 
-    repository.searchByPartialMock.mockReturnValueOnce(folder);
-    jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
+    repository.searchByUuidMock.mockResolvedValueOnce(folder);
+    jest
+      .spyOn(allParentFoldersStatusIsExists, 'run')
+      .mockResolvedValueOnce(true);
 
     await SUT.run(folder.uuid);
 
@@ -42,23 +45,26 @@ describe('Folder deleter', () => {
   it('throws an error when trashing a folder already trashed', async () => {
     const folder = FolderMother.trashed();
 
-    repository.searchByPartialMock.mockReturnValueOnce(folder);
-    jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
+    repository.searchByUuidMock.mockResolvedValueOnce(folder);
+    jest
+      .spyOn(allParentFoldersStatusIsExists, 'run')
+      .mockResolvedValueOnce(true);
 
     await SUT.run(folder.uuid).catch((err) => {
       expect(err).toBeDefined();
+      expect(err).toBeInstanceOf(FolderAlreadyTrashed);
     });
 
     expect(repository.deleteMock).not.toBeCalled();
   });
 
-  it('does not delete the folder if a higher folder is already deleted ', async () => {
+  it('does not delete the folder if a higher folder is already trashed ', async () => {
     const folder = FolderMother.exists();
 
-    repository.searchByPartialMock.mockReturnValueOnce(folder);
+    repository.searchByUuidMock.mockResolvedValueOnce(folder);
     jest
       .spyOn(allParentFoldersStatusIsExists, 'run')
-      .mockReturnValueOnce(false);
+      .mockResolvedValueOnce(false);
 
     await SUT.run(folder.uuid).catch((err) => {
       expect(err).toBeDefined();
@@ -70,8 +76,10 @@ describe('Folder deleter', () => {
   it('recreates the placeholder if the deletion fails', async () => {
     const folder = FolderMother.exists();
 
-    repository.searchByPartialMock.mockReturnValueOnce(folder);
-    jest.spyOn(allParentFoldersStatusIsExists, 'run').mockReturnValueOnce(true);
+    repository.searchByUuidMock.mockResolvedValueOnce(folder);
+    jest
+      .spyOn(allParentFoldersStatusIsExists, 'run')
+      .mockResolvedValueOnce(true);
     remote.trashMock.mockRejectedValue(new Error('Error during the deletion'));
 
     await SUT.run(folder.uuid);
diff --git a/tests/context/virtual-drive/folders/application/FolderMover.test.ts b/tests/context/virtual-drive/folders/application/FolderMover.test.ts
index 93ae06223..57f6a973a 100644
--- a/tests/context/virtual-drive/folders/application/FolderMover.test.ts
+++ b/tests/context/virtual-drive/folders/application/FolderMover.test.ts
@@ -1,4 +1,4 @@
-import { FolderFinder } from '../../../../../src/context/virtual-drive/folders/application/FolderFinder';
+import { ParentFolderFinder } from '../../../../../src/context/virtual-drive/folders/application/ParentFolderFinder';
 import { FolderMover } from '../../../../../src/context/virtual-drive/folders/application/FolderMover';
 import { FolderPath } from '../../../../../src/context/virtual-drive/folders/domain/FolderPath';
 import { FolderRemoteFileSystemMock } from '../__mocks__/FolderRemoteFileSystemMock';
@@ -7,24 +7,27 @@ import { FolderMother } from '../domain/FolderMother';
 
 describe('Folder Mover', () => {
   let repository: FolderRepositoryMock;
-  let folderFinder: FolderFinder;
+  let folderFinder: ParentFolderFinder;
   let remoteFileSystem: FolderRemoteFileSystemMock;
   let SUT: FolderMover;
 
   beforeEach(() => {
     repository = new FolderRepositoryMock();
-    folderFinder = new FolderFinder(repository);
+    folderFinder = new ParentFolderFinder(repository);
     remoteFileSystem = new FolderRemoteFileSystemMock();
 
     SUT = new FolderMover(repository, remoteFileSystem, folderFinder);
   });
 
   it('Folders cannot be overwrite', async () => {
-    const folder = FolderMother.in(1, '/folderA/folderB');
+    const folder = FolderMother.fromPartial({
+      parentId: 1,
+      path: '/folderA/folderB',
+    });
     const destination = new FolderPath('/folderC/folderB');
 
-    repository.searchByPartialMock.mockImplementation(() =>
-      FolderMother.in(2, destination.value)
+    repository.matchingPartialMock.mockImplementation(() =>
+      FolderMother.fromPartial({ parentId: 2, path: destination.value })
     );
 
     try {
@@ -39,13 +42,19 @@ describe('Folder Mover', () => {
 
   describe('Move', () => {
     it('moves a folder when the destination folder does not contain a folder with the same folder', async () => {
-      const folder = FolderMother.in(1, '/folderA/folderB');
+      const folder = FolderMother.fromPartial({
+        parentId: 1,
+        path: '/folderA/folderB',
+      });
       const destination = new FolderPath('/folderC/folderB');
-      const folderC = FolderMother.in(2, '/folderC');
+      const folderC = FolderMother.fromPartial({
+        parentId: 2,
+        path: '/folderC',
+      });
 
-      repository.searchByPartialMock
-        .mockReturnValueOnce(undefined)
-        .mockReturnValueOnce(folderC);
+      repository.matchingPartialMock
+        .mockReturnValueOnce([])
+        .mockReturnValueOnce([folderC]);
 
       await SUT.run(folder, destination);
 
diff --git a/tests/context/virtual-drive/folders/application/FolderPathUpdater.test.ts b/tests/context/virtual-drive/folders/application/FolderPathUpdater.test.ts
index 3e9489748..212ddcb18 100644
--- a/tests/context/virtual-drive/folders/application/FolderPathUpdater.test.ts
+++ b/tests/context/virtual-drive/folders/application/FolderPathUpdater.test.ts
@@ -40,7 +40,7 @@ describe('Folder Path Updater', () => {
 
   it('throws a Folder Not Found Error if not folder is founded', async () => {
     const { uuid, destination } = provideInputs();
-    repository.searchByPartialMock.mockReturnValueOnce(undefined);
+    repository.matchingPartialMock.mockReturnValueOnce([]);
 
     try {
       await folderPathUpdater.run(uuid, destination);
@@ -53,7 +53,7 @@ describe('Folder Path Updater', () => {
     const folder = FolderMother.any();
     const destination = FolderPathMother.any();
 
-    repository.searchByPartialMock.mockReturnValueOnce(folder);
+    repository.matchingPartialMock.mockReturnValueOnce([folder]);
 
     try {
       await folderPathUpdater.run(folder.uuid, destination.value);
@@ -66,7 +66,7 @@ describe('Folder Path Updater', () => {
     const folder = FolderMother.any();
     const folderPathWithNewName = FolderPathMother.onFolder(folder.dirname);
 
-    repository.searchByPartialMock.mockReturnValueOnce(folder);
+    repository.matchingPartialMock.mockReturnValueOnce([folder]);
 
     await folderPathUpdater.run(folder.uuid, folderPathWithNewName.value);
 
@@ -84,7 +84,7 @@ describe('Folder Path Updater', () => {
       folder.name + '(1)'
     );
 
-    repository.searchByPartialMock.mockReturnValueOnce(folder);
+    repository.matchingPartialMock.mockReturnValueOnce([folder]);
 
     await folderPathUpdater.run(folder.uuid, desiredPath.value);
 
@@ -98,7 +98,7 @@ describe('Folder Path Updater', () => {
   it('throws a Path Has Not Changed Error if the path desired path is the same as the current', async () => {
     const folder = FolderMother.any();
 
-    repository.searchByPartialMock.mockReturnValueOnce(folder);
+    repository.matchingPartialMock.mockReturnValueOnce([folder]);
 
     try {
       await folderPathUpdater.run(folder.uuid, folder.path);
diff --git a/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts b/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
index aa244ba35..04d1cb7ae 100644
--- a/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
+++ b/tests/context/virtual-drive/folders/application/SynchronizeOfflineModifications.test.ts
@@ -51,7 +51,7 @@ describe('Synchronize Offline Modifications', () => {
 
     await SUT.run(FolderUuid.random().value);
 
-    expect(repository.searchByPartialMock).not.toBeCalled();
+    expect(repository.matchingPartialMock).not.toBeCalled();
   });
 
   it('throws an error if there is no folder with the given uuid', async () => {
@@ -59,7 +59,7 @@ describe('Synchronize Offline Modifications', () => {
       .spyOn(offlineRepository, 'searchByPartial')
       .mockReturnValueOnce(OfflineFolderMother.random());
 
-    repository.searchByPartialMock.mockReturnValueOnce(undefined);
+    repository.matchingPartialMock.mockReturnValueOnce(undefined);
 
     try {
       await SUT.run(FolderUuid.random().value);
@@ -85,7 +85,7 @@ describe('Synchronize Offline Modifications', () => {
       .spyOn(offlineRepository, 'searchByPartial')
       .mockReturnValueOnce(offlineFolder);
 
-    repository.searchByPartialMock.mockReturnValueOnce(folder);
+    repository.matchingPartialMock.mockReturnValueOnce(folder);
 
     const renamerSpy = jest.spyOn(renamer, 'run');
 
@@ -112,7 +112,7 @@ describe('Synchronize Offline Modifications', () => {
 
     const renamerSpy = jest.spyOn(renamer, 'run');
 
-    repository.searchByPartialMock.mockReturnValueOnce(folder);
+    repository.matchingPartialMock.mockReturnValueOnce([folder]);
 
     const event = new FolderRenamedDomainEvent({
       aggregateId: offlineFolder.uuid,
@@ -155,9 +155,9 @@ describe('Synchronize Offline Modifications', () => {
 
     const renamerSpy = jest.spyOn(renamer, 'run');
 
-    repository.searchByPartialMock
-      .mockReturnValueOnce(afterCreation)
-      .mockReturnValueOnce(afterFirstRename);
+    repository.matchingPartialMock
+      .mockReturnValueOnce([afterCreation])
+      .mockReturnValueOnce([afterFirstRename]);
 
     const uuid = offlineFolder.uuid;
 
diff --git a/tests/context/virtual-drive/folders/domain/FolderMother.ts b/tests/context/virtual-drive/folders/domain/FolderMother.ts
index c34d93704..8c67cf830 100644
--- a/tests/context/virtual-drive/folders/domain/FolderMother.ts
+++ b/tests/context/virtual-drive/folders/domain/FolderMother.ts
@@ -34,18 +34,6 @@ export class FolderMother {
     });
   }
 
-  static in(folderId: number, path: string) {
-    return Folder.from({
-      id: 20445,
-      uuid: FolderUuid.random().value,
-      path,
-      parentId: folderId,
-      updatedAt: new Date().toISOString(),
-      createdAt: new Date().toISOString(),
-      status: FolderStatuses.EXISTS,
-    });
-  }
-
   static withId(folderId: number) {
     return Folder.from({
       id: folderId,
diff --git a/yarn.lock b/yarn.lock
index 4d49f0543..2b7ecb16d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1201,20 +1201,21 @@
     glob "^7.1.6"
     minimatch "^3.0.4"
 
-"@electron/get@^2.0.0":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.3.tgz#fba552683d387aebd9f3fcadbcafc8e12ee4f960"
-  integrity sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==
+"@electron/get@^1.14.1":
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40"
+  integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==
   dependencies:
     debug "^4.1.1"
     env-paths "^2.2.0"
     fs-extra "^8.1.0"
-    got "^11.8.5"
+    got "^9.6.0"
     progress "^2.0.3"
     semver "^6.2.0"
     sumchecker "^3.0.1"
   optionalDependencies:
     global-agent "^3.0.0"
+    global-tunnel-ng "^2.7.1"
 
 "@electron/universal@1.2.1":
   version "1.2.1"
@@ -2188,6 +2189,11 @@
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.27.8.tgz#6667fac16c436b5434a387a34dedb013198f6e6e"
   integrity sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==
 
+"@sindresorhus/is@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
+  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+
 "@sindresorhus/is@^4.0.0":
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
@@ -2318,6 +2324,13 @@
     "@svgr/plugin-jsx" "^6.5.1"
     "@svgr/plugin-svgo" "^6.5.1"
 
+"@szmarczak/http-timer@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
+  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
+  dependencies:
+    defer-to-connect "^1.0.1"
+
 "@szmarczak/http-timer@^4.0.5":
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
@@ -2735,12 +2748,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.32.tgz#5b5becc5da76fc055b2a601c8a3adbf13891227e"
   integrity sha512-zpnXe4dEz6PrWz9u7dqyRoq9VxwCvoXRPy/ewhmMa1CgEyVmtL1NJPQ2MX+4pf97vetquVKkpiMx0MwI8pjNOw==
 
-"@types/node@^18.11.18":
-  version "18.19.14"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.14.tgz#1880ff1b3ac913f3877f711588e5ed227da01886"
-  integrity sha512-EnQ4Us2rmOS64nHDWr0XqAD8DsO6f3XR6lf9UIIrZQpUzPVdN/oPuEzfDWNHSyXLvoGgjuEm/sPwFGSSs35Wtg==
-  dependencies:
-    undici-types "~5.26.4"
+"@types/node@^16.11.26":
+  version "16.18.83"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.83.tgz#681d1a20676d24fc47e2da3934536304097a81d8"
+  integrity sha512-TmBqzDY/GeCEmLob/31SunOQnqYE3ZiiuEh1U9o3HqE1E2cqKZQA5RQg4krEguCY3StnkXyDmCny75qyFLx/rA==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
@@ -2927,13 +2938,6 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/yauzl@^2.9.1":
-  version "2.10.3"
-  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999"
-  integrity sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==
-  dependencies:
-    "@types/node" "*"
-
 "@typescript-eslint/eslint-plugin@^5.4.0", "@typescript-eslint/eslint-plugin@^5.51.0", "@typescript-eslint/eslint-plugin@^5.6.0", "@typescript-eslint/eslint-plugin@^5.8.1":
   version "5.59.11"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.59.11.tgz#8d466aa21abea4c3f37129997b198d141f09e76f"
@@ -4018,6 +4022,19 @@ cacheable-lookup@^5.0.3:
   resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
   integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
 
+cacheable-request@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
+  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
+  dependencies:
+    clone-response "^1.0.2"
+    get-stream "^5.1.0"
+    http-cache-semantics "^4.0.0"
+    keyv "^3.0.0"
+    lowercase-keys "^2.0.0"
+    normalize-url "^4.1.0"
+    responselike "^1.0.2"
+
 cacheable-request@^7.0.2:
   version "7.0.4"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817"
@@ -4415,6 +4432,16 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
+concat-stream@^1.6.2:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
+  dependencies:
+    buffer-from "^1.0.0"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
 concurrently@^6.5.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-6.5.1.tgz#4518c67f7ac680cf5c34d5adf399a2a2047edc8c"
@@ -4445,6 +4472,14 @@ conf@^10.2.0:
     pkg-up "^3.1.0"
     semver "^7.3.5"
 
+config-chain@^1.1.11:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
+  integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
 confusing-browser-globals@^1.0.10:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
@@ -4759,7 +4794,7 @@ debounce@^1.2.1:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@2.6.9, debug@^2.6.8:
+debug@2.6.9, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -4808,6 +4843,13 @@ decode-uri-component@^0.2.2:
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
   integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
+decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==
+  dependencies:
+    mimic-response "^1.0.0"
+
 decompress-response@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
@@ -4873,6 +4915,11 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
+defer-to-connect@^1.0.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
+  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
+
 defer-to-connect@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
@@ -5172,6 +5219,11 @@ duplexer2@^0.1.2:
   dependencies:
     readable-stream "^2.0.2"
 
+duplexer3@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e"
+  integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==
+
 duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -5356,14 +5408,14 @@ electron-updater@^4.6.4:
     lodash.isequal "^4.5.0"
     semver "^7.3.5"
 
-electron@^25.8.4:
-  version "25.9.8"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-25.9.8.tgz#7c125ccbddad02861736275b0d4a387c59a91469"
-  integrity sha512-PGgp6PH46QVENHuAHc2NT1Su8Q1qov7qIl2jI5tsDpTibwV2zD8539AeWBQySeBU4dhbj9onIl7+1bXQ0wefBg==
+electron@^19.1.9:
+  version "19.1.9"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-19.1.9.tgz#01995eea4014f7cdb2f616f5f3492d4ed6f5e4f0"
+  integrity sha512-XT5LkTzIHB+ZtD3dTmNnKjVBWrDWReCKt9G1uAFLz6uJMEVcIUiYO+fph5pLXETiBw/QZBx8egduMEfIccLx+g==
   dependencies:
-    "@electron/get" "^2.0.0"
-    "@types/node" "^18.11.18"
-    extract-zip "^2.0.1"
+    "@electron/get" "^1.14.1"
+    "@types/node" "^16.11.26"
+    extract-zip "^1.0.3"
 
 emittery@^0.8.1:
   version "0.8.1"
@@ -5390,7 +5442,7 @@ enabled@2.0.x:
   resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2"
   integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==
 
-encodeurl@~1.0.2:
+encodeurl@^1.0.2, encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
@@ -6069,16 +6121,15 @@ express@^4.17.3, express@^4.18.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-extract-zip@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
-  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
+extract-zip@^1.0.3:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
+  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
   dependencies:
-    debug "^4.1.1"
-    get-stream "^5.1.0"
+    concat-stream "^1.6.2"
+    debug "^2.6.9"
+    mkdirp "^0.5.4"
     yauzl "^2.10.0"
-  optionalDependencies:
-    "@types/yauzl" "^2.9.1"
 
 extsprintf@^1.2.0:
   version "1.4.1"
@@ -6443,6 +6494,13 @@ get-package-type@^0.1.0:
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
+get-stream@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
 get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
@@ -6529,6 +6587,16 @@ global-agent@^3.0.0:
     semver "^7.3.2"
     serialize-error "^7.0.1"
 
+global-tunnel-ng@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f"
+  integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==
+  dependencies:
+    encodeurl "^1.0.2"
+    lodash "^4.17.10"
+    npm-conf "^1.1.3"
+    tunnel "^0.0.6"
+
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -6598,7 +6666,7 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-got@^11.7.0, got@^11.8.5:
+got@^11.7.0:
   version "11.8.6"
   resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
   integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
@@ -6615,6 +6683,23 @@ got@^11.7.0, got@^11.8.5:
     p-cancelable "^2.0.0"
     responselike "^2.0.0"
 
+got@^9.6.0:
+  version "9.6.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
+  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
+  dependencies:
+    "@sindresorhus/is" "^0.14.0"
+    "@szmarczak/http-timer" "^1.1.2"
+    cacheable-request "^6.0.0"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^4.1.0"
+    lowercase-keys "^1.0.1"
+    mimic-response "^1.0.1"
+    p-cancelable "^1.0.0"
+    to-readable-stream "^1.0.0"
+    url-parse-lax "^3.0.0"
+
 graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.10, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
@@ -7024,6 +7109,11 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
+ini@^1.3.4:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
 internal-slot@^1.0.3, internal-slot@^1.0.4, internal-slot@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.5.tgz#f2a2ee21f668f8627a4667f309dc0f4fb6674986"
@@ -7976,6 +8066,11 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
+json-buffer@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+  integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==
+
 json-buffer@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
@@ -8105,6 +8200,13 @@ keyboardevents-areequal@^0.2.1:
   resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194"
   integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw==
 
+keyv@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
+  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
+  dependencies:
+    json-buffer "3.0.0"
+
 keyv@^4.0.0:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
@@ -8344,7 +8446,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
-lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
+lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -8410,6 +8512,11 @@ lower-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
+lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
+  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
+
 lowercase-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
@@ -8628,7 +8735,7 @@ mimic-fn@^3.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74"
   integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==
 
-mimic-response@^1.0.0:
+mimic-response@^1.0.0, mimic-response@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
@@ -8761,7 +8868,7 @@ minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp@^0.5.1, mkdirp@^0.5.5:
+mkdirp@^0.5.1, mkdirp@^0.5.4, mkdirp@^0.5.5:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
@@ -8967,11 +9074,24 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
 
+normalize-url@^4.1.0:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
+  integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
+
 normalize-url@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
+npm-conf@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
+  integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
+  dependencies:
+    config-chain "^1.1.11"
+    pify "^3.0.0"
+
 npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -9170,6 +9290,11 @@ ora@^5.1.0:
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
 
+p-cancelable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
+  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+
 p-cancelable@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
@@ -9358,6 +9483,11 @@ pify@^2.3.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
+
 pirates@^4.0.1, pirates@^4.0.4:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
@@ -9704,6 +9834,11 @@ prelude-ls@~1.1.2:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
   integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
 
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA==
+
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
@@ -9782,6 +9917,11 @@ prop-types@^15.6.2, prop-types@^15.8.1:
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
+
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -10051,7 +10191,7 @@ read-pkg@^6.0.0:
     parse-json "^5.2.0"
     type-fest "^1.0.1"
 
-readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@~2.3.6:
+readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@~2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -10241,6 +10381,13 @@ resolve@^2.0.0-next.4:
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+responselike@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==
+  dependencies:
+    lowercase-keys "^1.0.0"
+
 responselike@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
@@ -11257,6 +11404,11 @@ to-fast-properties@^2.0.0:
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
   integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
+to-readable-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
+  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -11398,6 +11550,11 @@ tsutils@^3.21.0:
   dependencies:
     tslib "^1.8.1"
 
+tunnel@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
@@ -11466,6 +11623,11 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+typedarray@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
+
 typescript@^4.5.2:
   version "4.9.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
@@ -11486,11 +11648,6 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-undici-types@~5.26.4:
-  version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
-  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
-
 undici@^5.5.1:
   version "5.22.1"
   resolved "https://registry.yarnpkg.com/undici/-/undici-5.22.1.tgz#877d512effef2ac8be65e695f3586922e1a57d7b"
@@ -11588,6 +11745,13 @@ url-loader@^4.1.1:
     mime-types "^2.1.27"
     schema-utils "^3.0.0"
 
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ==
+  dependencies:
+    prepend-http "^2.0.0"
+
 url-parse@^1.5.3:
   version "1.5.10"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"

From 4c9e8e685e39096ec1dee11369643954c842c55d Mon Sep 17 00:00:00 2001
From: joan vicens <joanvicens@proton.me>
Date: Tue, 27 Feb 2024 15:46:50 +0100
Subject: [PATCH 188/188] chore: disable unit test on master

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2169cb1ae..c533ba801 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,6 +1,6 @@
 name: Test
 
-on: [pull_request]
+on: []
 
 jobs:
   test: