diff --git a/_regroup/forge.config.cjs b/apps/electron/forge.config.cjs
similarity index 99%
rename from _regroup/forge.config.cjs
rename to apps/electron/forge.config.cjs
index dff7ac806..197e9c549 100644
--- a/_regroup/forge.config.cjs
+++ b/apps/electron/forge.config.cjs
@@ -187,7 +187,7 @@ function getExtraResourcesForPlatform() {
     const getScriptRessources = () => {
         const scripts = ["trilium-portable", "trilium-safe-mode", "trilium-no-cert-check"];
         const scriptExt = (process.platform === "win32") ? "bat" : "sh";
-        return scripts.map(script => `./bin/tpl/${script}.${scriptExt}`);
+        return scripts.map(script => `./tpl/${script}.${scriptExt}`);
     }
 
     switch (process.platform) {
diff --git a/apps/electron/scripts/copy-dist.ts b/apps/electron/scripts/copy-dist.ts
index 320fd9b13..3d8b76601 100644
--- a/apps/electron/scripts/copy-dist.ts
+++ b/apps/electron/scripts/copy-dist.ts
@@ -22,8 +22,8 @@ try {
      */
     const assetsToCopy = new Set([
         "./forge.config.cjs",   
-        "./bin/electron-forge/desktop.ejs",
-        "./bin/electron-forge/sign-windows.cjs",
+        "./scripts/electron-forge/desktop.ejs",
+        "./scripts/electron-forge/sign-windows.cjs",
     ]);
 
     for (const asset of assetsToCopy) {
@@ -34,7 +34,7 @@ try {
     /**
      * Directories to be copied relative to the project root into <resource_dir>/src/public/app-dist.
      */
-    const publicDirsToCopy = ["./src/public/app/doc_notes"];
+    const publicDirsToCopy = ["../server/src/public/app/doc_notes"];
     const PUBLIC_DIR = path.join(DEST_DIR, "src", "public", "app-dist");
     for (const dir of publicDirsToCopy) {
         fs.copySync(dir, path.join(PUBLIC_DIR, path.basename(dir)));
diff --git a/_regroup/bin/electron-forge/desktop.ejs b/apps/electron/scripts/electron-forge/desktop.ejs
similarity index 100%
rename from _regroup/bin/electron-forge/desktop.ejs
rename to apps/electron/scripts/electron-forge/desktop.ejs
diff --git a/_regroup/bin/electron-forge/sign-windows.cjs b/apps/electron/scripts/electron-forge/sign-windows.cjs
similarity index 100%
rename from _regroup/bin/electron-forge/sign-windows.cjs
rename to apps/electron/scripts/electron-forge/sign-windows.cjs