diff --git a/rollup.config.js b/rollup.config.js
index 19fd44085b0af3c34aa179fd185be48d7ba2de03..eaa236ecff3a488ca0c27a88fb43f19c567a5faa 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -272,7 +272,7 @@ Dependencies:
                 {src: 'assets/manifest.json', dest: 'dist', rename: pkg.name + '.manifest.json'},
                 {src: 'assets/*.metadata.json', dest: 'dist'},
                 {src: 'node_modules/vpu-common/assets/icons/*.svg', dest: 'dist/local/vpu-common/icons'},
-                {src: 'node_modules/tabulator-tables/dist/css', dest: 'dist/local/vpu-fileupload/tabulator-tables'},
+                {src: 'node_modules/tabulator-tables/dist/css', dest: 'dist/local/vpu-file-source/tabulator-tables'},
             ],
         }),
         useBabel && babel({
diff --git a/src/vpu-official-signature-pdf-upload.js b/src/vpu-official-signature-pdf-upload.js
index 3902efa8d246d1a48103a834a050c883825aabb7..cafa7687f89fc8697914a3b9571f9f964e5b2ceb 100644
--- a/src/vpu-official-signature-pdf-upload.js
+++ b/src/vpu-official-signature-pdf-upload.js
@@ -293,7 +293,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
         this.errorFilesCount = 0;
 
         commonUtils.asyncObjectForEach(errorFilesCopy, async (file, id) => {
-            await this.fileUploadClickHandler(file.file, id);
+            await this.fileQueueingClickHandler(file.file, id);
         });
 
         that._("#re-upload-all-button").stop();
@@ -729,10 +729,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
                         <vpu-file-source
                             allowed-mime-types="application/pdf"
                             decompress-zip
-                            always-send-file
-                            deferred
                             lang="${this.lang}"
-                            url="${this.fileSourceUrl}"
                             ?disabled="${this.signingProcessActive}"
                             text="${i18n.t('official-pdf-upload.upload-area-text')}"
                             button-label="${i18n.t('official-pdf-upload.upload-button-label')}"
@@ -740,7 +737,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitElem
                             ></vpu-file-source>
                     </div>
                 </div>
-                           <div id="grid-container">
+                <div id="grid-container">
                     <div class="left-container">
                         <div class="files-block field ${classMap({hidden: !this.queueBlockEnabled})}">
                             <!-- Queued files headline and queueing spinner -->
diff --git a/src/vpu-qualified-signature-pdf-upload.js b/src/vpu-qualified-signature-pdf-upload.js
index 93451b170d56e4f7220cde35307675a80cb2d430..7fded248ab149793a2f332bbd5a8801eb6f68940 100644
--- a/src/vpu-qualified-signature-pdf-upload.js
+++ b/src/vpu-qualified-signature-pdf-upload.js
@@ -879,10 +879,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(VPUSignatureLitEle
                             nextcloud-auth-url="${showTestNextcloudFilePicker ? nextcloudWebAppPasswordURL : ""}"
                             nextcloud-web-dav-url="${nextcloudWebDavURL}"
                             decompress-zip
-                            always-send-file
-                            deferred
                             lang="${this.lang}"
-                            url="${this.fileSourceUrl}"
                             ?disabled="${this.signingProcessActive}"
                             text="${i18n.t('qualified-pdf-upload.upload-area-text')}"
                             button-label="${i18n.t('qualified-pdf-upload.upload-button-label')}"
diff --git a/src/vpu-signature-lit-element.js b/src/vpu-signature-lit-element.js
index 43df839f8802fb7ac221ada29823d2e5e98cf767..b1d85636988d162fcf9b4405cc4531bc4b4197c2 100644
--- a/src/vpu-signature-lit-element.js
+++ b/src/vpu-signature-lit-element.js
@@ -9,7 +9,6 @@ export default class VPUSignatureLitElement extends LitElement {
         this.uploadInProgress = false;
         this.queueBlockEnabled = false;
         this._queueKey = 0;
-        this.fileSourceUrl = "";
 
         // will be set in function update
         this.fileSourceUrl = "";
@@ -24,11 +23,6 @@ export default class VPUSignatureLitElement extends LitElement {
         const key = this._queueKey;
         this.queuedFiles[key] = file;
         this.updateQueuedFilesCount();
-        console.log("file", file);
-
-        const data = {"file": file};
-        const event = new CustomEvent("vpu-fileupload-file-queued", { "detail": data, bubbles: true, composed: true });
-        this.dispatchEvent(event);
 
         return key;
     }
@@ -133,8 +127,6 @@ export default class VPUSignatureLitElement extends LitElement {
 
         data.file = file;
 
-        // const event = new CustomEvent("vpu-fileupload-file-finished", { "detail": data, bubbles: true, composed: true });
-        // this.dispatchEvent(event);
         this.onFileUploadFinished(data);
     }
 
diff --git a/src/vpu-signature-verification.js b/src/vpu-signature-verification.js
index c31dbcb0ff24c3667b5c1d20e9d167ca87fcac2c..34c77a3a6734f8f9f924406d2e494828ac03890c 100644
--- a/src/vpu-signature-verification.js
+++ b/src/vpu-signature-verification.js
@@ -229,7 +229,7 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
         this.errorFilesCount = 0;
 
         commonUtils.asyncObjectForEach(errorFilesCopy, async (file, id) => {
-            await this.fileUploadClickHandler(file.file, id);
+            await this.fileQueueingClickHandler(file.file, id);
         });
 
         that._("#re-upload-all-button").stop();
@@ -672,10 +672,7 @@ class SignatureVerification extends ScopedElementsMixin(VPUSignatureLitElement)
                         <vpu-file-source
                             allowed-mime-types="application/pdf"
                             decompress-zip
-                            always-send-file
-                            deferred
                             lang="${this.lang}"
-                            url="${this.fileSourceUrl}"
                             ?disabled="${this.verificationProcessActive}"
                             text="${i18n.t('signature-verification.upload-area-text')}"
                             button-label="${i18n.t('signature-verification.upload-button-label')}"
diff --git a/vendor/file-handling b/vendor/file-handling
index f87ce174fb6ed7b3e464d4a249819749d06b8010..39d039c761f484c6028dea6b2e0c064f04662af4 160000
--- a/vendor/file-handling
+++ b/vendor/file-handling
@@ -1 +1 @@
-Subproject commit f87ce174fb6ed7b3e464d4a249819749d06b8010
+Subproject commit 39d039c761f484c6028dea6b2e0c064f04662af4