diff --git a/app/src/androidTest/java/com/nextcloud/client/files/downloader/DownloaderServiceTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/download/DownloaderServiceTest.kt
similarity index 97%
rename from app/src/androidTest/java/com/nextcloud/client/files/downloader/DownloaderServiceTest.kt
rename to app/src/androidTest/java/com/nextcloud/client/files/download/DownloaderServiceTest.kt
index 3e01188ca8..a1b621443b 100644
--- a/app/src/androidTest/java/com/nextcloud/client/files/downloader/DownloaderServiceTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/files/download/DownloaderServiceTest.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.nextcloud.client.files.downloader
+package com.nextcloud.client.files.download
 
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.rule.ServiceTestRule
diff --git a/app/src/androidTest/java/com/nextcloud/client/files/downloader/RegistryTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/download/RegistryTest.kt
similarity index 99%
rename from app/src/androidTest/java/com/nextcloud/client/files/downloader/RegistryTest.kt
rename to app/src/androidTest/java/com/nextcloud/client/files/download/RegistryTest.kt
index b4018d7ad4..14f543c2cd 100644
--- a/app/src/androidTest/java/com/nextcloud/client/files/downloader/RegistryTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/files/download/RegistryTest.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.nextcloud.client.files.downloader
+package com.nextcloud.client.files.download
 
 import com.nextcloud.client.account.User
 import com.nextcloud.client.files.DownloadRequest
diff --git a/app/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerConnectionTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerConnectionTest.kt
similarity index 99%
rename from app/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerConnectionTest.kt
rename to app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerConnectionTest.kt
index b33fa175f4..5052c897a3 100644
--- a/app/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerConnectionTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerConnectionTest.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.nextcloud.client.files.downloader
+package com.nextcloud.client.files.download
 
 import android.content.ComponentName
 import android.content.Context
diff --git a/app/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerTest.kt b/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerTest.kt
similarity index 99%
rename from app/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerTest.kt
rename to app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerTest.kt
index 39cdf9c02e..809970b886 100644
--- a/app/src/androidTest/java/com/nextcloud/client/files/downloader/TransferManagerTest.kt
+++ b/app/src/androidTest/java/com/nextcloud/client/files/download/TransferManagerTest.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.nextcloud.client.files.downloader
+package com.nextcloud.client.files.download
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.nextcloud.client.account.User
diff --git a/app/src/androidTest/java/com/owncloud/android/AbstractIT.java b/app/src/androidTest/java/com/owncloud/android/AbstractIT.java
index 9b05e3a913..3a983845ec 100644
--- a/app/src/androidTest/java/com/owncloud/android/AbstractIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/AbstractIT.java
@@ -21,7 +21,7 @@ import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.account.UserAccountManagerImpl;
 import com.nextcloud.client.device.BatteryStatus;
 import com.nextcloud.client.device.PowerManagementService;
-import com.nextcloud.client.files.uploader.FileUploadWorker;
+import com.nextcloud.client.files.upload.FileUploadWorker;
 import com.nextcloud.client.network.Connectivity;
 import com.nextcloud.client.network.ConnectivityService;
 import com.nextcloud.client.preferences.AppPreferencesImpl;
diff --git a/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java b/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java
index c58787c720..468ba9f2bd 100644
--- a/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/AbstractOnServerIT.java
@@ -13,7 +13,7 @@ import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.account.UserAccountManagerImpl;
 import com.nextcloud.client.device.BatteryStatus;
 import com.nextcloud.client.device.PowerManagementService;
-import com.nextcloud.client.files.uploader.FileUploadWorker;
+import com.nextcloud.client.files.upload.FileUploadWorker;
 import com.nextcloud.client.network.Connectivity;
 import com.nextcloud.client.network.ConnectivityService;
 import com.nextcloud.java.util.Optional;
diff --git a/app/src/androidTest/java/com/owncloud/android/UploadIT.java b/app/src/androidTest/java/com/owncloud/android/UploadIT.java
index 8db4ce1511..ee162e0b65 100644
--- a/app/src/androidTest/java/com/owncloud/android/UploadIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/UploadIT.java
@@ -24,7 +24,7 @@ package com.owncloud.android;
 import com.nextcloud.client.account.UserAccountManagerImpl;
 import com.nextcloud.client.device.BatteryStatus;
 import com.nextcloud.client.device.PowerManagementService;
-import com.nextcloud.client.files.uploader.FileUploadWorker;
+import com.nextcloud.client.files.upload.FileUploadWorker;
 import com.nextcloud.client.network.Connectivity;
 import com.nextcloud.client.network.ConnectivityService;
 import com.owncloud.android.datamodel.OCFile;
diff --git a/app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt b/app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt
index 7329579ca0..c10c0c87cf 100644
--- a/app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/files/services/FileUploaderIT.kt
@@ -26,8 +26,8 @@ import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.account.UserAccountManagerImpl
 import com.nextcloud.client.device.BatteryStatus
 import com.nextcloud.client.device.PowerManagementService
-import com.nextcloud.client.files.uploader.FileUploadHelper
-import com.nextcloud.client.files.uploader.FileUploadWorker
+import com.nextcloud.client.files.upload.FileUploadHelper
+import com.nextcloud.client.files.upload.FileUploadWorker
 import com.nextcloud.client.network.Connectivity
 import com.nextcloud.client.network.ConnectivityService
 import com.owncloud.android.AbstractOnServerIT
diff --git a/app/src/androidTest/java/com/owncloud/android/ui/helpers/UriUploaderIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/helpers/UriUploaderIT.kt
index c96e794dfc..a46b499ffb 100644
--- a/app/src/androidTest/java/com/owncloud/android/ui/helpers/UriUploaderIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/ui/helpers/UriUploaderIT.kt
@@ -2,7 +2,7 @@ package com.owncloud.android.ui.helpers
 
 import android.net.Uri
 import androidx.test.core.app.launchActivity
-import com.nextcloud.client.files.uploader.FileUploadWorker
+import com.nextcloud.client.files.upload.FileUploadWorker
 import com.nextcloud.test.TestActivity
 import com.owncloud.android.AbstractIT
 import org.junit.Assert
diff --git a/app/src/generic/java/com/owncloud/android/utils/PushUtils.java b/app/src/generic/java/com/owncloud/android/utils/PushUtils.java
index 3f5d2ef888..c39ce93890 100644
--- a/app/src/generic/java/com/owncloud/android/utils/PushUtils.java
+++ b/app/src/generic/java/com/owncloud/android/utils/PushUtils.java
@@ -25,9 +25,9 @@ package com.owncloud.android.utils;
 import android.content.Context;
 
 import com.nextcloud.client.account.UserAccountManager;
+import com.nextcloud.client.preferences.AppPreferencesImpl;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.datamodel.SignatureVerification;
-import com.nextcloud.client.preferences.AppPreferencesImpl;
 
 import java.security.Key;
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5860944ab2..bdf6327f8b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -170,7 +170,7 @@
             android:name="com.nextcloud.client.jobs.NotificationWork$NotificationReceiver"
             android:exported="false" />
         <receiver
-            android:name="com.nextcloud.client.files.uploader.FileUploadWorker$Companion$UploadNotificationActionReceiver"
+            android:name="com.nextcloud.client.jobs.upload.FileUploadWorker$Companion$UploadNotificationActionReceiver"
             android:exported="false" />
         <receiver
             android:name="com.nextcloud.client.widget.DashboardWidgetProvider"
@@ -394,7 +394,7 @@
             android:name=".services.OperationsService"
             android:exported="false" />
         <service
-            android:name="com.nextcloud.client.files.transfer.FileTransferService"
+            android:name="com.nextcloud.client.jobs.transfer.FileTransferService"
             android:foregroundServiceType="dataSync"
             android:exported="false" />
         <service
diff --git a/app/src/main/java/com/nextcloud/client/documentscan/DocumentScanViewModel.kt b/app/src/main/java/com/nextcloud/client/documentscan/DocumentScanViewModel.kt
index 4d23e62d1b..c030ab3e4d 100644
--- a/app/src/main/java/com/nextcloud/client/documentscan/DocumentScanViewModel.kt
+++ b/app/src/main/java/com/nextcloud/client/documentscan/DocumentScanViewModel.kt
@@ -29,9 +29,9 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import com.nextcloud.client.account.CurrentAccountProvider
 import com.nextcloud.client.di.IoDispatcher
-import com.nextcloud.client.files.uploader.FileUploadHelper
-import com.nextcloud.client.files.uploader.FileUploadWorker
 import com.nextcloud.client.jobs.BackgroundJobManager
+import com.nextcloud.client.jobs.upload.FileUploadHelper
+import com.nextcloud.client.jobs.upload.FileUploadWorker
 import com.nextcloud.client.logger.Logger
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.files.services.NameCollisionPolicy
diff --git a/app/src/main/java/com/nextcloud/client/documentscan/GeneratePdfFromImagesWork.kt b/app/src/main/java/com/nextcloud/client/documentscan/GeneratePdfFromImagesWork.kt
index b7e08583ab..4ea4583e2a 100644
--- a/app/src/main/java/com/nextcloud/client/documentscan/GeneratePdfFromImagesWork.kt
+++ b/app/src/main/java/com/nextcloud/client/documentscan/GeneratePdfFromImagesWork.kt
@@ -32,8 +32,8 @@ import androidx.work.WorkerParameters
 import com.nextcloud.client.account.AnonymousUser
 import com.nextcloud.client.account.User
 import com.nextcloud.client.account.UserAccountManager
-import com.nextcloud.client.files.uploader.FileUploadHelper
-import com.nextcloud.client.files.uploader.FileUploadWorker
+import com.nextcloud.client.jobs.upload.FileUploadHelper
+import com.nextcloud.client.jobs.upload.FileUploadWorker
 import com.nextcloud.client.logger.Logger
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.OCFile
diff --git a/app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt b/app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt
index 26648c929e..1d6e22590a 100644
--- a/app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt
+++ b/app/src/main/java/com/nextcloud/client/editimage/EditImageActivity.kt
@@ -34,8 +34,8 @@ import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import com.canhub.cropper.CropImageView
 import com.nextcloud.client.di.Injectable
-import com.nextcloud.client.files.uploader.FileUploadHelper
-import com.nextcloud.client.files.uploader.FileUploadWorker
+import com.nextcloud.client.jobs.upload.FileUploadHelper
+import com.nextcloud.client.jobs.upload.FileUploadWorker
 import com.nextcloud.utils.extensions.getParcelableArgument
 import com.owncloud.android.R
 import com.owncloud.android.databinding.ActivityEditImageBinding
diff --git a/app/src/main/java/com/nextcloud/client/etm/EtmViewModel.kt b/app/src/main/java/com/nextcloud/client/etm/EtmViewModel.kt
index 4060a0533f..01e12e9b40 100644
--- a/app/src/main/java/com/nextcloud/client/etm/EtmViewModel.kt
+++ b/app/src/main/java/com/nextcloud/client/etm/EtmViewModel.kt
@@ -35,9 +35,9 @@ import com.nextcloud.client.etm.pages.EtmBackgroundJobsFragment
 import com.nextcloud.client.etm.pages.EtmFileTransferFragment
 import com.nextcloud.client.etm.pages.EtmMigrations
 import com.nextcloud.client.etm.pages.EtmPreferencesFragment
-import com.nextcloud.client.files.transfer.TransferManagerConnection
 import com.nextcloud.client.jobs.BackgroundJobManager
 import com.nextcloud.client.jobs.JobInfo
+import com.nextcloud.client.jobs.transfer.TransferManagerConnection
 import com.nextcloud.client.migrations.MigrationInfo
 import com.nextcloud.client.migrations.MigrationsDb
 import com.nextcloud.client.migrations.MigrationsManager
diff --git a/app/src/main/java/com/nextcloud/client/etm/pages/EtmFileTransferFragment.kt b/app/src/main/java/com/nextcloud/client/etm/pages/EtmFileTransferFragment.kt
index cbe46e679e..997106e7df 100644
--- a/app/src/main/java/com/nextcloud/client/etm/pages/EtmFileTransferFragment.kt
+++ b/app/src/main/java/com/nextcloud/client/etm/pages/EtmFileTransferFragment.kt
@@ -15,8 +15,8 @@ import androidx.recyclerview.widget.RecyclerView
 import com.nextcloud.client.etm.EtmBaseFragment
 import com.nextcloud.client.files.DownloadRequest
 import com.nextcloud.client.files.UploadRequest
-import com.nextcloud.client.files.transfer.Transfer
-import com.nextcloud.client.files.transfer.TransferManager
+import com.nextcloud.client.jobs.transfer.Transfer
+import com.nextcloud.client.jobs.transfer.TransferManager
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.db.OCUpload
diff --git a/app/src/main/java/com/nextcloud/client/files/Registry.kt b/app/src/main/java/com/nextcloud/client/files/Registry.kt
index 1d6d582a75..a970063ae9 100644
--- a/app/src/main/java/com/nextcloud/client/files/Registry.kt
+++ b/app/src/main/java/com/nextcloud/client/files/Registry.kt
@@ -20,8 +20,8 @@
  */
 package com.nextcloud.client.files
 
-import com.nextcloud.client.files.transfer.Transfer
-import com.nextcloud.client.files.transfer.TransferState
+import com.nextcloud.client.jobs.transfer.Transfer
+import com.nextcloud.client.jobs.transfer.TransferState
 import com.owncloud.android.datamodel.OCFile
 import java.util.UUID
 import kotlin.math.max
diff --git a/app/src/main/java/com/nextcloud/client/files/Request.kt b/app/src/main/java/com/nextcloud/client/files/Request.kt
index 56ab3d7430..5fd4153d40 100644
--- a/app/src/main/java/com/nextcloud/client/files/Request.kt
+++ b/app/src/main/java/com/nextcloud/client/files/Request.kt
@@ -23,8 +23,8 @@ package com.nextcloud.client.files
 import android.os.Parcel
 import android.os.Parcelable
 import com.nextcloud.client.account.User
-import com.nextcloud.client.files.upload.PostUploadAction
-import com.nextcloud.client.files.upload.UploadTrigger
+import com.nextcloud.client.jobs.upload.PostUploadAction
+import com.nextcloud.client.jobs.upload.UploadTrigger
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.datamodel.UploadsStorageManager
 import com.owncloud.android.db.OCUpload
diff --git a/app/src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt b/app/src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt
index 8a09e07997..fcf02665fb 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/ContactsBackupWork.kt
@@ -36,9 +36,9 @@ import androidx.work.WorkerParameters
 import com.nextcloud.client.account.User
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.files.UploadRequest
-import com.nextcloud.client.files.transfer.TransferManagerConnection
-import com.nextcloud.client.files.upload.PostUploadAction
-import com.nextcloud.client.files.upload.UploadTrigger
+import com.nextcloud.client.jobs.transfer.TransferManagerConnection
+import com.nextcloud.client.jobs.upload.PostUploadAction
+import com.nextcloud.client.jobs.upload.UploadTrigger
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.ArbitraryDataProvider
 import com.owncloud.android.datamodel.FileDataStorageManager
diff --git a/app/src/main/java/com/nextcloud/client/jobs/FilesExportWork.kt b/app/src/main/java/com/nextcloud/client/jobs/FilesExportWork.kt
index 05586ba965..b5afe62407 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/FilesExportWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/FilesExportWork.kt
@@ -33,7 +33,7 @@ import androidx.core.app.NotificationCompat
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import com.nextcloud.client.account.User
-import com.nextcloud.client.files.downloader.FileDownloadHelper
+import com.nextcloud.client.jobs.download.FileDownloadHelper
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
diff --git a/app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt b/app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt
index fcca598db0..655799afeb 100644
--- a/app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/FilesSyncWork.kt
@@ -34,8 +34,8 @@ import androidx.work.ForegroundInfo
 import androidx.work.WorkerParameters
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.device.PowerManagementService
-import com.nextcloud.client.files.uploader.FileUploadHelper
-import com.nextcloud.client.files.uploader.FileUploadWorker
+import com.nextcloud.client.jobs.upload.FileUploadHelper
+import com.nextcloud.client.jobs.upload.FileUploadWorker
 import com.nextcloud.client.network.ConnectivityService
 import com.nextcloud.client.preferences.SubFolderRule
 import com.owncloud.android.R
diff --git a/app/src/main/java/com/nextcloud/client/files/downloader/DownloadNotificationManager.kt b/app/src/main/java/com/nextcloud/client/jobs/download/DownloadNotificationManager.kt
similarity index 99%
rename from app/src/main/java/com/nextcloud/client/files/downloader/DownloadNotificationManager.kt
rename to app/src/main/java/com/nextcloud/client/jobs/download/DownloadNotificationManager.kt
index c3ea0ef997..46687b8cd3 100644
--- a/app/src/main/java/com/nextcloud/client/files/downloader/DownloadNotificationManager.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/download/DownloadNotificationManager.kt
@@ -19,7 +19,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.client.files.downloader
+package com.nextcloud.client.jobs.download
 
 import android.app.Notification
 import android.app.NotificationManager
diff --git a/app/src/main/java/com/nextcloud/client/files/downloader/DownloadTask.kt b/app/src/main/java/com/nextcloud/client/jobs/download/DownloadTask.kt
similarity index 98%
rename from app/src/main/java/com/nextcloud/client/files/downloader/DownloadTask.kt
rename to app/src/main/java/com/nextcloud/client/jobs/download/DownloadTask.kt
index dda1816864..32678a45f3 100644
--- a/app/src/main/java/com/nextcloud/client/files/downloader/DownloadTask.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/download/DownloadTask.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.nextcloud.client.files.downloader
+package com.nextcloud.client.jobs.download
 
 import android.content.ContentResolver
 import android.content.Context
diff --git a/app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadError.kt b/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadError.kt
similarity index 94%
rename from app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadError.kt
rename to app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadError.kt
index f46783b33c..1d4a3b252c 100644
--- a/app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadError.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadError.kt
@@ -19,7 +19,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.client.files.downloader
+package com.nextcloud.client.jobs.download
 
 enum class FileDownloadError {
     Failed, Cancelled
diff --git a/app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadHelper.kt b/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadHelper.kt
similarity index 99%
rename from app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadHelper.kt
rename to app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadHelper.kt
index 15c30c8942..d665051d14 100644
--- a/app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadHelper.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadHelper.kt
@@ -19,7 +19,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.client.files.downloader
+package com.nextcloud.client.jobs.download
 
 import com.nextcloud.client.account.User
 import com.nextcloud.client.jobs.BackgroundJobManager
diff --git a/app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadIntents.kt b/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadIntents.kt
similarity index 98%
rename from app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadIntents.kt
rename to app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadIntents.kt
index 78f15a0729..a59b848015 100644
--- a/app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadIntents.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadIntents.kt
@@ -19,7 +19,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.client.files.downloader
+package com.nextcloud.client.jobs.download
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadWorker.kt
similarity index 97%
rename from app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadWorker.kt
rename to app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadWorker.kt
index b45e50ea49..d92b83ffeb 100644
--- a/app/src/main/java/com/nextcloud/client/files/downloader/FileDownloadWorker.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/download/FileDownloadWorker.kt
@@ -19,7 +19,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.client.files.downloader
+package com.nextcloud.client.jobs.download
 
 import android.accounts.Account
 import android.accounts.AccountManager
@@ -108,7 +108,7 @@ class FileDownloadWorker(
     private var lastPercent = 0
 
     private val intents = FileDownloadIntents(context)
-    private lateinit var notificationManager: DownloadNotificationManager
+    private lateinit var notificationManager: com.nextcloud.client.jobs.download.DownloadNotificationManager
     private var downloadProgressListener = FileDownloadProgressListener()
 
     private var user: User? = null
@@ -126,7 +126,11 @@ class FileDownloadWorker(
             val requestDownloads = getRequestDownloads()
 
             notificationManager =
-                DownloadNotificationManager(workerId ?: SecureRandom().nextInt(), context, viewThemeUtils)
+                com.nextcloud.client.jobs.download.DownloadNotificationManager(
+                    workerId ?: SecureRandom().nextInt(),
+                    context,
+                    viewThemeUtils
+                )
             addAccountUpdateListener()
 
             val foregroundInfo = ForegroundServiceHelper.createWorkerForegroundInfo(
diff --git a/app/src/main/java/com/nextcloud/client/files/transfer/FileTransferService.kt b/app/src/main/java/com/nextcloud/client/jobs/transfer/FileTransferService.kt
similarity index 97%
rename from app/src/main/java/com/nextcloud/client/files/transfer/FileTransferService.kt
rename to app/src/main/java/com/nextcloud/client/jobs/transfer/FileTransferService.kt
index daa240c4e7..3738f87d61 100644
--- a/app/src/main/java/com/nextcloud/client/files/transfer/FileTransferService.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/transfer/FileTransferService.kt
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.nextcloud.client.files.transfer
+package com.nextcloud.client.jobs.transfer
 
 import android.app.Service
 import android.content.Context
@@ -30,8 +30,8 @@ import com.nextcloud.client.core.LocalBinder
 import com.nextcloud.client.device.PowerManagementService
 import com.nextcloud.client.files.Direction
 import com.nextcloud.client.files.Request
-import com.nextcloud.client.files.downloader.DownloadTask
-import com.nextcloud.client.files.upload.UploadTask
+import com.nextcloud.client.jobs.download.DownloadTask
+import com.nextcloud.client.jobs.upload.UploadTask
 import com.nextcloud.client.logger.Logger
 import com.nextcloud.client.network.ClientFactory
 import com.nextcloud.client.network.ConnectivityService
diff --git a/app/src/main/java/com/nextcloud/client/files/transfer/Transfer.kt b/app/src/main/java/com/nextcloud/client/jobs/transfer/Transfer.kt
similarity index 98%
rename from app/src/main/java/com/nextcloud/client/files/transfer/Transfer.kt
rename to app/src/main/java/com/nextcloud/client/jobs/transfer/Transfer.kt
index 4b5524b093..e2c12f33bc 100644
--- a/app/src/main/java/com/nextcloud/client/files/transfer/Transfer.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/transfer/Transfer.kt
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.nextcloud.client.files.transfer
+package com.nextcloud.client.jobs.transfer
 
 import com.nextcloud.client.files.Direction
 import com.nextcloud.client.files.DownloadRequest
diff --git a/app/src/main/java/com/nextcloud/client/files/transfer/TransferManager.kt b/app/src/main/java/com/nextcloud/client/jobs/transfer/TransferManager.kt
similarity index 98%
rename from app/src/main/java/com/nextcloud/client/files/transfer/TransferManager.kt
rename to app/src/main/java/com/nextcloud/client/jobs/transfer/TransferManager.kt
index d5a96440a4..b6f3a765b2 100644
--- a/app/src/main/java/com/nextcloud/client/files/transfer/TransferManager.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/transfer/TransferManager.kt
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.nextcloud.client.files.transfer
+package com.nextcloud.client.jobs.transfer
 
 import com.nextcloud.client.files.Request
 import com.owncloud.android.datamodel.OCFile
diff --git a/app/src/main/java/com/nextcloud/client/files/transfer/TransferManagerConnection.kt b/app/src/main/java/com/nextcloud/client/jobs/transfer/TransferManagerConnection.kt
similarity index 99%
rename from app/src/main/java/com/nextcloud/client/files/transfer/TransferManagerConnection.kt
rename to app/src/main/java/com/nextcloud/client/jobs/transfer/TransferManagerConnection.kt
index e4cd701e2f..4bb47e71a5 100644
--- a/app/src/main/java/com/nextcloud/client/files/transfer/TransferManagerConnection.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/transfer/TransferManagerConnection.kt
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.nextcloud.client.files.transfer
+package com.nextcloud.client.jobs.transfer
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/com/nextcloud/client/files/transfer/TransferManagerImpl.kt b/app/src/main/java/com/nextcloud/client/jobs/transfer/TransferManagerImpl.kt
similarity index 98%
rename from app/src/main/java/com/nextcloud/client/files/transfer/TransferManagerImpl.kt
rename to app/src/main/java/com/nextcloud/client/jobs/transfer/TransferManagerImpl.kt
index 0113002d96..d70cedaf9f 100644
--- a/app/src/main/java/com/nextcloud/client/files/transfer/TransferManagerImpl.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/transfer/TransferManagerImpl.kt
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.nextcloud.client.files.transfer
+package com.nextcloud.client.jobs.transfer
 
 import com.nextcloud.client.core.AsyncRunner
 import com.nextcloud.client.core.IsCancelled
@@ -28,8 +28,8 @@ import com.nextcloud.client.files.DownloadRequest
 import com.nextcloud.client.files.Registry
 import com.nextcloud.client.files.Request
 import com.nextcloud.client.files.UploadRequest
-import com.nextcloud.client.files.downloader.DownloadTask
-import com.nextcloud.client.files.upload.UploadTask
+import com.nextcloud.client.jobs.download.DownloadTask
+import com.nextcloud.client.jobs.upload.UploadTask
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.operations.UploadFileOperation
 import java.util.UUID
diff --git a/app/src/main/java/com/nextcloud/client/files/transfer/TransferState.kt b/app/src/main/java/com/nextcloud/client/jobs/transfer/TransferState.kt
similarity index 95%
rename from app/src/main/java/com/nextcloud/client/files/transfer/TransferState.kt
rename to app/src/main/java/com/nextcloud/client/jobs/transfer/TransferState.kt
index 0b9b5a1040..f4bdd87fb3 100644
--- a/app/src/main/java/com/nextcloud/client/files/transfer/TransferState.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/transfer/TransferState.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.nextcloud.client.files.transfer
+package com.nextcloud.client.jobs.transfer
 
 enum class TransferState {
     PENDING,
diff --git a/app/src/main/java/com/nextcloud/client/files/uploader/FileUploadHelper.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt
similarity index 98%
rename from app/src/main/java/com/nextcloud/client/files/uploader/FileUploadHelper.kt
rename to app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt
index c57116d2e7..659b9d41cb 100644
--- a/app/src/main/java/com/nextcloud/client/files/uploader/FileUploadHelper.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadHelper.kt
@@ -19,12 +19,12 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.client.files.uploader
+package com.nextcloud.client.jobs.upload
 
 import com.nextcloud.client.account.User
 import com.nextcloud.client.account.UserAccountManager
-import com.nextcloud.client.files.uploader.FileUploadWorker.Companion.currentUploadFileOperation
 import com.nextcloud.client.jobs.BackgroundJobManager
+import com.nextcloud.client.jobs.upload.FileUploadWorker.Companion.currentUploadFileOperation
 import com.owncloud.android.MainApp
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.datamodel.UploadsStorageManager
diff --git a/app/src/main/java/com/nextcloud/client/files/uploader/FileUploadWorker.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt
similarity index 99%
rename from app/src/main/java/com/nextcloud/client/files/uploader/FileUploadWorker.kt
rename to app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt
index 8357e30ff9..3a67388c68 100644
--- a/app/src/main/java/com/nextcloud/client/files/uploader/FileUploadWorker.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt
@@ -19,7 +19,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.client.files.uploader
+package com.nextcloud.client.jobs.upload
 
 import android.content.BroadcastReceiver
 import android.content.Context
diff --git a/app/src/main/java/com/nextcloud/client/files/uploader/FileUploaderDelegate.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploaderDelegate.kt
similarity index 98%
rename from app/src/main/java/com/nextcloud/client/files/uploader/FileUploaderDelegate.kt
rename to app/src/main/java/com/nextcloud/client/jobs/upload/FileUploaderDelegate.kt
index b26286a0bc..65278cff86 100644
--- a/app/src/main/java/com/nextcloud/client/files/uploader/FileUploaderDelegate.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploaderDelegate.kt
@@ -19,7 +19,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.client.files.uploader
+package com.nextcloud.client.jobs.upload
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/com/nextcloud/client/files/uploader/FileUploaderIntents.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploaderIntents.kt
similarity index 99%
rename from app/src/main/java/com/nextcloud/client/files/uploader/FileUploaderIntents.kt
rename to app/src/main/java/com/nextcloud/client/jobs/upload/FileUploaderIntents.kt
index d1cbe079d6..7cfdafe531 100644
--- a/app/src/main/java/com/nextcloud/client/files/uploader/FileUploaderIntents.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/upload/FileUploaderIntents.kt
@@ -19,7 +19,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.client.files.uploader
+package com.nextcloud.client.jobs.upload
 
 import android.app.PendingIntent
 import android.content.Context
diff --git a/app/src/main/java/com/nextcloud/client/files/upload/PostUploadAction.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/PostUploadAction.kt
similarity index 91%
rename from app/src/main/java/com/nextcloud/client/files/upload/PostUploadAction.kt
rename to app/src/main/java/com/nextcloud/client/jobs/upload/PostUploadAction.kt
index d773178872..7a299e9bbb 100644
--- a/app/src/main/java/com/nextcloud/client/files/upload/PostUploadAction.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/upload/PostUploadAction.kt
@@ -17,9 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package com.nextcloud.client.files.upload
-
-import com.nextcloud.client.files.uploader.FileUploadWorker
+package com.nextcloud.client.jobs.upload
 
 enum class PostUploadAction(val value: Int) {
     NONE(FileUploadWorker.LOCAL_BEHAVIOUR_FORGET),
diff --git a/app/src/main/java/com/nextcloud/client/files/uploader/UploadNotificationManager.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/UploadNotificationManager.kt
similarity index 99%
rename from app/src/main/java/com/nextcloud/client/files/uploader/UploadNotificationManager.kt
rename to app/src/main/java/com/nextcloud/client/jobs/upload/UploadNotificationManager.kt
index 1a73a5c788..01ea03ad76 100644
--- a/app/src/main/java/com/nextcloud/client/files/uploader/UploadNotificationManager.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/upload/UploadNotificationManager.kt
@@ -19,7 +19,7 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.nextcloud.client.files.uploader
+package com.nextcloud.client.jobs.upload
 
 import android.app.Notification
 import android.app.NotificationManager
diff --git a/app/src/main/java/com/nextcloud/client/files/upload/UploadTask.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/UploadTask.kt
similarity index 98%
rename from app/src/main/java/com/nextcloud/client/files/upload/UploadTask.kt
rename to app/src/main/java/com/nextcloud/client/jobs/upload/UploadTask.kt
index f7011a470c..edcbc8498d 100644
--- a/app/src/main/java/com/nextcloud/client/files/upload/UploadTask.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/upload/UploadTask.kt
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.nextcloud.client.files.upload
+package com.nextcloud.client.jobs.upload
 
 import android.content.Context
 import com.nextcloud.client.account.User
diff --git a/app/src/main/java/com/nextcloud/client/files/upload/UploadTrigger.kt b/app/src/main/java/com/nextcloud/client/jobs/upload/UploadTrigger.kt
similarity index 97%
rename from app/src/main/java/com/nextcloud/client/files/upload/UploadTrigger.kt
rename to app/src/main/java/com/nextcloud/client/jobs/upload/UploadTrigger.kt
index a285d9b091..2f7dc74ded 100644
--- a/app/src/main/java/com/nextcloud/client/files/upload/UploadTrigger.kt
+++ b/app/src/main/java/com/nextcloud/client/jobs/upload/UploadTrigger.kt
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-package com.nextcloud.client.files.upload
+package com.nextcloud.client.jobs.upload
 
 import com.owncloud.android.operations.UploadFileOperation
 
diff --git a/app/src/main/java/com/owncloud/android/db/OCUpload.java b/app/src/main/java/com/owncloud/android/db/OCUpload.java
index ebe5b8a0b5..5de0074cf9 100644
--- a/app/src/main/java/com/owncloud/android/db/OCUpload.java
+++ b/app/src/main/java/com/owncloud/android/db/OCUpload.java
@@ -27,8 +27,8 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 import com.nextcloud.client.account.User;
-import com.nextcloud.client.files.uploader.FileUploadHelper;
-import com.nextcloud.client.files.uploader.FileUploadWorker;
+import com.nextcloud.client.jobs.upload.FileUploadHelper;
+import com.nextcloud.client.jobs.upload.FileUploadWorker;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.UploadsStorageManager;
 import com.owncloud.android.datamodel.UploadsStorageManager.UploadStatus;
diff --git a/app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java
index dc56c43ebe..8091553ca2 100644
--- a/app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java
+++ b/app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java
@@ -23,7 +23,6 @@ package com.owncloud.android.operations;
 
 import android.content.Context;
 import android.text.TextUtils;
-import android.util.Log;
 import android.webkit.MimeTypeMap;
 
 import com.nextcloud.client.account.User;
diff --git a/app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java b/app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java
index bc1dc318e8..bb1a8e43d7 100644
--- a/app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@ -25,7 +25,7 @@ import android.content.Intent;
 import android.text.TextUtils;
 
 import com.nextcloud.client.account.User;
-import com.nextcloud.client.files.downloader.FileDownloadHelper;
+import com.nextcloud.client.jobs.download.FileDownloadHelper;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datamodel.e2e.v1.decrypted.DecryptedFolderMetadataFileV1;
@@ -294,7 +294,7 @@ public class SynchronizeFolderOperation extends SyncOperation {
         if (mLocalFolder.isEncrypted() && object == null) {
             throw new IllegalStateException("metadata is null!");
         }
-        
+
         // get current data about local contents of the folder to synchronize
         Map<String, OCFile> localFilesMap;
         E2EVersion e2EVersion;
@@ -308,7 +308,7 @@ public class SynchronizeFolderOperation extends SyncOperation {
             localFilesMap = RefreshFolderOperation.prefillLocalFilesMap((DecryptedFolderMetadataFile) object,
                                                                         storageManager.getFolderContent(mLocalFolder, false));
         }
-        
+
         // loop to synchronize every child
         List<OCFile> updatedFiles = new ArrayList<>(folderAndFiles.size() - 1);
         OCFile remoteFile;
@@ -421,7 +421,6 @@ public class SynchronizeFolderOperation extends SyncOperation {
     }
 
 
-    @SuppressFBWarnings("JLM")
     private void prepareOpsFromLocalKnowledge() throws OperationCancelledException {
         List<OCFile> children = getStorageManager().getFolderContent(mLocalFolder, false);
         for (OCFile child : children) {
diff --git a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
index a9820a8575..d7015c8148 100644
--- a/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
+++ b/app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
@@ -29,7 +29,7 @@ import android.text.TextUtils;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.device.BatteryStatus;
 import com.nextcloud.client.device.PowerManagementService;
-import com.nextcloud.client.files.uploader.FileUploadWorker;
+import com.nextcloud.client.jobs.upload.FileUploadWorker;
 import com.nextcloud.client.network.Connectivity;
 import com.nextcloud.client.network.ConnectivityService;
 import com.owncloud.android.datamodel.ArbitraryDataProvider;
diff --git a/app/src/main/java/com/owncloud/android/services/SyncFolderHandler.java b/app/src/main/java/com/owncloud/android/services/SyncFolderHandler.java
index 7a5d4d25f2..32ef8f656a 100644
--- a/app/src/main/java/com/owncloud/android/services/SyncFolderHandler.java
+++ b/app/src/main/java/com/owncloud/android/services/SyncFolderHandler.java
@@ -28,7 +28,7 @@ import android.os.Message;
 import android.util.Pair;
 
 import com.nextcloud.client.account.User;
-import com.nextcloud.client.files.downloader.FileDownloadWorker;
+import com.nextcloud.client.jobs.download.FileDownloadWorker;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.IndexedForest;
 import com.owncloud.android.lib.common.OwnCloudAccount;
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
index 4923aedbc7..6d0b6983f8 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -59,8 +59,8 @@ import android.widget.Toast;
 import com.google.android.material.button.MaterialButton;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.di.Injectable;
-import com.nextcloud.client.files.uploader.FileUploadHelper;
-import com.nextcloud.client.files.uploader.FileUploadWorker;
+import com.nextcloud.client.jobs.upload.FileUploadHelper;
+import com.nextcloud.client.jobs.upload.FileUploadWorker;
 import com.nextcloud.client.preferences.AppPreferences;
 import com.nextcloud.utils.extensions.BundleExtensionsKt;
 import com.nextcloud.utils.extensions.IntentExtensionsKt;
@@ -894,8 +894,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
             UploadFileOperation.CREATED_BY_USER,
             false,
             false,
-            NameCollisionPolicy.ASK_USER
-                                             );
+            NameCollisionPolicy.ASK_USER);
         finish();
     }
 
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
index 85bb6f55d4..e4f3242cee 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
@@ -40,10 +40,10 @@ import androidx.recyclerview.widget.GridLayoutManager
 import com.nextcloud.client.core.Clock
 import com.nextcloud.client.device.PowerManagementService
 import com.nextcloud.client.di.Injectable
-import com.nextcloud.client.files.uploader.FileUploadWorker
 import com.nextcloud.client.jobs.BackgroundJobManager
 import com.nextcloud.client.jobs.MediaFoldersDetectionWork
 import com.nextcloud.client.jobs.NotificationWork
+import com.nextcloud.client.jobs.upload.FileUploadWorker
 import com.nextcloud.client.preferences.AppPreferences
 import com.nextcloud.client.preferences.SubFolderRule
 import com.nextcloud.utils.extensions.getParcelableArgument
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
index e61a6ac5af..3c6d92ea45 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -37,7 +37,7 @@ import android.widget.TextView;
 
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.di.Injectable;
-import com.nextcloud.client.files.uploader.FileUploadWorker;
+import com.nextcloud.client.jobs.upload.FileUploadWorker;
 import com.nextcloud.client.preferences.AppPreferences;
 import com.owncloud.android.R;
 import com.owncloud.android.databinding.UploadFilesLayoutBinding;
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
index 263e7b6d48..0da9990760 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
@@ -38,8 +38,8 @@ import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.core.Clock;
 import com.nextcloud.client.device.PowerManagementService;
-import com.nextcloud.client.files.uploader.FileUploadWorker;
 import com.nextcloud.client.jobs.BackgroundJobManager;
+import com.nextcloud.client.jobs.upload.FileUploadWorker;
 import com.nextcloud.client.network.ConnectivityService;
 import com.nextcloud.client.utils.Throttler;
 import com.nextcloud.model.WorkerState;
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
index 81ec8f65c7..b8e633860a 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
@@ -46,7 +46,7 @@ import android.widget.LinearLayout;
 import com.elyeproj.loaderviewlibrary.LoaderImageView;
 import com.nextcloud.android.common.ui.theme.utils.ColorRole;
 import com.nextcloud.client.account.User;
-import com.nextcloud.client.files.uploader.FileUploadHelper;
+import com.nextcloud.client.jobs.upload.FileUploadHelper;
 import com.nextcloud.client.preferences.AppPreferences;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
index 9016949e3b..76f8a9033b 100755
--- a/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
@@ -43,8 +43,8 @@ import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.core.Clock;
 import com.nextcloud.client.device.PowerManagementService;
-import com.nextcloud.client.files.uploader.FileUploadHelper;
-import com.nextcloud.client.files.uploader.FileUploadWorker;
+import com.nextcloud.client.jobs.upload.FileUploadHelper;
+import com.nextcloud.client.jobs.upload.FileUploadWorker;
 import com.nextcloud.client.network.ConnectivityService;
 import com.nextcloud.java.util.Optional;
 import com.owncloud.android.MainApp;
diff --git a/app/src/main/java/com/owncloud/android/ui/asynctasks/CopyAndUploadContentUrisTask.java b/app/src/main/java/com/owncloud/android/ui/asynctasks/CopyAndUploadContentUrisTask.java
index 93835452c0..8880a75bc9 100644
--- a/app/src/main/java/com/owncloud/android/ui/asynctasks/CopyAndUploadContentUrisTask.java
+++ b/app/src/main/java/com/owncloud/android/ui/asynctasks/CopyAndUploadContentUrisTask.java
@@ -30,7 +30,7 @@ import android.provider.DocumentsContract;
 import android.widget.Toast;
 
 import com.nextcloud.client.account.User;
-import com.nextcloud.client.files.uploader.FileUploadHelper;
+import com.nextcloud.client.jobs.upload.FileUploadHelper;
 import com.owncloud.android.R;
 import com.owncloud.android.files.services.NameCollisionPolicy;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java b/app/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java
index 3fea500fb3..24baca8850 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/parcel/SyncedFolderParcelable.java
@@ -23,7 +23,7 @@ package com.owncloud.android.ui.dialog.parcel;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.nextcloud.client.files.uploader.FileUploadWorker;
+import com.nextcloud.client.jobs.upload.FileUploadWorker;
 import com.nextcloud.client.preferences.SubFolderRule;
 import com.owncloud.android.datamodel.MediaFolderType;
 import com.owncloud.android.datamodel.SyncedFolderDisplayItem;
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupListFragment.java
index 8aad8525c6..32d852a8d5 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupListFragment.java
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupListFragment.java
@@ -40,10 +40,10 @@ import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.files.DownloadRequest;
 import com.nextcloud.client.files.Request;
-import com.nextcloud.client.files.transfer.Transfer;
-import com.nextcloud.client.files.transfer.TransferManagerConnection;
-import com.nextcloud.client.files.transfer.TransferState;
 import com.nextcloud.client.jobs.BackgroundJobManager;
+import com.nextcloud.client.jobs.transfer.Transfer;
+import com.nextcloud.client.jobs.transfer.TransferManagerConnection;
+import com.nextcloud.client.jobs.transfer.TransferState;
 import com.nextcloud.client.network.ClientFactory;
 import com.nextcloud.utils.extensions.BundleExtensionsKt;
 import com.owncloud.android.R;
diff --git a/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt b/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt
index 4d06d198b7..a858b321e3 100644
--- a/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt
+++ b/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt
@@ -23,7 +23,7 @@ import android.content.ContentResolver
 import android.net.Uri
 import android.os.Parcelable
 import com.nextcloud.client.account.User
-import com.nextcloud.client.files.uploader.FileUploadHelper
+import com.nextcloud.client.jobs.upload.FileUploadHelper
 import com.owncloud.android.R
 import com.owncloud.android.files.services.NameCollisionPolicy
 import com.owncloud.android.lib.common.utils.Log_OC
diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt
index 23d7bd00b4..2c52285063 100644
--- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt
+++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt
@@ -62,8 +62,8 @@ import androidx.media3.ui.PlayerView
 import com.nextcloud.client.account.User
 import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.di.Injectable
-import com.nextcloud.client.files.downloader.FileDownloadHelper
 import com.nextcloud.client.jobs.BackgroundJobManager
+import com.nextcloud.client.jobs.download.FileDownloadHelper
 import com.nextcloud.client.media.ExoplayerListener
 import com.nextcloud.client.media.NextcloudExoPlayer.createNextcloudExoplayer
 import com.nextcloud.client.media.PlayerServiceConnection
diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
index a1ef3e8057..01b8de5018 100644
--- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
+++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
@@ -53,8 +53,8 @@ import android.view.ViewGroup;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.di.Injectable;
-import com.nextcloud.client.files.downloader.FileDownloadHelper;
 import com.nextcloud.client.jobs.BackgroundJobManager;
+import com.nextcloud.client.jobs.download.FileDownloadHelper;
 import com.nextcloud.client.media.ExoplayerListener;
 import com.nextcloud.client.media.NextcloudExoPlayer;
 import com.nextcloud.client.media.PlayerServiceConnection;
diff --git a/app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java b/app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java
index 5430ddca3f..cd42dbfaa5 100644
--- a/app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java
+++ b/app/src/main/java/com/owncloud/android/utils/FilesSyncHelper.java
@@ -33,8 +33,8 @@ import android.provider.MediaStore;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.device.BatteryStatus;
 import com.nextcloud.client.device.PowerManagementService;
-import com.nextcloud.client.files.uploader.FileUploadWorker;
 import com.nextcloud.client.jobs.BackgroundJobManager;
+import com.nextcloud.client.jobs.upload.FileUploadWorker;
 import com.nextcloud.client.network.ConnectivityService;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.datamodel.FilesystemDataProvider;
diff --git a/app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java b/app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java
index 5a3101d932..29586740ad 100644
--- a/app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java
+++ b/app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java
@@ -44,9 +44,9 @@ import android.widget.EditText;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.files.Request;
 import com.nextcloud.client.files.UploadRequest;
-import com.nextcloud.client.files.transfer.TransferManagerConnection;
-import com.nextcloud.client.files.upload.PostUploadAction;
-import com.nextcloud.client.files.upload.UploadTrigger;
+import com.nextcloud.client.jobs.transfer.TransferManagerConnection;
+import com.nextcloud.client.jobs.upload.PostUploadAction;
+import com.nextcloud.client.jobs.upload.UploadTrigger;
 import com.nextcloud.client.preferences.AppPreferences;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
diff --git a/app/src/test/java/com/owncloud/android/ui/activity/SyncedFoldersActivityTest.java b/app/src/test/java/com/owncloud/android/ui/activity/SyncedFoldersActivityTest.java
index e3b18f9ea8..73c5e00a6c 100644
--- a/app/src/test/java/com/owncloud/android/ui/activity/SyncedFoldersActivityTest.java
+++ b/app/src/test/java/com/owncloud/android/ui/activity/SyncedFoldersActivityTest.java
@@ -22,7 +22,7 @@
 
 package com.owncloud.android.ui.activity;
 
-import com.nextcloud.client.files.uploader.FileUploadWorker;
+import com.nextcloud.client.files.upload.FileUploadWorker;
 import com.nextcloud.client.preferences.SubFolderRule;
 import com.owncloud.android.datamodel.MediaFolderType;
 import com.owncloud.android.datamodel.SyncedFolderDisplayItem;
diff --git a/app/src/test/java/com/owncloud/android/ui/adapter/GalleryAdapterTest.kt b/app/src/test/java/com/owncloud/android/ui/adapter/GalleryAdapterTest.kt
index ad2a74956e..ffffa18aa2 100644
--- a/app/src/test/java/com/owncloud/android/ui/adapter/GalleryAdapterTest.kt
+++ b/app/src/test/java/com/owncloud/android/ui/adapter/GalleryAdapterTest.kt
@@ -24,7 +24,7 @@ package com.owncloud.android.ui.adapter
 
 import android.content.Context
 import com.nextcloud.client.account.User
-import com.nextcloud.client.files.uploader.FileUploadHelper
+import com.nextcloud.client.files.upload.FileUploadHelper
 import com.nextcloud.client.preferences.AppPreferences
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.GalleryItems