diff --git a/packages/web-app-files/src/HandleUpload.ts b/packages/web-app-files/src/HandleUpload.ts
index ada14dd4729..c86b1704a59 100644
--- a/packages/web-app-files/src/HandleUpload.ts
+++ b/packages/web-app-files/src/HandleUpload.ts
@@ -16,6 +16,7 @@ import { locationPublicLink } from 'web-pkg/src/router/public'
 import { locationSpacesGeneric } from 'web-pkg/src/router/spaces'
 import { isPersonalSpaceResource, isShareSpaceResource } from 'web-client/src/helpers'
 import { ClientService } from 'web-pkg/types'
+import { queryItemAsString } from 'web-pkg/src/composables'
 
 export interface HandleUploadOptions {
   clientService: ClientService
@@ -112,8 +113,12 @@ export class HandleUpload extends BasePlugin {
 
     if (!this.currentFolder && unref(this.route)?.params?.token) {
       // public file drop
-      const publicLinkToken = unref(this.route).params.token
-      let endpoint = this.clientService.owncloudSdk.publicFiles.getFileUrl(publicLinkToken) + '/'
+      const publicLinkToken = queryItemAsString(unref(this.route).params.token)
+      let endpoint = urlJoin(
+        this.clientService.webdav.getPublicFileUrl(this.space, publicLinkToken),
+        { trailingSlash: true }
+      )
+
       for (const file of files) {
         if (!this._uppy.getPlugin('Tus')) {
           endpoint = urlJoin(endpoint, encodeURIComponent(file.name))
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 beabe462f61..6a4d70ac70d 100644
--- a/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
+++ b/packages/web-app-files/src/components/SideBar/Versions/FileVersions.vue
@@ -63,16 +63,19 @@ import { isShareSpaceResource, Resource, SpaceResource } from 'web-client/src/he
 import { SharePermissions } from 'web-client/src/helpers/share'
 import { useDownloadFile } from 'web-pkg/src/composables/download/useDownloadFile'
 import { formatDateFromJSDate } from 'web-pkg/src/helpers'
+import { useClientService } from 'web-pkg/src/composables'
 
 export default defineComponent({
   name: 'FileVersions',
   setup() {
+    const clientService = useClientService()
     const loading = ref(false)
 
     return {
       ...useDownloadFile(),
       space: inject<Ref<SpaceResource>>('space'),
       resource: inject<Ref<Resource>>('resource'),
+      clientService,
       loading
     }
   },
@@ -118,8 +121,12 @@ export default defineComponent({
       this.loading = false
     },
     async revertVersion(file) {
-      const { fileId, id, path } = this.resource
-      await this.$client.fileVersions.restoreFileVersion(fileId, this.currentVersionId(file), path)
+      const { id } = this.resource
+      await this.clientService.webdav.restoreFileVersion(
+        this.space,
+        this.resource,
+        this.currentVersionId(file)
+      )
       const resource = await (this.$clientService.webdav as WebDAV).getFileInfo(
         this.space,
         this.resource
diff --git a/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts b/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts
index a8bf29ea2ec..ffb9fe22bdf 100644
--- a/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts
+++ b/packages/web-app-files/src/composables/actions/spaces/useSpaceActionsUploadImage.ts
@@ -1,6 +1,6 @@
 import { computed, unref, VNodeRef } from 'vue'
 import { Store } from 'vuex'
-import { SpaceResource } from 'web-client/src'
+import { Resource, SpaceResource } from 'web-client/src'
 import { Drive } from 'web-client/src/generated'
 import {
   useClientService,
@@ -57,22 +57,24 @@ export const useSpaceActionsUploadImage = ({
     }
 
     return loadingService.addTask(() => {
-      return clientService.owncloudSdk.files
-        .putFileContents(`/spaces/${selectedSpace.id}/.space/${file.name}`, file, {
+      return clientService.webdav
+        .putFileContents(selectedSpace, {
+          path: `/.space/${file.name}`,
+          content: file,
           headers: extraHeaders,
           overwrite: true
         })
-        .then((image) => {
+        .then(({ fileId }: Resource) => {
           return graphClient.drives
             .updateDrive(
-              selectedSpace.id as string,
+              selectedSpace.id.toString(),
               {
                 special: [
                   {
                     specialFolder: {
                       name: 'image'
                     },
-                    id: image['OC-FileId']
+                    id: fileId
                   }
                 ]
               } as Drive,
@@ -80,7 +82,7 @@ export const useSpaceActionsUploadImage = ({
             )
             .then(({ data }) => {
               store.commit('runtime/spaces/UPDATE_SPACE_FIELD', {
-                id: selectedSpace.id as string,
+                id: selectedSpace.id.toString(),
                 field: 'spaceImageData',
                 value: data.special.find((special) => special.specialFolder.name === 'image')
               })
diff --git a/packages/web-app-files/src/search/sdk/list.ts b/packages/web-app-files/src/search/sdk/list.ts
index a773f644ca1..79dc15477a5 100644
--- a/packages/web-app-files/src/search/sdk/list.ts
+++ b/packages/web-app-files/src/search/sdk/list.ts
@@ -1,24 +1,15 @@
 import { SearchList, SearchResult } from 'web-app-search/src/types'
 import ListComponent from '../../components/Search/List.vue'
 import { ClientService } from 'web-pkg/src/services'
-import {
-  ProjectSpaceResource,
-  buildResource,
-  isProjectSpaceResource,
-  Resource
-} from 'web-client/src/helpers'
+import { ProjectSpaceResource, isProjectSpaceResource } from 'web-client/src/helpers'
 import { Component, computed, Ref, unref } from 'vue'
-import { DavProperties, DavProperty } from 'web-client/src/webdav/constants'
+import { DavProperties } from 'web-client/src/webdav/constants'
 import { Store } from 'vuex'
 import { ConfigurationManager } from 'web-pkg/src'
 import { urlJoin } from 'web-client/src/utils'
 
 export const searchLimit = 200
 
-export interface SearchResource extends Resource {
-  highlights: string
-}
-
 export default class List implements SearchList {
   public readonly component: Component
   private readonly store: Store<any>
@@ -60,30 +51,27 @@ export default class List implements SearchList {
       }
     }
 
-    const { range, results } = await this.clientService.owncloudSdk.files.search(
-      term,
+    const { resources, totalResults } = await this.clientService.webdav.search(term, {
       searchLimit,
-      DavProperties.Default,
+      davProperties: DavProperties.Default,
       useSpacesEndpoint
-    )
+    })
 
     return {
-      totalResults: range ? parseInt(range?.split('/')[1]) : null,
-      values: results.map((result) => {
-        const projectSpace = this.getProjectSpace(result.fileInfo[DavProperty.FileParent])
-        const resource = {
-          ...(projectSpace ? projectSpace : buildResource(result)),
-          highlights: result.fileInfo[DavProperty.Highlights] || ''
-        } as SearchResource
+      totalResults,
+      values: resources.map((resource) => {
+        const matchingSpace = this.getProjectSpace(resource.parentFolderId)
+        const data = matchingSpace ? matchingSpace : resource
 
         // info: in oc10 we have no storageId in resources. All resources are mounted into the personal space.
-        if (!resource.storageId) {
-          resource.storageId = this.store.getters.user.id
+        if (!data.storageId) {
+          data.storageId = this.store.getters.user.id
         }
-        if (this.configurationManager.options.routing.fullShareOwnerPaths && resource.shareRoot) {
-          resource.path = urlJoin(resource.shareRoot, resource.path)
+        if (this.configurationManager.options.routing.fullShareOwnerPaths && data.shareRoot) {
+          data.path = urlJoin(data.shareRoot, data.path)
         }
-        return { id: resource.id, data: resource }
+
+        return { id: data.id, data }
       })
     }
   }
diff --git a/packages/web-app-files/src/search/sdk/preview.ts b/packages/web-app-files/src/search/sdk/preview.ts
index 5a58a7b1ace..87af69d114a 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 'web-app-search/src/types'
 import PreviewComponent from '../../components/Search/Preview.vue'
 import { ClientService } from 'web-pkg/src/services'
-import { ProjectSpaceResource, buildResource, isProjectSpaceResource } from 'web-client/src/helpers'
+import { ProjectSpaceResource, isProjectSpaceResource } from 'web-client/src/helpers'
 import { Cache } from 'web-pkg/src/helpers/cache'
 import { Component, computed, Ref, unref } from 'vue'
 import { Router } from 'vue-router'
-import { DavProperties, DavProperty } from 'web-client/src/webdav/constants'
+import { DavProperties } from 'web-client/src/webdav/constants'
 import { Store } from 'vuex'
 import { ConfigurationManager } from 'web-pkg/src'
 import { urlJoin } from 'web-client/src/utils'
@@ -64,35 +64,34 @@ export default class Preview implements SearchPreview {
     const areHiddenFilesShown = this.store.state.Files?.areHiddenFilesShown
     const useSpacesEndpoint = this.store.getters.capabilities?.spaces?.enabled === true
 
-    const { range, results } = await this.clientService.owncloudSdk.files.search(
-      term,
-      previewSearchLimit, // todo: add configuration option, other places need that too... needs consolidation
-      DavProperties.Default,
+    const { resources, totalResults } = await this.clientService.webdav.search(term, {
+      searchLimit: previewSearchLimit,
+      davProperties: DavProperties.Default,
       useSpacesEndpoint
-    )
-    const resources = results.reduce((acc, result) => {
-      const projectSpace = this.getProjectSpace(result.fileInfo[DavProperty.FileParent])
-      const resource = projectSpace ? projectSpace : buildResource(result)
-      // info: in oc10 we have no storageId in resources. All resources are mounted into the personal space.
-      if (!resource.storageId) {
-        resource.storageId = this.store.getters.user.id
-      }
+    })
 
-      if (this.configurationManager.options.routing.fullShareOwnerPaths && resource.shareRoot) {
-        resource.path = urlJoin(resource.shareRoot, resource.path)
-      }
+    return {
+      totalResults,
+      values: resources
+        .map((resource) => {
+          const matchingSpace = this.getProjectSpace(resource.parentFolderId)
+          const data = matchingSpace ? matchingSpace : resource
 
-      // filter results if hidden files shouldn't be shown due to settings
-      if (!resource.name.startsWith('.') || areHiddenFilesShown) {
-        acc.push({ id: resource.id, data: { ...resource } })
-      }
+          // info: in oc10 we have no storageId in resources. All resources are mounted into the personal space.
+          if (!data.storageId) {
+            data.storageId = this.store.getters.user.id
+          }
+          if (this.configurationManager.options.routing.fullShareOwnerPaths && data.shareRoot) {
+            data.path = urlJoin(data.shareRoot, data.path)
+          }
 
-      return acc
-    }, [])
-    return this.cache.set(term, {
-      totalResults: range ? parseInt(range?.split('/')[1]) : null,
-      values: resources
-    })
+          return { id: data.id, data }
+        })
+        .filter(({ data }) => {
+          // filter results if hidden files shouldn't be shown due to settings
+          return !data.name.startsWith('.') || areHiddenFilesShown
+        })
+    }
   }
 
   public get available(): boolean {
diff --git a/packages/web-app-files/src/views/FilesDrop.vue b/packages/web-app-files/src/views/FilesDrop.vue
index d1bd91ae530..fd41ec95199 100644
--- a/packages/web-app-files/src/views/FilesDrop.vue
+++ b/packages/web-app-files/src/views/FilesDrop.vue
@@ -36,7 +36,6 @@
 
 <script lang="ts">
 import { mapGetters } from 'vuex'
-import { DavProperties, DavProperty } from 'web-client/src/webdav/constants'
 import { createLocationPublic, createLocationSpaces } from 'web-pkg/src/router'
 
 import ResourceUpload from '../components/AppBar/Upload/ResourceUpload.vue'
@@ -54,7 +53,6 @@ import { useUpload } from 'web-runtime/src/composables/upload'
 import { useGettext } from 'vue3-gettext'
 import {
   useClientService,
-  usePublicLinkPassword,
   usePublicLinkToken,
   useStore,
   useRouter,
@@ -72,6 +70,8 @@ import { UppyService } from 'web-runtime/src/services/uppyService'
 import { useAuthService } from 'web-pkg/src/composables/authContext/useAuthService'
 import { HandleUpload } from 'web-app-files/src/HandleUpload'
 import { createFileRouteOptions } from 'web-pkg/src/helpers/router'
+import { SpaceResource } from 'web-client/src'
+import { PublicSpaceResource } from 'web-client/src/helpers'
 
 export default defineComponent({
   components: {
@@ -87,7 +87,6 @@ export default defineComponent({
     const authService = useAuthService()
     const clientService = useClientService()
     const publicToken = usePublicLinkToken({ store })
-    const publicLinkPassword = usePublicLinkPassword({ store })
     const isUserContext = useUserContext({ store })
     const { getInternalSpace } = useGetMatchingSpace()
     useUpload({ uppyService })
@@ -111,7 +110,7 @@ export default defineComponent({
       })
     }
 
-    const share = ref()
+    const share = ref<PublicSpaceResource>()
     const dragareaEnabled = ref(false)
     const loading = ref(true)
     const errorMessage = ref(null)
@@ -142,7 +141,7 @@ export default defineComponent({
 
       if (unref(isUserContext) && unref(fileId)) {
         try {
-          const path = await clientService.owncloudSdk.files.getPathForFileId(unref(fileId))
+          const path = await clientService.webdav.getPathForFileId(unref(fileId))
           await resolveToInternalLocation(path)
           loading.value = false
           return
@@ -151,11 +150,14 @@ export default defineComponent({
         }
       }
 
-      clientService.owncloudSdk.publicFiles
-        .list(unref(publicToken), unref(publicLinkPassword), DavProperties.PublicLink, '0')
-        .then((files) => {
+      const spaces: SpaceResource[] = store.getters['runtime/spaces/spaces']
+      const space = spaces.find((s) => s.driveAlias === `public/${unref(publicToken)}`)
+
+      clientService.webdav
+        .listFiles(space, {}, { depth: 0 })
+        .then(({ resource }) => {
           // Redirect to files list if the link doesn't have role "uploader"
-          const sharePermissions = parseInt(files[0].getProperty(DavProperty.PublicLinkPermission))
+          const sharePermissions = (resource as PublicSpaceResource).publicLinkPermission
           if (linkRoleUploaderFolder.bitmask(false) !== sharePermissions) {
             router.replace(
               createLocationPublic('files-public-link', {
@@ -164,7 +166,7 @@ export default defineComponent({
             )
             return
           }
-          share.value = files[0]
+          share.value = resource as PublicSpaceResource
         })
         .catch((error) => {
           // likely missing password, redirect to public link password prompt
@@ -220,7 +222,7 @@ export default defineComponent({
       if (this.share) {
         return this.$gettext(
           '%{owner} shared this folder with you for uploading',
-          { owner: this.share.getProperty(this.$client.publicFiles.PUBLIC_LINK_SHARE_OWNER) },
+          { owner: this.share.publicLinkShareOwner },
           true
         )
       }
diff --git a/packages/web-app-files/src/views/spaces/DriveResolver.vue b/packages/web-app-files/src/views/spaces/DriveResolver.vue
index cd021574bd8..3b303da5645 100644
--- a/packages/web-app-files/src/views/spaces/DriveResolver.vue
+++ b/packages/web-app-files/src/views/spaces/DriveResolver.vue
@@ -115,7 +115,7 @@ export default defineComponent({
         const isRunningOnEos = store.getters.configuration?.options?.runningOnEos
         if (unref(isUserContext) && unref(fileId) && !isRunningOnEos) {
           try {
-            const path = await clientService.owncloudSdk.files.getPathForFileId(unref(fileId))
+            const path = await clientService.webdav.getPathForFileId(unref(fileId))
             await resolveToInternalLocation(path)
             loading.value = false
             return
diff --git a/packages/web-app-files/tests/unit/composables/actions/spaces/useSpaceActionsUploadImage.spec.ts b/packages/web-app-files/tests/unit/composables/actions/spaces/useSpaceActionsUploadImage.spec.ts
index ee41fc16647..671c8516201 100644
--- a/packages/web-app-files/tests/unit/composables/actions/spaces/useSpaceActionsUploadImage.spec.ts
+++ b/packages/web-app-files/tests/unit/composables/actions/spaces/useSpaceActionsUploadImage.spec.ts
@@ -10,7 +10,7 @@ import {
 } from 'web-test-helpers'
 import { unref, VNodeRef } from 'vue'
 import { useStore } from 'web-pkg/src/composables'
-import { SpaceResource } from 'web-client/src'
+import { Resource, SpaceResource } from 'web-client/src'
 import { Drive } from 'web-client/src/generated'
 
 describe('uploadImage', () => {
@@ -22,9 +22,9 @@ describe('uploadImage', () => {
           clientService.graphAuthenticated.drives.updateDrive.mockResolvedValue(
             mockAxiosResolve(driveMock)
           )
-          clientService.owncloudSdk.files.putFileContents.mockImplementation(() =>
-            Promise.resolve({
-              'OC-FileId':
+          clientService.webdav.putFileContents.mockResolvedValue(
+            mock<Resource>({
+              fileId:
                 'YTE0ODkwNGItNTZhNy00NTQ4LTk2N2MtZjcwZjhhYTY0Y2FjOmQ4YzMzMmRiLWUxNWUtNDRjMy05NGM2LTViYjQ2MGMwMWJhMw=='
             })
           )
@@ -43,9 +43,7 @@ describe('uploadImage', () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
       getWrapper({
         setup: async ({ uploadImageSpace }, { storeOptions, clientService }) => {
-          clientService.owncloudSdk.files.putFileContents.mockImplementation(() =>
-            Promise.reject(new Error(''))
-          )
+          clientService.webdav.putFileContents.mockRejectedValue(new Error(''))
 
           await uploadImageSpace({
             currentTarget: {
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 220b1d160c1..5edef13cf94 100644
--- a/packages/web-app-files/tests/unit/search/sdk.spec.ts
+++ b/packages/web-app-files/tests/unit/search/sdk.spec.ts
@@ -6,9 +6,13 @@ import { mock, mockDeep } from 'jest-mock-extended'
 import { ref } from 'vue'
 import { createStore, defaultStoreMockOptions } from 'web-test-helpers/src'
 import { ProjectSpaceResource } from 'web-client/src/helpers'
-import { DavProperty } from 'web-client/src/webdav/constants'
 import { ConfigurationManager } from 'web-pkg/src'
 
+const getClientServiceMock = (result = { resources: [], totalResults: 0 }) => {
+  const clientService = mockDeep<ClientService>()
+  clientService.webdav.search.mockResolvedValue(result)
+  return clientService
+}
 const searchMock = jest.fn()
 const clientService = mockDeep<ClientService>()
 clientService.owncloudSdk.files.search.mockImplementation(searchMock)
@@ -36,6 +40,7 @@ const storeWithoutFileSearch = mockDeep<Store<any>>({
 
 describe('SDKProvider', () => {
   it('is only available if announced via capabilities', () => {
+    const clientService = getClientServiceMock()
     const search = new SDKSearch(
       storeWithoutFileSearch,
       mock<Router>(),
@@ -47,6 +52,7 @@ describe('SDKProvider', () => {
 
   describe('SDKProvider previewSearch', () => {
     it('is not available on certain routes', () => {
+      const clientService = getClientServiceMock()
       ;[
         { route: 'foo', available: true },
         { route: 'search-provider-list' },
@@ -66,17 +72,17 @@ describe('SDKProvider', () => {
     })
 
     it('can search', async () => {
-      const search = new SDKSearch(getStore(), mock<Router>(), clientService, configurationManager)
       const files = [
         { id: 'foo', name: 'foo', fileInfo: {} },
         { id: 'bar', name: 'bar', fileInfo: {} },
         { id: 'baz', name: 'baz', fileInfo: {} }
       ]
+      const clientService = getClientServiceMock({ resources: files, totalResults: 3 })
+      const search = new SDKSearch(getStore(), mock<Router>(), clientService, configurationManager)
 
       const noTerm = await search.previewSearch.search('')
       expect(noTerm).toEqual({ totalResults: null, values: [] })
 
-      searchMock.mockReturnValueOnce({ results: files })
       const withTerm = await search.previewSearch.search('foo')
       expect(withTerm.values.map((r) => r.data)).toMatchObject(files)
 
@@ -86,44 +92,41 @@ describe('SDKProvider', () => {
     it('properly returns space resources', async () => {
       const spaceId = '1'
       const space = mock<ProjectSpaceResource>({ id: spaceId, name: 'foo', driveType: 'project' })
+      const files = [{ id: 'foo', name: 'foo', parentFolderId: space.id }]
+      const clientService = getClientServiceMock({ resources: files, totalResults: 1 })
       const search = new SDKSearch(
         getStore([space]),
         mock<Router>(),
         clientService,
         configurationManager
       )
-      const files = [{ id: 'foo', name: 'foo', fileInfo: { [DavProperty.FileParent]: space.id } }]
-
-      searchMock.mockReturnValueOnce({ results: files })
       const withTerm = (await search.previewSearch.search('foo')) as any
       expect(withTerm.values.map((r) => r.data)[0].id).toEqual(spaceId)
     })
   })
   describe('SDKProvider listSearch', () => {
     it('can search', async () => {
-      const search = new SDKSearch(getStore(), mock<Router>(), clientService, configurationManager)
       const files = [
         { id: 'foo', name: 'foo', fileInfo: {} },
         { id: 'bar', name: 'bar', fileInfo: {} },
         { id: 'baz', name: 'baz', fileInfo: {} }
       ]
-
-      searchMock.mockReturnValueOnce({ results: files })
+      const clientService = getClientServiceMock({ resources: files, totalResults: 3 })
+      const search = new SDKSearch(getStore(), mock<Router>(), clientService, configurationManager)
       const withTerm = (await search.listSearch.search('foo')) as any
       expect(withTerm.values.map((r) => r.data)).toMatchObject(files)
     })
     it('properly returns space resources', async () => {
       const spaceId = '1'
       const space = mock<ProjectSpaceResource>({ id: spaceId, driveType: 'project' })
+      const files = [{ id: 'foo', name: 'foo', parentFolderId: space.id }]
+      const clientService = getClientServiceMock({ resources: files, totalResults: 1 })
       const search = new SDKSearch(
         getStore([space]),
         mock<Router>(),
         clientService,
         configurationManager
       )
-      const files = [{ id: 'foo', name: 'foo', fileInfo: { [DavProperty.FileParent]: space.id } }]
-
-      searchMock.mockReturnValueOnce({ results: files })
       const withTerm = (await search.listSearch.search('foo')) as any
       expect(withTerm.values.map((r) => r.data)[0].id).toEqual(spaceId)
     })
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 ac7420a9fac..c84f8e2eaae 100644
--- a/packages/web-app-files/tests/unit/views/FilesDrop.spec.ts
+++ b/packages/web-app-files/tests/unit/views/FilesDrop.spec.ts
@@ -29,9 +29,7 @@ describe('FilesDrop view', () => {
 
 function getMountedWrapper() {
   const $clientService = mockDeep<ClientService>()
-  $clientService.owncloudSdk.publicFiles.list.mockImplementation(() =>
-    Promise.resolve([{ getProperty: jest.fn() }])
-  )
+  $clientService.webdav.listFiles.mockReturnValue(undefined)
   const defaultMocks = {
     ...defaultComponentMocks({
       currentRoute: mock<RouteLocation>({ name: 'files-common-favorites' })
diff --git a/packages/web-app-files/tests/unit/views/spaces/DriveResolver.spec.ts b/packages/web-app-files/tests/unit/views/spaces/DriveResolver.spec.ts
index e7d0b873027..0edef52fbd9 100644
--- a/packages/web-app-files/tests/unit/views/spaces/DriveResolver.spec.ts
+++ b/packages/web-app-files/tests/unit/views/spaces/DriveResolver.spec.ts
@@ -67,7 +67,7 @@ describe('DriveResolver view', () => {
     const space = { id: '1', getDriveAliasAndItem: jest.fn(), driveType: 'public' }
     const internalSpace = { id: '1', getDriveAliasAndItem: jest.fn(), driveType: 'personal' }
     const clientService = mockDeep<ClientService>()
-    clientService.owncloudSdk.files.getPathForFileId.mockResolvedValue('/path')
+    clientService.webdav.getPathForFileId.mockResolvedValue('/path')
     clientService.webdav.getFileInfo.mockResolvedValue(mock<Resource>())
     const { wrapper, mocks } = getMountedWrapper({
       space,
@@ -85,7 +85,7 @@ describe('DriveResolver view', () => {
   it('redirects to private link if user has access to the resource via a share', async () => {
     const space = { id: '1', getDriveAliasAndItem: jest.fn(), driveType: 'public' }
     const clientService = mockDeep<ClientService>()
-    clientService.owncloudSdk.files.getPathForFileId.mockResolvedValue('/path')
+    clientService.webdav.getPathForFileId.mockResolvedValue('/path')
     const { wrapper, mocks } = getMountedWrapper({
       space,
       mocks: { $clientService: clientService },
diff --git a/packages/web-app-search/src/types.ts b/packages/web-app-search/src/types.ts
index 4bd1e53238b..7b69aab40c6 100644
--- a/packages/web-app-search/src/types.ts
+++ b/packages/web-app-search/src/types.ts
@@ -1,5 +1,5 @@
 export interface SearchResultValue {
-  id: string
+  id: string | number
   data: unknown
 }
 
diff --git a/packages/web-client/src/helpers/space/functions.ts b/packages/web-client/src/helpers/space/functions.ts
index 642ac64d404..d3e2e2b1c42 100644
--- a/packages/web-client/src/helpers/space/functions.ts
+++ b/packages/web-client/src/helpers/space/functions.ts
@@ -14,6 +14,16 @@ import { DavProperty } from '../../webdav/constants'
 import { buildWebDavPublicPath } from '../publicLink'
 import { urlJoin } from '../../utils'
 
+export function getRelativeSpecialFolderSpacePath(space: SpaceResource, type: 'image' | 'readme') {
+  const typeMap = { image: 'spaceImageData', readme: 'spaceReadmeData' }
+  const webDavPathComponents = decodeURI(space[typeMap[type]].webDavUrl).split('/')
+  const idComponent = webDavPathComponents.find((c) => c.startsWith(space.id.toString()))
+  if (!idComponent) {
+    return ''
+  }
+  return webDavPathComponents.slice(webDavPathComponents.indexOf(idComponent) + 1).join('/')
+}
+
 export function buildPublicSpaceResource(data): PublicSpaceResource {
   const publicLinkPassword = data.publicLinkPassword
 
diff --git a/packages/web-client/src/webdav/clearTrashBin.ts b/packages/web-client/src/webdav/clearTrashBin.ts
new file mode 100644
index 00000000000..a74159707e1
--- /dev/null
+++ b/packages/web-client/src/webdav/clearTrashBin.ts
@@ -0,0 +1,28 @@
+import {
+  Resource,
+  SpaceResource,
+  buildWebDavFilesTrashPath,
+  buildWebDavSpacesTrashPath
+} from '../helpers'
+import { WebDavOptions } from './types'
+import { User } from '../helpers'
+
+interface ClearTrashBinOptions {
+  hasShareJail?: boolean
+  id?: Resource['id']
+  user?: User
+}
+
+export const ClearTrashBinFactory = ({ sdk }: WebDavOptions) => {
+  return {
+    clearTrashBin(
+      space: SpaceResource,
+      { hasShareJail = true, id, user }: ClearTrashBinOptions = {}
+    ): Promise<void> {
+      const path = hasShareJail
+        ? buildWebDavSpacesTrashPath(space.id)
+        : buildWebDavFilesTrashPath(user.id)
+      return sdk.fileTrash.clearTrashBin(path, id)
+    }
+  }
+}
diff --git a/packages/web-client/src/webdav/getPathForFileId.ts b/packages/web-client/src/webdav/getPathForFileId.ts
new file mode 100644
index 00000000000..57abd2f3eb5
--- /dev/null
+++ b/packages/web-client/src/webdav/getPathForFileId.ts
@@ -0,0 +1,9 @@
+import { WebDavOptions } from './types'
+
+export const GetPathForFileIdFactory = ({ sdk }: WebDavOptions) => {
+  return {
+    getPathForFileId(id: string): Promise<string> {
+      return sdk.files.getPathForFileId(id)
+    }
+  }
+}
diff --git a/packages/web-client/src/webdav/getPublicFileUrl.ts b/packages/web-client/src/webdav/getPublicFileUrl.ts
new file mode 100644
index 00000000000..d0c7d054b3a
--- /dev/null
+++ b/packages/web-client/src/webdav/getPublicFileUrl.ts
@@ -0,0 +1,10 @@
+import { SpaceResource } from '../helpers'
+import { WebDavOptions } from './types'
+
+export const GetPublicFileUrlFactory = ({ sdk }: WebDavOptions) => {
+  return {
+    getPublicFileUrl(space: SpaceResource, publicLinkToken: string): string {
+      return sdk.publicFiles.getFileUrl(publicLinkToken)
+    }
+  }
+}
diff --git a/packages/web-client/src/webdav/index.ts b/packages/web-client/src/webdav/index.ts
index d05b2893635..e65117b5f8f 100644
--- a/packages/web-client/src/webdav/index.ts
+++ b/packages/web-client/src/webdav/index.ts
@@ -4,11 +4,16 @@ import { CreateFolderFactory } from './createFolder'
 import { GetFileContentsFactory } from './getFileContents'
 import { GetFileInfoFactory } from './getFileInfo'
 import { GetFileUrlFactory } from './getFileUrl'
+import { GetPublicFileUrlFactory } from './getPublicFileUrl'
 import { ListFilesFactory } from './listFiles'
 import { MoveFilesFactory } from './moveFiles'
 import { PutFileContentsFactory } from './putFileContents'
 import { DeleteFileFactory } from './deleteFile'
 import { RestoreFileFactory } from './restoreFile'
+import { RestoreFileVersionFactory } from './restoreFileVersion'
+import { ClearTrashBinFactory } from './clearTrashBin'
+import { SearchFactory } from './search'
+import { GetPathForFileIdFactory } from './getPathForFileId'
 
 export * from './types'
 
@@ -25,6 +30,9 @@ export const webdav = (options: WebDavOptions): WebDAV => {
   const { putFileContents } = PutFileContentsFactory(getFileInfoFactory, options)
 
   const { getFileUrl, revokeUrl } = GetFileUrlFactory(getFileContentsFactory, options)
+  const { getPublicFileUrl } = GetPublicFileUrlFactory(options)
+
+  const { getPathForFileId } = GetPathForFileIdFactory(options)
 
   const { copyFiles } = CopyFilesFactory(options)
   const { moveFiles } = MoveFilesFactory(options)
@@ -32,17 +40,28 @@ export const webdav = (options: WebDavOptions): WebDAV => {
   const { deleteFile } = DeleteFileFactory(options)
   const { restoreFile } = RestoreFileFactory(options)
 
+  const { restoreFileVersion } = RestoreFileVersionFactory(options)
+
+  const { clearTrashBin } = ClearTrashBinFactory(options)
+
+  const { search } = SearchFactory(options)
+
   return {
     copyFiles,
     createFolder,
     deleteFile,
     restoreFile,
+    restoreFileVersion,
     getFileContents,
     getFileInfo,
     getFileUrl,
+    getPublicFileUrl,
+    getPathForFileId,
     listFiles,
     moveFiles,
     putFileContents,
-    revokeUrl
+    revokeUrl,
+    clearTrashBin,
+    search
   }
 }
diff --git a/packages/web-client/src/webdav/putFileContents.ts b/packages/web-client/src/webdav/putFileContents.ts
index 1f696b0143a..112d2eafaae 100644
--- a/packages/web-client/src/webdav/putFileContents.ts
+++ b/packages/web-client/src/webdav/putFileContents.ts
@@ -14,7 +14,13 @@ export const PutFileContentsFactory = (
         path,
         content = '',
         ...options
-      }: { path?: string; content?: string; previousEntityTag?: string }
+      }: {
+        path?: string
+        content?: string
+        previousEntityTag?: string
+        headers?: Record<string, string>
+        overwrite?: boolean
+      }
     ): Promise<FileResource> {
       if (isPublicSpaceResource(space)) {
         await sdk.publicFiles.putFileContents(
diff --git a/packages/web-client/src/webdav/restoreFileVersion.ts b/packages/web-client/src/webdav/restoreFileVersion.ts
new file mode 100644
index 00000000000..7025925cd65
--- /dev/null
+++ b/packages/web-client/src/webdav/restoreFileVersion.ts
@@ -0,0 +1,17 @@
+import { FileResource, SpaceResource } from '../helpers'
+import { WebDavOptions } from './types'
+import { urlJoin } from '../utils'
+import { Resource } from '..'
+
+export const RestoreFileVersionFactory = ({ sdk }: WebDavOptions) => {
+  return {
+    restoreFileVersion(
+      space: SpaceResource,
+      { id, path }: Resource,
+      versionId: string
+    ): Promise<FileResource> {
+      const webDavPath = urlJoin(space.webDavPath, path)
+      return sdk.fileVersions.restoreFileVersion(id, versionId, webDavPath)
+    }
+  }
+}
diff --git a/packages/web-client/src/webdav/search.ts b/packages/web-client/src/webdav/search.ts
new file mode 100644
index 00000000000..609d4b6c56f
--- /dev/null
+++ b/packages/web-client/src/webdav/search.ts
@@ -0,0 +1,42 @@
+import { Resource, buildResource } from '../helpers'
+import { WebDavOptions } from './types'
+import { DavProperties, DavProperty } from './constants'
+
+export interface SearchResource extends Resource {
+  highlights: string
+}
+
+export type SearchOptions = {
+  davProperties?: DavProperty[]
+  searchLimit?: number
+  useSpacesEndpoint?: boolean
+}
+
+export type SearchResult = {
+  resources: SearchResource[]
+  totalResults: number
+}
+
+export const SearchFactory = ({ sdk }: WebDavOptions) => {
+  return {
+    async search(
+      term: string,
+      { davProperties = DavProperties.Default, searchLimit, useSpacesEndpoint }: any
+    ): Promise<SearchResult> {
+      const { range, results } = await sdk.files.search(
+        term,
+        searchLimit,
+        davProperties,
+        useSpacesEndpoint
+      )
+
+      return {
+        resources: results.map((r) => ({
+          ...buildResource(r),
+          highlights: r.fileInfo[DavProperty.Highlights] || ''
+        })),
+        totalResults: range ? parseInt(range?.split('/')[1]) : null
+      }
+    }
+  }
+}
diff --git a/packages/web-client/src/webdav/types.ts b/packages/web-client/src/webdav/types.ts
index 6f981cca286..b34bb9a4769 100644
--- a/packages/web-client/src/webdav/types.ts
+++ b/packages/web-client/src/webdav/types.ts
@@ -3,12 +3,17 @@ import { CreateFolderFactory } from './createFolder'
 import { GetFileContentsFactory } from './getFileContents'
 import { GetFileInfoFactory } from './getFileInfo'
 import { GetFileUrlFactory } from './getFileUrl'
+import { GetPublicFileUrlFactory } from './getPublicFileUrl'
 import { ListFilesFactory } from './listFiles'
 import { PutFileContentsFactory } from './putFileContents'
 import { CopyFilesFactory } from './copyFiles'
 import { MoveFilesFactory } from './moveFiles'
 import { DeleteFileFactory } from './deleteFile'
 import { RestoreFileFactory } from './restoreFile'
+import { RestoreFileVersionFactory } from './restoreFileVersion'
+import { ClearTrashBinFactory } from './clearTrashBin'
+import { SearchFactory } from './search'
+import { GetPathForFileIdFactory } from './getPathForFileId'
 
 export interface WebDavOptions {
   sdk: OwnCloudSdk
@@ -17,13 +22,18 @@ export interface WebDavOptions {
 export interface WebDAV {
   getFileInfo: ReturnType<typeof GetFileInfoFactory>['getFileInfo']
   getFileUrl: ReturnType<typeof GetFileUrlFactory>['getFileUrl']
+  getPublicFileUrl: ReturnType<typeof GetPublicFileUrlFactory>['getPublicFileUrl']
   revokeUrl: ReturnType<typeof GetFileUrlFactory>['revokeUrl']
   listFiles: ReturnType<typeof ListFilesFactory>['listFiles']
   createFolder: ReturnType<typeof CreateFolderFactory>['createFolder']
   getFileContents: ReturnType<typeof GetFileContentsFactory>['getFileContents']
   putFileContents: ReturnType<typeof PutFileContentsFactory>['putFileContents']
+  getPathForFileId: ReturnType<typeof GetPathForFileIdFactory>['getPathForFileId']
   copyFiles: ReturnType<typeof CopyFilesFactory>['copyFiles']
   moveFiles: ReturnType<typeof MoveFilesFactory>['moveFiles']
   deleteFile: ReturnType<typeof DeleteFileFactory>['deleteFile']
   restoreFile: ReturnType<typeof RestoreFileFactory>['restoreFile']
+  restoreFileVersion: ReturnType<typeof RestoreFileVersionFactory>['restoreFileVersion']
+  clearTrashBin: ReturnType<typeof ClearTrashBinFactory>['clearTrashBin']
+  search: ReturnType<typeof SearchFactory>['search']
 }
diff --git a/packages/web-pkg/src/components/SideBar/Spaces/Details/SpaceDetails.vue b/packages/web-pkg/src/components/SideBar/Spaces/Details/SpaceDetails.vue
index 8974b50e63d..34db6e8a576 100644
--- a/packages/web-pkg/src/components/SideBar/Spaces/Details/SpaceDetails.vue
+++ b/packages/web-pkg/src/components/SideBar/Spaces/Details/SpaceDetails.vue
@@ -86,13 +86,13 @@
   </div>
 </template>
 <script lang="ts">
-import { defineComponent, inject, ref, computed, unref } from 'vue'
+import { defineComponent, inject, ref, Ref, computed, unref } from 'vue'
 import { mapGetters } from 'vuex'
 import { useTask } from 'vue-concurrency'
-import { buildResource, buildWebDavSpacesPath, SpaceResource } from 'web-client/src/helpers'
+import { getRelativeSpecialFolderSpacePath, SpaceResource } from 'web-client/src/helpers'
 import { spaceRoleManager } from 'web-client/src/helpers/share'
 import { ImageDimension } from 'web-pkg/src/constants'
-import { useStore, usePreviewService } from 'web-pkg/src/composables'
+import { useStore, usePreviewService, useClientService } from 'web-pkg/src/composables'
 import SpaceQuota from '../../../SpaceQuota.vue'
 import { formatDateFromISO } from 'web-pkg/src/helpers'
 import { eventBus } from 'web-pkg/src/services/eventBus'
@@ -121,7 +121,8 @@ export default defineComponent({
   setup(props) {
     const store = useStore()
     const previewService = usePreviewService()
-    const resource = inject<SpaceResource>('resource')
+    const clientService = useClientService()
+    const resource = inject<Ref<SpaceResource>>('resource')
     const spaceImage = ref('')
     const copySpaceIdIconInitial = 'file-copy'
     const copySpaceIdIcon = ref(copySpaceIdIconInitial)
@@ -132,22 +133,12 @@ export default defineComponent({
         return
       }
 
-      const webDavPathComponents = decodeURI(ref.resource.spaceImageData.webDavUrl).split('/')
-      const idComponent = webDavPathComponents.find((c) => c.startsWith(ref.resource.id))
-      if (!idComponent) {
-        return
-      }
-      const path = webDavPathComponents
-        .slice(webDavPathComponents.indexOf(idComponent) + 1)
-        .join('/')
-
-      const fileInfo = yield ref.$client.files.fileInfo(
-        buildWebDavSpacesPath(idComponent, decodeURIComponent(path))
-      )
-      const imageResource = buildResource(fileInfo)
+      const imageResource = yield clientService.webdav.getFileInfo(unref(resource), {
+        path: getRelativeSpecialFolderSpacePath(unref(resource), 'image')
+      })
 
       spaceImage.value = yield previewService.loadPreview({
-        space: resource,
+        space: unref(resource),
         resource: imageResource,
         dimensions: ImageDimension.Preview
       })
diff --git a/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue b/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
index 888588c57c9..a869120ab28 100644
--- a/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
+++ b/packages/web-pkg/src/components/Spaces/ReadmeContentModal.vue
@@ -9,7 +9,11 @@
       @cancel="cancel"
     >
       <template #content>
-        <label v-translate class="oc-label" for="description-input-area">Space description</label>
+        <label
+          class="oc-label"
+          for="description-input-area"
+          v-text="$gettext('Space description')"
+        />
         <textarea
           id="description-input-area"
           v-model="readmeContent"
@@ -21,14 +25,17 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, PropType } from 'vue'
+import { computed, defineComponent, PropType, onMounted, ref, unref } from 'vue'
+import { useGettext } from 'vue3-gettext'
+import { SpaceResource } from 'web-client/src'
+import { getRelativeSpecialFolderSpacePath } from 'web-client/src/helpers'
+import { useClientService, useStore } from 'web-pkg/src/composables'
 
-import { mapActions, mapMutations } from 'vuex'
 export default defineComponent({
   name: 'SpaceReadmeContentModal',
   props: {
     space: {
-      type: Object,
+      type: Object as PropType<SpaceResource>,
       required: true
     },
     cancel: {
@@ -36,52 +43,52 @@ export default defineComponent({
       required: true
     }
   },
-  data: function () {
-    return {
-      readmeContent: ''
-    }
-  },
-  computed: {
-    modalTitle() {
-      return this.$gettext('Edit description for space %{name}', {
-        name: this.space.name
+  setup(props) {
+    const store = useStore()
+    const { $gettext } = useGettext()
+    const clientService = useClientService()
+
+    const readmeContent = ref<string>()
+    const modalTitle = computed(() =>
+      $gettext('Edit description for space %{name}', {
+        name: props.space.name
       })
-    }
-  },
-  async mounted() {
-    const webDavPathComponents = this.space.spaceReadmeData.webDavUrl.split('/')
-    const path = webDavPathComponents.slice(webDavPathComponents.indexOf('dav') + 1).join('/')
-    this.readmeContent = await this.$client.files.getFileContents(decodeURI(path))
-  },
-  methods: {
-    ...mapActions(['showMessage', 'showErrorMessage']),
-    ...mapMutations('Files', ['UPDATE_RESOURCE_FIELD']),
+    )
 
-    editReadme() {
-      const webDavPathComponents = this.space.spaceReadmeData.webDavUrl.split('/')
-      const path = webDavPathComponents.slice(webDavPathComponents.indexOf('dav') + 1).join('/')
+    const editReadme = async () => {
+      try {
+        const readmeMetaData = await clientService.webdav.putFileContents(props.space, {
+          path: getRelativeSpecialFolderSpacePath(props.space, 'readme'),
+          content: unref(readmeContent)
+        })
 
-      return this.$client.files
-        .putFileContents(decodeURI(path), this.readmeContent)
-        .then((readmeMetaData) => {
-          this.cancel()
-          this.UPDATE_RESOURCE_FIELD({
-            id: this.space.id,
-            field: 'spaceReadmeData',
-            value: { ...this.space.spaceReadmeData, ...{ etag: readmeMetaData.ETag } }
-          })
-          this.showMessage({
-            title: this.$gettext('Space description was edited successfully')
-          })
+        props.cancel()
+        store.commit('Files/UPDATE_RESOURCE_FIELD', {
+          id: props.space.id,
+          field: 'spaceReadmeData',
+          value: { ...props.space.spaceReadmeData, ...{ etag: readmeMetaData.etag } }
+        })
+        store.dispatch('showMessage', {
+          title: $gettext('Space description was edited successfully')
         })
-        .catch((error) => {
-          console.error(error)
-          this.showErrorMessage({
-            title: this.$gettext('Failed to edit space description'),
-            error
-          })
+      } catch (error) {
+        console.error(error)
+        store.dispatch('showErrorMessage', {
+          title: $gettext('Failed to edit space description'),
+          error
         })
+      }
     }
+
+    onMounted(async () => {
+      readmeContent.value = (
+        await clientService.webdav.getFileContents(props.space, {
+          path: getRelativeSpecialFolderSpacePath(props.space, 'readme')
+        })
+      ).body
+    })
+
+    return { readmeContent, modalTitle, editReadme }
   }
 })
 </script>
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
index 3e4630b6eeb..21732e13b1f 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsEmptyTrashBin.ts
@@ -1,11 +1,7 @@
 import { Store } from 'vuex'
 import { isLocationTrashActive } from '../../../router'
-import {
-  buildWebDavSpacesTrashPath,
-  SpaceResource,
-  isProjectSpaceResource,
-  buildWebDavFilesTrashPath
-} from 'web-client/src/helpers'
+import { SpaceResource } from 'web-client/src/helpers'
+import { isProjectSpaceResource } from 'web-client/src/helpers'
 import { computed, unref } from 'vue'
 import {
   useCapabilityFilesPermanentDeletion,
@@ -28,12 +24,8 @@ export const useFileActionsEmptyTrashBin = ({ store }: { store?: Store<any> } =
   const hasPermanentDeletion = useCapabilityFilesPermanentDeletion()
 
   const emptyTrashBin = ({ space }: { space: SpaceResource }) => {
-    const path = unref(hasShareJail)
-      ? buildWebDavSpacesTrashPath(space.id)
-      : buildWebDavFilesTrashPath(store.getters.user.id)
-
-    return clientService.owncloudSdk.fileTrash
-      .clearTrashBin(path)
+    return clientService.webdav
+      .clearTrashBin(space, { hasShareJail: unref(hasShareJail), user: store.getters.user })
       .then(() => {
         store.dispatch('showMessage', {
           title: $gettext('All deleted files were removed')
diff --git a/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts b/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts
index 728a002d268..18f24f779fb 100644
--- a/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts
+++ b/packages/web-pkg/src/composables/actions/files/useFileActionsSetReadme.ts
@@ -14,8 +14,8 @@ export const useFileActionsSetReadme = ({ store }: { store?: Store<any> } = {})
 
   const handler = async ({ space, resources }: FileActionOptions) => {
     try {
-      const { owncloudSdk, graphAuthenticated, webdav } = clientService
-      const fileContent = await owncloudSdk.files.getFileContents(resources[0].webDavPath)
+      const { graphAuthenticated, webdav } = clientService
+      const fileContent = (await webdav.getFileContents(space, { path: resources[0].path })).body
 
       try {
         await webdav.getFileInfo(space, { path: '.space' })
@@ -23,7 +23,10 @@ export const useFileActionsSetReadme = ({ store }: { store?: Store<any> } = {})
         await webdav.createFolder(space, { path: '.space' })
       }
 
-      await owncloudSdk.files.putFileContents(`/spaces/${space.id}/.space/readme.md`, fileContent)
+      await webdav.putFileContents(space, {
+        path: `/.space/readme.md`,
+        content: fileContent
+      })
       const file = await webdav.getFileInfo(space, { path: '.space/readme.md' })
 
       const { data: updatedDriveData } = await graphAuthenticated.drives.updateDrive(
diff --git a/packages/web-pkg/src/composables/actions/helpers/useFileActionsDeleteResources.ts b/packages/web-pkg/src/composables/actions/helpers/useFileActionsDeleteResources.ts
index 404aa14d4e0..825a6db2ec9 100644
--- a/packages/web-pkg/src/composables/actions/helpers/useFileActionsDeleteResources.ts
+++ b/packages/web-pkg/src/composables/actions/helpers/useFileActionsDeleteResources.ts
@@ -1,12 +1,7 @@
 import { Store } from 'vuex'
 import { cloneStateObject } from '../../../helpers/store'
 import { isSameResource } from '../../../helpers/resource'
-import {
-  buildWebDavFilesTrashPath,
-  buildWebDavSpacesTrashPath,
-  Resource,
-  SpaceResource
-} from 'web-client/src/helpers'
+import { Resource, SpaceResource } from 'web-client/src/helpers'
 import PQueue from 'p-queue'
 import { isLocationSpacesActive } from '../../../router'
 import { dirname } from 'path'
@@ -111,13 +106,13 @@ export const useFileActionsDeleteResources = ({ store }: { store?: Store<any> })
     )
   })
 
-  const trashbin_deleteOp = (space, resource) => {
-    const path = unref(hasShareJail)
-      ? buildWebDavSpacesTrashPath(space.id)
-      : buildWebDavFilesTrashPath(store.getters.user.id)
-
-    return owncloudSdk.fileTrash
-      .clearTrashBin(path, resource.id)
+  const trashbin_deleteOp = (space: SpaceResource, resource: Resource) => {
+    return clientService.webdav
+      .clearTrashBin(space, {
+        hasShareJail: unref(hasShareJail),
+        id: resource.id,
+        user: store.getters.user
+      })
       .then(() => {
         store.dispatch('Files/removeFilesFromTrashbin', [resource])
         const translated = $gettext(
diff --git a/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts b/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts
index d4598affdc3..7eb98d8c8fb 100644
--- a/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts
+++ b/packages/web-pkg/tests/unit/components/Spaces/ReadmeContentModal.spec.ts
@@ -1,6 +1,5 @@
 import ReadmeContentModal from 'web-pkg/src/components/Spaces/ReadmeContentModal.vue'
-import { mockDeep } from 'jest-mock-extended'
-import { OwnCloudSdk } from 'web-client/src/types'
+import { mock } from 'jest-mock-extended'
 import {
   createStore,
   defaultPlugins,
@@ -9,35 +8,41 @@ import {
   defaultComponentMocks,
   defaultStubs
 } from 'web-test-helpers'
-
-afterEach(() => jest.clearAllMocks())
+import { GetFileContentsResponse } from 'web-client/src/webdav/getFileContents'
+import { Resource } from 'web-client/src'
 
 describe('ReadmeContentModal', () => {
   describe('method "editReadme"', () => {
     it('should show message on success', async () => {
-      const { wrapper } = getWrapper()
-      const showMessageStub = jest.spyOn(wrapper.vm, 'showMessage')
+      const { wrapper, storeOptions } = getWrapper()
       await wrapper.vm.editReadme()
-
-      expect(showMessageStub).toHaveBeenCalledTimes(1)
+      expect(storeOptions.actions.showMessage).toHaveBeenCalledTimes(1)
     })
 
     it('should show message on error', async () => {
       jest.spyOn(console, 'error').mockImplementation(() => undefined)
-      const { wrapper } = getWrapper(false)
-      const showErrorMessageStub = jest.spyOn(wrapper.vm, 'showErrorMessage')
+      const { wrapper, storeOptions } = getWrapper(false)
       await wrapper.vm.editReadme()
-
-      expect(showErrorMessageStub).toHaveBeenCalledTimes(1)
+      expect(storeOptions.actions.showErrorMessage).toHaveBeenCalledTimes(1)
     })
   })
 })
 
 function getWrapper(resolvePutFileContents = true) {
-  const clientMock = mockDeep<OwnCloudSdk>()
   const storeOptions = defaultStoreMockOptions
   const store = createStore(storeOptions)
+
+  const mocks = defaultComponentMocks()
+  const { $clientService: clientService } = mocks
+  clientService.webdav.getFileContents.mockResolvedValue(mock<GetFileContentsResponse>())
+  if (resolvePutFileContents) {
+    clientService.webdav.putFileContents.mockResolvedValue(mock<Resource>())
+  } else {
+    clientService.webdav.putFileContents.mockRejectedValue(new Error(''))
+  }
+
   return {
+    storeOptions,
     wrapper: mount(ReadmeContentModal, {
       props: {
         cancel: jest.fn(),
@@ -52,24 +57,8 @@ function getWrapper(resolvePutFileContents = true) {
       global: {
         plugins: [...defaultPlugins(), store],
         stubs: { ...defaultStubs, portal: true, 'oc-modal': true },
-        mocks: {
-          ...defaultComponentMocks(),
-          $client: {
-            ...clientMock,
-            files: {
-              ...clientMock.files,
-              putFileContents: jest.fn().mockImplementation(() => {
-                if (resolvePutFileContents) {
-                  return Promise.resolve('readme')
-                }
-                return Promise.reject(new Error(''))
-              }),
-              getFileContents: jest.fn().mockImplementation(() => {
-                return Promise.resolve('readme')
-              })
-            }
-          }
-        }
+        mocks,
+        provide: mocks
       }
     })
   }
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
index ddfcd2b590a..0ee75efcfba 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsEmptyTrashBin.spec.ts
@@ -110,12 +110,11 @@ function getWrapper({
     space: mock<ProjectSpaceResource>({ driveType, isEditor: () => false, isManager: () => false })
   }
 
-  mocks.$clientService.owncloudSdk.fileTrash.clearTrashBin.mockImplementation(() => {
-    if (resolveClearTrashBin) {
-      return Promise.resolve({})
-    }
-    return Promise.reject(new Error(''))
-  })
+  if (resolveClearTrashBin) {
+    mocks.$clientService.webdav.clearTrashBin.mockResolvedValue()
+  } else {
+    mocks.$clientService.webdav.clearTrashBin.mockRejectedValue(new Error(''))
+  }
 
   const storeOptions = {
     ...defaultStoreMockOptions,
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts
index 03994bdbe1c..02a910df96b 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsRestore.spec.ts
@@ -197,12 +197,6 @@ function getWrapper({
     return Promise.reject(new Error(''))
   })
   mocks.$clientService.owncloudSdk.users.getUser.mockImplementation(() => ({ quota: {} }))
-  mocks.$clientService.owncloudSdk.fileTrash.restore.mockImplementation(() => {
-    if (resolveRestore) {
-      return Promise.resolve({})
-    }
-    return Promise.reject(new Error(''))
-  })
 
   const storeOptions = {
     ...defaultStoreMockOptions,
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetImage.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetImage.spec.ts
index 15adb96fe3b..74fe4b0ec99 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetImage.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetImage.spec.ts
@@ -134,23 +134,6 @@ describe('setImage', () => {
         }
       })
     })
-
-    /* FIXME: Reintroduce with latest copyMove bugfix
-      it('should not copy the image if source and destination path are the same', async () => {
-        mockAxios.request.mockImplementationOnce(() => {
-          return Promise.resolve({ data: { special: [{ specialFolder: { name: 'image' } }] } })
-        })
-        getWrapper()
-        await wrapper.vm.$_setSpaceImage_trigger({
-          resources: [
-            {
-              webDavPath: '/spaces/1fe58d8b-aa69-4c22-baf7-97dd57479f22/.space/image.png',
-              name: 'image.png'
-            }
-          ]
-        })
-        expect(wrapper.vm.$client.files.copy).toBeCalledTimes(0)
-      }) */
   })
 })
 
diff --git a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetReadme.spec.ts b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetReadme.spec.ts
index 38dd191722c..9675ae4c8ab 100644
--- a/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetReadme.spec.ts
+++ b/packages/web-pkg/tests/unit/composables/actions/files/useFileActionsSetReadme.spec.ts
@@ -1,7 +1,6 @@
 import { useFileActionsSetReadme } from 'web-pkg/src/composables/actions/files/useFileActionsSetReadme'
-import { buildSpace, SpaceResource } from 'web-client/src/helpers'
-import { mock, mockDeep } from 'jest-mock-extended'
-import { OwnCloudSdk } from 'web-client/src/types'
+import { buildSpace, FileResource, SpaceResource } from 'web-client/src/helpers'
+import { mock } from 'jest-mock-extended'
 import {
   createStore,
   defaultStoreMockOptions,
@@ -11,6 +10,7 @@ import {
   mockAxiosResolve
 } from 'web-test-helpers'
 import { nextTick, unref } from 'vue'
+import { GetFileContentsResponse } from 'web-client/src/webdav/getFileContents'
 
 describe('setReadme', () => {
   describe('isEnabled property', () => {
@@ -147,23 +147,20 @@ function getWrapper({
     options: { storeOptions: typeof defaultStoreMockOptions }
   ) => void
 }) {
-  const clientMock = mockDeep<OwnCloudSdk>()
-
   const mocks = {
     ...defaultComponentMocks({
       currentRoute: mock<RouteLocation>({ name: 'files-spaces-generic' })
     }),
     space
   }
-  mocks.$clientService.owncloudSdk.files.getFileContents.mockImplementation(() => {
-    if (resolveGetFileContents) {
-      return Promise.resolve('readme')
-    }
-    return Promise.reject(new Error(''))
-  })
+  if (resolveGetFileContents) {
+    mocks.$clientService.webdav.getFileContents.mockResolvedValue(mock<GetFileContentsResponse>())
+  } else {
+    mocks.$clientService.webdav.getFileContents.mockRejectedValue(new Error(''))
+  }
 
-  mocks.$clientService.owncloudSdk.files.putFileContents.mockImplementation(() =>
-    Promise.resolve({ ETag: '60c7243c2e7f1' })
+  mocks.$clientService.webdav.putFileContents.mockResolvedValue(
+    mock<FileResource>({ etag: '60c7243c2e7f1' })
   )
 
   mocks.$clientService.webdav.getFileInfo.mockImplementation(() =>
diff --git a/packages/web-runtime/src/pages/resolvePrivateLink.vue b/packages/web-runtime/src/pages/resolvePrivateLink.vue
index c6f31809c82..78eed1430ae 100644
--- a/packages/web-runtime/src/pages/resolvePrivateLink.vue
+++ b/packages/web-runtime/src/pages/resolvePrivateLink.vue
@@ -105,7 +105,7 @@ export default defineComponent({
       let matchingSpace = getMatchingSpace(id)
       let resourceIsNestedInShare = false
       if (matchingSpace) {
-        path = yield clientService.owncloudSdk.files.getPathForFileId(id)
+        path = yield clientService.webdav.getPathForFileId(id)
         resource.value = yield clientService.webdav.getFileInfo(matchingSpace, { path })
       } else {
         // no matching space found => the file doesn't lie in own spaces => it's a share.