diff --git a/_regroup/.gitattributes b/.gitattributes
similarity index 55%
rename from _regroup/.gitattributes
rename to .gitattributes
index c2de311c3..0fb51bab7 100644
--- a/_regroup/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,8 @@
 package-lock.json linguist-generated=true
 **/package-lock.json linguist-generated=true
-src/public/app/doc_notes/en/User[[:space:]]Guide/** linguist-generated=true
-src/public/app/doc_notes/en/User[[:space:]]Guide/**/*.md eol=lf
+apps/server/src/assets/doc_notes/en/User[[:space:]]Guide/** linguist-generated=true
+
+docs/**/*.md eol=lf
 
 demo/**/*.html eol=lf
 demo/**/*.json eol=lf
@@ -10,4 +11,4 @@ demo/**/*.txt eol=lf
 demo/**/*.js eol=lf
 demo/**/*.css eol=lf
 
-libraries/** linguist-vendored
\ No newline at end of file
+apps/client/src/libraries/** linguist-vendored
\ No newline at end of file
diff --git a/_regroup/.gitignore b/_regroup/.gitignore
deleted file mode 100644
index b8b091d80..000000000
--- a/_regroup/.gitignore
+++ /dev/null
@@ -1,50 +0,0 @@
-.cache
-.DS_Store
-node_modules/
-dist/
-upload/
-build/
-coverage/
-src/public/app-dist/
-npm-debug.log
-yarn-error.log
-po-*/
-.flatpak-builder/
-
-*.db
-!test/**/*.db
-!integration-tests/db/document.db
-!integration-tests/db/config.ini
-integration-tests/db/log
-integration-tests/db/sessions
-integration-tests/db/backup
-integration-tests/db/session_secret.txt
-
-cert.key
-cert.crt
-server-package.json
-.idea/httpRequests/
-.idea/shelf/
-data/
-data-test/
-data-demo/
-tmp/
-.eslintcache
-
-out/
-
-images/app-icons/mac/*.png
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/
-/playwright/.auth/
-
-data-docs/backup
-data-docs/log
-data-docs/session
-data-docs/session_secret.txt
-data-docs/document.*
-
-# Webpack
-webpack-stats.json
\ No newline at end of file
diff --git a/_regroup/.vscode/launch.json b/_regroup/.vscode/launch.json
deleted file mode 100644
index f8d4780a1..000000000
--- a/_regroup/.vscode/launch.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    // nodemon should be installed globally, use npm i -g nodemon
-    {
-      "console": "integratedTerminal",
-      "internalConsoleOptions": "neverOpen",
-      "name": "nodemon start-server",
-      "program": "${workspaceFolder}/src/www",
-      "request": "launch",
-      "restart": true,
-      "runtimeExecutable": "nodemon",
-      "env": {
-        "TRILIUM_ENV": "dev",
-        "TRILIUM_DATA_DIR": "./data"
-      },
-      "skipFiles": ["<node_internals>/**"],
-      "type": "node",
-      "outputCapture": "std"
-    }
-  ]
-}
diff --git a/_regroup_monorepo/apps/server/nodemon.json b/_regroup_monorepo/apps/server/nodemon.json
deleted file mode 100644
index e860ebccc..000000000
--- a/_regroup_monorepo/apps/server/nodemon.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "restartable": "rs",
-  "ignore": [".git", "node_modules/**/node_modules", "src/public/"],
-  "verbose": false,
-  "exec": "tsx",
-  "watch": ["src/", "translations/"],
-  "signal": "SIGTERM",
-  "env": {
-    "NODE_ENV": "development"
-  },
-  "ext": "ts,js,json"
-}