diff --git a/package.json b/package.json
index b0665e295e6..0bd44693e7d 100644
--- a/package.json
+++ b/package.json
@@ -56,6 +56,10 @@
     "@cucumber/messages": "^17.1.1",
     "@cucumber/pretty-formatter": "^1.0.0-alpha.2",
     "@noble/hashes": "^1.0.0",
+    "@ownclouders/babel-preset": "workspace:*",
+    "@ownclouders/eslint-config": "workspace:*",
+    "@ownclouders/prettier-config": "workspace:*",
+    "@ownclouders/tsconfig": "workspace:*",
     "@playwright/test": "^1.27.0",
     "@rollup-extras/plugin-copy": "^1.2.5",
     "@rollup/plugin-alias": "^3.1.9",
@@ -99,6 +103,7 @@
     "pino-pretty": "^7.6.0",
     "playwright": "^1.26.1",
     "postcss": "^8.3.6",
+    "qs": "^6.10.3",
     "react": "^17.0.2",
     "regenerator-runtime": "^0.13.7",
     "requirejs": "^2.3.6",
diff --git a/packages/web-app-draw-io/package.json b/packages/web-app-draw-io/package.json
index 39059d161e9..746b00cc25f 100644
--- a/packages/web-app-draw-io/package.json
+++ b/packages/web-app-draw-io/package.json
@@ -2,5 +2,12 @@
   "name": "draw-io",
   "version": "0.0.0",
   "description": "ownCloud web draw.io integration",
-  "license": "AGPL-3.0"
+  "license": "AGPL-3.0",
+  "peerDependencies": {
+    "@vue/composition-api": "^1.6.2",
+    "luxon": "^2.4.0",
+    "vuex": "^3.6.2",
+    "web-client": "workspace:*",
+    "web-pkg": "workspace:*"
+  }
 }
diff --git a/packages/web-app-draw-io/src/App.vue b/packages/web-app-draw-io/src/App.vue
index ff9f4085340..f4ecfcd79c4 100644
--- a/packages/web-app-draw-io/src/App.vue
+++ b/packages/web-app-draw-io/src/App.vue
@@ -17,7 +17,7 @@
 import { mapActions } from 'vuex'
 import qs from 'qs'
 import { DateTime } from 'luxon'
-import { DavPermission, DavProperty } from 'web-pkg/src/constants'
+import { DavPermission, DavProperty } from 'web-client/src/webdav/constants'
 import { useAppDefaults } from 'web-pkg/src/composables'
 import { defineComponent } from '@vue/composition-api'
 import { basename } from 'path'
diff --git a/packages/web-app-external/package.json b/packages/web-app-external/package.json
index 4e19f1d493e..ed123019b82 100644
--- a/packages/web-app-external/package.json
+++ b/packages/web-app-external/package.json
@@ -2,5 +2,12 @@
     "name": "external",
     "version": "0.0.0",
     "description": "ownCloud web integration of the reva app provider",
-    "license": "AGPL-3.0"
+    "license": "AGPL-3.0",
+    "peerDependencies": {
+        "@vue/composition-api": "^1.6.2",
+        "uuid": "^9.0.0",
+        "vuex": "^3.6.2",
+        "web-client": "workspace:*",
+        "web-pkg": "workspace:*"
+    }
 }
diff --git a/packages/web-app-external/src/App.vue b/packages/web-app-external/src/App.vue
index 08c6b9e9fd7..ce50badf29e 100644
--- a/packages/web-app-external/src/App.vue
+++ b/packages/web-app-external/src/App.vue
@@ -38,9 +38,9 @@ import ErrorScreen from './components/ErrorScreen.vue'
 import LoadingScreen from './components/LoadingScreen.vue'
 import { computed, unref } from '@vue/composition-api'
 import { queryItemAsString, useAppDefaults, useRouteQuery } from 'web-pkg/src/composables'
-import { defineComponent } from '@vue/runtime-core'
-import { DavProperty } from 'web-pkg/src/constants'
-import { urlJoin } from 'web-pkg/src/utils'
+import { defineComponent } from '@vue/composition-api'
+import { DavProperty } from 'web-client/src/webdav/constants'
+import { urlJoin } from 'web-client/src/utils'
 import { stringify } from 'qs'
 import { configurationManager } from 'web-pkg/src/configuration'
 
diff --git a/packages/web-app-external/src/store/index.ts b/packages/web-app-external/src/store/index.ts
index 23dcd4599f9..57b4245f24b 100644
--- a/packages/web-app-external/src/store/index.ts
+++ b/packages/web-app-external/src/store/index.ts
@@ -1,5 +1,5 @@
 import { Commit } from 'vuex'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 import { configurationManager } from 'web-pkg/src/configuration'
 import { v4 as uuidV4 } from 'uuid'
 
diff --git a/packages/web-app-files/package.json b/packages/web-app-files/package.json
index c8acbc83df6..f0cd21090d8 100644
--- a/packages/web-app-files/package.json
+++ b/packages/web-app-files/package.json
@@ -1,9 +1,32 @@
 {
-  "name": "files",
+  "name": "web-app-files",
   "version": "0.0.0",
   "description": "ownCloud web files",
   "license": "AGPL-3.0",
   "dependencies": {
     "copy-to-clipboard": "^3.3.1"
+  },
+  "peerDependencies": {
+    "@vue/composition-api": "^1.6.2",
+    "filesize": "^9.0.11",
+    "fuse.js": "^6.5.3",
+    "lodash-es": "4.17.21",
+    "luxon": "^2.4.0",
+    "marked": "^4.0.12",
+    "p-queue": "^6.6.2",
+    "popper-max-size-modifier": "^0.2.0",
+    "qs": "^6.10.3",
+    "sanitize-html": "^2.7.0",
+    "semver": "^7.3.8",
+    "uuid": "^9.0.0",
+    "vue-concurrency": "^3.0.0-7",
+    "vue-gettext": "^2.1.5",
+    "vue-resize": "^1.0.1",
+    "vue-router": "~3.5.3",
+    "vuex": "^3.6.2",
+    "web-app-search": "workspace:*",
+    "web-client": "workspace:*",
+    "web-pkg": "workspace:*",
+    "web-runtime": "workspace:*"
   }
 }
diff --git a/packages/web-app-files/src/App.vue b/packages/web-app-files/src/App.vue
index 6f19622462c..2b41eba20d8 100644
--- a/packages/web-app-files/src/App.vue
+++ b/packages/web-app-files/src/App.vue
@@ -6,14 +6,13 @@
 </template>
 <script lang="ts">
 import { defineComponent, watch } from '@vue/composition-api'
-import { Route } from 'vue-router'
 import { useRoute, useStore } from 'web-pkg/src/composables'
 import { eventBus } from 'web-pkg/src/services/eventBus'
 
 export default defineComponent({
   setup() {
     const store = useStore<any>()
-    watch(useRoute(), (to: Route, from?: Route) => {
+    watch(useRoute(), () => {
       store.dispatch('Files/resetFileSelection')
     })
   },
diff --git a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
index 0997e5aaa16..3b784765042 100644
--- a/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateAndUpload.vue
@@ -132,14 +132,14 @@ import pathUtil from 'path'
 import MixinFileActions, { EDITOR_MODE_CREATE } from '../../mixins/fileActions'
 import { isLocationPublicActive, isLocationSpacesActive } from '../../router'
 import { useActiveLocation } from '../../composables'
-import { useGraphClient } from 'web-client/src/composables'
 
 import {
   useRequest,
   useCapabilityShareJailEnabled,
   useCapabilitySpacesEnabled,
   useStore,
-  useUserContext
+  useUserContext,
+  useGraphClient
 } from 'web-pkg/src/composables'
 
 import ResourceUpload from './Upload/ResourceUpload.vue'
@@ -153,15 +153,11 @@ import {
 import { useUpload } from 'web-runtime/src/composables/upload'
 import { useUploadHelpers } from '../../composables/upload'
 import { eventBus } from 'web-pkg/src/services/eventBus'
-import { SpaceResource } from 'web-client/src/helpers'
-import {
-  extractNameWithoutExtension,
-  resolveFileNameDuplicate,
-  ResourcesUpload
-} from '../../helpers/resource'
+import { extractNameWithoutExtension, SpaceResource } from 'web-client/src/helpers'
+import { resolveFileNameDuplicate, ResourcesUpload } from '../../helpers/resource'
 import { WebDAV } from 'web-client/src/webdav'
 import { configurationManager } from 'web-pkg/src/configuration'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 import qs from 'qs'
 
 export default defineComponent({
diff --git a/packages/web-app-files/src/components/AppBar/CreateSpace.vue b/packages/web-app-files/src/components/AppBar/CreateSpace.vue
index 9dfd907cf34..bd7696e33ae 100644
--- a/packages/web-app-files/src/components/AppBar/CreateSpace.vue
+++ b/packages/web-app-files/src/components/AppBar/CreateSpace.vue
@@ -17,7 +17,7 @@
 import { mapActions, mapMutations } from 'vuex'
 
 import { defineComponent } from '@vue/composition-api'
-import { useGraphClient } from 'web-client/src/composables'
+import { useGraphClient } from 'web-pkg/src/composables'
 import { buildSpace } from 'web-client/src/helpers'
 import { configurationManager } from 'web-pkg/src/configuration'
 import { WebDAV } from 'web-client/src/webdav'
diff --git a/packages/web-app-files/src/components/SideBar/Details/SpaceDetails.vue b/packages/web-app-files/src/components/SideBar/Details/SpaceDetails.vue
index 325fcf5c000..7ae0bcc1726 100644
--- a/packages/web-app-files/src/components/SideBar/Details/SpaceDetails.vue
+++ b/packages/web-app-files/src/components/SideBar/Details/SpaceDetails.vue
@@ -67,7 +67,7 @@
 import { defineComponent, ref, unref } from '@vue/composition-api'
 import { mapGetters } from 'vuex'
 import { useTask } from 'vue-concurrency'
-import { buildResource } from '../../../helpers/resources'
+import { buildResource } from 'web-client/src/helpers'
 import { loadPreview } from 'web-pkg/src/helpers/preview'
 import { spaceRoleManager } from 'web-client/src/helpers/share'
 import { buildWebDavSpacesPath } from 'web-client/src/helpers'
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
index 1fb20beb6cb..f01d187c3d7 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue
@@ -87,7 +87,7 @@ import {
   useCapabilityShareJailEnabled
 } from 'web-pkg/src/composables'
 
-import { defineComponent } from '@vue/runtime-core'
+import { defineComponent } from '@vue/composition-api'
 
 // just a dummy function to trick gettext tools
 const $gettext = (str) => {
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue
index 299df7f3633..9b76f3c41fb 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue
@@ -113,7 +113,7 @@ import {
   SpacePeopleShareRoles
 } from 'web-client/src/helpers/share'
 import * as uuid from 'uuid'
-import { defineComponent } from '@vue/runtime-core'
+import { defineComponent } from '@vue/composition-api'
 import { PropType } from '@vue/composition-api'
 
 export default defineComponent({
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
index ad33e125311..6500bc717d3 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -131,7 +131,7 @@ import { cloneStateObject } from '../../../helpers/store'
 import { showQuickLinkPasswordModal } from '../../../quickActions'
 import DetailsAndEdit from './Links/DetailsAndEdit.vue'
 import NameAndCopy from './Links/NameAndCopy.vue'
-import { useGraphClient } from 'web-client/src/composables'
+import { useGraphClient } from 'web-pkg/src/composables'
 import CreateQuickLink from './Links/CreateQuickLink.vue'
 import { getLocaleFromLanguage } from 'web-pkg/src/helpers'
 import { SpaceResource } from 'web-client/src/helpers'
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
index d15bcb26bf6..d7d98b3adce 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue
@@ -182,7 +182,7 @@ import {
   linkRoleInternalFolder,
   LinkShareRoles
 } from 'web-client/src/helpers/share'
-import { defineComponent } from '@vue/runtime-core'
+import { defineComponent } from '@vue/composition-api'
 import { formatDateFromDateTime, formatRelativeDateFromDateTime } from 'web-pkg/src/helpers'
 import { SpaceResource } from 'web-client/src/helpers'
 import { PropType } from '@vue/composition-api'
diff --git a/packages/web-app-files/src/components/SideBar/Shares/Shared/RoleItem.vue b/packages/web-app-files/src/components/SideBar/Shares/Shared/RoleItem.vue
index 4a5d07cfca9..4931ed1c182 100644
--- a/packages/web-app-files/src/components/SideBar/Shares/Shared/RoleItem.vue
+++ b/packages/web-app-files/src/components/SideBar/Shares/Shared/RoleItem.vue
@@ -10,7 +10,7 @@
 
 <script lang="ts">
 import { PropType } from '@vue/composition-api'
-import { defineComponent } from '@vue/runtime-core'
+import { defineComponent } from '@vue/composition-api'
 import { ShareRole } from 'web-client/src/helpers/share'
 
 export default defineComponent({
diff --git a/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue b/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
index 7be81401438..6f660ff3cc9 100644
--- a/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
+++ b/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
@@ -49,7 +49,7 @@
 </template>
 <script lang="ts">
 import { mapActions, mapGetters, mapMutations } from 'vuex'
-import { DavProperty } from 'web-pkg/src/constants'
+import { DavProperty } from 'web-client/src/webdav/constants'
 import { formatRelativeDateFromHTTP, formatFileSize } from 'web-pkg/src/helpers'
 import { WebDAV } from 'web-client/src/webdav'
 import { inject } from '@vue/composition-api'
diff --git a/packages/web-app-files/src/components/Spaces/QuotaModal.vue b/packages/web-app-files/src/components/Spaces/QuotaModal.vue
index e81e4c7b44c..9238f4f4f1b 100644
--- a/packages/web-app-files/src/components/Spaces/QuotaModal.vue
+++ b/packages/web-app-files/src/components/Spaces/QuotaModal.vue
@@ -20,9 +20,9 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/runtime-core'
+import { defineComponent } from '@vue/composition-api'
 import { mapActions, mapMutations } from 'vuex'
-import { useGraphClient } from 'web-client/src/composables'
+import { useGraphClient } from 'web-pkg/src/composables'
 import QuotaSelect from 'web-pkg/src/components/QuotaSelect.vue'
 
 export default defineComponent({
diff --git a/packages/web-app-files/src/composables/upload/useUploadHelpers.ts b/packages/web-app-files/src/composables/upload/useUploadHelpers.ts
index 2a2dc4d2e37..92d16c8af1e 100644
--- a/packages/web-app-files/src/composables/upload/useUploadHelpers.ts
+++ b/packages/web-app-files/src/composables/upload/useUploadHelpers.ts
@@ -5,7 +5,7 @@ import { ComputedRef, Ref, unref } from '@vue/composition-api'
 import * as uuid from 'uuid'
 import path from 'path'
 import { Resource, SpaceResource } from 'web-client/src/helpers'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 
 interface UploadHelpersOptions {
   space: ComputedRef<SpaceResource>
diff --git a/packages/web-app-files/src/helpers/extensions/fileExtensions.ts b/packages/web-app-files/src/helpers/extensions/fileExtensions.ts
deleted file mode 100644
index 961deb0a1d1..00000000000
--- a/packages/web-app-files/src/helpers/extensions/fileExtensions.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default {
-  complex: ['tar.bz2', 'tar.gz', '.tar.xz']
-}
diff --git a/packages/web-app-files/src/helpers/path.js b/packages/web-app-files/src/helpers/path.js
index 51fd7a4aaaa..5a407e62afc 100644
--- a/packages/web-app-files/src/helpers/path.js
+++ b/packages/web-app-files/src/helpers/path.js
@@ -1,4 +1,4 @@
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 
 /**
  * Return all absolute parent paths.
diff --git a/packages/web-app-files/src/helpers/resource/actions/upload.ts b/packages/web-app-files/src/helpers/resource/actions/upload.ts
index c4d226180f7..a51f560540f 100644
--- a/packages/web-app-files/src/helpers/resource/actions/upload.ts
+++ b/packages/web-app-files/src/helpers/resource/actions/upload.ts
@@ -1,14 +1,12 @@
 import filesize from 'filesize'
 import { Resource } from 'web-client'
-import { isShareSpaceResource, SpaceResource } from 'web-client/src/helpers'
-import { UppyResource } from 'web-runtime/src/composables/upload'
 import {
-  ConflictDialog,
   extractExtensionFromFile,
-  ResolveConflict,
-  resolveFileNameDuplicate,
-  ResolveStrategy
-} from '..'
+  isShareSpaceResource,
+  SpaceResource
+} from 'web-client/src/helpers'
+import { UppyResource } from 'web-runtime/src/composables/upload'
+import { ConflictDialog, ResolveConflict, resolveFileNameDuplicate, ResolveStrategy } from '..'
 import { locationPublicLink } from '../../../router/public'
 import { locationSpacesGeneric } from '../../../router/spaces'
 
diff --git a/packages/web-app-files/src/helpers/resource/conflictHandling/conflictUtils.ts b/packages/web-app-files/src/helpers/resource/conflictHandling/conflictUtils.ts
index 9c47c42ce07..c24462305da 100644
--- a/packages/web-app-files/src/helpers/resource/conflictHandling/conflictUtils.ts
+++ b/packages/web-app-files/src/helpers/resource/conflictHandling/conflictUtils.ts
@@ -1,6 +1,5 @@
 import { dirname } from 'path'
-import { Resource, SpaceResource } from 'web-client/src/helpers'
-import { extractNameWithoutExtension } from '../index'
+import { extractNameWithoutExtension, Resource, SpaceResource } from 'web-client/src/helpers'
 
 export const resolveFileNameDuplicate = (name, extension, existingFiles, iteration = 1) => {
   let potentialName
diff --git a/packages/web-app-files/src/helpers/resource/index.ts b/packages/web-app-files/src/helpers/resource/index.ts
index 9c500e83b72..29b877e1847 100644
--- a/packages/web-app-files/src/helpers/resource/index.ts
+++ b/packages/web-app-files/src/helpers/resource/index.ts
@@ -1,5 +1,4 @@
 export * from './filter'
-export * from './resource'
 export * from './sameResource'
 export * from './conflictHandling'
 export * from './actions'
diff --git a/packages/web-app-files/src/helpers/resource/resource.ts b/packages/web-app-files/src/helpers/resource/resource.ts
deleted file mode 100644
index cf99fa8f141..00000000000
--- a/packages/web-app-files/src/helpers/resource/resource.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Resource } from 'web-client'
-import fileExtensions from '../extensions/fileExtensions'
-
-const extractIdSegment = (id: string, index: number): string => {
-  if (!id || typeof id !== 'string') {
-    return ''
-  }
-  return id.indexOf('!') >= 0 ? id.split('!')[index] : ''
-}
-
-export const extractStorageId = (id?: string): string => {
-  return extractIdSegment(id, 0)
-}
-
-export const extractNodeId = (id?: string): string => {
-  return extractIdSegment(id, 1)
-}
-
-export const extractNameWithoutExtension = (resource?: Resource): string => {
-  const extension = resource.extension || ''
-  const name = resource.name || ''
-  if (!extension.length) {
-    return name
-  }
-  const extensionIndexInName = name.lastIndexOf(`.${extension}`)
-  return name.substring(0, extensionIndexInName)
-}
-
-export const extractExtensionFromFile = (resource: Resource): string => {
-  const name = resource.name
-  if (resource.type === 'dir' || resource.type === 'folder' || resource.isFolder) {
-    return ''
-  }
-
-  const parts = name.split('.')
-  if (parts.length > 2) {
-    for (let i = 0; i < parts.length; i++) {
-      const possibleExtension = parts.slice(i, parts.length).join('.')
-      if (fileExtensions.complex.includes(possibleExtension)) {
-        return possibleExtension
-      }
-    }
-  }
-  // Fallback if file extension is unknown or no extension
-  if (parts.length < 2) {
-    return ''
-  }
-  return parts[parts.length - 1]
-}
diff --git a/packages/web-app-files/src/helpers/resources.ts b/packages/web-app-files/src/helpers/resources.ts
index 597cf1c0cff..f62fe4ffb62 100644
--- a/packages/web-app-files/src/helpers/resources.ts
+++ b/packages/web-app-files/src/helpers/resources.ts
@@ -2,7 +2,7 @@ import orderBy from 'lodash-es/orderBy'
 import path, { basename, join } from 'path'
 import { DateTime } from 'luxon'
 import { getIndicators } from './statusIndicators'
-import { DavPermission, DavProperty } from 'web-pkg/src/constants'
+import { DavProperty } from 'web-client/src/webdav/constants'
 import {
   LinkShareRoles,
   PeopleShareRoles,
@@ -14,10 +14,14 @@ import {
   spaceRoleManager,
   spaceRoleViewer
 } from 'web-client/src/helpers/share'
-import { extractExtensionFromFile, extractNodeId, extractStorageId } from './resource'
-import { buildWebDavSpacesPath, extractDomSelector } from 'web-client/src/helpers/resource'
+import {
+  buildWebDavSpacesPath,
+  extractDomSelector,
+  extractExtensionFromFile,
+  extractStorageId
+} from 'web-client/src/helpers/resource'
 import { Resource, SpaceResource, SHARE_JAIL_ID } from 'web-client/src/helpers'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 
 export function renameResource(space: SpaceResource, resource: Resource, newPath: string) {
   resource.name = basename(newPath)
@@ -27,97 +31,6 @@ export function renameResource(space: SpaceResource, resource: Resource, newPath
   return resource
 }
 
-export function buildResource(resource): Resource {
-  const name = resource.fileInfo[DavProperty.Name] || path.basename(resource.name)
-  const isFolder = resource.type === 'dir' || resource.type === 'folder'
-  const extension = extractExtensionFromFile({ ...resource, name })
-  let resourcePath
-
-  if (resource.name.startsWith('/files') || resource.name.startsWith('/space')) {
-    resourcePath = resource.name.split('/').slice(3).join('/')
-  } else {
-    resourcePath = resource.name
-  }
-
-  if (!resourcePath.startsWith('/')) {
-    resourcePath = `/${resourcePath}`
-  }
-
-  const id = resource.fileInfo[DavProperty.FileId]
-  const r = {
-    id,
-    fileId: id,
-    storageId: extractStorageId(id),
-    parentFolderId: resource.fileInfo[DavProperty.FileParent],
-    mimeType: resource.fileInfo[DavProperty.MimeType],
-    name,
-    extension: isFolder ? '' : extension,
-    path: resourcePath,
-    webDavPath: resource.name,
-    type: isFolder ? 'folder' : resource.type,
-    isFolder,
-    mdate: resource.fileInfo[DavProperty.LastModifiedDate],
-    size: isFolder
-      ? resource.fileInfo[DavProperty.ContentSize]
-      : resource.fileInfo[DavProperty.ContentLength],
-    indicators: [],
-    permissions: (resource.fileInfo[DavProperty.Permissions] as string) || '',
-    starred: resource.fileInfo[DavProperty.IsFavorite] !== '0',
-    etag: resource.fileInfo[DavProperty.ETag],
-    sharePermissions: resource.fileInfo[DavProperty.SharePermissions],
-    shareTypes: (function () {
-      if (resource.fileInfo[DavProperty.ShareTypes]) {
-        return resource.fileInfo[DavProperty.ShareTypes].map((v) => parseInt(v))
-      }
-      return []
-    })(),
-    privateLink: resource.fileInfo[DavProperty.PrivateLink],
-    downloadURL: resource.fileInfo[DavProperty.DownloadURL],
-    shareId: resource.fileInfo[DavProperty.ShareId],
-    shareRoot: resource.fileInfo[DavProperty.ShareRoot],
-    ownerId: resource.fileInfo[DavProperty.OwnerId],
-    ownerDisplayName: resource.fileInfo[DavProperty.OwnerDisplayName],
-    canUpload: function () {
-      return this.permissions.indexOf(DavPermission.FolderCreateable) >= 0
-    },
-    canDownload: function () {
-      return true
-    },
-    canBeDeleted: function () {
-      return this.permissions.indexOf(DavPermission.Deletable) >= 0
-    },
-    canRename: function () {
-      return this.permissions.indexOf(DavPermission.Renameable) >= 0
-    },
-    canShare: function () {
-      return this.permissions.indexOf(DavPermission.Shareable) >= 0
-    },
-    canCreate: function () {
-      return this.permissions.indexOf(DavPermission.FolderCreateable) >= 0
-    },
-    isMounted: function () {
-      return this.permissions.indexOf(DavPermission.Mounted) >= 0
-    },
-    isReceivedShare: function () {
-      return this.permissions.indexOf(DavPermission.Shared) >= 0
-    },
-    canDeny: function () {
-      return this.permissions.indexOf(DavPermission.Deny) >= 0
-    },
-    getDomSelector: () => extractDomSelector(id)
-  }
-  Object.defineProperty(r, 'nodeId', {
-    get() {
-      return extractNodeId(this.id)
-    }
-  })
-  return r
-}
-
-export function buildWebDavPublicPath(publicLinkToken, path = '') {
-  return '/' + `public-files/${publicLinkToken}/${path}`.split('/').filter(Boolean).join('/')
-}
-
 export function buildWebDavFilesPath(userId, path) {
   return '/' + `files/${userId}/${path}`.split('/').filter(Boolean).join('/')
 }
diff --git a/packages/web-app-files/src/mixins/actions/rename.ts b/packages/web-app-files/src/mixins/actions/rename.ts
index 58fad0fe9b7..b89fec831e5 100644
--- a/packages/web-app-files/src/mixins/actions/rename.ts
+++ b/packages/web-app-files/src/mixins/actions/rename.ts
@@ -1,10 +1,14 @@
 import { mapActions, mapGetters, mapMutations, mapState } from 'vuex'
-import { isSameResource, extractNameWithoutExtension } from '../../helpers/resource'
+import { isSameResource } from '../../helpers/resource'
 import { isLocationTrashActive, isLocationSharesActive } from '../../router'
 import { Resource } from 'web-client'
 import { dirname, join } from 'path'
 import { WebDAV } from 'web-client/src/webdav'
-import { SpaceResource, isShareSpaceResource } from 'web-client/src/helpers'
+import {
+  SpaceResource,
+  isShareSpaceResource,
+  extractNameWithoutExtension
+} from 'web-client/src/helpers'
 import { createFileRouteOptions } from 'web-pkg/src/helpers/router'
 import { renameResource } from '../../helpers/resources'
 
diff --git a/packages/web-app-files/src/mixins/actions/showDetails.ts b/packages/web-app-files/src/mixins/actions/showDetails.ts
index fafb8a06043..0542cfca45b 100644
--- a/packages/web-app-files/src/mixins/actions/showDetails.ts
+++ b/packages/web-app-files/src/mixins/actions/showDetails.ts
@@ -4,7 +4,7 @@ import isFilesAppActive from './helpers/isFilesAppActive'
 import { eventBus } from 'web-pkg/src/services/eventBus'
 import { SideBarEventTopics } from '../../composables/sideBar'
 import { isProjectSpaceResource } from 'web-client/src/helpers'
-import { useGraphClient } from 'web-client/src/composables'
+import { useGraphClient } from 'web-pkg/src/composables'
 
 export default {
   setup() {
diff --git a/packages/web-app-files/src/mixins/spaces/actions/setImage.js b/packages/web-app-files/src/mixins/spaces/actions/setImage.js
index 8e0148c6be7..c3ee47a2186 100644
--- a/packages/web-app-files/src/mixins/spaces/actions/setImage.js
+++ b/packages/web-app-files/src/mixins/spaces/actions/setImage.js
@@ -1,7 +1,7 @@
 import { isLocationSpacesActive } from '../../../router'
 import { clientService } from 'web-pkg/src/services'
 import { mapMutations, mapActions, mapGetters, mapState } from 'vuex'
-import { buildResource } from '../../../helpers/resources'
+import { buildResource } from 'web-client/src/helpers'
 import { thumbnailService } from '../../../services'
 
 export default {
diff --git a/packages/web-app-files/src/mixins/spaces/actions/showMembers.js b/packages/web-app-files/src/mixins/spaces/actions/showMembers.js
index e3e7ad24b8f..7b7ced9a377 100644
--- a/packages/web-app-files/src/mixins/spaces/actions/showMembers.js
+++ b/packages/web-app-files/src/mixins/spaces/actions/showMembers.js
@@ -1,7 +1,7 @@
 import { mapActions, mapMutations } from 'vuex'
 import { eventBus } from 'web-pkg/src/services/eventBus'
 import { SideBarEventTopics } from '../../../composables/sideBar'
-import { useGraphClient } from 'web-client/src/composables'
+import { useGraphClient } from 'web-pkg/src/composables'
 
 export default {
   setup() {
diff --git a/packages/web-app-files/src/router/deprecated.ts b/packages/web-app-files/src/router/deprecated.ts
index 8f7e4289c14..c7f189cff92 100644
--- a/packages/web-app-files/src/router/deprecated.ts
+++ b/packages/web-app-files/src/router/deprecated.ts
@@ -5,7 +5,7 @@ import { createLocationCommon } from './common'
 import { createLocationPublic } from './public'
 import { isLocationActive as isLocationActiveNoCompat } from './utils'
 import { createLocationTrash } from './trash'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 
 /**
  * all route configs created by buildRoutes are deprecated,
diff --git a/packages/web-app-files/src/search/sdk/index.ts b/packages/web-app-files/src/search/sdk/index.ts
index 8a4271508b5..9318dd123c3 100644
--- a/packages/web-app-files/src/search/sdk/index.ts
+++ b/packages/web-app-files/src/search/sdk/index.ts
@@ -1,4 +1,4 @@
-import { SearchProvider, SearchList, SearchPreview } from 'search/src/types'
+import { SearchProvider, SearchList, SearchPreview } from 'web-app-search/src/types'
 import Preview from './preview'
 import List from './list'
 import { EventBus } from 'web-pkg/src/services/eventBus'
diff --git a/packages/web-app-files/src/search/sdk/list.ts b/packages/web-app-files/src/search/sdk/list.ts
index 175267fd05b..1c83e5dde62 100644
--- a/packages/web-app-files/src/search/sdk/list.ts
+++ b/packages/web-app-files/src/search/sdk/list.ts
@@ -1,9 +1,9 @@
-import { SearchList, SearchResult } from 'search/src/types'
+import { SearchList, SearchResult } from 'web-app-search/src/types'
 import ListComponent from '../../components/Search/List.vue'
 import { clientService } from 'web-pkg/src/services'
-import { buildResource } from '../../helpers/resources'
+import { buildResource } from 'web-client/src/helpers'
 import { Component } from 'vue'
-import { DavProperties } from 'web-pkg/src/constants'
+import { DavProperties } from 'web-client/src/webdav/constants'
 import { Store } from 'vuex'
 
 export const searchLimit = 200
diff --git a/packages/web-app-files/src/search/sdk/preview.ts b/packages/web-app-files/src/search/sdk/preview.ts
index 2897c4f9dad..5ebbffa6c33 100644
--- a/packages/web-app-files/src/search/sdk/preview.ts
+++ b/packages/web-app-files/src/search/sdk/preview.ts
@@ -1,11 +1,11 @@
-import { SearchPreview, SearchResult } from 'search/src/types'
+import { SearchPreview, SearchResult } from 'web-app-search/src/types'
 import PreviewComponent from '../../components/Search/Preview.vue'
 import { clientService } from 'web-pkg/src/services'
-import { buildResource } from '../../helpers/resources'
+import { buildResource } from 'web-client/src/helpers'
 import { Cache } from 'web-pkg/src/helpers/cache'
 import { Component } from 'vue'
 import VueRouter from 'vue-router'
-import { DavProperties } from 'web-pkg/src/constants'
+import { DavProperties } from 'web-client/src/webdav/constants'
 import { Store } from 'vuex'
 
 export const previewSearchLimit = 8
diff --git a/packages/web-app-files/src/services/archiver.ts b/packages/web-app-files/src/services/archiver.ts
index 19b2248366d..ef5f0baa82a 100644
--- a/packages/web-app-files/src/services/archiver.ts
+++ b/packages/web-app-files/src/services/archiver.ts
@@ -1,7 +1,10 @@
-import { major, rcompare } from 'semver'
+// Workaround https://github.com/npm/node-semver/issues/381
+import major from 'semver/functions/major'
+import rcompare from 'semver/functions/rcompare'
+
 import { RuntimeError } from 'web-runtime/src/container/error'
 import { clientService as defaultClientService, ClientService } from 'web-pkg/src/services'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 import { configurationManager } from 'web-pkg/src/configuration'
 /**
  * Archiver struct within the capabilities as defined in reva
diff --git a/packages/web-app-files/src/services/folder/loaderFavorites.ts b/packages/web-app-files/src/services/folder/loaderFavorites.ts
index 81d2835a965..1b8c3bc0a27 100644
--- a/packages/web-app-files/src/services/folder/loaderFavorites.ts
+++ b/packages/web-app-files/src/services/folder/loaderFavorites.ts
@@ -1,8 +1,8 @@
 import { FolderLoader, FolderLoaderTask, TaskContext } from '../folder'
 import Router from 'vue-router'
 import { useTask } from 'vue-concurrency'
-import { DavProperties } from 'web-pkg/src/constants'
-import { buildResource } from '../../helpers/resources'
+import { DavProperties } from 'web-client/src/webdav/constants'
+import { buildResource } from 'web-client/src/helpers'
 import { isLocationCommonActive } from '../../router'
 
 export class FolderLoaderFavorites implements FolderLoader {
diff --git a/packages/web-app-files/src/services/folder/loaderTrashbin.ts b/packages/web-app-files/src/services/folder/loaderTrashbin.ts
index 6f8ea2c5c6f..115e98489ac 100644
--- a/packages/web-app-files/src/services/folder/loaderTrashbin.ts
+++ b/packages/web-app-files/src/services/folder/loaderTrashbin.ts
@@ -1,11 +1,10 @@
 import { FolderLoader, FolderLoaderTask, TaskContext } from '../folder'
 import Router from 'vue-router'
 import { useTask } from 'vue-concurrency'
-import { DavProperties } from 'web-pkg/src/constants'
+import { DavProperties } from 'web-client/src/webdav/constants'
 import { isLocationTrashActive } from '../../router'
 import {
   buildDeletedResource,
-  buildResource,
   buildWebDavFilesTrashPath,
   buildWebDavSpacesTrashPath
 } from '../../helpers/resources'
@@ -13,6 +12,7 @@ import { Store } from 'vuex'
 import { Resource } from 'web-client'
 import { useCapabilityShareJailEnabled } from 'web-pkg/src/composables'
 import { unref } from '@vue/composition-api'
+import { buildResource } from 'web-client/src/helpers'
 
 export class FolderLoaderTrashbin implements FolderLoader {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
diff --git a/packages/web-app-files/src/store/actions.ts b/packages/web-app-files/src/store/actions.ts
index c31c1163779..7390e0cfa5a 100644
--- a/packages/web-app-files/src/store/actions.ts
+++ b/packages/web-app-files/src/store/actions.ts
@@ -2,7 +2,7 @@ import PQueue from 'p-queue'
 import { dirname } from 'path'
 
 import { getParentPaths } from '../helpers/path'
-import { buildResource, buildShare, buildCollaboratorShare } from '../helpers/resources'
+import { buildShare, buildCollaboratorShare } from '../helpers/resources'
 import { $gettext, $gettextInterpolate } from '../gettext'
 import { ResourceTransfer, TransferType } from '../helpers/resource'
 import { loadPreview } from 'web-pkg/src/helpers/preview'
@@ -12,7 +12,7 @@ import { ShareTypes } from 'web-client/src/helpers/share'
 import get from 'lodash-es/get'
 import { ClipboardActions } from '../helpers/clipboardActions'
 import { thumbnailService } from '../services'
-import { Resource, SpaceResource } from 'web-client/src/helpers'
+import { buildResource, Resource, SpaceResource } from 'web-client/src/helpers'
 import { WebDAV } from 'web-client/src/webdav'
 import { ClientService } from 'web-pkg/src/services'
 
diff --git a/packages/web-app-files/src/views/FilesDrop.vue b/packages/web-app-files/src/views/FilesDrop.vue
index ca521fe7fb1..6f4cdcac071 100644
--- a/packages/web-app-files/src/views/FilesDrop.vue
+++ b/packages/web-app-files/src/views/FilesDrop.vue
@@ -36,17 +36,17 @@
 
 <script lang="ts">
 import { mapActions, mapGetters } from 'vuex'
-import { DavProperties, DavProperty } from 'web-pkg/src/constants'
+import { DavProperties, DavProperty } from 'web-client/src/webdav/constants'
 import { createLocationPublic } from '../router'
 
 import ResourceUpload from '../components/AppBar/Upload/ResourceUpload.vue'
-import { getCurrentInstance, onMounted } from '@vue/composition-api/dist/vue-composition-api'
+import { getCurrentInstance, onMounted } from '@vue/composition-api'
 import { useUpload } from 'web-runtime/src/composables/upload'
 import * as uuid from 'uuid'
 import { usePublicLinkPassword, useStore } from 'web-pkg/src/composables'
 import { eventBus } from 'web-pkg/src/services/eventBus'
 import { linkRoleUploaderFolder } from 'web-client/src/helpers/share'
-import { defineComponent } from '@vue/runtime-core'
+import { defineComponent } from '@vue/composition-api'
 
 export default defineComponent({
   components: {
diff --git a/packages/web-app-files/src/views/spaces/DriveRedirect.vue b/packages/web-app-files/src/views/spaces/DriveRedirect.vue
index 07ac99ca352..1fbbc7f39bc 100644
--- a/packages/web-app-files/src/views/spaces/DriveRedirect.vue
+++ b/packages/web-app-files/src/views/spaces/DriveRedirect.vue
@@ -8,7 +8,7 @@
 import { computed, defineComponent, unref } from '@vue/composition-api'
 import { useRoute, useRouter, useStore } from 'web-pkg/src/composables'
 import AppLoadingSpinner from 'web-pkg/src/components/AppLoadingSpinner.vue'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 import { createFileRouteOptions } from 'web-pkg/src/helpers/router'
 
 // 'personal/home' is used as personal drive alias from static contexts
diff --git a/packages/web-app-files/src/views/spaces/Projects.vue b/packages/web-app-files/src/views/spaces/Projects.vue
index bf2424ddcbf..bcabf12fb7b 100644
--- a/packages/web-app-files/src/views/spaces/Projects.vue
+++ b/packages/web-app-files/src/views/spaces/Projects.vue
@@ -133,13 +133,12 @@ import CreateSpace from '../../components/AppBar/CreateSpace.vue'
 import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
 import AppLoadingSpinner from 'web-pkg/src/components/AppLoadingSpinner.vue'
 import { computed, defineComponent, unref } from '@vue/composition-api'
-import { useAccessToken, useStore } from 'web-pkg/src/composables'
+import { useAccessToken, useStore, useGraphClient } from 'web-pkg/src/composables'
 import { useTask } from 'vue-concurrency'
 import { mapMutations, mapActions, mapGetters } from 'vuex'
 import { loadPreview } from 'web-pkg/src/helpers/preview'
 import { ImageDimension } from '../../constants'
 import SpaceContextActions from '../../components/Spaces/SpaceContextActions.vue'
-import { useGraphClient } from 'web-client/src/composables'
 import { configurationManager } from 'web-pkg/src/configuration'
 import { buildSpace, SpaceResource } from 'web-client/src/helpers'
 import SideBar from '../../components/SideBar/SideBar.vue'
diff --git a/packages/web-app-files/tests/unit/components/ActionMenuItem.spec.js b/packages/web-app-files/tests/unit/components/ActionMenuItem.spec.js
index 73b7d3f5c01..05c4e34c4f4 100644
--- a/packages/web-app-files/tests/unit/components/ActionMenuItem.spec.js
+++ b/packages/web-app-files/tests/unit/components/ActionMenuItem.spec.js
@@ -3,7 +3,7 @@ import Vuex from 'vuex'
 import DesignSystem from 'owncloud-design-system'
 import GetTextPlugin from 'vue-gettext'
 
-import ActionMenuItem from '@files/src/components/ActionMenuItem'
+import ActionMenuItem from 'web-app-files/src/components/ActionMenuItem'
 import { fileActions } from '../../__fixtures__/fileActions'
 
 const localVue = createLocalVue()
diff --git a/packages/web-app-files/tests/unit/components/AppBar/AppBar.spec.js b/packages/web-app-files/tests/unit/components/AppBar/AppBar.spec.js
index 3f0e7346ad8..455a38dc552 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/AppBar.spec.js
+++ b/packages/web-app-files/tests/unit/components/AppBar/AppBar.spec.js
@@ -4,7 +4,7 @@ import Vuex from 'vuex'
 import DesignSystem from 'owncloud-design-system'
 import GetTextPlugin from 'vue-gettext'
 
-import AppBar from '@files/src/components/AppBar/AppBar.vue'
+import AppBar from 'web-app-files/src/components/AppBar/AppBar.vue'
 
 const localVue = createLocalVue()
 localVue.use(Vuex)
diff --git a/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.js b/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.js
index 0fb61c699e0..12e3f1e3a08 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.js
+++ b/packages/web-app-files/tests/unit/components/AppBar/CreateAndUpload.spec.js
@@ -4,7 +4,7 @@ import DesignSystem from 'owncloud-design-system'
 import GetTextPlugin from 'vue-gettext'
 
 import stubs from '@/tests/unit/stubs'
-import CreateAndUpload from 'files/src/components/AppBar/CreateAndUpload'
+import CreateAndUpload from 'web-app-files/src/components/AppBar/CreateAndUpload'
 import { createLocationSpaces } from '../../../../src/router'
 import { ResolveStrategy, ResourcesUpload } from '../../../../src/helpers/resource'
 
diff --git a/packages/web-app-files/tests/unit/components/AppBar/SharesNavigation.spec.js b/packages/web-app-files/tests/unit/components/AppBar/SharesNavigation.spec.js
index d320bd263a4..aee2e680195 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/SharesNavigation.spec.js
+++ b/packages/web-app-files/tests/unit/components/AppBar/SharesNavigation.spec.js
@@ -7,7 +7,7 @@ import GetTextPlugin from 'vue-gettext'
 
 import stubs from '@/tests/unit/stubs'
 
-import SharesNavigation from '@files/src/components/AppBar/SharesNavigation'
+import SharesNavigation from 'web-app-files/src/components/AppBar/SharesNavigation'
 
 const localVue = createLocalVue()
 localVue.use(Vuex)
diff --git a/packages/web-app-files/tests/unit/components/AppBar/ViewOptions.spec.js b/packages/web-app-files/tests/unit/components/AppBar/ViewOptions.spec.js
index 379ed984ace..0bc977ba9ba 100644
--- a/packages/web-app-files/tests/unit/components/AppBar/ViewOptions.spec.js
+++ b/packages/web-app-files/tests/unit/components/AppBar/ViewOptions.spec.js
@@ -4,12 +4,12 @@ import VueRouter from 'vue-router'
 import merge from 'lodash-es/merge'
 import VueCompositionAPI from '@vue/composition-api'
 
-import Store from '@files/src/store'
+import Store from 'web-app-files/src/store'
 import stubs from '@/tests/unit/stubs'
 import OcPageSize from '@/tests/unit/stubs/OcPageSize'
 import OcSwitch from '@/tests/unit/stubs/OcSwitch'
 
-import ViewOptions from '@files/src/components/AppBar/ViewOptions.vue'
+import ViewOptions from 'web-app-files/src/components/AppBar/ViewOptions.vue'
 
 const OcTooltip = jest.fn()
 
diff --git a/packages/web-app-files/tests/unit/components/ContextActionMenu.spec.js b/packages/web-app-files/tests/unit/components/ContextActionMenu.spec.js
index 7c4cfb2793c..a81a37a42f6 100644
--- a/packages/web-app-files/tests/unit/components/ContextActionMenu.spec.js
+++ b/packages/web-app-files/tests/unit/components/ContextActionMenu.spec.js
@@ -3,7 +3,7 @@ import Vuex from 'vuex'
 import DesignSystem from 'owncloud-design-system'
 import GetTextPlugin from 'vue-gettext'
 
-import ContextActionMenu from '@files/src/components/ContextActionMenu'
+import ContextActionMenu from 'web-app-files/src/components/ContextActionMenu'
 
 const localVue = createLocalVue()
 localVue.use(Vuex)
diff --git a/packages/web-app-files/tests/unit/components/FilesList/ContextActions.spec.js b/packages/web-app-files/tests/unit/components/FilesList/ContextActions.spec.js
index c3579775f64..f64c887ae9c 100644
--- a/packages/web-app-files/tests/unit/components/FilesList/ContextActions.spec.js
+++ b/packages/web-app-files/tests/unit/components/FilesList/ContextActions.spec.js
@@ -4,7 +4,7 @@ import stubs from '@/tests/unit/stubs/index.js'
 import { createLocalVue, mount } from '@vue/test-utils'
 import ContextActions from '../../../../src/components/FilesList/ContextActions.vue'
 import GetTextPlugin from 'vue-gettext'
-import fixtureMimeTypes from '@files/tests/__fixtures__/mimeTypes.js'
+import fixtureMimeTypes from 'web-app-files/tests/__fixtures__/mimeTypes.js'
 
 const localVue = createLocalVue()
 localVue.use(DesignSystem)
diff --git a/packages/web-app-files/tests/unit/components/FilesList/Pagination.spec.js b/packages/web-app-files/tests/unit/components/FilesList/Pagination.spec.js
index 2e8b77c1abd..31c79149601 100644
--- a/packages/web-app-files/tests/unit/components/FilesList/Pagination.spec.js
+++ b/packages/web-app-files/tests/unit/components/FilesList/Pagination.spec.js
@@ -1,6 +1,6 @@
 import _ from 'lodash'
 import DesignSystem from 'owncloud-design-system'
-import Pagination from '@files/src/components/FilesList/Pagination.vue'
+import Pagination from 'web-app-files/src/components/FilesList/Pagination.vue'
 import {
   createLocalVue as OGCreateLocalVue,
   mount,
diff --git a/packages/web-app-files/tests/unit/components/Search/List.spec.js b/packages/web-app-files/tests/unit/components/Search/List.spec.js
index 88adbc898ed..e482bbfc0a8 100644
--- a/packages/web-app-files/tests/unit/components/Search/List.spec.js
+++ b/packages/web-app-files/tests/unit/components/Search/List.spec.js
@@ -5,7 +5,7 @@
 // import DesignSystem from 'owncloud-design-system'
 // import GetTextPlugin from 'vue-gettext'
 //
-// import List from '@files/src/components/Search/List.vue'
+// import List from 'web-app-files/src/components/Search/List.vue'
 //
 // const localVue = createLocalVue()
 // localVue.use(Vuex)
diff --git a/packages/web-app-files/tests/unit/components/Search/Preview.spec.ts b/packages/web-app-files/tests/unit/components/Search/Preview.spec.ts
index dad718a19c8..b8fa50e6ae6 100644
--- a/packages/web-app-files/tests/unit/components/Search/Preview.spec.ts
+++ b/packages/web-app-files/tests/unit/components/Search/Preview.spec.ts
@@ -1,7 +1,7 @@
 import { shallowMount, createLocalVue } from '@vue/test-utils'
 import DesignSystem from 'owncloud-design-system'
 
-import Preview from '@files/src/components/Search/Preview.vue'
+import Preview from 'web-app-files/src/components/Search/Preview.vue'
 import { createStore } from 'vuex-extensions'
 import Vuex from 'vuex'
 
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Actions/FileActions.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Actions/FileActions.spec.js
index 470239cb903..118303b8633 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Actions/FileActions.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Actions/FileActions.spec.js
@@ -2,11 +2,11 @@ import Vuex from 'vuex'
 import DesignSystem from 'owncloud-design-system'
 import stubs from '@/tests/unit/stubs/index.js'
 import { createLocalVue, mount } from '@vue/test-utils'
-import FileActions from '@files/src/components/SideBar/Actions/FileActions.vue'
+import FileActions from 'web-app-files/src/components/SideBar/Actions/FileActions.vue'
 
 import GetTextPlugin from 'vue-gettext'
 
-import { apps, getActions, fileActions } from '@files/tests/__fixtures__/fileActions.js'
+import { apps, getActions, fileActions } from 'web-app-files/tests/__fixtures__/fileActions.js'
 
 const localVue = createLocalVue()
 localVue.use(DesignSystem)
diff --git a/packages/web-app-files/tests/unit/components/SideBar/FileInfo.spec.js b/packages/web-app-files/tests/unit/components/SideBar/FileInfo.spec.js
index 2f087b5e60a..5c5b72bcb47 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/FileInfo.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/FileInfo.spec.js
@@ -4,7 +4,7 @@ import GetTextPlugin from 'vue-gettext'
 
 import stubs from '@/tests/unit/stubs'
 
-import FileInfo from '@files/src/components/SideBar/FileInfo.vue'
+import FileInfo from 'web-app-files/src/components/SideBar/FileInfo.vue'
 
 const simpleOwnFile = {
   type: 'file',
diff --git a/packages/web-app-files/tests/unit/components/SideBar/PrivateLinkItem.spec.js b/packages/web-app-files/tests/unit/components/SideBar/PrivateLinkItem.spec.js
index 13dafc5aab0..502826395a2 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/PrivateLinkItem.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/PrivateLinkItem.spec.js
@@ -2,7 +2,7 @@ import Vuex from 'vuex'
 import GetTextPlugin from 'vue-gettext'
 import DesignSystem from 'owncloud-design-system'
 import { mount, createLocalVue } from '@vue/test-utils'
-import PrivateLinkItem from '@files/src/components/SideBar/PrivateLinkItem.vue'
+import PrivateLinkItem from 'web-app-files/src/components/SideBar/PrivateLinkItem.vue'
 
 jest.useFakeTimers()
 
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/AutocompleteItem.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/AutocompleteItem.spec.js
index 18a25084c00..ec107733d7d 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/AutocompleteItem.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/AutocompleteItem.spec.js
@@ -1,6 +1,6 @@
 import { createLocalVue, shallowMount } from '@vue/test-utils'
 import Vuex from 'vuex'
-import AutocompleteItem from '@files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/AutocompleteItem.vue'
+import AutocompleteItem from 'web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/AutocompleteItem.vue'
 import stubs from '../../../../../../../../../tests/unit/stubs'
 import { ShareTypes } from 'web-client/src/helpers/share'
 
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/ExpirationDatepicker.spec.ts b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/ExpirationDatepicker.spec.ts
index 754b4183e35..5ad063d56c3 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/ExpirationDatepicker.spec.ts
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/ExpirationDatepicker.spec.ts
@@ -1,6 +1,6 @@
 import { createLocalVue, mount, Wrapper } from '@vue/test-utils'
 import VueCompositionAPI, { nextTick } from '@vue/composition-api'
-import ExpirationDatepicker from '@files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/ExpirationDatepicker.vue'
+import ExpirationDatepicker from 'web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/ExpirationDatepicker.vue'
 import { ShareTypes } from 'web-client/src/helpers/share'
 import merge from 'lodash-es/merge'
 import Vuex, { GetterTree } from 'vuex'
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.spec.js
index c76d5716399..f4805a1da49 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.spec.js
@@ -1,6 +1,6 @@
 import { createLocalVue, mount } from '@vue/test-utils'
 import GetTextPlugin from 'vue-gettext'
-import InviteCollaboratorForm from '@files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue'
+import InviteCollaboratorForm from 'web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/InviteCollaboratorForm.vue'
 import { ShareTypes } from 'web-client/src/helpers/share'
 import Vuex from 'vuex'
 import DesignSystem from 'owncloud-design-system'
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.spec.js
index 21f274c71b8..c72c78adde0 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.spec.js
@@ -7,11 +7,11 @@ import Users from '@/__fixtures__/users'
 import Collaborators from '@/__fixtures__/collaborators'
 import SharedFiles from '@/__fixtures__/sharedFiles'
 
-import RecipientContainer from '@files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.vue'
+import RecipientContainer from 'web-app-files/src/components/SideBar/Shares/Collaborators/InviteCollaborator/RecipientContainer.vue'
 import { buildSharedResource } from 'web-client/src/helpers'
 import { ShareTypes } from 'web-client/src/helpers/share'
 
-jest.mock('@files/src/helpers/user/avatarUrl', () => ({
+jest.mock('web-app-files/src/helpers/user/avatarUrl', () => ({
   avatarUrl: jest.fn().mockReturnValue('avatarUrl')
 }))
 
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.js
index 89174a747f2..a448939df53 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/ListItem.spec.js
@@ -1,6 +1,6 @@
 import { createLocalVue, mount } from '@vue/test-utils'
 import Vuex from 'vuex'
-import ListItem from '@files/src/components/SideBar/Shares/Collaborators/ListItem.vue'
+import ListItem from 'web-app-files/src/components/SideBar/Shares/Collaborators/ListItem.vue'
 import stubs from '@/tests/unit/stubs'
 import GetTextPlugin from 'vue-gettext'
 import Users from '@/__fixtures__/users'
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/RoleDropdown.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/RoleDropdown.spec.js
index 10df203f74c..89335053b0c 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/RoleDropdown.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Collaborators/RoleDropdown.spec.js
@@ -1,4 +1,4 @@
-import RoleDropdown from '@files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue'
+import RoleDropdown from 'web-app-files/src/components/SideBar/Shares/Collaborators/RoleDropdown.vue'
 import { createLocalVue, mount, shallowMount } from '@vue/test-utils'
 import GetTextPlugin from 'vue-gettext'
 import Vuex from 'vuex'
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js
index 97b1a716675..fd8eff4d66f 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileLinks.spec.js
@@ -3,7 +3,7 @@ import stubs from '@/tests/unit/stubs'
 import GetTextPlugin from 'vue-gettext'
 import DesignSystem from 'owncloud-design-system'
 import { mount, shallowMount, createLocalVue } from '@vue/test-utils'
-import FileLinks from '@files/src/components/SideBar/Shares/FileLinks.vue'
+import FileLinks from 'web-app-files/src/components/SideBar/Shares/FileLinks.vue'
 import { createLocationSpaces } from '../../../../../src/router'
 
 const localVue = createLocalVue()
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
index 337ecc94e0b..a9cd06342d8 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/FileShares.spec.js
@@ -10,7 +10,7 @@ import Collaborators from '@/__fixtures__/collaborators'
 import { spaceRoleManager } from 'web-client/src/helpers/share'
 import * as reactivityComposables from 'web-pkg/src/composables/reactivity'
 import * as routerComposables from 'web-pkg/src/composables/router'
-import FileShares from '@files/src/components/SideBar/Shares/FileShares.vue'
+import FileShares from 'web-app-files/src/components/SideBar/Shares/FileShares.vue'
 import { buildSpace } from 'web-client/src/helpers'
 import { clientService } from 'web-pkg/src/services'
 
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/DetailsAndEdit.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/DetailsAndEdit.spec.js
index f6e224574a8..56de0e4ee52 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/DetailsAndEdit.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/DetailsAndEdit.spec.js
@@ -3,7 +3,7 @@ import GetTextPlugin from 'vue-gettext'
 import Vuex from 'vuex'
 import DesignSystem from 'owncloud-design-system'
 import stubs from '@/tests/unit/stubs'
-import DetailsAndEdit from '@files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue'
+import DetailsAndEdit from 'web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue'
 import { LinkShareRoles } from 'web-client/src/helpers/share'
 
 const localVue = createLocalVue()
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/NameAndCopy.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/NameAndCopy.spec.js
index 1a49cf39427..36c372919da 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/NameAndCopy.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/Links/NameAndCopy.spec.js
@@ -2,7 +2,7 @@ import { createLocalVue, mount } from '@vue/test-utils'
 import Vuex from 'vuex'
 import GetTextPlugin from 'vue-gettext'
 import DesignSystem from 'owncloud-design-system'
-import NameAndCopy from '@files/src/components/SideBar/Shares/Links/NameAndCopy.vue'
+import NameAndCopy from 'web-app-files/src/components/SideBar/Shares/Links/NameAndCopy.vue'
 
 jest.useFakeTimers()
 
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.js
index 82564937544..1d07863fa1a 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/SharesPanel.spec.js
@@ -4,7 +4,7 @@ import Vuex from 'vuex'
 import DesignSystem from 'owncloud-design-system'
 import VueCompositionAPI from '@vue/composition-api'
 
-import SharesPanel from '@files/src/components/SideBar/Shares/SharesPanel.vue'
+import SharesPanel from 'web-app-files/src/components/SideBar/Shares/SharesPanel.vue'
 const localVue = createLocalVue()
 localVue.use(VueCompositionAPI)
 
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js
index 654b31a9f96..97dd7196674 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Shares/SpaceMembers.spec.js
@@ -1,4 +1,4 @@
-import SpaceMembers from '@files/src/components/SideBar/Shares/SpaceMembers.vue'
+import SpaceMembers from 'web-app-files/src/components/SideBar/Shares/SpaceMembers.vue'
 import { createLocalVue, mount, shallowMount } from '@vue/test-utils'
 import GetTextPlugin from 'vue-gettext'
 import Vuex from 'vuex'
diff --git a/packages/web-app-files/tests/unit/components/SideBar/SideBar.spec.js b/packages/web-app-files/tests/unit/components/SideBar/SideBar.spec.js
index 16195cddc95..98aff8b4bda 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/SideBar.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/SideBar.spec.js
@@ -2,19 +2,19 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'
 import VueCompositionAPI from '@vue/composition-api'
 import Vuex from 'vuex'
 import GetTextPlugin from 'vue-gettext'
-import fileSideBars from '@files/src/fileSideBars'
+import fileSideBars from 'web-app-files/src/fileSideBars'
 import stubs from '@/tests/unit/stubs'
 import merge from 'lodash-es/merge'
-import { buildResource } from '@files/src/helpers/resources'
+import { buildResource } from 'web-app-files/src/helpers/resources'
 import { clientService } from 'web-pkg/src/services'
 import { createLocationPublic, createLocationSpaces } from '../../../../src/router'
 
 import InnerSideBar from 'web-pkg/src/components/sideBar/SideBar.vue'
-import SideBar from '@files/src/components/SideBar/SideBar.vue'
+import SideBar from 'web-app-files/src/components/SideBar/SideBar.vue'
 
 jest.mock('web-pkg/src/observer')
-jest.mock('@files/src/helpers/resources', () => {
-  const original = jest.requireActual('@files/src/helpers/resources')
+jest.mock('web-app-files/src/helpers/resources', () => {
+  const original = jest.requireActual('web-app-files/src/helpers/resources')
   return {
     ...original,
     buildResource: jest.fn()
diff --git a/packages/web-app-files/tests/unit/components/SideBar/SpaceInfo.spec.js b/packages/web-app-files/tests/unit/components/SideBar/SpaceInfo.spec.js
index d3a85d0d10e..514268e4584 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/SpaceInfo.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/SpaceInfo.spec.js
@@ -3,7 +3,7 @@ import GetTextPlugin from 'vue-gettext'
 
 import stubs from '@/tests/unit/stubs'
 
-import SpaceInfo from '@files/src/components/SideBar/SpaceInfo.vue'
+import SpaceInfo from 'web-app-files/src/components/SideBar/SpaceInfo.vue'
 import Vuex from 'vuex'
 
 const spaceMock = {
diff --git a/packages/web-app-files/tests/unit/components/SideBar/Versions/FileVersions.spec.js b/packages/web-app-files/tests/unit/components/SideBar/Versions/FileVersions.spec.js
index 729f26e1221..2b89dc30c46 100644
--- a/packages/web-app-files/tests/unit/components/SideBar/Versions/FileVersions.spec.js
+++ b/packages/web-app-files/tests/unit/components/SideBar/Versions/FileVersions.spec.js
@@ -4,7 +4,7 @@ import stubs from '@/tests/unit/stubs'
 import GetTextPlugin from 'vue-gettext'
 import DesignSystem from 'owncloud-design-system'
 import { mount, shallowMount, createLocalVue } from '@vue/test-utils'
-import FileVersions from '@files/src/components/SideBar/Versions/FileVersions.vue'
+import FileVersions from 'web-app-files/src/components/SideBar/Versions/FileVersions.vue'
 
 const defaultStubs = {
   ...stubs,
diff --git a/packages/web-app-files/tests/unit/components/SpaceQuota.spec.js b/packages/web-app-files/tests/unit/components/SpaceQuota.spec.js
index 40ac4ebbc0a..7efd26246b7 100644
--- a/packages/web-app-files/tests/unit/components/SpaceQuota.spec.js
+++ b/packages/web-app-files/tests/unit/components/SpaceQuota.spec.js
@@ -3,7 +3,7 @@ import Vuex from 'vuex'
 import DesignSystem from 'owncloud-design-system'
 import GetTextPlugin from 'vue-gettext'
 
-import SpaceQuota from '@files/src/components/SpaceQuota'
+import SpaceQuota from 'web-app-files/src/components/SpaceQuota'
 
 const localVue = createLocalVue()
 localVue.use(Vuex)
diff --git a/packages/web-app-files/tests/unit/components/Spaces/QuotaModal.spec.js b/packages/web-app-files/tests/unit/components/Spaces/QuotaModal.spec.js
index 1c6c74f5e7e..2bbf0610d3e 100644
--- a/packages/web-app-files/tests/unit/components/Spaces/QuotaModal.spec.js
+++ b/packages/web-app-files/tests/unit/components/Spaces/QuotaModal.spec.js
@@ -1,6 +1,6 @@
 import Vuex from 'vuex'
 import { mount, createLocalVue } from '@vue/test-utils'
-import QuotaModal from '@files/src/components/Spaces/QuotaModal.vue'
+import QuotaModal from 'web-app-files/src/components/Spaces/QuotaModal.vue'
 import stubs from 'tests/unit/stubs'
 import { createStore } from 'vuex-extensions'
 import mockAxios from 'jest-mock-axios'
diff --git a/packages/web-app-files/tests/unit/components/Spaces/ReadmeContentModal.spec.js b/packages/web-app-files/tests/unit/components/Spaces/ReadmeContentModal.spec.js
index 86b5d7f952a..7717079d9c9 100644
--- a/packages/web-app-files/tests/unit/components/Spaces/ReadmeContentModal.spec.js
+++ b/packages/web-app-files/tests/unit/components/Spaces/ReadmeContentModal.spec.js
@@ -1,6 +1,6 @@
 import Vuex from 'vuex'
 import { mount, createLocalVue } from '@vue/test-utils'
-import ReadmeContentModal from '@files/src/components/Spaces/ReadmeContentModal.vue'
+import ReadmeContentModal from 'web-app-files/src/components/Spaces/ReadmeContentModal.vue'
 import stubs from 'tests/unit/stubs'
 // eslint-disable-next-line jest/no-mocks-import
 import sdkMock from '@/__mocks__/sdk'
diff --git a/packages/web-app-files/tests/unit/composables/pagination/usePagination.spec.ts b/packages/web-app-files/tests/unit/composables/pagination/usePagination.spec.ts
index 7bb920e0d81..8e22f9abb4c 100644
--- a/packages/web-app-files/tests/unit/composables/pagination/usePagination.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/pagination/usePagination.spec.ts
@@ -2,7 +2,7 @@ import { ref } from '@vue/composition-api'
 import { usePagination } from '../../../../src/composables'
 import { createComposableWrapper } from '../composables.setup'
 
-jest.unmock('@files/src/composables')
+jest.unmock('web-app-files/src/composables')
 
 describe('usePagination', () => {
   it('should be valid', () => {
diff --git a/packages/web-app-files/tests/unit/helpers/permissions.spec.js b/packages/web-app-files/tests/unit/helpers/permissions.spec.js
index 73ccb5dd0bf..fca48005e4c 100644
--- a/packages/web-app-files/tests/unit/helpers/permissions.spec.js
+++ b/packages/web-app-files/tests/unit/helpers/permissions.spec.js
@@ -1,4 +1,4 @@
-import { canBeMoved } from '@files/src/helpers/permissions.js'
+import { canBeMoved } from 'web-app-files/src/helpers/permissions.js'
 
 describe('permissions helper', () => {
   describe('canBeMoved function', () => {
diff --git a/packages/web-app-files/tests/unit/helpers/resource/resource.spec.ts b/packages/web-app-files/tests/unit/helpers/resource/resource.spec.ts
deleted file mode 100644
index ab0745ccdb8..00000000000
--- a/packages/web-app-files/tests/unit/helpers/resource/resource.spec.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import {
-  extractExtensionFromFile,
-  extractNameWithoutExtension
-} from '../../../../src/helpers/resource'
-import { Resource } from 'web-client'
-
-const resourceWithoutExtension = {
-  name: 'file'
-}
-const resourceNameWithExtension = {
-  name: 'file.txt',
-  extension: 'txt'
-}
-const resourceNameWithExtensionAndDots = {
-  name: 'file.dot.txt',
-  extension: 'txt'
-}
-
-describe('filterResources', () => {
-  describe('extractNameWithoutExtension', () => {
-    it('should return resource name when there is no extension', () => {
-      expect(extractNameWithoutExtension(resourceWithoutExtension as Resource)).toEqual(
-        resourceWithoutExtension.name
-      )
-    })
-    it('should return resource name without extension when there is an extension', () => {
-      expect(extractNameWithoutExtension(resourceNameWithExtension as Resource)).toEqual('file')
-    })
-    it('should return resource name with dots without extension when there is an extension', () => {
-      expect(extractNameWithoutExtension(resourceNameWithExtensionAndDots as Resource)).toEqual(
-        'file.dot'
-      )
-    })
-  })
-  describe('extractExtensionFromFile', () => {
-    it('should return simple file extension', () => {
-      expect(extractExtensionFromFile({ name: 'test.png' } as Resource)).toEqual('png')
-    })
-    it('should return complex file extension', () => {
-      expect(extractExtensionFromFile({ name: 'test.tar.gz' } as Resource)).toEqual('tar.gz')
-    })
-    it('should return unknown file extension', () => {
-      expect(extractExtensionFromFile({ name: 'test.unknown' } as Resource)).toEqual('unknown')
-    })
-    it('should return no file extension', () => {
-      expect(extractExtensionFromFile({ name: 'test' } as Resource)).toEqual('')
-    })
-    it.each([
-      { name: 'afolder', isFolder: true },
-      { name: 'afolder', type: 'dir' },
-      { name: 'afolder', type: 'folder' }
-    ])('should return empty string if folder', (resource) => {
-      expect(extractExtensionFromFile(resource as Resource)).toEqual('')
-    })
-  })
-})
diff --git a/packages/web-app-files/tests/unit/mixins/actions/acceptShare.spec.js b/packages/web-app-files/tests/unit/mixins/actions/acceptShare.spec.js
index 01d6ad5b69d..104e1da8af1 100644
--- a/packages/web-app-files/tests/unit/mixins/actions/acceptShare.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/actions/acceptShare.spec.js
@@ -1,6 +1,6 @@
 import Vuex from 'vuex'
 import { mount, createLocalVue } from '@vue/test-utils'
-import acceptShare from '@files/src/mixins/actions/acceptShare.ts'
+import acceptShare from 'web-app-files/src/mixins/actions/acceptShare.ts'
 import { createLocationShares } from '../../../../src/router'
 import { ShareStatus } from 'web-client/src/helpers/share'
 
diff --git a/packages/web-app-files/tests/unit/mixins/actions/clearSelection.spec.js b/packages/web-app-files/tests/unit/mixins/actions/clearSelection.spec.js
index 19eba53ca82..8dad9e6532d 100644
--- a/packages/web-app-files/tests/unit/mixins/actions/clearSelection.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/actions/clearSelection.spec.js
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import clearSelection from '@files/src/mixins/actions/clearSelection.js'
+import clearSelection from 'web-app-files/src/mixins/actions/clearSelection.js'
 
 const localVue = createLocalVue()
 localVue.use(Vuex)
diff --git a/packages/web-app-files/tests/unit/mixins/actions/delete.spec.js b/packages/web-app-files/tests/unit/mixins/actions/delete.spec.js
index 06a269748b8..d21335a8022 100644
--- a/packages/web-app-files/tests/unit/mixins/actions/delete.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/actions/delete.spec.js
@@ -1,6 +1,6 @@
 import Vuex from 'vuex'
 import { mount, createLocalVue } from '@vue/test-utils'
-import Delete from '@files/src/mixins/actions/delete.js'
+import Delete from 'web-app-files/src/mixins/actions/delete.js'
 import {
   createLocationShares,
   createLocationSpaces,
diff --git a/packages/web-app-files/tests/unit/mixins/actions/emptyTrashBin.spec.js b/packages/web-app-files/tests/unit/mixins/actions/emptyTrashBin.spec.js
index 633252faa7f..91d707d00f5 100644
--- a/packages/web-app-files/tests/unit/mixins/actions/emptyTrashBin.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/actions/emptyTrashBin.spec.js
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import EmptyTashBin from '@files/src/mixins/actions/emptyTrashBin.js'
+import EmptyTashBin from 'web-app-files/src/mixins/actions/emptyTrashBin.js'
 import { createLocationTrash, createLocationSpaces } from '../../../../src/router'
 // eslint-disable-next-line jest/no-mocks-import
 import sdkMock from '@/__mocks__/sdk'
diff --git a/packages/web-app-files/tests/unit/mixins/actions/rename.spec.ts b/packages/web-app-files/tests/unit/mixins/actions/rename.spec.ts
index 8094081e4be..4babb809ca6 100644
--- a/packages/web-app-files/tests/unit/mixins/actions/rename.spec.ts
+++ b/packages/web-app-files/tests/unit/mixins/actions/rename.spec.ts
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import rename from 'files/src/mixins/actions/rename'
+import rename from 'web-app-files/src/mixins/actions/rename'
 import { mockDeep } from 'jest-mock-extended'
 import { SpaceResource } from 'web-client/src/helpers'
 import { defaultComponentMocks } from '../../../../../../tests/unit/mocks/defaultComponentMocks'
diff --git a/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js b/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js
index d3219b679ab..e9bf864ff41 100644
--- a/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/actions/restore.spec.js
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import Restore from '@files/src/mixins/actions/restore.ts'
+import Restore from 'web-app-files/src/mixins/actions/restore.ts'
 import { createLocationTrash, createLocationSpaces } from '../../../../src/router'
 // eslint-disable-next-line jest/no-mocks-import
 import sdkMock from '@/__mocks__/sdk'
diff --git a/packages/web-app-files/tests/unit/mixins/actions/showDetails.spec.ts b/packages/web-app-files/tests/unit/mixins/actions/showDetails.spec.ts
index 88b1b69235d..4e16397fa44 100644
--- a/packages/web-app-files/tests/unit/mixins/actions/showDetails.spec.ts
+++ b/packages/web-app-files/tests/unit/mixins/actions/showDetails.spec.ts
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import showDetails from 'files/src/mixins/actions/showDetails'
+import showDetails from 'web-app-files/src/mixins/actions/showDetails'
 import { defaultComponentMocks } from '../../../../../../tests/unit/mocks/defaultComponentMocks'
 import { defaultStoreMockOptions } from '../../../../../../tests/unit/mocks/store/defaultStoreMockOptions'
 import { eventBus } from 'web-pkg/src/services/eventBus'
diff --git a/packages/web-app-files/tests/unit/mixins/deleteResources.spec.ts b/packages/web-app-files/tests/unit/mixins/deleteResources.spec.ts
index 43415a1c937..c73e07564ac 100644
--- a/packages/web-app-files/tests/unit/mixins/deleteResources.spec.ts
+++ b/packages/web-app-files/tests/unit/mixins/deleteResources.spec.ts
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import deleteResources from 'files/src/mixins/deleteResources'
+import deleteResources from 'web-app-files/src/mixins/deleteResources'
 import { defaultComponentMocks } from '../../../../../tests/unit/mocks/defaultComponentMocks'
 import { mockDeep } from 'jest-mock-extended'
 import { SpaceResource } from 'web-client/src/helpers'
diff --git a/packages/web-app-files/tests/unit/mixins/spaces/delete.spec.js b/packages/web-app-files/tests/unit/mixins/spaces/delete.spec.js
index 2da64d65d0b..93fe7bf55c7 100644
--- a/packages/web-app-files/tests/unit/mixins/spaces/delete.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/spaces/delete.spec.js
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import Delete from '@files/src/mixins/spaces/actions/delete.js'
+import Delete from 'web-app-files/src/mixins/spaces/actions/delete.js'
 import { createLocationSpaces } from '../../../../src/router'
 import mockAxios from 'jest-mock-axios'
 import { buildSpace } from 'web-client/src/helpers'
diff --git a/packages/web-app-files/tests/unit/mixins/spaces/deletedFiles.spec.ts b/packages/web-app-files/tests/unit/mixins/spaces/deletedFiles.spec.ts
index d48bbc49417..60f5624d921 100644
--- a/packages/web-app-files/tests/unit/mixins/spaces/deletedFiles.spec.ts
+++ b/packages/web-app-files/tests/unit/mixins/spaces/deletedFiles.spec.ts
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount } from '@vue/test-utils'
-import DeletedFiles from 'files/src/mixins/spaces/actions/deletedFiles.js'
+import DeletedFiles from 'web-app-files/src/mixins/spaces/actions/deletedFiles.js'
 import { createLocationTrash } from '../../../../src/router'
 import { buildSpace, SpaceResource } from 'web-client/src/helpers'
 import { defaultComponentMocks } from '../../../../../../tests/unit/mocks/defaultComponentMocks'
diff --git a/packages/web-app-files/tests/unit/mixins/spaces/disable.spec.js b/packages/web-app-files/tests/unit/mixins/spaces/disable.spec.js
index c48ae9b0c70..0d3e605cfab 100644
--- a/packages/web-app-files/tests/unit/mixins/spaces/disable.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/spaces/disable.spec.js
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import disable from '@files/src/mixins/spaces/actions/disable.js'
+import disable from 'web-app-files/src/mixins/spaces/actions/disable.js'
 import { createLocationSpaces } from '../../../../src/router'
 import mockAxios from 'jest-mock-axios'
 import { buildSpace } from 'web-client/src/helpers'
diff --git a/packages/web-app-files/tests/unit/mixins/spaces/editDescription.spec.js b/packages/web-app-files/tests/unit/mixins/spaces/editDescription.spec.js
index 4744d17fd7e..1ebd2ae3956 100644
--- a/packages/web-app-files/tests/unit/mixins/spaces/editDescription.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/spaces/editDescription.spec.js
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import EditDescription from '@files/src/mixins/spaces/actions/editDescription.js'
+import EditDescription from 'web-app-files/src/mixins/spaces/actions/editDescription.js'
 import { createLocationSpaces } from '../../../../src/router'
 import mockAxios from 'jest-mock-axios'
 
diff --git a/packages/web-app-files/tests/unit/mixins/spaces/editQuota.spec.js b/packages/web-app-files/tests/unit/mixins/spaces/editQuota.spec.js
index 28078d09030..d2ddb02a091 100644
--- a/packages/web-app-files/tests/unit/mixins/spaces/editQuota.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/spaces/editQuota.spec.js
@@ -1,6 +1,6 @@
 import Vuex from 'vuex'
 import { mount, createLocalVue } from '@vue/test-utils'
-import EditQuota from '@files/src/mixins/spaces/actions/editQuota.js'
+import EditQuota from 'web-app-files/src/mixins/spaces/actions/editQuota.js'
 import { buildSpace } from 'web-client/src/helpers'
 import { createStore } from 'vuex-extensions'
 
diff --git a/packages/web-app-files/tests/unit/mixins/spaces/editReadmeContent.spec.js b/packages/web-app-files/tests/unit/mixins/spaces/editReadmeContent.spec.js
index 89116ce254e..61be6a14dc7 100644
--- a/packages/web-app-files/tests/unit/mixins/spaces/editReadmeContent.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/spaces/editReadmeContent.spec.js
@@ -1,6 +1,6 @@
 import Vuex from 'vuex'
 import { mount, createLocalVue } from '@vue/test-utils'
-import editReadmeContent from '@files/src/mixins/spaces/actions/editReadmeContent.js'
+import editReadmeContent from 'web-app-files/src/mixins/spaces/actions/editReadmeContent.js'
 import { buildSpace } from 'web-client/src/helpers'
 
 const localVue = createLocalVue()
diff --git a/packages/web-app-files/tests/unit/mixins/spaces/navigate.spec.js b/packages/web-app-files/tests/unit/mixins/spaces/navigate.spec.js
index e639dcad045..0e9d9e36267 100644
--- a/packages/web-app-files/tests/unit/mixins/spaces/navigate.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/spaces/navigate.spec.js
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import Navigate from '@files/src/mixins/spaces/actions/navigate.js'
+import Navigate from 'web-app-files/src/mixins/spaces/actions/navigate.js'
 import { createLocationSpaces, createLocationTrash } from '../../../../src/router'
 
 const localVue = createLocalVue()
diff --git a/packages/web-app-files/tests/unit/mixins/spaces/rename.spec.js b/packages/web-app-files/tests/unit/mixins/spaces/rename.spec.js
index f8144cd7a1f..e54abf082fc 100644
--- a/packages/web-app-files/tests/unit/mixins/spaces/rename.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/spaces/rename.spec.js
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import rename from '@files/src/mixins/spaces/actions/rename.js'
+import rename from 'web-app-files/src/mixins/spaces/actions/rename.js'
 import { createLocationSpaces } from '../../../../src/router'
 import mockAxios from 'jest-mock-axios'
 
diff --git a/packages/web-app-files/tests/unit/mixins/spaces/restore.spec.js b/packages/web-app-files/tests/unit/mixins/spaces/restore.spec.js
index ec795e368da..bb7b83da33f 100644
--- a/packages/web-app-files/tests/unit/mixins/spaces/restore.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/spaces/restore.spec.js
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import restore from '@files/src/mixins/spaces/actions/restore.ts'
+import restore from 'web-app-files/src/mixins/spaces/actions/restore.ts'
 import { createLocationSpaces } from '../../../../src/router'
 import mockAxios from 'jest-mock-axios'
 import { buildSpace } from 'web-client/src/helpers'
diff --git a/packages/web-app-files/tests/unit/mixins/spaces/setImage.spec.js b/packages/web-app-files/tests/unit/mixins/spaces/setImage.spec.js
index f415ac6b6ac..85245a46387 100644
--- a/packages/web-app-files/tests/unit/mixins/spaces/setImage.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/spaces/setImage.spec.js
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import setImage from '@files/src/mixins/spaces/actions/setImage.js'
+import setImage from 'web-app-files/src/mixins/spaces/actions/setImage.js'
 import { createLocationSpaces } from '../../../../src/router'
 import mockAxios from 'jest-mock-axios'
 // eslint-disable-next-line jest/no-mocks-import
diff --git a/packages/web-app-files/tests/unit/mixins/spaces/setReadme.spec.js b/packages/web-app-files/tests/unit/mixins/spaces/setReadme.spec.js
index 56dd2f58505..949742e716e 100644
--- a/packages/web-app-files/tests/unit/mixins/spaces/setReadme.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/spaces/setReadme.spec.js
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import setReadme from '@files/src/mixins/spaces/actions/setReadme.js'
+import setReadme from 'web-app-files/src/mixins/spaces/actions/setReadme.js'
 import { createLocationSpaces } from '../../../../src/router'
 // eslint-disable-next-line jest/no-mocks-import
 import sdkMock from '@/__mocks__/sdk'
diff --git a/packages/web-app-files/tests/unit/mixins/spaces/showMembers.spec.js b/packages/web-app-files/tests/unit/mixins/spaces/showMembers.spec.js
index 4217b7f22c2..d3fecd66165 100644
--- a/packages/web-app-files/tests/unit/mixins/spaces/showMembers.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/spaces/showMembers.spec.js
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import ShowMembers from '@files/src/mixins/spaces/actions/showMembers.js'
+import ShowMembers from 'web-app-files/src/mixins/spaces/actions/showMembers.js'
 
 const localVue = createLocalVue()
 localVue.use(Vuex)
diff --git a/packages/web-app-files/tests/unit/mixins/spaces/uploadImage.spec.js b/packages/web-app-files/tests/unit/mixins/spaces/uploadImage.spec.js
index 6ce97d88db0..220aef8c19e 100644
--- a/packages/web-app-files/tests/unit/mixins/spaces/uploadImage.spec.js
+++ b/packages/web-app-files/tests/unit/mixins/spaces/uploadImage.spec.js
@@ -1,7 +1,7 @@
 import Vuex from 'vuex'
 import { createStore } from 'vuex-extensions'
 import { mount, createLocalVue } from '@vue/test-utils'
-import uploadImage from '@files/src/mixins/spaces/actions/uploadImage.js'
+import uploadImage from 'web-app-files/src/mixins/spaces/actions/uploadImage.js'
 import { createLocationSpaces } from '../../../../src/router'
 import mockAxios from 'jest-mock-axios'
 // eslint-disable-next-line jest/no-mocks-import
diff --git a/packages/web-app-files/tests/unit/search/sdk.spec.ts b/packages/web-app-files/tests/unit/search/sdk.spec.ts
index 27f7aec00fd..56425b252ff 100644
--- a/packages/web-app-files/tests/unit/search/sdk.spec.ts
+++ b/packages/web-app-files/tests/unit/search/sdk.spec.ts
@@ -14,7 +14,7 @@ jest.spyOn(clientService, 'owncloudSdk', 'get').mockImplementation(
     } as any)
 )
 
-jest.mock('../../../src/helpers/resources', () => ({
+jest.mock('web-client/src/helpers', () => ({
   buildResource: (v) => v
 }))
 
diff --git a/packages/web-app-files/tests/unit/store/getters.spec.js b/packages/web-app-files/tests/unit/store/getters.spec.js
index 8d7c446ee50..a8f83ffde05 100644
--- a/packages/web-app-files/tests/unit/store/getters.spec.js
+++ b/packages/web-app-files/tests/unit/store/getters.spec.js
@@ -1,4 +1,4 @@
-import getters from '@files/src/store/getters'
+import getters from 'web-app-files/src/store/getters'
 import FixtureFiles from '@/__fixtures__/files'
 
 let state
diff --git a/packages/web-app-files/tests/unit/views/FilesDrop.spec.ts b/packages/web-app-files/tests/unit/views/FilesDrop.spec.ts
index 529867e49aa..11bb6166e09 100644
--- a/packages/web-app-files/tests/unit/views/FilesDrop.spec.ts
+++ b/packages/web-app-files/tests/unit/views/FilesDrop.spec.ts
@@ -1,8 +1,8 @@
-import FilesDrop from '@files/src/views/FilesDrop.vue'
+import FilesDrop from 'web-app-files/src/views/FilesDrop.vue'
 import { shallowMount } from '@vue/test-utils'
 import GetTextPlugin from 'vue-gettext'
 import { getStore, localVue } from './views.setup.js'
-import { DavProperty } from 'web-pkg/src/constants'
+import { DavProperty } from 'web-client/src/webdav/constants'
 import { linkRoleUploaderFolder } from 'web-client/src/helpers/share'
 import VueCompositionAPI from '@vue/composition-api/dist/vue-composition-api'
 
diff --git a/packages/web-app-files/tests/unit/views/shares/SharedViaLink.spec.ts b/packages/web-app-files/tests/unit/views/shares/SharedViaLink.spec.ts
index f99f30fa079..511df82ca94 100644
--- a/packages/web-app-files/tests/unit/views/shares/SharedViaLink.spec.ts
+++ b/packages/web-app-files/tests/unit/views/shares/SharedViaLink.spec.ts
@@ -1,5 +1,5 @@
 import { createFile } from '../views.setup.js'
-import SharedViaLink from '@files/src/views/shares/SharedViaLink.vue'
+import SharedViaLink from 'web-app-files/src/views/shares/SharedViaLink.vue'
 
 const component = { ...SharedViaLink, mounted: jest.fn() }
 
diff --git a/packages/web-app-files/tests/unit/views/spaces/GenericSpace.spec.ts b/packages/web-app-files/tests/unit/views/spaces/GenericSpace.spec.ts
index 42c419743c1..a7d4de8d8fa 100644
--- a/packages/web-app-files/tests/unit/views/spaces/GenericSpace.spec.ts
+++ b/packages/web-app-files/tests/unit/views/spaces/GenericSpace.spec.ts
@@ -41,7 +41,7 @@ describe('GenericSpace view', () => {
 // })
 //
 // afterEach(() => {
-//   jest.unmock('@files/src/composables/index')
+//   jest.unmock('web-app-files/src/composables/index')
 // })
 //
 // window.ResizeObserver =
diff --git a/packages/web-app-files/tests/unit/views/spaces/GenericTrash.spec.ts b/packages/web-app-files/tests/unit/views/spaces/GenericTrash.spec.ts
index c3a59af3f14..9bc9f8cbd4d 100644
--- a/packages/web-app-files/tests/unit/views/spaces/GenericTrash.spec.ts
+++ b/packages/web-app-files/tests/unit/views/spaces/GenericTrash.spec.ts
@@ -4,7 +4,7 @@ describe('GenericTrash view', () => {
 
 // import Vuex from 'vuex'
 // import { mount, createLocalVue } from '@vue/test-utils'
-// import Trashbin from '@files/src/views/spaces/Trashbin.vue'
+// import Trashbin from 'web-app-files/src/views/spaces/Trashbin.vue'
 // import { createStore } from 'vuex-extensions'
 // import { createLocationTrash } from '../../../../src/router'
 // import waitFor from 'wait-for-expect'
@@ -80,8 +80,8 @@ describe('GenericTrash view', () => {
 /* Old TrashBin.spec.js
 
 import { mount } from '@vue/test-utils'
-import TrashBin from '@files/src/components/TrashBin.vue'
-import { getStore, localVue, createFile } from '@files/tests/unit/components/components.setup.js'
+import TrashBin from 'web-app-files/src/components/TrashBin.vue'
+import { getStore, localVue, createFile } from 'web-app-files/tests/unit/components/components.setup.js'
 
 const stubs = {
   'app-bar': true,
diff --git a/packages/web-app-pdf-viewer/package.json b/packages/web-app-pdf-viewer/package.json
index c9217cf3246..fef228f7b8c 100644
--- a/packages/web-app-pdf-viewer/package.json
+++ b/packages/web-app-pdf-viewer/package.json
@@ -2,5 +2,10 @@
   "name": "pdf-viewer",
   "version": "0.0.0",
   "description": "ownCloud web PDF viewer",
-  "license": "AGPL-3.0"
+  "license": "AGPL-3.0",
+  "peerDependencies": {
+    "@vue/composition-api": "^1.6.2",
+    "vuex": "^3.6.2",
+    "web-pkg": "workspace:*"
+  }
 }
diff --git a/packages/web-app-pdf-viewer/src/App.vue b/packages/web-app-pdf-viewer/src/App.vue
index 1c8c5716b26..81d971e042a 100644
--- a/packages/web-app-pdf-viewer/src/App.vue
+++ b/packages/web-app-pdf-viewer/src/App.vue
@@ -13,7 +13,7 @@ import { useAppDefaults } from 'web-pkg/src/composables'
 import AppTopBar from 'web-pkg/src/components/AppTopBar.vue'
 import ErrorScreen from './components/ErrorScreen.vue'
 import LoadingScreen from './components/LoadingScreen.vue'
-import { defineComponent } from '@vue/runtime-core'
+import { defineComponent } from '@vue/composition-api'
 
 export default defineComponent({
   name: 'PDFViewer',
diff --git a/packages/web-app-preview/package.json b/packages/web-app-preview/package.json
index 99f8b6f7952..d85dc8b192c 100644
--- a/packages/web-app-preview/package.json
+++ b/packages/web-app-preview/package.json
@@ -2,5 +2,11 @@
   "name": "preview",
   "version": "0.0.0",
   "description": "ownCloud Web Preview",
-  "license": "AGPL-3.0"
+  "license": "AGPL-3.0",
+  "peerDependencies": {
+    "@vue/composition-api": "^1.6.2",
+    "vuex": "^3.6.2",
+    "web-client": "workspace:*",
+    "web-pkg": "workspace:*"
+  }
 }
diff --git a/packages/web-app-preview/src/App.vue b/packages/web-app-preview/src/App.vue
index dc9050ab566..dfadf8d4731 100644
--- a/packages/web-app-preview/src/App.vue
+++ b/packages/web-app-preview/src/App.vue
@@ -94,7 +94,7 @@
   </main>
 </template>
 <script lang="ts">
-import { defineComponent } from '@vue/runtime-core'
+import { defineComponent } from '@vue/composition-api'
 import { mapGetters } from 'vuex'
 import {
   useAccessToken,
diff --git a/packages/web-app-search/package.json b/packages/web-app-search/package.json
index f89bc2d57d7..28cea6ca9f8 100644
--- a/packages/web-app-search/package.json
+++ b/packages/web-app-search/package.json
@@ -1,9 +1,10 @@
 {
-  "name": "search",
+  "name": "web-app-search",
   "version": "0.0.0",
   "description": "ownCloud web search",
   "license": "AGPL-3.0",
   "dependencies": {
+    "mark.js": "^8.11.1",
     "p-cancelable": "^3.0.0",
     "portal-vue": "^2.1.7",
     "vue": "^2.6.10",
@@ -11,5 +12,11 @@
   },
   "devDependencies": {
     "ts-async-decorators": "^0.3.0"
+  },
+  "peerDependencies": {
+    "@vue/composition-api": "^1.6.2",
+    "lodash-es": "^4.17.21",
+    "web-app-files": "workspace:*",
+    "web-pkg": "workspace:*"
   }
 }
diff --git a/rollup.config.js b/packages/web-app-search/rollup.config.mjs
similarity index 97%
rename from rollup.config.js
rename to packages/web-app-search/rollup.config.mjs
index a2530632701..3973e0234a4 100644
--- a/rollup.config.js
+++ b/packages/web-app-search/rollup.config.mjs
@@ -1,5 +1,5 @@
 import vue from 'rollup-plugin-vue'
-import resolve from 'rollup-plugin-node-resolve'
+import resolve from '@rollup/plugin-node-resolve'
 import json from '@rollup/plugin-json'
 import commonjs from '@rollup/plugin-commonjs'
 import babel from 'rollup-plugin-babel'
@@ -21,10 +21,12 @@ import nodePolyfills from 'rollup-plugin-polyfill-node'
 import alias from '@rollup/plugin-alias'
 import inject from '@rollup/plugin-inject'
 import copy from '@rollup-extras/plugin-copy'
+import packageJson from './package.json' assert { type: "json" }
 
 const production = !process.env.ROLLUP_WATCH
 const sourcemap = process.env.SOURCE_MAP === 'true'
-const { version } = require('./package.json')
+
+const { version } = packageJson
 const compilationTimestamp = new Date().getTime()
 
 const config = {
diff --git a/packages/web-app-search/src/portals/SearchBar.vue b/packages/web-app-search/src/portals/SearchBar.vue
index 4358e669c48..65a3e950d81 100644
--- a/packages/web-app-search/src/portals/SearchBar.vue
+++ b/packages/web-app-search/src/portals/SearchBar.vue
@@ -96,7 +96,7 @@
 <script lang="js">
 import { providerStore } from '../service'
 
-import { createLocationCommon } from 'files/src/router'
+import { createLocationCommon } from 'web-app-files/src/router'
 import Mark from 'mark.js'
 import debounce from 'lodash-es/debounce'
 import { eventBus } from 'web-pkg/src/services/eventBus'
diff --git a/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts b/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts
index 4392e839266..3d8e25740b2 100644
--- a/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts
+++ b/packages/web-app-search/tests/unit/portals/SearchBar.spec.ts
@@ -2,7 +2,7 @@ import { Wrapper, mount, createLocalVue } from '@vue/test-utils'
 import DesignSystem from 'owncloud-design-system'
 import SearchBar from '../../../src/portals/SearchBar.vue'
 import AsyncComputed from 'vue-async-computed'
-import { createLocationCommon } from 'files/src/router'
+import { createLocationCommon } from 'web-app-files/src/router'
 import flushPromises from 'flush-promises'
 
 const localVue = createLocalVue()
diff --git a/packages/web-app-text-editor/package.json b/packages/web-app-text-editor/package.json
index d4c57128bc7..ea378df5f16 100644
--- a/packages/web-app-text-editor/package.json
+++ b/packages/web-app-text-editor/package.json
@@ -2,5 +2,14 @@
   "name": "text-editor",
   "version": "0.0.0",
   "description": "ownCloud Web simple text editor",
-  "license": "AGPL-3.0"
+  "license": "AGPL-3.0",
+  "peerDependencies": {
+    "@vue/composition-api": "^1.6.2",
+    "marked": "^4.0.12",
+    "sanitize-html": "^2.7.0",
+    "vue-concurrency": "^3.0.0-7",
+    "vuex": "^3.6.2",
+    "web-client": "workspace:*",
+    "web-pkg": "workspace:*"
+  }
 }
diff --git a/packages/web-app-text-editor/src/App.vue b/packages/web-app-text-editor/src/App.vue
index 716d496f6a9..268b351b864 100644
--- a/packages/web-app-text-editor/src/App.vue
+++ b/packages/web-app-text-editor/src/App.vue
@@ -47,10 +47,10 @@ import sanitizeHtml from 'sanitize-html'
 import { useTask } from 'vue-concurrency'
 import { computed, onMounted, onBeforeUnmount, ref, unref, Ref, watch } from '@vue/composition-api'
 import { mapActions } from 'vuex'
-import { DavPermission, DavProperty } from 'web-pkg/src/constants'
+import { DavPermission, DavProperty } from 'web-client/src/webdav/constants'
 import { useAppDefaults } from 'web-pkg/src/composables'
 import AppTopBar from 'web-pkg/src/components/AppTopBar.vue'
-import { defineComponent } from '@vue/runtime-core'
+import { defineComponent } from '@vue/composition-api'
 import { Resource } from 'web-client'
 
 export default defineComponent({
diff --git a/packages/web-app-user-management/package.json b/packages/web-app-user-management/package.json
index ff7ee04fd12..870b48bda54 100644
--- a/packages/web-app-user-management/package.json
+++ b/packages/web-app-user-management/package.json
@@ -6,5 +6,15 @@
   "dependencies": {
     "email-validator": "^2.0.4",
     "mark.js": "^8.11.1"
+  },
+  "peerDependencies": {
+    "@vue/composition-api": "^1.6.2",
+    "axios": "^0.27.1",
+    "fuse.js": "^6.5.3",
+    "lodash-es": "4.17.21",
+    "uuid": "^9.0.0",
+    "vue-concurrency": "^3.0.0-7",
+    "vuex": "^3.6.2",
+    "web-pkg": "workspace:*"
   }
 }
diff --git a/packages/web-app-user-management/src/components/AppTemplate.vue b/packages/web-app-user-management/src/components/AppTemplate.vue
index 341ea37e124..a8acc1f0426 100644
--- a/packages/web-app-user-management/src/components/AppTemplate.vue
+++ b/packages/web-app-user-management/src/components/AppTemplate.vue
@@ -40,7 +40,7 @@
 <script lang="ts">
 import AppLoadingSpinner from 'web-pkg/src/components/AppLoadingSpinner.vue'
 import SideBar from 'web-pkg/src/components/sideBar/SideBar.vue'
-import { defineComponent } from '@vue/runtime-core'
+import { defineComponent } from '@vue/composition-api'
 
 export default defineComponent({
   components: {
diff --git a/packages/web-app-user-management/src/views/Groups.vue b/packages/web-app-user-management/src/views/Groups.vue
index 8dea7f81a87..bd27c4be4ee 100644
--- a/packages/web-app-user-management/src/views/Groups.vue
+++ b/packages/web-app-user-management/src/views/Groups.vue
@@ -85,11 +85,10 @@ import { ref, unref } from '@vue/composition-api'
 import { useTask } from 'vue-concurrency'
 import { eventBus } from 'web-pkg/src/services/eventBus'
 import { mapActions } from 'vuex'
-import { $gettext } from 'files/src/router/utils'
 import DetailsPanel from '../components/Groups/SideBar/DetailsPanel.vue'
 import EditPanel from '../components/Groups/SideBar/EditPanel.vue'
-import { useGraphClient } from 'web-client/src/composables'
-import { defineComponent } from '@vue/runtime-core'
+import { useGraphClient } from 'web-pkg/src/composables'
+import { defineComponent } from '@vue/composition-api'
 import AppTemplate from '../components/AppTemplate.vue'
 
 export default defineComponent({
@@ -153,7 +152,7 @@ export default defineComponent({
         {
           app: 'DetailsPanel',
           icon: 'group-2',
-          title: $gettext('Group details'),
+          title: this.$gettext('Group details'),
           component: DetailsPanel,
           default: true,
           enabled: true,
@@ -162,7 +161,7 @@ export default defineComponent({
         {
           app: 'EditPanel',
           icon: 'pencil',
-          title: $gettext('Edit group'),
+          title: this.$gettext('Edit group'),
           component: EditPanel,
           default: false,
           enabled: false // this.selectedGroups.length === 1
diff --git a/packages/web-app-user-management/src/views/Users.vue b/packages/web-app-user-management/src/views/Users.vue
index c23967bb726..b7116b69eb4 100644
--- a/packages/web-app-user-management/src/views/Users.vue
+++ b/packages/web-app-user-management/src/views/Users.vue
@@ -93,9 +93,8 @@ import { useTask } from 'vue-concurrency'
 import { eventBus } from 'web-pkg/src/services/eventBus'
 import { mapActions, mapGetters, mapMutations, mapState } from 'vuex'
 import axios from 'axios'
-import { $gettext } from 'files/src/router/utils'
-import { defineComponent } from '@vue/runtime-core'
-import { useGraphClient } from 'web-client/src/composables'
+import { defineComponent } from '@vue/composition-api'
+import { useGraphClient } from 'web-pkg/src/composables'
 import AppTemplate from '../components/AppTemplate.vue'
 import { v4 as uuidV4 } from 'uuid'
 
@@ -254,7 +253,7 @@ export default defineComponent({
         {
           app: 'DetailsPanel',
           icon: 'user',
-          title: $gettext('User details'),
+          title: this.$gettext('User details'),
           component: DetailsPanel,
           default: true,
           enabled: true,
@@ -263,7 +262,7 @@ export default defineComponent({
         {
           app: 'EditPanel',
           icon: 'pencil',
-          title: $gettext('Edit user'),
+          title: this.$gettext('Edit user'),
           component: EditPanel,
           default: false,
           enabled: this.selectedUsers.length === 1,
@@ -273,7 +272,7 @@ export default defineComponent({
         {
           app: 'GroupAssignmentsPanel',
           icon: 'group-2',
-          title: $gettext('Group assignments'),
+          title: this.$gettext('Group assignments'),
           component: GroupAssignmentsPanel,
           default: false,
           enabled: this.selectedUsers.length === 1,
diff --git a/packages/web-client/package.json b/packages/web-client/package.json
index 1c6dce13767..31580d70388 100644
--- a/packages/web-client/package.json
+++ b/packages/web-client/package.json
@@ -8,7 +8,8 @@
   "scripts": {
     "generate-openapi": "rm -rf src/generated && docker run --rm -v \"${PWD}/src:/local\" openapitools/openapi-generator-cli generate -i https://raw.githubusercontent.com/owncloud/libre-graph-api/main/api/openapi-spec/v0.0.yaml  -g typescript-axios -o /local/generated"
   },
-  "dependencies": {
-    "@types/proper-url-join": "^2.1.1"
+  "peerDependencies": {
+    "axios": "^0.27.1",
+    "lodash-es": "^4.17.21"
   }
 }
diff --git a/packages/web-client/src/composables/index.ts b/packages/web-client/src/composables/index.ts
deleted file mode 100644
index 20c6cebbc32..00000000000
--- a/packages/web-client/src/composables/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './graphClient'
diff --git a/packages/web-client/src/helpers/index.ts b/packages/web-client/src/helpers/index.ts
index f8fd7a2aa23..23c04b383ae 100644
--- a/packages/web-client/src/helpers/index.ts
+++ b/packages/web-client/src/helpers/index.ts
@@ -1,3 +1,4 @@
+export * from './publicLink'
 export * from './resource'
 export * from './space'
 export * from './user'
diff --git a/packages/web-client/src/helpers/publicLink/functions.ts b/packages/web-client/src/helpers/publicLink/functions.ts
new file mode 100644
index 00000000000..dbfef492c06
--- /dev/null
+++ b/packages/web-client/src/helpers/publicLink/functions.ts
@@ -0,0 +1,3 @@
+export function buildWebDavPublicPath(publicLinkToken, path = '') {
+  return '/' + `public-files/${publicLinkToken}/${path}`.split('/').filter(Boolean).join('/')
+}
diff --git a/packages/web-client/src/helpers/publicLink/index.ts b/packages/web-client/src/helpers/publicLink/index.ts
new file mode 100644
index 00000000000..326e35231ee
--- /dev/null
+++ b/packages/web-client/src/helpers/publicLink/index.ts
@@ -0,0 +1 @@
+export * from './functions'
diff --git a/packages/web-client/src/helpers/resource/functions.ts b/packages/web-client/src/helpers/resource/functions.ts
index dc040972067..6aa47375e2f 100644
--- a/packages/web-client/src/helpers/resource/functions.ts
+++ b/packages/web-client/src/helpers/resource/functions.ts
@@ -1,4 +1,11 @@
-import { urlJoin } from 'web-pkg/src/utils'
+import { basename } from 'path'
+import { urlJoin } from '../../utils'
+import { DavPermission, DavProperty } from '../../webdav/constants'
+import { Resource } from './types'
+
+const fileExtensions = {
+  complex: ['tar.bz2', 'tar.gz', '.tar.xz']
+}
 
 export function buildWebDavSpacesPath(storageId: string | number, path?: string) {
   return urlJoin('spaces', storageId, path, {
@@ -9,3 +16,137 @@ export function buildWebDavSpacesPath(storageId: string | number, path?: string)
 export const extractDomSelector = (str: string): string => {
   return str.replace(/[^A-Za-z0-9\-_]/g, '')
 }
+
+const extractIdSegment = (id: string, index: number): string => {
+  if (!id || typeof id !== 'string') {
+    return ''
+  }
+  return id.indexOf('!') >= 0 ? id.split('!')[index] : ''
+}
+
+export const extractStorageId = (id?: string): string => {
+  return extractIdSegment(id, 0)
+}
+
+export const extractNodeId = (id?: string): string => {
+  return extractIdSegment(id, 1)
+}
+
+export const extractNameWithoutExtension = (resource?: Resource): string => {
+  const extension = resource.extension || ''
+  const name = resource.name || ''
+  if (!extension.length) {
+    return name
+  }
+  const extensionIndexInName = name.lastIndexOf(`.${extension}`)
+  return name.substring(0, extensionIndexInName)
+}
+
+export const extractExtensionFromFile = (resource: Resource): string => {
+  const name = resource.name
+  if (resource.type === 'dir' || resource.type === 'folder' || resource.isFolder) {
+    return ''
+  }
+
+  const parts = name.split('.')
+  if (parts.length > 2) {
+    for (let i = 0; i < parts.length; i++) {
+      const possibleExtension = parts.slice(i, parts.length).join('.')
+      if (fileExtensions.complex.includes(possibleExtension)) {
+        return possibleExtension
+      }
+    }
+  }
+  // Fallback if file extension is unknown or no extension
+  if (parts.length < 2) {
+    return ''
+  }
+  return parts[parts.length - 1]
+}
+
+export function buildResource(resource): Resource {
+  const name = resource.fileInfo[DavProperty.Name] || basename(resource.name)
+  const isFolder = resource.type === 'dir' || resource.type === 'folder'
+  const extension = extractExtensionFromFile({ ...resource, name })
+  let resourcePath
+
+  if (resource.name.startsWith('/files') || resource.name.startsWith('/space')) {
+    resourcePath = resource.name.split('/').slice(3).join('/')
+  } else {
+    resourcePath = resource.name
+  }
+
+  if (!resourcePath.startsWith('/')) {
+    resourcePath = `/${resourcePath}`
+  }
+
+  const id = resource.fileInfo[DavProperty.FileId]
+  const r = {
+    id,
+    fileId: id,
+    storageId: extractStorageId(id),
+    parentFolderId: resource.fileInfo[DavProperty.FileParent],
+    mimeType: resource.fileInfo[DavProperty.MimeType],
+    name,
+    extension: isFolder ? '' : extension,
+    path: resourcePath,
+    webDavPath: resource.name,
+    type: isFolder ? 'folder' : resource.type,
+    isFolder,
+    mdate: resource.fileInfo[DavProperty.LastModifiedDate],
+    size: isFolder
+      ? resource.fileInfo[DavProperty.ContentSize]
+      : resource.fileInfo[DavProperty.ContentLength],
+    indicators: [],
+    permissions: (resource.fileInfo[DavProperty.Permissions] as string) || '',
+    starred: resource.fileInfo[DavProperty.IsFavorite] !== '0',
+    etag: resource.fileInfo[DavProperty.ETag],
+    sharePermissions: resource.fileInfo[DavProperty.SharePermissions],
+    shareTypes: (function () {
+      if (resource.fileInfo[DavProperty.ShareTypes]) {
+        return resource.fileInfo[DavProperty.ShareTypes].map((v) => parseInt(v))
+      }
+      return []
+    })(),
+    privateLink: resource.fileInfo[DavProperty.PrivateLink],
+    downloadURL: resource.fileInfo[DavProperty.DownloadURL],
+    shareId: resource.fileInfo[DavProperty.ShareId],
+    shareRoot: resource.fileInfo[DavProperty.ShareRoot],
+    ownerId: resource.fileInfo[DavProperty.OwnerId],
+    ownerDisplayName: resource.fileInfo[DavProperty.OwnerDisplayName],
+    canUpload: function () {
+      return this.permissions.indexOf(DavPermission.FolderCreateable) >= 0
+    },
+    canDownload: function () {
+      return true
+    },
+    canBeDeleted: function () {
+      return this.permissions.indexOf(DavPermission.Deletable) >= 0
+    },
+    canRename: function () {
+      return this.permissions.indexOf(DavPermission.Renameable) >= 0
+    },
+    canShare: function () {
+      return this.permissions.indexOf(DavPermission.Shareable) >= 0
+    },
+    canCreate: function () {
+      return this.permissions.indexOf(DavPermission.FolderCreateable) >= 0
+    },
+    isMounted: function () {
+      return this.permissions.indexOf(DavPermission.Mounted) >= 0
+    },
+    isReceivedShare: function () {
+      return this.permissions.indexOf(DavPermission.Shared) >= 0
+    },
+    canDeny: function () {
+      return this.permissions.indexOf(DavPermission.Deny) >= 0
+    },
+    getDomSelector: () => extractDomSelector(id)
+  }
+  Object.defineProperty(r, 'nodeId', {
+    get() {
+      return extractNodeId(this.id)
+    }
+  })
+  return r
+}
diff --git a/packages/web-client/src/helpers/share/index.ts b/packages/web-client/src/helpers/share/index.ts
index 07df902c387..557079acbcd 100644
--- a/packages/web-client/src/helpers/share/index.ts
+++ b/packages/web-client/src/helpers/share/index.ts
@@ -2,5 +2,6 @@ export * from './constants'
 export * from './permission'
 export * from './role'
 export * from './share'
+export * from './space'
 export * from './status'
 export * from './type'
diff --git a/packages/web-client/src/helpers/share/space.ts b/packages/web-client/src/helpers/share/space.ts
new file mode 100644
index 00000000000..c709e1740fd
--- /dev/null
+++ b/packages/web-client/src/helpers/share/space.ts
@@ -0,0 +1,34 @@
+import { spaceRoleEditor, spaceRoleManager, spaceRoleViewer } from './role'
+import { Share } from './share'
+import { ShareTypes } from './type'
+
+export function buildSpaceShare(s, storageId): Share {
+  let permissions, role
+
+  switch (s.role) {
+    case spaceRoleManager.name:
+      permissions = spaceRoleManager.bitmask(true)
+      role = spaceRoleManager
+      break
+    case spaceRoleEditor.name:
+      permissions = spaceRoleEditor.bitmask(true)
+      role = spaceRoleEditor
+      break
+    case spaceRoleViewer.name:
+      permissions = spaceRoleViewer.bitmask(true)
+      role = spaceRoleViewer
+      break
+  }
+
+  return {
+    shareType: ShareTypes.space.value,
+    id: storageId,
+    collaborator: {
+      name: s.onPremisesSamAccountName,
+      displayName: s.displayName,
+      additionalInfo: null
+    },
+    permissions,
+    role
+  }
+}
diff --git a/packages/web-client/src/helpers/space/functions.ts b/packages/web-client/src/helpers/space/functions.ts
index dbf4d658243..418e8160f3d 100644
--- a/packages/web-client/src/helpers/space/functions.ts
+++ b/packages/web-client/src/helpers/space/functions.ts
@@ -2,10 +2,10 @@ import { User } from '../user'
 import { buildWebDavSpacesPath, extractDomSelector, Resource } from '../resource'
 import { SpacePeopleShareRoles, spaceRoleEditor, spaceRoleManager, spaceRoleViewer } from '../share'
 import { PublicSpaceResource, ShareSpaceResource, SpaceResource, SHARE_JAIL_ID } from './types'
-import { DavProperty } from 'web-pkg/src/constants'
-import { buildWebDavPublicPath } from 'files/src/helpers/resources'
-import { urlJoin } from 'web-pkg/src/utils'
-import { extractNodeId } from 'files/src/helpers/resource'
+import { DavProperty } from '../../webdav/constants'
+import { buildWebDavPublicPath } from '../publicLink/functions'
+import { urlJoin } from '../../utils'
+import { extractNodeId } from '../resource'
 
 export function buildPublicSpaceResource(data): PublicSpaceResource {
   const publicLinkPassword = data.publicLinkPassword
diff --git a/packages/web-client/src/utils/index.ts b/packages/web-client/src/utils/index.ts
new file mode 100644
index 00000000000..ff84fed0842
--- /dev/null
+++ b/packages/web-client/src/utils/index.ts
@@ -0,0 +1 @@
+export * from './urlJoin'
diff --git a/packages/web-pkg/src/utils/urlJoin.ts b/packages/web-client/src/utils/urlJoin.ts
similarity index 100%
rename from packages/web-pkg/src/utils/urlJoin.ts
rename to packages/web-client/src/utils/urlJoin.ts
diff --git a/packages/web-pkg/src/constants/dav.ts b/packages/web-client/src/webdav/constants/dav.ts
similarity index 100%
rename from packages/web-pkg/src/constants/dav.ts
rename to packages/web-client/src/webdav/constants/dav.ts
diff --git a/packages/web-pkg/src/constants/index.ts b/packages/web-client/src/webdav/constants/index.ts
similarity index 100%
rename from packages/web-pkg/src/constants/index.ts
rename to packages/web-client/src/webdav/constants/index.ts
diff --git a/packages/web-client/src/webdav/copyFiles.ts b/packages/web-client/src/webdav/copyFiles.ts
index 91b6da818b2..fbdc798132a 100644
--- a/packages/web-client/src/webdav/copyFiles.ts
+++ b/packages/web-client/src/webdav/copyFiles.ts
@@ -1,4 +1,4 @@
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from '../utils'
 import { isPublicSpaceResource, SpaceResource } from '../helpers'
 import { WebDavOptions } from './types'
 
diff --git a/packages/web-client/src/webdav/createFolder.ts b/packages/web-client/src/webdav/createFolder.ts
index 96cc5bfb1da..a49bd1ed301 100644
--- a/packages/web-client/src/webdav/createFolder.ts
+++ b/packages/web-client/src/webdav/createFolder.ts
@@ -1,8 +1,8 @@
-import { DavProperties } from 'web-pkg/src/constants'
+import { DavProperties } from './constants'
 import { FolderResource, isPublicSpaceResource, SpaceResource } from '../helpers'
 import { GetFileInfoFactory } from './getFileInfo'
 import { WebDavOptions } from './types'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from '../utils'
 
 export const CreateFolderFactory = (
   getFileInfoFactory: ReturnType<typeof GetFileInfoFactory>,
diff --git a/packages/web-client/src/webdav/deleteFile.ts b/packages/web-client/src/webdav/deleteFile.ts
index ef8d3cb5403..a6c92897aeb 100644
--- a/packages/web-client/src/webdav/deleteFile.ts
+++ b/packages/web-client/src/webdav/deleteFile.ts
@@ -1,4 +1,4 @@
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from '../utils'
 import { FileResource, isPublicSpaceResource, SpaceResource } from '../helpers'
 import { WebDavOptions } from './types'
 
diff --git a/packages/web-client/src/webdav/getFileContents.ts b/packages/web-client/src/webdav/getFileContents.ts
index 2e119360dd0..f1ef0fd48d1 100644
--- a/packages/web-client/src/webdav/getFileContents.ts
+++ b/packages/web-client/src/webdav/getFileContents.ts
@@ -1,4 +1,4 @@
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from '../utils'
 import { isPublicSpaceResource, SpaceResource } from '../helpers'
 import { WebDavOptions } from './types'
 
diff --git a/packages/web-client/src/webdav/listFiles.ts b/packages/web-client/src/webdav/listFiles.ts
index 365e84a72fc..3c52c5c5056 100644
--- a/packages/web-client/src/webdav/listFiles.ts
+++ b/packages/web-client/src/webdav/listFiles.ts
@@ -1,5 +1,5 @@
-import { buildResource } from 'files/src/helpers/resources'
-import { DavProperties, DavProperty } from 'web-pkg/src/constants'
+import { buildResource } from '../helpers/resource'
+import { DavProperties, DavProperty } from './constants'
 import {
   buildPublicSpaceResource,
   isPublicSpaceResource,
@@ -7,7 +7,7 @@ import {
   SpaceResource
 } from '../helpers'
 import { WebDavOptions } from './types'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from '../utils'
 
 export type ListFilesOptions = {
   depth?: number
diff --git a/packages/web-client/src/webdav/moveFiles.ts b/packages/web-client/src/webdav/moveFiles.ts
index 51973f62cf8..4f01320349d 100644
--- a/packages/web-client/src/webdav/moveFiles.ts
+++ b/packages/web-client/src/webdav/moveFiles.ts
@@ -1,4 +1,4 @@
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from '../utils'
 import {
   isPublicSpaceResource,
   SpaceResource,
diff --git a/packages/web-client/src/webdav/putFileContents.ts b/packages/web-client/src/webdav/putFileContents.ts
index 8ec1ede9ea7..1f696b0143a 100644
--- a/packages/web-client/src/webdav/putFileContents.ts
+++ b/packages/web-client/src/webdav/putFileContents.ts
@@ -1,4 +1,4 @@
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from '../utils'
 import { FileResource, isPublicSpaceResource, SpaceResource } from '../helpers'
 import { GetFileInfoFactory } from './getFileInfo'
 import { WebDavOptions } from './types'
diff --git a/packages/web-client/tests/unit/helpers/resource/resource.spec.ts b/packages/web-client/tests/unit/helpers/resource/resource.spec.ts
index 12164065d87..34f32b55547 100644
--- a/packages/web-client/tests/unit/helpers/resource/resource.spec.ts
+++ b/packages/web-client/tests/unit/helpers/resource/resource.spec.ts
@@ -1,4 +1,9 @@
-import { extractDomSelector } from '../../../../src/helpers/resource'
+import {
+  extractDomSelector,
+  extractExtensionFromFile,
+  extractNameWithoutExtension
+} from '../../../../src/helpers/resource'
+import { Resource } from 'web-client'
 
 describe('extractDomSelector', () => {
   it.each([
@@ -19,3 +24,54 @@ describe('extractDomSelector', () => {
     }
   )
 })
+
+const resourceWithoutExtension = {
+  name: 'file'
+}
+const resourceNameWithExtension = {
+  name: 'file.txt',
+  extension: 'txt'
+}
+const resourceNameWithExtensionAndDots = {
+  name: 'file.dot.txt',
+  extension: 'txt'
+}
+
+describe('filterResources', () => {
+  describe('extractNameWithoutExtension', () => {
+    it('should return resource name when there is no extension', () => {
+      expect(extractNameWithoutExtension(resourceWithoutExtension as Resource)).toEqual(
+        resourceWithoutExtension.name
+      )
+    })
+    it('should return resource name without extension when there is an extension', () => {
+      expect(extractNameWithoutExtension(resourceNameWithExtension as Resource)).toEqual('file')
+    })
+    it('should return resource name with dots without extension when there is an extension', () => {
+      expect(extractNameWithoutExtension(resourceNameWithExtensionAndDots as Resource)).toEqual(
+        'file.dot'
+      )
+    })
+  })
+  describe('extractExtensionFromFile', () => {
+    it('should return simple file extension', () => {
+      expect(extractExtensionFromFile({ name: 'test.png' } as Resource)).toEqual('png')
+    })
+    it('should return complex file extension', () => {
+      expect(extractExtensionFromFile({ name: 'test.tar.gz' } as Resource)).toEqual('tar.gz')
+    })
+    it('should return unknown file extension', () => {
+      expect(extractExtensionFromFile({ name: 'test.unknown' } as Resource)).toEqual('unknown')
+    })
+    it('should return no file extension', () => {
+      expect(extractExtensionFromFile({ name: 'test' } as Resource)).toEqual('')
+    })
+    it.each([
+      { name: 'afolder', isFolder: true },
+      { name: 'afolder', type: 'dir' },
+      { name: 'afolder', type: 'folder' }
+    ])('should return empty string if folder', (resource) => {
+      expect(extractExtensionFromFile(resource as Resource)).toEqual('')
+    })
+  })
+})
diff --git a/packages/web-pkg/package.json b/packages/web-pkg/package.json
index cf76ef7beab..bc34c7c8803 100644
--- a/packages/web-pkg/package.json
+++ b/packages/web-pkg/package.json
@@ -1,6 +1,20 @@
 {
   "name": "web-pkg",
+  "private": true,
   "version": "0.0.0",
   "description": "ownCloud web pkg",
-  "license": "AGPL-3.0"
+  "license": "AGPL-3.0",
+  "main": "src/index.ts",
+  "peerDependencies": {
+    "@vue/composition-api": "^1.6.2",
+    "axios": "^0.27.1",
+    "filesize": "^9.0.11",
+    "lodash-es": "^4.17.21",
+    "luxon": "^2.4.0",
+    "qs": "^6.10.3",
+    "uuid": "^9.0.0",
+    "vue-router": "~3.5.3",
+    "vuex": "^3.6.2",
+    "web-client": "workspace:*"
+  }
 }
diff --git a/packages/web-pkg/src/components/AppTopBar.vue b/packages/web-pkg/src/components/AppTopBar.vue
index 49519ab3e93..715b357285b 100644
--- a/packages/web-pkg/src/components/AppTopBar.vue
+++ b/packages/web-pkg/src/components/AppTopBar.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/runtime-core'
+import { defineComponent } from '@vue/composition-api'
 
 export default defineComponent({
   name: 'AppTopBar',
diff --git a/packages/web-pkg/src/components/sideBar/CompareSaveDialog.vue b/packages/web-pkg/src/components/sideBar/CompareSaveDialog.vue
index 81635fb494b..9602f865d95 100644
--- a/packages/web-pkg/src/components/sideBar/CompareSaveDialog.vue
+++ b/packages/web-pkg/src/components/sideBar/CompareSaveDialog.vue
@@ -24,7 +24,7 @@
 <script lang="ts">
 import { defineComponent } from '@vue/composition-api'
 import isEqual from 'lodash-es/isEqual'
-import { eventBus } from 'web-pkg/src/services/eventBus'
+import { eventBus } from '../../services/eventBus'
 
 export default defineComponent({
   name: 'CompareSaveDialog',
diff --git a/packages/web-pkg/src/components/sideBar/SideBar.vue b/packages/web-pkg/src/components/sideBar/SideBar.vue
index b6f4460736e..86d08421d0f 100644
--- a/packages/web-pkg/src/components/sideBar/SideBar.vue
+++ b/packages/web-pkg/src/components/sideBar/SideBar.vue
@@ -97,7 +97,7 @@
 </template>
 
 <script lang="ts">
-import { VisibilityObserver } from 'web-pkg/src/observer'
+import { VisibilityObserver } from '../../observer'
 import { defineComponent, PropType } from '@vue/composition-api'
 import { Panel } from './types'
 
diff --git a/packages/web-pkg/src/composables/appDefaults/useAppDefaults.ts b/packages/web-pkg/src/composables/appDefaults/useAppDefaults.ts
index 0e1e204621b..99168cc9940 100644
--- a/packages/web-pkg/src/composables/appDefaults/useAppDefaults.ts
+++ b/packages/web-pkg/src/composables/appDefaults/useAppDefaults.ts
@@ -20,7 +20,7 @@ import { usePublicLinkContext, useRequest } from '../authContext'
 import { useClientService } from '../clientService'
 import { MaybeRef } from '../../utils'
 import { useDriveResolver } from '../driveResolver'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 
 // TODO: this file/folder contains file/folder loading logic extracted from preview and drawio extensions
 // Discussion how to progress from here can be found in this issue:
diff --git a/packages/web-pkg/src/composables/appDefaults/useAppFolderHandling.ts b/packages/web-pkg/src/composables/appDefaults/useAppFolderHandling.ts
index 528f155ec86..7b04a33c83e 100644
--- a/packages/web-pkg/src/composables/appDefaults/useAppFolderHandling.ts
+++ b/packages/web-pkg/src/composables/appDefaults/useAppFolderHandling.ts
@@ -8,11 +8,11 @@ import { MaybeRef } from '../../utils'
 import { Resource } from 'web-client'
 
 import { FileContext } from './types'
-import { authService } from 'web-runtime/src/services/auth'
 import { Route } from 'vue-router'
 import { useAppFileHandling } from './useAppFileHandling'
 import { useFileRouteReplace } from '../router/useFileRouteReplace'
-import { DavProperty } from '../../constants'
+import { DavProperty } from '../../../../web-client/src/webdav/constants'
+import { useAuthService } from '../authContext/useAuthService'
 
 interface AppFolderHandlingOptions {
   store: Store<any>
@@ -39,6 +39,7 @@ export function useAppFolderHandling({
   const { webdav } = clientService
   const { replaceInvalidFileRoute } = useFileRouteReplace()
   const { getFileInfo } = useAppFileHandling({ clientService })
+  const authService = useAuthService()
 
   const loadFolderForFileContext = async (context: MaybeRef<FileContext>) => {
     if (store.getters.activeFile && store.getters.activeFile.path !== '') {
diff --git a/packages/web-pkg/src/composables/authContext/useAuthService.ts b/packages/web-pkg/src/composables/authContext/useAuthService.ts
new file mode 100644
index 00000000000..b5752c28e6e
--- /dev/null
+++ b/packages/web-pkg/src/composables/authContext/useAuthService.ts
@@ -0,0 +1,9 @@
+import { getCurrentInstance } from '@vue/composition-api'
+
+export interface AuthServiceInterface {
+  handleAuthError(route: any): any
+}
+
+export const useAuthService = (): AuthServiceInterface => {
+  return (getCurrentInstance().proxy as any).$authService
+}
diff --git a/packages/web-pkg/src/composables/capability/useCapability.ts b/packages/web-pkg/src/composables/capability/useCapability.ts
index 2b6407936ed..51efd63d540 100644
--- a/packages/web-pkg/src/composables/capability/useCapability.ts
+++ b/packages/web-pkg/src/composables/capability/useCapability.ts
@@ -1,7 +1,7 @@
 import { Store } from 'vuex'
 import get from 'lodash-es/get'
 import { computed, ComputedRef } from '@vue/composition-api'
-import { useStore } from 'web-pkg/src/composables'
+import { useStore } from '../store'
 
 export const useCapability = <T>(
   store: Store<any>,
diff --git a/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts b/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
index a3bb4ee8ed5..1ab2adf3b47 100644
--- a/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
+++ b/packages/web-pkg/src/composables/driveResolver/useDriveResolver.ts
@@ -3,12 +3,12 @@ import { Store } from 'vuex'
 import { computed, Ref, ref, unref, watch } from '@vue/composition-api'
 import { buildShareSpaceResource, SpaceResource } from 'web-client/src/helpers'
 import { useRouteQuery } from '../router'
-import { useGraphClient } from 'web-client/src/composables'
+import { useGraphClient } from '../graphClient'
 import { Resource } from 'web-client'
 import { useSpacesLoading } from './useSpacesLoading'
 import { queryItemAsString } from '../appDefaults'
 import { configurationManager } from '../../configuration'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 import { useCapabilitySpacesEnabled } from '../capability'
 
 interface DriveResolverOptions {
diff --git a/packages/web-client/src/composables/graphClient/index.ts b/packages/web-pkg/src/composables/graphClient/index.ts
similarity index 100%
rename from packages/web-client/src/composables/graphClient/index.ts
rename to packages/web-pkg/src/composables/graphClient/index.ts
diff --git a/packages/web-client/src/composables/graphClient/useGraphClient.ts b/packages/web-pkg/src/composables/graphClient/useGraphClient.ts
similarity index 85%
rename from packages/web-client/src/composables/graphClient/useGraphClient.ts
rename to packages/web-pkg/src/composables/graphClient/useGraphClient.ts
index ac955ddf3de..8f62cba1f65 100644
--- a/packages/web-client/src/composables/graphClient/useGraphClient.ts
+++ b/packages/web-pkg/src/composables/graphClient/useGraphClient.ts
@@ -1,6 +1,6 @@
 import { computed, unref } from '@vue/composition-api'
 import { Store } from 'vuex'
-import { useAccessToken, useClientService, useStore } from 'web-pkg/src/composables'
+import { useAccessToken, useClientService, useStore } from '../'
 
 interface GraphClientOptions {
   store?: Store<any>
diff --git a/packages/web-pkg/src/composables/index.ts b/packages/web-pkg/src/composables/index.ts
index 77b3fc74c40..fc63cdad879 100644
--- a/packages/web-pkg/src/composables/index.ts
+++ b/packages/web-pkg/src/composables/index.ts
@@ -3,6 +3,7 @@ export * from './authContext'
 export * from './capability'
 export * from './clientService'
 export * from './driveResolver'
+export * from './graphClient'
 export * from './localStorage'
 export * from './reactivity'
 export * from './router'
diff --git a/packages/web-pkg/src/configuration/manager.ts b/packages/web-pkg/src/configuration/manager.ts
index 04a473355ab..fef708d120f 100644
--- a/packages/web-pkg/src/configuration/manager.ts
+++ b/packages/web-pkg/src/configuration/manager.ts
@@ -7,7 +7,7 @@ import {
 import isNil from 'lodash-es/isNil'
 import get from 'lodash-es/get'
 import set from 'lodash-es/set'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 
 export interface RawConfig {
   server: string
diff --git a/packages/web-pkg/src/helpers/preview/privatePreviewBlob.ts b/packages/web-pkg/src/helpers/preview/privatePreviewBlob.ts
index 000ffe8f32c..5a079eb68bb 100644
--- a/packages/web-pkg/src/helpers/preview/privatePreviewBlob.ts
+++ b/packages/web-pkg/src/helpers/preview/privatePreviewBlob.ts
@@ -1,6 +1,6 @@
-import { encodePath } from 'web-pkg/src/utils'
+import { encodePath } from '../../utils'
 import { cacheService } from '../../services'
-import { clientService } from 'web-pkg/src/services'
+import { clientService } from '../../services'
 import { buildQueryString } from './common'
 import isEqual from 'lodash-es/isEqual'
 
diff --git a/packages/web-pkg/src/helpers/preview/publicPreviewUrl.ts b/packages/web-pkg/src/helpers/preview/publicPreviewUrl.ts
index 27b4adbb477..1b47ba73da9 100644
--- a/packages/web-pkg/src/helpers/preview/publicPreviewUrl.ts
+++ b/packages/web-pkg/src/helpers/preview/publicPreviewUrl.ts
@@ -1,5 +1,5 @@
 import { buildQueryString } from './common'
-import { clientService } from 'web-pkg/src/services'
+import { clientService } from '../../services'
 
 interface PublicPreviewUrlOptions {
   resource: {
diff --git a/packages/web-pkg/src/index.ts b/packages/web-pkg/src/index.ts
new file mode 100644
index 00000000000..0062a8eea8d
--- /dev/null
+++ b/packages/web-pkg/src/index.ts
@@ -0,0 +1,8 @@
+export * from './composables'
+export * from './configuration'
+export * from './decorator'
+export * from './helpers'
+export * from './http'
+export * from './observer'
+export * from './services'
+export * from './utils'
diff --git a/packages/web-pkg/src/services/cache.ts b/packages/web-pkg/src/services/cache.ts
index 1f791f051d0..e1c252fa59e 100644
--- a/packages/web-pkg/src/services/cache.ts
+++ b/packages/web-pkg/src/services/cache.ts
@@ -1,4 +1,4 @@
-import { Cache } from 'web-pkg/src/helpers/cache'
+import { Cache } from '../helpers/cache'
 
 const filePreviewCache = new Cache<
   string,
diff --git a/packages/web-pkg/src/utils/index.ts b/packages/web-pkg/src/utils/index.ts
index bfff496c147..1548840cf78 100644
--- a/packages/web-pkg/src/utils/index.ts
+++ b/packages/web-pkg/src/utils/index.ts
@@ -1,4 +1,3 @@
 export * from './encodePath'
 export * from './objectKeys'
 export * from './types'
-export * from './urlJoin'
diff --git a/packages/web-pkg/tests/unit/utils/urlJoin.spec.ts b/packages/web-pkg/tests/unit/utils/urlJoin.spec.ts
index 628349427a2..2659980b14a 100644
--- a/packages/web-pkg/tests/unit/utils/urlJoin.spec.ts
+++ b/packages/web-pkg/tests/unit/utils/urlJoin.spec.ts
@@ -1,4 +1,4 @@
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 
 describe('proper-url-join', () => {
   it.each([
diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json
index 0a4aef41f1a..b8559096d13 100644
--- a/packages/web-runtime/package.json
+++ b/packages/web-runtime/package.json
@@ -34,14 +34,14 @@
     "promise": "^8.1.0",
     "qs": "^6.10.3",
     "sanitize-html": "^2.7.0",
-    "semver": "^7.3.7",
+    "semver": "^7.3.8",
     "tippy.js": "^6.3.7",
     "utf8": "^3.0.0",
     "uuid": "^9.0.0",
     "v-calendar": "^2.3.2",
     "vue": "^2.6.10",
     "vue-async-computed": "^3.9.0",
-    "vue-concurrency": "^2.2.1",
+    "vue-concurrency": "^3.0.0-7",
     "vue-events": "^3.1.0",
     "vue-gettext": "^2.1.5",
     "vue-inline-svg": "^2.0.0",
@@ -53,7 +53,8 @@
     "vuex": "^3.6.2",
     "vuex-extensions": "^1.1.5",
     "vuex-router-sync": "^5.0.0",
-    "web-pkg": "*",
+    "web-client": "workspace:*",
+    "web-pkg": "workspace:*",
     "webdav": "^4.10.0",
     "webfontloader": "^1.6.28",
     "xml-js": "^1.6.11"
diff --git a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
index 5252f4101e6..74b083e8316 100644
--- a/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
+++ b/packages/web-runtime/src/components/Topbar/ApplicationsMenu.vue
@@ -51,7 +51,7 @@
 import { clientService } from 'web-pkg/src/services'
 import { configurationManager } from 'web-pkg/src/configuration'
 import { mapGetters } from 'vuex'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 
 export default {
   props: {
diff --git a/packages/web-runtime/src/components/UploadInfo.vue b/packages/web-runtime/src/components/UploadInfo.vue
index a8bca124574..7f923cc3554 100644
--- a/packages/web-runtime/src/components/UploadInfo.vue
+++ b/packages/web-runtime/src/components/UploadInfo.vue
@@ -142,7 +142,7 @@ import { useCapabilityShareJailEnabled } from 'web-pkg/src/composables'
 import { mapGetters } from 'vuex'
 import { defineComponent } from '@vue/composition-api'
 import { UppyResource } from '../composables/upload'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 import { isUndefined } from 'lodash-es'
 import { configurationManager } from 'web-pkg/src/configuration'
 
diff --git a/packages/web-app-files/src/helpers/space/sortMembers.ts b/packages/web-runtime/src/helpers/space/sortMembers.ts
similarity index 100%
rename from packages/web-app-files/src/helpers/space/sortMembers.ts
rename to packages/web-runtime/src/helpers/space/sortMembers.ts
diff --git a/packages/web-runtime/src/helpers/theme.js b/packages/web-runtime/src/helpers/theme.js
index 417f73489a0..0604c88f443 100644
--- a/packages/web-runtime/src/helpers/theme.js
+++ b/packages/web-runtime/src/helpers/theme.js
@@ -1,5 +1,5 @@
 import { isEqual } from 'lodash-es'
-import defaultTheme from 'web-runtime/themes/owncloud/theme.json'
+import defaultTheme from '../../themes/owncloud/theme.json'
 import { v4 as uuidV4 } from 'uuid'
 
 export const loadTheme = async (location = '') => {
diff --git a/packages/web-runtime/src/index.ts b/packages/web-runtime/src/index.ts
index 51b7941326c..af492fc2ef9 100644
--- a/packages/web-runtime/src/index.ts
+++ b/packages/web-runtime/src/index.ts
@@ -35,7 +35,7 @@ import {
   Resource
 } from 'web-client/src/helpers'
 import { WebDAV } from 'web-client/src/webdav'
-import { DavProperty } from 'web-pkg/src/constants'
+import { DavProperty } from 'web-client/src/webdav/constants'
 
 export const bootstrap = async (configurationPath: string): Promise<void> => {
   const runtimeConfiguration = await announceConfiguration(configurationPath)
diff --git a/packages/web-runtime/src/pages/accessDenied.vue b/packages/web-runtime/src/pages/accessDenied.vue
index 34b3ab2b322..7497e585cd3 100644
--- a/packages/web-runtime/src/pages/accessDenied.vue
+++ b/packages/web-runtime/src/pages/accessDenied.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent } from '@vue/runtime-core'
+import { defineComponent } from '@vue/composition-api'
 import { mapGetters } from 'vuex'
 
 export default defineComponent({
diff --git a/packages/web-runtime/src/pages/account.vue b/packages/web-runtime/src/pages/account.vue
index b62ebbb550b..9a759da5497 100644
--- a/packages/web-runtime/src/pages/account.vue
+++ b/packages/web-runtime/src/pages/account.vue
@@ -82,9 +82,9 @@
 <script lang="ts">
 import { mapActions, mapGetters } from 'vuex'
 import EditPasswordModal from '../components/EditPasswordModal.vue'
-import { defineComponent } from '@vue/runtime-core'
-import { useGraphClient } from 'web-client/src/composables'
-import { urlJoin } from 'web-pkg/src/utils'
+import { defineComponent } from '@vue/composition-api'
+import { useGraphClient } from 'web-pkg/src/composables'
+import { urlJoin } from 'web-client/src/utils'
 import { configurationManager } from 'web-pkg/src/configuration'
 
 export default defineComponent({
diff --git a/packages/web-runtime/src/pages/login.vue b/packages/web-runtime/src/pages/login.vue
index 2a512282897..0fe6ddb7910 100644
--- a/packages/web-runtime/src/pages/login.vue
+++ b/packages/web-runtime/src/pages/login.vue
@@ -36,11 +36,13 @@
   </div>
 </template>
 
-<script>
+<script lang="ts">
 import { mapGetters } from 'vuex'
 import { authService } from '../services/auth'
 import { queryItemAsString, useRouteQuery } from 'web-pkg/src/composables'
-export default {
+import { defineComponent } from '@vue/composition-api'
+
+export default defineComponent({
   name: 'LoginPage',
   setup() {
     return {
@@ -86,5 +88,5 @@ export default {
       authService.loginUser(queryItemAsString(this.redirectUrl))
     }
   }
-}
+})
 </script>
diff --git a/packages/web-runtime/src/pages/resolvePrivateLink.vue b/packages/web-runtime/src/pages/resolvePrivateLink.vue
index fced25a0eb3..438b28aeb36 100644
--- a/packages/web-runtime/src/pages/resolvePrivateLink.vue
+++ b/packages/web-runtime/src/pages/resolvePrivateLink.vue
@@ -43,7 +43,7 @@ import {
 } from 'web-pkg/src/composables'
 import { unref, defineComponent, computed, onMounted } from '@vue/composition-api'
 import { clientService } from 'web-pkg/src/services'
-import { createLocationSpaces } from 'files/src/router'
+// import { createLocationSpaces } from 'web-app-files/src/router'
 import { dirname } from 'path'
 import { createFileRouteOptions } from 'web-pkg/src/helpers/router'
 import { useTask } from 'vue-concurrency'
@@ -56,9 +56,10 @@ import {
   Resource,
   SpaceResource
 } from 'web-client/src/helpers'
-import { DavProperty } from 'web-pkg/src/constants'
-import { urlJoin } from 'web-pkg/src/utils'
+import { DavProperty } from 'web-client/src/webdav/constants'
+import { urlJoin } from 'web-client/src/utils'
 import { configurationManager } from 'web-pkg/src/configuration'
+import { RawLocation } from 'vue-router'
 
 export default defineComponent({
   name: 'ResolvePrivateLink',
@@ -119,10 +120,13 @@ export default defineComponent({
       }
 
       const { params, query } = createFileRouteOptions(matchingSpace, { fileId, path })
-      const location = createLocationSpaces('files-spaces-generic', {
+      // FIXME: we should not hardcode the name here, but we should not depend on
+      // createLocationSpaces('files-spaces-generic') in web-app-files either
+      const location: RawLocation = {
+        name: 'files-spaces-generic',
         params,
         query: { ...query, ...(scrollTo && { scrollTo }) }
-      })
+      }
       return router.push(location)
     })
 
diff --git a/packages/web-runtime/src/pages/resolvePublicLink.vue b/packages/web-runtime/src/pages/resolvePublicLink.vue
index debe66b7972..19a9ead20f9 100644
--- a/packages/web-runtime/src/pages/resolvePublicLink.vue
+++ b/packages/web-runtime/src/pages/resolvePublicLink.vue
@@ -85,11 +85,11 @@ import {
 import { useTask } from 'vue-concurrency'
 import { ref, unref, computed, defineComponent } from '@vue/composition-api'
 import {
+  buildWebDavPublicPath,
   buildPublicSpaceResource,
   isPublicSpaceResource,
   PublicSpaceResource
 } from 'web-client/src/helpers'
-import { buildWebDavPublicPath } from 'files/src/helpers/resources'
 import isEmpty from 'lodash-es/isEmpty'
 import { useLoadTokenInfo } from '../composables/tokenInfo'
 
diff --git a/packages/web-runtime/src/services/uppyService.ts b/packages/web-runtime/src/services/uppyService.ts
index 46ba9845e73..fb258330739 100644
--- a/packages/web-runtime/src/services/uppyService.ts
+++ b/packages/web-runtime/src/services/uppyService.ts
@@ -5,7 +5,7 @@ import { eventBus } from 'web-pkg/src/services/eventBus'
 import { UppyResource } from '../composables/upload'
 import { CustomDropTarget } from '../composables/upload/uppyPlugins/customDropTarget'
 import { CustomTus } from '../composables/upload/uppyPlugins/customTus'
-import { urlJoin } from 'web-pkg/src/utils'
+import { urlJoin } from 'web-client/src/utils'
 
 type UppyServiceTopics =
   | 'uploadStarted'
diff --git a/packages/web-runtime/src/store/spaces.ts b/packages/web-runtime/src/store/spaces.ts
index 9d2073a8cfe..c7a4bc79358 100644
--- a/packages/web-runtime/src/store/spaces.ts
+++ b/packages/web-runtime/src/store/spaces.ts
@@ -2,8 +2,9 @@ import { buildSpace } from 'web-client/src/helpers'
 import Vue from 'vue'
 import { set, has } from 'lodash-es'
 import { unref } from '@vue/composition-api'
-import { buildSpaceShare } from 'files/src/helpers/resources'
-import { sortSpaceMembers } from 'files/src/helpers/space'
+import { buildSpaceShare } from 'web-client/src/helpers/share'
+import { sortSpaceMembers } from '../helpers/space/sortMembers'
+
 import { configurationManager } from 'web-pkg/src/configuration'
 
 const state = {
diff --git a/packages/web-runtime/tests/unit/pages/resolvePublicLink.js b/packages/web-runtime/tests/unit/pages/resolvePublicLink.js
index 571e59815f4..3b2b0a282fc 100644
--- a/packages/web-runtime/tests/unit/pages/resolvePublicLink.js
+++ b/packages/web-runtime/tests/unit/pages/resolvePublicLink.js
@@ -1,4 +1,4 @@
-import { getStore, localVue } from 'files/tests/unit/views/views.setup.js'
+import { getStore, localVue } from 'web-app-files/tests/unit/views/views.setup.js'
 import { shallowMount, mount } from '@vue/test-utils'
 import resolvePublicLink from '../../../src/pages/resolvePublicLink'
 
diff --git a/rollup.config.mjs b/rollup.config.mjs
new file mode 100644
index 00000000000..ad22415773a
--- /dev/null
+++ b/rollup.config.mjs
@@ -0,0 +1,259 @@
+import vue from 'rollup-plugin-vue'
+// import resolve from '@rollup/plugin-node-resolve'
+import resolve from 'rollup-plugin-node-resolve'
+
+import json from '@rollup/plugin-json'
+import commonjs from '@rollup/plugin-commonjs'
+import babel from 'rollup-plugin-babel'
+import modify from 'rollup-plugin-modify'
+import { terser } from 'rollup-plugin-terser'
+import visualizer from 'rollup-plugin-visualizer'
+import * as path from 'path'
+import del from 'rollup-plugin-delete'
+import * as fs from 'fs'
+import gzip from 'rollup-plugin-gzip'
+import ejs from 'ejs'
+import progress from 'rollup-plugin-progress'
+import postcss from 'rollup-plugin-postcss'
+import serve from 'rollup-plugin-serve'
+import livereload from 'rollup-plugin-livereload'
+import html from '@rollup/plugin-html'
+import ts from 'rollup-plugin-ts'
+import nodePolyfills from 'rollup-plugin-polyfill-node'
+import alias from '@rollup/plugin-alias'
+import inject from '@rollup/plugin-inject'
+import copy from '@rollup-extras/plugin-copy'
+import packageJson from './package.json' assert { type: "json" }
+import {fileURLToPath} from 'url'
+import { dirname, resolve as pathResolve } from 'path'
+
+
+const production = !process.env.ROLLUP_WATCH
+const sourcemap = process.env.SOURCE_MAP === 'true'
+
+const { version } = packageJson
+const compilationTimestamp = new Date().getTime()
+
+const config = {
+  requirejs: {},
+  cdn: process.env.CDN === 'true'
+}
+if (process.env.REQUIRE_TIMEOUT) {
+  config.requirejs.waitSeconds = parseInt(process.env.REQUIRE_TIMEOUT)
+}
+
+const __filename = fileURLToPath(import.meta.url)
+const projectRootDir = dirname(__filename)
+
+const plugins = [
+  postcss({
+    extract: path.join('css', 'web.css'),
+    minimize: production,
+    sourceMap: sourcemap,
+    config: false
+  }),
+  alias({
+    entries: [
+      { find: 'crypto', replacement: pathResolve(projectRootDir, 'polyfills/crypto.js') },
+      { find: 'qs', replacement: pathResolve(projectRootDir, 'node_modules/qs/lib/index.js') }
+    ]
+  }),
+  commonjs({
+    include: 'node_modules/**'
+  }),
+  vue({
+    css: false
+  }),
+  nodePolyfills(),
+  resolve({
+    include: 'node_modules/**',
+    browser: true,
+    preferBuiltins: false
+  }),
+  babel({
+    // babelHelpers: 'bundled',
+    exclude: 'node_modules/**'
+  }),
+  modify({
+    'process.env.NODE_ENV': JSON.stringify(production ? 'production' : 'development'),
+    'process.env.PACKAGE_VERSION': JSON.stringify(version),
+    // todo: owncloud-sdk _makeOCSrequest has no catch
+    // this is required if a network error for example 'blocked by CORS' happened
+    'l(o.instance+p,{method:e,body:d.body,headers:h})':
+      'l(o.instance+p,{method:e,body:d.body,headers:h}).catch(function(e){return r(e)})'
+  }),
+  ts({
+    browserslist: false
+  }),
+  inject({
+    Buffer: ['buffer', 'Buffer']
+  }),
+  json(),
+  copy({
+    targets: [
+      { src: 'node_modules/requirejs/require.js', dest: 'js' },
+      {
+        src: 'node_modules/owncloud-design-system/dist/system/icons/*',
+        dest: 'icons'
+      },
+      {
+        src: 'node_modules/owncloud-design-system/dist/system/fonts/*',
+        dest: 'fonts'
+      }
+    ],
+    watch: false
+  }),
+  copy({
+    targets: [
+      { src: './packages/web-container/img/*', dest: 'img' },
+      { src: './packages/web-container/*.{html,json,txt}' },
+      { src: './packages/web-runtime/themes/**/*', dest: 'themes' },
+      { src: `./config/${production ? 'config.json.dist' : 'config.json'}` }
+    ]
+  }),
+  html({
+    title: process.env.TITLE || 'ownCloud',
+    attributes: {
+      html: { lang: 'en' },
+      link: [],
+      script: []
+    },
+    meta: [
+      {
+        charset: 'utf-8'
+      },
+      {
+        name: 'viewport',
+        content: 'initial-scale=1.0, minimum-scale=1.0'
+      },
+      {
+        name: 'theme-color',
+        content: '#375f7E'
+      },
+      {
+        'http-equiv': 'x-ua-compatible',
+        content: 'IE=edge'
+      }
+    ],
+    template: ({ attributes, files, meta, publicPath, title }) => {
+      return new Promise((resolve, reject) => {
+        ejs.renderFile(
+          './packages/web-container/index.html.ejs',
+          {
+            helpers: {
+              makeHtmlAttributes: html.makeHtmlAttributes
+            },
+            data: {
+              attributes,
+              meta,
+              publicPath,
+              title,
+              files,
+              bundle: Object.keys(files).reduce((acc, c) => {
+                if (!Object.hasOwnProperty.call(acc, c)) {
+                  acc[c] = {}
+                }
+                files[c].forEach((f) => {
+                  const fp = path.parse(f.fileName)
+                  const lastDash = fp.name.lastIndexOf('-')
+                  acc[c][
+                    production
+                      ? fp.name.slice(0, lastDash !== -1 ? lastDash : 0) || fp.name
+                      : fp.name
+                  ] = c === 'js' ? fp.name : f.fileName
+                })
+
+                return acc
+              }, {}),
+              roots: {
+                css: 'css',
+                js: 'js'
+              },
+              config: config,
+              compilationTimestamp: compilationTimestamp
+            }
+          },
+          {},
+          (err, html) => {
+            if (err) {
+              reject(err)
+            } else {
+              resolve(html)
+            }
+          }
+        )
+      })
+    }
+  }),
+  progress()
+]
+
+if (production) {
+  plugins.push(terser())
+  plugins.push(
+    del({
+      runOnce: true,
+      targets: path.join('dist', '*'),
+      dot: true
+    })
+  )
+}
+
+if (process.env.SERVER === 'true') {
+  plugins.push(
+    serve({
+      host: '0.0.0.0',
+      contentBase: ['dist'],
+      port: process.env.PORT || 9100
+    })
+  )
+  plugins.push(
+    livereload({
+      watch: 'dist'
+    })
+  )
+}
+
+if (process.env.REPORT === 'true') {
+  plugins.push(
+    visualizer({
+      filename: path.join('dist', 'report.html')
+    })
+  )
+}
+
+if (production) {
+  plugins.push(gzip())
+}
+
+export default {
+  input: fs.readdirSync('packages').reduce((acc, i) => {
+    for (const extension of ['js', 'ts']) {
+      const root = path.join('packages', i, 'src', `index.${extension}`)
+      if (fs.existsSync(root)) {
+        acc[i] = root
+        break
+      }
+    }
+    return acc
+  }, {}),
+  output: {
+    dir: 'dist',
+    format: 'amd',
+    sourcemap: sourcemap,
+    chunkFileNames: path.join('js', 'chunks', production ? '[name]-[hash].js' : '[name].js'),
+    entryFileNames: path.join('js', production ? '[name]-[hash].js' : '[name].js')
+  },
+  manualChunks: (id) => {
+    if (id.includes('node_modules')) {
+      return 'vendor'
+    }
+  },
+  onwarn: (warning) => {
+    if (warning.code !== 'CIRCULAR_DEPENDENCY') {
+      console.error(`(!) ${warning.message}`)
+    }
+  },
+  // preserveSymlinks: true,
+  plugins
+}
diff --git a/yarn.lock b/yarn.lock
index cb5d5162fe2..98579ac333e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -363,16 +363,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.0, @babel/parser@npm:^7.13.9, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.7, @babel/parser@npm:^7.17.3, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6":
-  version: 7.17.3
-  resolution: "@babel/parser@npm:7.17.3"
-  bin:
-    parser: ./bin/babel-parser.js
-  checksum: 311869baef97c7630ac3b3c4600da18229b95aa2785b2daab2044384745fe0653070916ade28749fb003f7369a081111ada53e37284ba48d6b5858cbb9e411d1
-  languageName: node
-  linkType: hard
-
-"@babel/parser@npm:^7.16.4":
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.4, @babel/parser@npm:^7.16.7, @babel/parser@npm:^7.17.3, @babel/parser@npm:^7.6.0, @babel/parser@npm:^7.9.6":
   version: 7.19.4
   resolution: "@babel/parser@npm:7.19.4"
   bin:
@@ -1331,7 +1322,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.0, @babel/types@npm:^7.13.0, @babel/types@npm:^7.16.0, @babel/types@npm:^7.16.7, @babel/types@npm:^7.16.8, @babel/types@npm:^7.17.0, @babel/types@npm:^7.17.10, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.6.1, @babel/types@npm:^7.8.3, @babel/types@npm:^7.9.6":
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.16.0, @babel/types@npm:^7.16.7, @babel/types@npm:^7.16.8, @babel/types@npm:^7.17.0, @babel/types@npm:^7.17.10, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.6.1, @babel/types@npm:^7.8.3, @babel/types@npm:^7.9.6":
   version: 7.17.10
   resolution: "@babel/types@npm:7.17.10"
   dependencies:
@@ -1931,7 +1922,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ownclouders/babel-preset@workspace:packages/babel-preset":
+"@ownclouders/babel-preset@workspace:*, @ownclouders/babel-preset@workspace:packages/babel-preset":
   version: 0.0.0-use.local
   resolution: "@ownclouders/babel-preset@workspace:packages/babel-preset"
   dependencies:
@@ -1939,7 +1930,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@ownclouders/eslint-config@workspace:packages/eslint-config":
+"@ownclouders/eslint-config@workspace:*, @ownclouders/eslint-config@workspace:packages/eslint-config":
   version: 0.0.0-use.local
   resolution: "@ownclouders/eslint-config@workspace:packages/eslint-config"
   dependencies:
@@ -1962,7 +1953,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@ownclouders/prettier-config@workspace:packages/prettier-config":
+"@ownclouders/prettier-config@workspace:*, @ownclouders/prettier-config@workspace:packages/prettier-config":
   version: 0.0.0-use.local
   resolution: "@ownclouders/prettier-config@workspace:packages/prettier-config"
   dependencies:
@@ -1970,7 +1961,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@ownclouders/tsconfig@workspace:packages/tsconfig":
+"@ownclouders/tsconfig@workspace:*, @ownclouders/tsconfig@workspace:packages/tsconfig":
   version: 0.0.0-use.local
   resolution: "@ownclouders/tsconfig@workspace:packages/tsconfig"
   languageName: unknown
@@ -2497,15 +2488,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/proper-url-join@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "@types/proper-url-join@npm:2.1.1"
-  dependencies:
-    query-string: ^6.3.0
-  checksum: a3efe6003d1b94b990a00e3a8cd2dcbd7b8f87a6c872f4b8f0e8c8f6a9df1fd3f104cef3f05a08fdd58e90d60f0e2c1fcc6619a8dc6c59396d2cea0ba99f2887
-  languageName: node
-  linkType: hard
-
 "@types/q@npm:^1.5.1":
   version: 1.5.4
   resolution: "@types/q@npm:1.5.4"
@@ -2790,19 +2772,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vue/compiler-core@npm:3.1.1":
-  version: 3.1.1
-  resolution: "@vue/compiler-core@npm:3.1.1"
-  dependencies:
-    "@babel/parser": ^7.12.0
-    "@babel/types": ^7.12.0
-    "@vue/shared": 3.1.1
-    estree-walker: ^2.0.1
-    source-map: ^0.6.1
-  checksum: 82eb70903675e708e81c8246b7bcbeb7d8e8c4abd9604d82e8f3e3f2d129c318feb2c2f69af2498512791d2ae708a7aa403614d8ee2f4db4604af5d8a81fe9e6
-  languageName: node
-  linkType: hard
-
 "@vue/compiler-core@npm:3.2.40":
   version: 3.2.40
   resolution: "@vue/compiler-core@npm:3.2.40"
@@ -2815,16 +2784,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vue/compiler-dom@npm:3.1.1":
-  version: 3.1.1
-  resolution: "@vue/compiler-dom@npm:3.1.1"
-  dependencies:
-    "@vue/compiler-core": 3.1.1
-    "@vue/shared": 3.1.1
-  checksum: 1734a0a9bced33d4fc31400fe7f944771c926d4a9f5f106a25d3c3aa0f914fb7a8796e937925e1579509870a823cb783deace4212a588c56fd8f938dd9405f9b
-  languageName: node
-  linkType: hard
-
 "@vue/compiler-dom@npm:3.2.40":
   version: 3.2.40
   resolution: "@vue/compiler-dom@npm:3.2.40"
@@ -2835,33 +2794,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vue/compiler-sfc@npm:^3.0.0, @vue/compiler-sfc@npm:^3.0.5":
-  version: 3.1.1
-  resolution: "@vue/compiler-sfc@npm:3.1.1"
-  dependencies:
-    "@babel/parser": ^7.13.9
-    "@babel/types": ^7.13.0
-    "@vue/compiler-core": 3.1.1
-    "@vue/compiler-dom": 3.1.1
-    "@vue/compiler-ssr": 3.1.1
-    "@vue/shared": 3.1.1
-    consolidate: ^0.16.0
-    estree-walker: ^2.0.1
-    hash-sum: ^2.0.0
-    lru-cache: ^5.1.1
-    magic-string: ^0.25.7
-    merge-source-map: ^1.1.0
-    postcss: ^8.1.10
-    postcss-modules: ^4.0.0
-    postcss-selector-parser: ^6.0.4
-    source-map: ^0.6.1
-  peerDependencies:
-    vue: 3.1.1
-  checksum: a5f1ad2045a3c05c679a84ad87a19f16791bd014766ed80d50c4d9ba2e28e8728e882a2fafee65b44b6789fed739898fb8d78989e109e8a5a881260cd31d72ac
-  languageName: node
-  linkType: hard
-
-"@vue/compiler-sfc@npm:^3.2.37":
+"@vue/compiler-sfc@npm:^3.0.0, @vue/compiler-sfc@npm:^3.0.5, @vue/compiler-sfc@npm:^3.2.37":
   version: 3.2.40
   resolution: "@vue/compiler-sfc@npm:3.2.40"
   dependencies:
@@ -2879,16 +2812,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vue/compiler-ssr@npm:3.1.1":
-  version: 3.1.1
-  resolution: "@vue/compiler-ssr@npm:3.1.1"
-  dependencies:
-    "@vue/compiler-dom": 3.1.1
-    "@vue/shared": 3.1.1
-  checksum: 31c33fe5f91a2903ce5fa45cd48c5f355406d61648579a7b77c86caf61a192b7ca78c966128119830302db8be41b51e6da6b945d64220d77ff1d9bd4d8e0c639
-  languageName: node
-  linkType: hard
-
 "@vue/compiler-ssr@npm:3.2.40":
   version: 3.2.40
   resolution: "@vue/compiler-ssr@npm:3.2.40"
@@ -3000,13 +2923,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vue/shared@npm:3.1.1":
-  version: 3.1.1
-  resolution: "@vue/shared@npm:3.1.1"
-  checksum: 20c62892cce5952a5684d7bfd6021f897792b25d6b6db1434dfc3920e2982dbf713dff54e460ed76efc511c18fd8500c3ee27995023079241e71662f1381185b
-  languageName: node
-  linkType: hard
-
 "@vue/shared@npm:3.2.36":
   version: 3.2.36
   resolution: "@vue/shared@npm:3.2.36"
@@ -3990,10 +3906,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caf@npm:^9.0.0":
-  version: 9.1.0
-  resolution: "caf@npm:9.1.0"
-  checksum: 16c2985b73019b5e61681c37ee033aebdaf38c2fb16b4d17bf91382b1687441321e25529285914168de0e6eba0c446f77793d4ec820114dde8117231488dee5a
+"caf@npm:^13.1.1":
+  version: 13.1.1
+  resolution: "caf@npm:13.1.1"
+  checksum: f65f6c1ec51a84af3f014a785d4426befaffea909404f0f4f3e981969793e23df8b2f8fd5bbb880363abd5e234e0cf8ddd46f0f378aec530530cdc4967d67972
   languageName: node
   linkType: hard
 
@@ -4500,15 +4416,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"consolidate@npm:^0.16.0":
-  version: 0.16.0
-  resolution: "consolidate@npm:0.16.0"
-  dependencies:
-    bluebird: ^3.7.2
-  checksum: f17164ffb2c4f79b4cbf685f1c76a49f59d329a40954b436425498861dc137b46fe821b2aadafa2dcfeb7eebd46846f35bd2c36b4a704d38521b4210a22a7515
-  languageName: node
-  linkType: hard
-
 "constantinople@npm:^4.0.1":
   version: 4.0.1
   resolution: "constantinople@npm:4.0.1"
@@ -5325,6 +5232,12 @@ __metadata:
 "draw-io@workspace:packages/web-app-draw-io":
   version: 0.0.0-use.local
   resolution: "draw-io@workspace:packages/web-app-draw-io"
+  peerDependencies:
+    "@vue/composition-api": ^1.6.2
+    luxon: ^2.4.0
+    vuex: ^3.6.2
+    web-client: "workspace:*"
+    web-pkg: "workspace:*"
   languageName: unknown
   linkType: soft
 
@@ -6090,6 +6003,12 @@ __metadata:
 "external@workspace:packages/web-app-external":
   version: 0.0.0-use.local
   resolution: "external@workspace:packages/web-app-external"
+  peerDependencies:
+    "@vue/composition-api": ^1.6.2
+    uuid: ^9.0.0
+    vuex: ^3.6.2
+    web-client: "workspace:*"
+    web-pkg: "workspace:*"
   languageName: unknown
   linkType: soft
 
@@ -6232,14 +6151,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"files@workspace:packages/web-app-files":
-  version: 0.0.0-use.local
-  resolution: "files@workspace:packages/web-app-files"
-  dependencies:
-    copy-to-clipboard: ^3.3.1
-  languageName: unknown
-  linkType: soft
-
 "filesize@npm:^9.0.11":
   version: 9.0.11
   resolution: "filesize@npm:9.0.11"
@@ -6256,13 +6167,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"filter-obj@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "filter-obj@npm:1.1.0"
-  checksum: cf2104a7c45ff48e7f505b78a3991c8f7f30f28bd8106ef582721f321f1c6277f7751aacd5d83026cb079d9d5091082f588d14a72e7c5d720ece79118fa61e10
-  languageName: node
-  linkType: hard
-
 "find-babel-config@npm:^1.1.0":
   version: 1.2.0
   resolution: "find-babel-config@npm:1.2.0"
@@ -6770,13 +6674,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hash-sum@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "hash-sum@npm:2.0.0"
-  checksum: efeeacf09ecbd467202865403c3a1991fa15d4f4903c1148ecbe13223fdbf9ec6d7dc661e17e5ce6e776cd70d67b6ee4c82e0171318962435be45c1155175f3f
-  languageName: node
-  linkType: hard
-
 "he@npm:^1.1.0, he@npm:^1.2.0":
   version: 1.2.0
   resolution: "he@npm:1.2.0"
@@ -8786,15 +8683,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "lru-cache@npm:5.1.1"
-  dependencies:
-    yallist: ^3.0.2
-  checksum: c154ae1cbb0c2206d1501a0e94df349653c92c8cbb25236d7e85190bcaf4567a03ac6eb43166fabfa36fd35623694da7233e88d9601fbf411a9a481d85dbd2cb
-  languageName: node
-  linkType: hard
-
 "lru-cache@npm:^6.0.0":
   version: 6.0.0
   resolution: "lru-cache@npm:6.0.0"
@@ -9953,6 +9841,10 @@ __metadata:
 "pdf-viewer@workspace:packages/web-app-pdf-viewer":
   version: 0.0.0-use.local
   resolution: "pdf-viewer@workspace:packages/web-app-pdf-viewer"
+  peerDependencies:
+    "@vue/composition-api": ^1.6.2
+    vuex: ^3.6.2
+    web-pkg: "workspace:*"
   languageName: unknown
   linkType: soft
 
@@ -10751,6 +10643,11 @@ __metadata:
 "preview@workspace:packages/web-app-preview":
   version: 0.0.0-use.local
   resolution: "preview@workspace:packages/web-app-preview"
+  peerDependencies:
+    "@vue/composition-api": ^1.6.2
+    vuex: ^3.6.2
+    web-client: "workspace:*"
+    web-pkg: "workspace:*"
   languageName: unknown
   linkType: soft
 
@@ -11043,18 +10940,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"query-string@npm:^6.3.0":
-  version: 6.14.1
-  resolution: "query-string@npm:6.14.1"
-  dependencies:
-    decode-uri-component: ^0.2.0
-    filter-obj: ^1.1.0
-    split-on-first: ^1.0.0
-    strict-uri-encode: ^2.0.0
-  checksum: f2c7347578fa0f3fd4eaace506470cb4e9dc52d409a7ddbd613f614b9a594d750877e193b5d5e843c7477b3b295b857ec328903c943957adc41a3efb6c929449
-  languageName: node
-  linkType: hard
-
 "querystring@npm:^0.2.0":
   version: 0.2.1
   resolution: "querystring@npm:0.2.1"
@@ -11701,6 +11586,10 @@ __metadata:
     "@cucumber/messages": ^17.1.1
     "@cucumber/pretty-formatter": ^1.0.0-alpha.2
     "@noble/hashes": ^1.0.0
+    "@ownclouders/babel-preset": "workspace:*"
+    "@ownclouders/eslint-config": "workspace:*"
+    "@ownclouders/prettier-config": "workspace:*"
+    "@ownclouders/tsconfig": "workspace:*"
     "@playwright/test": ^1.27.0
     "@rollup-extras/plugin-copy": ^1.2.5
     "@rollup/plugin-alias": ^3.1.9
@@ -11745,6 +11634,7 @@ __metadata:
     pino-pretty: ^7.6.0
     playwright: ^1.26.1
     postcss: ^8.3.6
+    qs: ^6.10.3
     react: ^17.0.2
     regenerator-runtime: ^0.13.7
     requirejs: ^2.3.6
@@ -11879,18 +11769,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"search@workspace:packages/web-app-search":
-  version: 0.0.0-use.local
-  resolution: "search@workspace:packages/web-app-search"
-  dependencies:
-    p-cancelable: ^3.0.0
-    portal-vue: ^2.1.7
-    ts-async-decorators: ^0.3.0
-    vue: ^2.6.10
-    vue-async-computed: ^3.9.0
-  languageName: unknown
-  linkType: soft
-
 "secure-json-parse@npm:^2.4.0":
   version: 2.4.0
   resolution: "secure-json-parse@npm:2.4.0"
@@ -11912,7 +11790,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:2 || 3 || 4 || 5 || 6 || 7, semver@npm:7.x, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.7":
+"semver@npm:2 || 3 || 4 || 5 || 6 || 7, semver@npm:7.x, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.7, semver@npm:^7.3.8":
   version: 7.3.8
   resolution: "semver@npm:7.3.8"
   dependencies:
@@ -12228,13 +12106,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"split-on-first@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "split-on-first@npm:1.1.0"
-  checksum: 16ff85b54ddcf17f9147210a4022529b343edbcbea4ce977c8f30e38408b8d6e0f25f92cd35b86a524d4797f455e29ab89eb8db787f3c10708e0b47ebf528d30
-  languageName: node
-  linkType: hard
-
 "split2@npm:^4.0.0":
   version: 4.1.0
   resolution: "split2@npm:4.1.0"
@@ -12325,13 +12196,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strict-uri-encode@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "strict-uri-encode@npm:2.0.0"
-  checksum: eaac4cf978b6fbd480f1092cab8b233c9b949bcabfc9b598dd79a758f7243c28765ef7639c876fa72940dac687181b35486ea01ff7df3e65ce3848c64822c581
-  languageName: node
-  linkType: hard
-
 "string-argv@npm:^0.3.1":
   version: 0.3.1
   resolution: "string-argv@npm:0.3.1"
@@ -12698,6 +12562,14 @@ __metadata:
 "text-editor@workspace:packages/web-app-text-editor":
   version: 0.0.0-use.local
   resolution: "text-editor@workspace:packages/web-app-text-editor"
+  peerDependencies:
+    "@vue/composition-api": ^1.6.2
+    marked: ^4.0.12
+    sanitize-html: ^2.7.0
+    vue-concurrency: ^3.0.0-7
+    vuex: ^3.6.2
+    web-client: "workspace:*"
+    web-pkg: "workspace:*"
   languageName: unknown
   linkType: soft
 
@@ -13270,6 +13142,15 @@ __metadata:
   dependencies:
     email-validator: ^2.0.4
     mark.js: ^8.11.1
+  peerDependencies:
+    "@vue/composition-api": ^1.6.2
+    axios: ^0.27.1
+    fuse.js: ^6.5.3
+    lodash-es: 4.17.21
+    uuid: ^9.0.0
+    vue-concurrency: ^3.0.0-7
+    vuex: ^3.6.2
+    web-pkg: "workspace:*"
   languageName: unknown
   linkType: soft
 
@@ -13424,12 +13305,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vue-concurrency@npm:^2.2.1":
-  version: 2.2.1
-  resolution: "vue-concurrency@npm:2.2.1"
+"vue-concurrency@npm:^3.0.0-7":
+  version: 3.0.0-7
+  resolution: "vue-concurrency@npm:3.0.0-7"
   dependencies:
-    caf: ^9.0.0
-  checksum: 989500bb3d3c3b79ed92a6522e176b87483d05f19a054ecdef78b8b8c3a0f543a536c3bd31cd7aaa03c2507ca38609316ee04f22355dd50fcef88c850fd49e6d
+    caf: ^13.1.1
+  checksum: 78339dcdf973251c9569b5b3592eb6336b27c49a434f8ade32263e769b7a3a17d742d0c6c09964e94eb104afa868eebea8d306b76cd73d0d98a2a4b56a8f80e5
   languageName: node
   linkType: hard
 
@@ -13632,17 +13513,77 @@ __metadata:
   languageName: node
   linkType: hard
 
-"web-client@workspace:packages/web-client":
+"web-app-files@workspace:packages/web-app-files":
   version: 0.0.0-use.local
-  resolution: "web-client@workspace:packages/web-client"
+  resolution: "web-app-files@workspace:packages/web-app-files"
+  dependencies:
+    copy-to-clipboard: ^3.3.1
+  peerDependencies:
+    "@vue/composition-api": ^1.6.2
+    filesize: ^9.0.11
+    fuse.js: ^6.5.3
+    lodash-es: 4.17.21
+    luxon: ^2.4.0
+    marked: ^4.0.12
+    p-queue: ^6.6.2
+    popper-max-size-modifier: ^0.2.0
+    qs: ^6.10.3
+    sanitize-html: ^2.7.0
+    semver: ^7.3.8
+    uuid: ^9.0.0
+    vue-concurrency: ^3.0.0-7
+    vue-gettext: ^2.1.5
+    vue-resize: ^1.0.1
+    vue-router: ~3.5.3
+    vuex: ^3.6.2
+    web-app-search: "workspace:*"
+    web-client: "workspace:*"
+    web-pkg: "workspace:*"
+    web-runtime: "workspace:*"
+  languageName: unknown
+  linkType: soft
+
+"web-app-search@workspace:packages/web-app-search":
+  version: 0.0.0-use.local
+  resolution: "web-app-search@workspace:packages/web-app-search"
   dependencies:
-    "@types/proper-url-join": ^2.1.1
+    mark.js: ^8.11.1
+    p-cancelable: ^3.0.0
+    portal-vue: ^2.1.7
+    ts-async-decorators: ^0.3.0
+    vue: ^2.6.10
+    vue-async-computed: ^3.9.0
+  peerDependencies:
+    "@vue/composition-api": ^1.6.2
+    lodash-es: ^4.17.21
+    web-app-files: "workspace:*"
+    web-pkg: "workspace:*"
   languageName: unknown
   linkType: soft
 
-"web-pkg@*, web-pkg@workspace:packages/web-pkg":
+"web-client@workspace:*, web-client@workspace:packages/web-client":
+  version: 0.0.0-use.local
+  resolution: "web-client@workspace:packages/web-client"
+  peerDependencies:
+    axios: ^0.27.1
+    lodash-es: ^4.17.21
+  languageName: unknown
+  linkType: soft
+
+"web-pkg@workspace:*, web-pkg@workspace:packages/web-pkg":
   version: 0.0.0-use.local
   resolution: "web-pkg@workspace:packages/web-pkg"
+  peerDependencies:
+    "@vue/composition-api": ^1.6.2
+    axios: ^0.27.1
+    filesize: ^9.0.11
+    lodash-es: ^4.17.21
+    luxon: ^2.4.0
+    qs: ^6.10.3
+    uuid: ^9.0.0
+    vue-router: ~3.5.3
+    vuex: ^3.6.2
+    web-client: "workspace:*"
   languageName: unknown
   linkType: soft
 
@@ -13683,14 +13624,14 @@ __metadata:
     promise: ^8.1.0
     qs: ^6.10.3
     sanitize-html: ^2.7.0
-    semver: ^7.3.7
+    semver: ^7.3.8
     tippy.js: ^6.3.7
     utf8: ^3.0.0
     uuid: ^9.0.0
     v-calendar: ^2.3.2
     vue: ^2.6.10
     vue-async-computed: ^3.9.0
-    vue-concurrency: ^2.2.1
+    vue-concurrency: ^3.0.0-7
     vue-events: ^3.1.0
     vue-gettext: ^2.1.5
     vue-inline-svg: ^2.0.0
@@ -13702,7 +13643,8 @@ __metadata:
     vuex: ^3.6.2
     vuex-extensions: ^1.1.5
     vuex-router-sync: ^5.0.0
-    web-pkg: "*"
+    web-client: "workspace:*"
+    web-pkg: "workspace:*"
     webdav: ^4.10.0
     webfontloader: ^1.6.28
     xml-js: ^1.6.11
@@ -13952,13 +13894,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yallist@npm:^3.0.2":
-  version: 3.1.1
-  resolution: "yallist@npm:3.1.1"
-  checksum: 48f7bb00dc19fc635a13a39fe547f527b10c9290e7b3e836b9a8f1ca04d4d342e85714416b3c2ab74949c9c66f9cebb0473e6bc353b79035356103b47641285d
-  languageName: node
-  linkType: hard
-
 "yallist@npm:^4.0.0":
   version: 4.0.0
   resolution: "yallist@npm:4.0.0"