diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 22dabee08b53b0e563e8265460684282812416a1..b2834ea4c3aa1a7b783a1cb19fc56feaa81ba30c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,14 +34,14 @@
         android:roundIcon="@drawable/ic_murena_eel"
         android:requestLegacyExternalStorage="true"> <!-- required to access media folder since app target sdk is 29+ but deprecated. Remove when Q support will be dropped-->
         <activity
-            android:name=".activity.AccountsActivity"
+            android:name=".ui.activity.AccountsActivity"
             android:exported="true"
             android:label="@string/my_account"
             android:theme="@style/AccountActivityTheme" />
 
         <!-- widget -->
         <receiver
-            android:name=".widgets.EDriveWidget"
+            android:name=".ui.widgets.EDriveWidget"
             android:exported="true"
             android:label="@string/app_widget_description">
             <intent-filter>
@@ -57,27 +57,27 @@
 
         <!-- eDrive -->
         <provider
-            android:name=".providers.MediasSyncProvider"
-            android:authorities="foundation.e.drive.providers.MediasSyncProvider"
+            android:name=".ui.providers.MediasSyncProvider"
+            android:authorities="foundation.e.drive.ui.providers.MediasSyncProvider"
             android:enabled="true"
             android:exported="true"
             android:label="@string/account_setting_media_sync" />
         <provider
-            android:name=".providers.SettingsSyncProvider"
-            android:authorities="foundation.e.drive.providers.SettingsSyncProvider"
+            android:name=".ui.providers.SettingsSyncProvider"
+            android:authorities="foundation.e.drive.ui.providers.SettingsSyncProvider"
             android:enabled="true"
             android:exported="true"
             android:label="@string/account_setting_app_sync" />
         <provider
-            android:name=".providers.MeteredConnectionAllowedProvider"
-            android:authorities="foundation.e.drive.providers.MeteredConnectionAllowedProvider"
+            android:name=".ui.providers.MeteredConnectionAllowedProvider"
+            android:authorities="foundation.e.drive.ui.providers.MeteredConnectionAllowedProvider"
             android:enabled="true"
             android:exported="true"
             android:label="@string/account_setting_metered_network" />
 
         <!-- Services -->
         <service
-            android:name=".services.InitializerService"
+            android:name=".setup.InitializerService"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
@@ -85,9 +85,9 @@
             </intent-filter>
         </service>
         <service
-            android:name=".services.ObserverService"
+            android:name=".detections.ObserverService"
             android:enabled="true" />
-        <service android:name=".services.SynchronizationService" />
+        <service android:name=".synchronizations.SynchronizationService" />
         <receiver
             android:name=".receivers.BootCompletedReceiver"
             android:enabled="true"
diff --git a/app/src/main/java/foundation/e/drive/EdriveApplication.java b/app/src/main/java/foundation/e/drive/EdriveApplication.java
index 1b69053b4529ef88d976a59ed03bf6abfef9fb48..ec48e7f6267ec9b9a87142621dcabb6e64618a1b 100644
--- a/app/src/main/java/foundation/e/drive/EdriveApplication.java
+++ b/app/src/main/java/foundation/e/drive/EdriveApplication.java
@@ -16,13 +16,13 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Environment;
 
-import foundation.e.drive.FileObservers.FileEventListener;
-import foundation.e.drive.FileObservers.RecursiveFileObserver;
+import foundation.e.drive.detections.FileObservers.FileEventListener;
+import foundation.e.drive.detections.FileObservers.RecursiveFileObserver;
 import foundation.e.drive.database.FailedSyncPrefsManager;
-import foundation.e.drive.services.SynchronizationService;
+import foundation.e.drive.synchronizations.SynchronizationService;
 import foundation.e.drive.utils.AppConstants;
 import foundation.e.drive.utils.CommonUtils;
-import foundation.e.drive.utils.ReleaseTree;
+import foundation.e.drive.utils.logs.ReleaseTree;
 import timber.log.Timber;
 import static timber.log.Timber.DebugTree;
 
diff --git a/app/src/main/java/foundation/e/drive/utils/FileDiffUtils.java b/app/src/main/java/foundation/e/drive/detections/FileDiffUtils.java
similarity index 98%
rename from app/src/main/java/foundation/e/drive/utils/FileDiffUtils.java
rename to app/src/main/java/foundation/e/drive/detections/FileDiffUtils.java
index 7b5c1814bc6727fe66ba0a35620b43b384895ea3..21217003c81560d1527b98fdb34b5912776119b3 100644
--- a/app/src/main/java/foundation/e/drive/utils/FileDiffUtils.java
+++ b/app/src/main/java/foundation/e/drive/detections/FileDiffUtils.java
@@ -6,7 +6,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.utils;
+package foundation.e.drive.detections;
 import com.owncloud.android.lib.resources.files.model.RemoteFile;
 
 import java.io.File;
diff --git a/app/src/main/java/foundation/e/drive/FileObservers/FileEventListener.java b/app/src/main/java/foundation/e/drive/detections/FileObservers/FileEventListener.java
similarity index 98%
rename from app/src/main/java/foundation/e/drive/FileObservers/FileEventListener.java
rename to app/src/main/java/foundation/e/drive/detections/FileObservers/FileEventListener.java
index 77c55b3629804685ae3ba467bbbcb7b0f2991104..dc4ae4c9431cc0ac1e1640f10906c7aa9024f424 100644
--- a/app/src/main/java/foundation/e/drive/FileObservers/FileEventListener.java
+++ b/app/src/main/java/foundation/e/drive/detections/FileObservers/FileEventListener.java
@@ -6,13 +6,12 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.FileObservers;
+package foundation.e.drive.detections.FileObservers;
 
 import static foundation.e.drive.models.SyncRequest.Type.REMOTE_DELETE;
 import static foundation.e.drive.models.SyncRequest.Type.UPLOAD;
 
 import android.content.Context;
-import android.content.Intent;
 import android.os.FileObserver;
 
 import com.owncloud.android.lib.resources.files.FileUtils;
@@ -23,9 +22,8 @@ import foundation.e.drive.database.DbHelper;
 import foundation.e.drive.models.SyncRequest;
 import foundation.e.drive.models.SyncedFileState;
 import foundation.e.drive.models.SyncedFolder;
-import foundation.e.drive.services.SynchronizationService;
 import foundation.e.drive.utils.CommonUtils;
-import foundation.e.drive.utils.SynchronizationServiceConnection;
+import foundation.e.drive.synchronizations.SynchronizationServiceConnection;
 import timber.log.Timber;
 
 /**
diff --git a/app/src/main/java/foundation/e/drive/FileObservers/RecursiveFileObserver.java b/app/src/main/java/foundation/e/drive/detections/FileObservers/RecursiveFileObserver.java
similarity index 98%
rename from app/src/main/java/foundation/e/drive/FileObservers/RecursiveFileObserver.java
rename to app/src/main/java/foundation/e/drive/detections/FileObservers/RecursiveFileObserver.java
index acd32bbae5f1c00a33560331c119fa404c588279..05412f45205702286c51426c686949e8270470f0 100644
--- a/app/src/main/java/foundation/e/drive/FileObservers/RecursiveFileObserver.java
+++ b/app/src/main/java/foundation/e/drive/detections/FileObservers/RecursiveFileObserver.java
@@ -6,7 +6,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.FileObservers;
+package foundation.e.drive.detections.FileObservers;
 
 import android.content.Context;
 import android.os.FileObserver;
diff --git a/app/src/main/java/foundation/e/drive/operations/ListFileRemoteOperation.java b/app/src/main/java/foundation/e/drive/detections/ListFileRemoteOperation.java
similarity index 88%
rename from app/src/main/java/foundation/e/drive/operations/ListFileRemoteOperation.java
rename to app/src/main/java/foundation/e/drive/detections/ListFileRemoteOperation.java
index 627f31ff87de57fbdd3644fb695310d25ff7a0fb..5800396ae28c8add16cf5b49c02a22cc5e13a930 100644
--- a/app/src/main/java/foundation/e/drive/operations/ListFileRemoteOperation.java
+++ b/app/src/main/java/foundation/e/drive/detections/ListFileRemoteOperation.java
@@ -7,26 +7,21 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.operations;
+package foundation.e.drive.detections;
 
 import android.content.Context;
 
-import androidx.annotation.VisibleForTesting;
-
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
-import com.owncloud.android.lib.resources.files.ReadFolderRemoteOperation;
 import com.owncloud.android.lib.resources.files.model.RemoteFile;
-import java.io.File;
+
 import java.util.ArrayList;
 import java.util.List;
-import java.util.ListIterator;
 
-import foundation.e.drive.contentScanner.RemoteFileLister;
+import foundation.e.drive.detections.listers.RemoteFileLister;
 import foundation.e.drive.database.DbHelper;
 import foundation.e.drive.models.SyncedFolder;
-import foundation.e.drive.utils.CommonUtils;
 import timber.log.Timber;
 
 
diff --git a/app/src/main/java/foundation/e/drive/services/ObserverService.java b/app/src/main/java/foundation/e/drive/detections/ObserverService.java
similarity index 96%
rename from app/src/main/java/foundation/e/drive/services/ObserverService.java
rename to app/src/main/java/foundation/e/drive/detections/ObserverService.java
index a9b761050bc3d625475002494ac2af23d0ad0cd2..603abfbea63f51668af2bc9442e133e64d8f8948 100644
--- a/app/src/main/java/foundation/e/drive/services/ObserverService.java
+++ b/app/src/main/java/foundation/e/drive/detections/ObserverService.java
@@ -7,7 +7,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.services;
+package foundation.e.drive.detections;
 
 import static foundation.e.drive.utils.AppConstants.INITIALIZATION_HAS_BEEN_DONE;
 
@@ -35,22 +35,22 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import foundation.e.drive.contentScanner.LocalContentScanner;
-import foundation.e.drive.contentScanner.LocalFileLister;
-import foundation.e.drive.contentScanner.RemoteContentScanner;
+import foundation.e.drive.detections.contentScanners.LocalContentScanner;
+import foundation.e.drive.detections.listers.LocalFileLister;
+import foundation.e.drive.detections.contentScanners.RemoteContentScanner;
 import foundation.e.drive.database.DbHelper;
-import foundation.e.drive.fileFilters.CrashlogsFileFilter;
-import foundation.e.drive.fileFilters.OnlyFileFilter;
+import foundation.e.drive.detections.fileFilters.CrashlogsFileFilter;
+import foundation.e.drive.detections.fileFilters.OnlyFileFilter;
 import foundation.e.drive.models.SyncRequest;
 import foundation.e.drive.models.SyncedFileState;
 import foundation.e.drive.models.SyncedFolder;
-import foundation.e.drive.operations.ListFileRemoteOperation;
 import foundation.e.drive.receivers.DebugCmdReceiver;
+import foundation.e.drive.setup.InitializerService;
 import foundation.e.drive.utils.AppConstants;
 import foundation.e.drive.utils.CommonUtils;
 import foundation.e.drive.utils.DavClientProvider;
-import foundation.e.drive.utils.ServiceExceptionHandler;
-import foundation.e.drive.utils.SynchronizationServiceConnection;
+import foundation.e.drive.utils.logs.ServiceExceptionHandler;
+import foundation.e.drive.synchronizations.SynchronizationServiceConnection;
 import timber.log.Timber;
 
 /**
diff --git a/app/src/main/java/foundation/e/drive/contentScanner/AbstractContentScanner.java b/app/src/main/java/foundation/e/drive/detections/contentScanners/AbstractContentScanner.java
similarity index 98%
rename from app/src/main/java/foundation/e/drive/contentScanner/AbstractContentScanner.java
rename to app/src/main/java/foundation/e/drive/detections/contentScanners/AbstractContentScanner.java
index 4917c25ef255e687df495a6ffcbdad0a0009eec4..5b10b33c6fbe23bdf9cee108e1e1c1d513fa9482 100644
--- a/app/src/main/java/foundation/e/drive/contentScanner/AbstractContentScanner.java
+++ b/app/src/main/java/foundation/e/drive/detections/contentScanners/AbstractContentScanner.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.contentScanner;
+package foundation.e.drive.detections.contentScanners;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/foundation/e/drive/contentScanner/LocalContentScanner.java b/app/src/main/java/foundation/e/drive/detections/contentScanners/LocalContentScanner.java
similarity index 96%
rename from app/src/main/java/foundation/e/drive/contentScanner/LocalContentScanner.java
rename to app/src/main/java/foundation/e/drive/detections/contentScanners/LocalContentScanner.java
index 65ad9d4e9c75fd6bc26c8288aa20810929bf3dd9..8c59c30f2c988afbf90a276a7a13958b68b260d3 100644
--- a/app/src/main/java/foundation/e/drive/contentScanner/LocalContentScanner.java
+++ b/app/src/main/java/foundation/e/drive/detections/contentScanners/LocalContentScanner.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.contentScanner;
+package foundation.e.drive.detections.contentScanners;
 
 import android.content.Context;
 
@@ -17,7 +17,7 @@ import foundation.e.drive.models.SyncRequest;
 import foundation.e.drive.models.SyncedFileState;
 import foundation.e.drive.models.SyncedFolder;
 import foundation.e.drive.utils.CommonUtils;
-import foundation.e.drive.utils.FileDiffUtils;
+import foundation.e.drive.detections.FileDiffUtils;
 import timber.log.Timber;
 
 /**
diff --git a/app/src/main/java/foundation/e/drive/contentScanner/RemoteContentScanner.java b/app/src/main/java/foundation/e/drive/detections/contentScanners/RemoteContentScanner.java
similarity index 95%
rename from app/src/main/java/foundation/e/drive/contentScanner/RemoteContentScanner.java
rename to app/src/main/java/foundation/e/drive/detections/contentScanners/RemoteContentScanner.java
index 9ff7c18c5c58bacadae5b383a9e5c02a487c4b74..5475146ffea4b4be67ad560cfba534ac08781b3e 100644
--- a/app/src/main/java/foundation/e/drive/contentScanner/RemoteContentScanner.java
+++ b/app/src/main/java/foundation/e/drive/detections/contentScanners/RemoteContentScanner.java
@@ -5,10 +5,10 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.contentScanner;
+package foundation.e.drive.detections.contentScanners;
 
 import static foundation.e.drive.models.SyncRequest.Type.LOCAL_DELETE;
-import static foundation.e.drive.utils.FileDiffUtils.getActionForFileDiff;
+import static foundation.e.drive.detections.FileDiffUtils.getActionForFileDiff;
 
 import android.content.Context;
 
@@ -22,7 +22,7 @@ import foundation.e.drive.models.SyncRequest;
 import foundation.e.drive.models.SyncedFileState;
 import foundation.e.drive.models.SyncedFolder;
 import foundation.e.drive.utils.CommonUtils;
-import foundation.e.drive.utils.FileDiffUtils;
+import foundation.e.drive.detections.FileDiffUtils;
 import timber.log.Timber;
 
 /**
diff --git a/app/src/main/java/foundation/e/drive/fileFilters/AppSettingsFileFilter.java b/app/src/main/java/foundation/e/drive/detections/fileFilters/AppSettingsFileFilter.java
similarity index 93%
rename from app/src/main/java/foundation/e/drive/fileFilters/AppSettingsFileFilter.java
rename to app/src/main/java/foundation/e/drive/detections/fileFilters/AppSettingsFileFilter.java
index 054ff25d98f31571cb23aab399646a8c47c0516a..e4df037297669929b8e6fdff544d5ebabfc8b1d8 100644
--- a/app/src/main/java/foundation/e/drive/fileFilters/AppSettingsFileFilter.java
+++ b/app/src/main/java/foundation/e/drive/detections/fileFilters/AppSettingsFileFilter.java
@@ -7,7 +7,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.fileFilters;
+package foundation.e.drive.detections.fileFilters;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/app/src/main/java/foundation/e/drive/fileFilters/CrashlogsFileFilter.java b/app/src/main/java/foundation/e/drive/detections/fileFilters/CrashlogsFileFilter.java
similarity index 93%
rename from app/src/main/java/foundation/e/drive/fileFilters/CrashlogsFileFilter.java
rename to app/src/main/java/foundation/e/drive/detections/fileFilters/CrashlogsFileFilter.java
index 28d310797312feb122868f59fe19a184396a2778..a1d430a3547c02e2b1788a51438726d33d6af6f7 100644
--- a/app/src/main/java/foundation/e/drive/fileFilters/CrashlogsFileFilter.java
+++ b/app/src/main/java/foundation/e/drive/detections/fileFilters/CrashlogsFileFilter.java
@@ -7,12 +7,12 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.fileFilters;
+package foundation.e.drive.detections.fileFilters;
 
 import java.io.File;
 import java.io.FileFilter;
 
-import foundation.e.drive.utils.ServiceExceptionHandler;
+import foundation.e.drive.utils.logs.ServiceExceptionHandler;
 
 /**
  * @Author Vincent Bourgmayer
diff --git a/app/src/main/java/foundation/e/drive/fileFilters/FileFilterFactory.java b/app/src/main/java/foundation/e/drive/detections/fileFilters/FileFilterFactory.java
similarity index 95%
rename from app/src/main/java/foundation/e/drive/fileFilters/FileFilterFactory.java
rename to app/src/main/java/foundation/e/drive/detections/fileFilters/FileFilterFactory.java
index b62ffd6d9fab3886f82575e5f224fa04e588ed51..f79a1cce3879a67788bcb2aeea64f2786278eed5 100644
--- a/app/src/main/java/foundation/e/drive/fileFilters/FileFilterFactory.java
+++ b/app/src/main/java/foundation/e/drive/detections/fileFilters/FileFilterFactory.java
@@ -7,7 +7,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.fileFilters;
+package foundation.e.drive.detections.fileFilters;
 
 import java.io.FileFilter;
 
diff --git a/app/src/main/java/foundation/e/drive/fileFilters/MediaFileFilter.java b/app/src/main/java/foundation/e/drive/detections/fileFilters/MediaFileFilter.java
similarity index 92%
rename from app/src/main/java/foundation/e/drive/fileFilters/MediaFileFilter.java
rename to app/src/main/java/foundation/e/drive/detections/fileFilters/MediaFileFilter.java
index f99e757b86600432ea87c84ba69d5a07bba6ef6f..b3fb915552f38686d4ee3cc3c9f9f08ffecbe55b 100644
--- a/app/src/main/java/foundation/e/drive/fileFilters/MediaFileFilter.java
+++ b/app/src/main/java/foundation/e/drive/detections/fileFilters/MediaFileFilter.java
@@ -7,7 +7,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.fileFilters;
+package foundation.e.drive.detections.fileFilters;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/app/src/main/java/foundation/e/drive/fileFilters/NoCacheFileFilter.java b/app/src/main/java/foundation/e/drive/detections/fileFilters/NoCacheFileFilter.java
similarity index 91%
rename from app/src/main/java/foundation/e/drive/fileFilters/NoCacheFileFilter.java
rename to app/src/main/java/foundation/e/drive/detections/fileFilters/NoCacheFileFilter.java
index 6b93dd0b0a0af6e31acb40bfddcebc527e85efbf..9022eabaa9bffe4ecc46615d247f800b9248c454 100644
--- a/app/src/main/java/foundation/e/drive/fileFilters/NoCacheFileFilter.java
+++ b/app/src/main/java/foundation/e/drive/detections/fileFilters/NoCacheFileFilter.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.fileFilters;
+package foundation.e.drive.detections.fileFilters;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/app/src/main/java/foundation/e/drive/fileFilters/OnlyFileFilter.java b/app/src/main/java/foundation/e/drive/detections/fileFilters/OnlyFileFilter.java
similarity index 91%
rename from app/src/main/java/foundation/e/drive/fileFilters/OnlyFileFilter.java
rename to app/src/main/java/foundation/e/drive/detections/fileFilters/OnlyFileFilter.java
index e5102f361afc43d75b9c3da60e8ef1e55075f4b9..ac24bfdea6d8b6f7f3b689863a4f4a9608ff41fb 100644
--- a/app/src/main/java/foundation/e/drive/fileFilters/OnlyFileFilter.java
+++ b/app/src/main/java/foundation/e/drive/detections/fileFilters/OnlyFileFilter.java
@@ -7,7 +7,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.fileFilters;
+package foundation.e.drive.detections.fileFilters;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/app/src/main/java/foundation/e/drive/fileFilters/SettingsFileFilter.java b/app/src/main/java/foundation/e/drive/detections/fileFilters/SettingsFileFilter.java
similarity index 95%
rename from app/src/main/java/foundation/e/drive/fileFilters/SettingsFileFilter.java
rename to app/src/main/java/foundation/e/drive/detections/fileFilters/SettingsFileFilter.java
index 6c1420796c0580a4ba2909421c8954d054f5ce46..006224349cd7d277221e3fefcc148367288dc17d 100644
--- a/app/src/main/java/foundation/e/drive/fileFilters/SettingsFileFilter.java
+++ b/app/src/main/java/foundation/e/drive/detections/fileFilters/SettingsFileFilter.java
@@ -7,7 +7,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.fileFilters;
+package foundation.e.drive.detections.fileFilters;
 
 import java.io.File;
 import java.io.FileFilter;
diff --git a/app/src/main/java/foundation/e/drive/contentScanner/AbstractFileLister.java b/app/src/main/java/foundation/e/drive/detections/listers/AbstractFileLister.java
similarity index 99%
rename from app/src/main/java/foundation/e/drive/contentScanner/AbstractFileLister.java
rename to app/src/main/java/foundation/e/drive/detections/listers/AbstractFileLister.java
index 1f4284cdc80a89c53f59f7aefdee4e1a523d5c59..448764280d025e562b29c778d140bbfc59cd0e4c 100644
--- a/app/src/main/java/foundation/e/drive/contentScanner/AbstractFileLister.java
+++ b/app/src/main/java/foundation/e/drive/detections/listers/AbstractFileLister.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.contentScanner;
+package foundation.e.drive.detections.listers;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/foundation/e/drive/contentScanner/FolderWrapper.java b/app/src/main/java/foundation/e/drive/detections/listers/FolderWrapper.java
similarity index 97%
rename from app/src/main/java/foundation/e/drive/contentScanner/FolderWrapper.java
rename to app/src/main/java/foundation/e/drive/detections/listers/FolderWrapper.java
index a1a03caf3838a96df8d02f28229259f24c81bb1b..ee2099fa64e0f56d08b191a37c6b198aa25c57ef 100644
--- a/app/src/main/java/foundation/e/drive/contentScanner/FolderWrapper.java
+++ b/app/src/main/java/foundation/e/drive/detections/listers/FolderWrapper.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.contentScanner;
+package foundation.e.drive.detections.listers;
 
 import androidx.annotation.NonNull;
 
diff --git a/app/src/main/java/foundation/e/drive/contentScanner/LocalFileLister.java b/app/src/main/java/foundation/e/drive/detections/listers/LocalFileLister.java
similarity index 97%
rename from app/src/main/java/foundation/e/drive/contentScanner/LocalFileLister.java
rename to app/src/main/java/foundation/e/drive/detections/listers/LocalFileLister.java
index 934718ac7b080f74c8071f780d9b40832df7fc59..edf73f7e84525cd65a630a8f66a1407d923672d6 100644
--- a/app/src/main/java/foundation/e/drive/contentScanner/LocalFileLister.java
+++ b/app/src/main/java/foundation/e/drive/detections/listers/LocalFileLister.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.contentScanner;
+package foundation.e.drive.detections.listers;
 
 import android.content.Context;
 
@@ -18,7 +18,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import foundation.e.drive.database.DbHelper;
-import foundation.e.drive.fileFilters.FileFilterFactory;
+import foundation.e.drive.detections.fileFilters.FileFilterFactory;
 import foundation.e.drive.models.SyncedFolder;
 import timber.log.Timber;
 
diff --git a/app/src/main/java/foundation/e/drive/contentScanner/RemoteFileLister.java b/app/src/main/java/foundation/e/drive/detections/listers/RemoteFileLister.java
similarity index 99%
rename from app/src/main/java/foundation/e/drive/contentScanner/RemoteFileLister.java
rename to app/src/main/java/foundation/e/drive/detections/listers/RemoteFileLister.java
index 440548e99764b086cfbbef0e4800d5031a739d01..1d5828508aa55922462e8b9cfda863043eef19eb 100644
--- a/app/src/main/java/foundation/e/drive/contentScanner/RemoteFileLister.java
+++ b/app/src/main/java/foundation/e/drive/detections/listers/RemoteFileLister.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.contentScanner;
+package foundation.e.drive.detections.listers;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/foundation/e/drive/work/FullScanWorker.java b/app/src/main/java/foundation/e/drive/detections/workers/FullScanWorker.java
similarity index 95%
rename from app/src/main/java/foundation/e/drive/work/FullScanWorker.java
rename to app/src/main/java/foundation/e/drive/detections/workers/FullScanWorker.java
index 2dd503bfb861d2b04fe0d352e3845533224b44e6..9a2226493566e9c38384238c3490ec1ff986ed4d 100644
--- a/app/src/main/java/foundation/e/drive/work/FullScanWorker.java
+++ b/app/src/main/java/foundation/e/drive/detections/workers/FullScanWorker.java
@@ -6,7 +6,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.work;
+package foundation.e.drive.detections.workers;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -18,7 +18,7 @@ import androidx.annotation.NonNull;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
 
-import foundation.e.drive.services.ObserverService;
+import foundation.e.drive.detections.ObserverService;
 import foundation.e.drive.utils.AppConstants;
 import foundation.e.drive.utils.CommonUtils;
 import timber.log.Timber;
diff --git a/app/src/main/java/foundation/e/drive/work/ListAppsWorker.java b/app/src/main/java/foundation/e/drive/detections/workers/ListAppsWorker.java
similarity index 98%
rename from app/src/main/java/foundation/e/drive/work/ListAppsWorker.java
rename to app/src/main/java/foundation/e/drive/detections/workers/ListAppsWorker.java
index b04e91c5f09580c9c198086ac9ebb39f76895b75..64bd74899f4d08e3f196358cb5ca9d997412bcdf 100644
--- a/app/src/main/java/foundation/e/drive/work/ListAppsWorker.java
+++ b/app/src/main/java/foundation/e/drive/detections/workers/ListAppsWorker.java
@@ -6,7 +6,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.work;
+package foundation.e.drive.detections.workers;
 
 import static com.owncloud.android.lib.resources.files.FileUtils.PATH_SEPARATOR;
 
diff --git a/app/src/main/java/foundation/e/drive/work/PeriodicWorker.java b/app/src/main/java/foundation/e/drive/detections/workers/PeriodicWorker.java
similarity index 85%
rename from app/src/main/java/foundation/e/drive/work/PeriodicWorker.java
rename to app/src/main/java/foundation/e/drive/detections/workers/PeriodicWorker.java
index fb48565443d3dc1b5d6b7b58eaf92fef7c16d242..048b883a901fb622317cc98580ac101cfbb8c3b0 100644
--- a/app/src/main/java/foundation/e/drive/work/PeriodicWorker.java
+++ b/app/src/main/java/foundation/e/drive/detections/workers/PeriodicWorker.java
@@ -6,10 +6,10 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.work;
+package foundation.e.drive.detections.workers;
 
-import static foundation.e.drive.work.WorkRequestFactory.WorkType.ONE_TIME_APP_LIST;
-import static foundation.e.drive.work.WorkRequestFactory.WorkType.ONE_TIME_FULL_SCAN;
+import static foundation.e.drive.workers.WorkRequestFactory.WorkType.ONE_TIME_APP_LIST;
+import static foundation.e.drive.workers.WorkRequestFactory.WorkType.ONE_TIME_FULL_SCAN;
 
 import android.content.Context;
 
@@ -22,6 +22,8 @@ import androidx.work.WorkerParameters;
 
 import java.util.List;
 
+import foundation.e.drive.workers.WorkRequestFactory;
+
 /**
  * Worker that trigger the chain of worker that really need to be periodic
  * This worker is required because we cannot chain periodic work through WorkerAPI
diff --git a/app/src/main/java/foundation/e/drive/models/SyncWrapper.java b/app/src/main/java/foundation/e/drive/models/SyncWrapper.java
index 6cae2050bc3e510bc12cadbdf9d5e357ef6d8c41..265fb58db6e6d196e4f98a3339a321e1073b3681 100644
--- a/app/src/main/java/foundation/e/drive/models/SyncWrapper.java
+++ b/app/src/main/java/foundation/e/drive/models/SyncWrapper.java
@@ -13,9 +13,9 @@ import android.content.Context;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 
 
-import foundation.e.drive.operations.DownloadFileOperation;
-import foundation.e.drive.operations.RemoveFileOperation;
-import foundation.e.drive.operations.UploadFileOperation;
+import foundation.e.drive.synchronizations.operations.DownloadFileOperation;
+import foundation.e.drive.synchronizations.operations.RemoveFileOperation;
+import foundation.e.drive.synchronizations.operations.UploadFileOperation;
 
 /**
  * This class encapsulates data, for SynchronizationService, about a thread which run a RemoteOperation
diff --git a/app/src/main/java/foundation/e/drive/receivers/AccountRemoveCallbackReceiver.java b/app/src/main/java/foundation/e/drive/receivers/AccountRemoveCallbackReceiver.java
index 6a95cef6e38de915298bfccbb4c41d288ec34d39..bd4bf5fba1c6e056a9d1639f0c93d8b9556f1831 100644
--- a/app/src/main/java/foundation/e/drive/receivers/AccountRemoveCallbackReceiver.java
+++ b/app/src/main/java/foundation/e/drive/receivers/AccountRemoveCallbackReceiver.java
@@ -25,9 +25,9 @@ import java.io.File;
 import foundation.e.drive.EdriveApplication;
 import foundation.e.drive.database.DbHelper;
 import foundation.e.drive.database.FailedSyncPrefsManager;
-import foundation.e.drive.services.InitializerService;
-import foundation.e.drive.services.ObserverService;
-import foundation.e.drive.services.SynchronizationService;
+import foundation.e.drive.setup.InitializerService;
+import foundation.e.drive.detections.ObserverService;
+import foundation.e.drive.synchronizations.SynchronizationService;
 import foundation.e.drive.utils.AppConstants;
 import timber.log.Timber;
 
diff --git a/app/src/main/java/foundation/e/drive/receivers/BootCompletedReceiver.java b/app/src/main/java/foundation/e/drive/receivers/BootCompletedReceiver.java
index 094cfeef9692c5f84aadfa9a1e5a409f68ce440c..724caf429ae168af17a9497e29c254d165f0bd7d 100644
--- a/app/src/main/java/foundation/e/drive/receivers/BootCompletedReceiver.java
+++ b/app/src/main/java/foundation/e/drive/receivers/BootCompletedReceiver.java
@@ -16,7 +16,7 @@ import android.database.sqlite.SQLiteException;
 
 import foundation.e.drive.BuildConfig;
 import foundation.e.drive.database.DbHelper;
-import foundation.e.drive.services.InitializerService;
+import foundation.e.drive.setup.InitializerService;
 import foundation.e.drive.utils.AppConstants;
 import foundation.e.drive.utils.CommonUtils;
 import timber.log.Timber;
diff --git a/app/src/main/java/foundation/e/drive/receivers/DebugCmdReceiver.java b/app/src/main/java/foundation/e/drive/receivers/DebugCmdReceiver.java
index 9e0e10b4cefa179122314a468db9202218aa8e2b..5f7f46e2e241b6ae3ab3bf1dfb316f5b44d279f0 100644
--- a/app/src/main/java/foundation/e/drive/receivers/DebugCmdReceiver.java
+++ b/app/src/main/java/foundation/e/drive/receivers/DebugCmdReceiver.java
@@ -10,11 +10,10 @@ package foundation.e.drive.receivers;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.util.Log;
 
 import foundation.e.drive.database.DbHelper;
-import foundation.e.drive.services.ObserverService;
-import foundation.e.drive.utils.ReleaseTree;
+import foundation.e.drive.detections.ObserverService;
+import foundation.e.drive.utils.logs.ReleaseTree;
 import timber.log.Timber;
 
 /**
diff --git a/app/src/main/java/foundation/e/drive/services/InitializerService.java b/app/src/main/java/foundation/e/drive/setup/InitializerService.java
similarity index 97%
rename from app/src/main/java/foundation/e/drive/services/InitializerService.java
rename to app/src/main/java/foundation/e/drive/setup/InitializerService.java
index c6438174e77c8ab39a944da563b732032db9a8ce..a302662d1d8783f15496bebc71a9861639414924 100644
--- a/app/src/main/java/foundation/e/drive/services/InitializerService.java
+++ b/app/src/main/java/foundation/e/drive/setup/InitializerService.java
@@ -7,7 +7,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.services;
+package foundation.e.drive.setup;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -23,7 +23,6 @@ import java.util.List;
 import foundation.e.drive.models.SyncedFolder;
 import foundation.e.drive.utils.AppConstants;
 import foundation.e.drive.utils.CommonUtils;
-import foundation.e.drive.utils.RootSyncedFolderProvider;
 import timber.log.Timber;
 
 import androidx.annotation.NonNull;
diff --git a/app/src/main/java/foundation/e/drive/utils/RootSyncedFolderProvider.kt b/app/src/main/java/foundation/e/drive/setup/RootSyncedFolderProvider.kt
similarity index 98%
rename from app/src/main/java/foundation/e/drive/utils/RootSyncedFolderProvider.kt
rename to app/src/main/java/foundation/e/drive/setup/RootSyncedFolderProvider.kt
index 2c3d46b90f3c5039e862da228194585dd91ab558..7989b42966d1c6067a9667e5071c031028daf76b 100644
--- a/app/src/main/java/foundation/e/drive/utils/RootSyncedFolderProvider.kt
+++ b/app/src/main/java/foundation/e/drive/setup/RootSyncedFolderProvider.kt
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.utils
+package foundation.e.drive.setup
 
 import android.content.Context
 import android.os.Build
@@ -21,6 +21,7 @@ import android.os.Environment.DIRECTORY_RINGTONES
 import android.os.Environment.DIRECTORY_MOVIES
 import com.owncloud.android.lib.resources.files.FileUtils.PATH_SEPARATOR
 import foundation.e.drive.models.SyncedFolder
+import foundation.e.drive.utils.CommonUtils
 
 object RootSyncedFolderProvider {
     private const val CATEGORY_IMAGES = "Images"
diff --git a/app/src/main/java/foundation/e/drive/work/CreateRemoteFolderWorker.java b/app/src/main/java/foundation/e/drive/setup/worker/CreateRemoteFolderWorker.java
similarity index 99%
rename from app/src/main/java/foundation/e/drive/work/CreateRemoteFolderWorker.java
rename to app/src/main/java/foundation/e/drive/setup/worker/CreateRemoteFolderWorker.java
index e112c0f393c270ebb8e1fcff685fbce925039eac..71360d6e0847b8397d31174320a4142626785aaf 100644
--- a/app/src/main/java/foundation/e/drive/work/CreateRemoteFolderWorker.java
+++ b/app/src/main/java/foundation/e/drive/setup/worker/CreateRemoteFolderWorker.java
@@ -6,7 +6,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.work;
+package foundation.e.drive.setup.worker;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
diff --git a/app/src/main/java/foundation/e/drive/work/FirstStartWorker.java b/app/src/main/java/foundation/e/drive/setup/worker/FirstStartWorker.java
similarity index 80%
rename from app/src/main/java/foundation/e/drive/work/FirstStartWorker.java
rename to app/src/main/java/foundation/e/drive/setup/worker/FirstStartWorker.java
index 5890e103e6c450b5ff71fe13f3a01363f2dce8cc..8ce379ea43e39bb42190e2902f3b68ad377b9c1e 100644
--- a/app/src/main/java/foundation/e/drive/work/FirstStartWorker.java
+++ b/app/src/main/java/foundation/e/drive/setup/worker/FirstStartWorker.java
@@ -6,12 +6,12 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.work;
+package foundation.e.drive.setup.worker;
 
 import static foundation.e.drive.utils.AppConstants.INITIALFOLDERS_NUMBER;
-import static foundation.e.drive.work.WorkRequestFactory.WorkType.ONE_TIME_APP_LIST;
-import static foundation.e.drive.work.WorkRequestFactory.WorkType.PERIODIC_CLEANING;
-import static foundation.e.drive.work.WorkRequestFactory.WorkType.PERIODIC_SCAN;
+import static foundation.e.drive.workers.WorkRequestFactory.WorkType.ONE_TIME_APP_LIST;
+import static foundation.e.drive.workers.WorkRequestFactory.WorkType.PERIODIC_CLEANING;
+import static foundation.e.drive.workers.WorkRequestFactory.WorkType.PERIODIC_SCAN;
 
 import android.content.Context;
 import android.content.Intent;
@@ -23,7 +23,12 @@ import androidx.work.Worker;
 import androidx.work.WorkerParameters;
 
 import foundation.e.drive.EdriveApplication;
+import foundation.e.drive.detections.ObserverService;
+import foundation.e.drive.synchronizations.SynchronizationService;
 import foundation.e.drive.utils.AppConstants;
+import foundation.e.drive.detections.workers.PeriodicWorker;
+import foundation.e.drive.workers.RecycleBinCleaningWorker;
+import foundation.e.drive.workers.WorkRequestFactory;
 import timber.log.Timber;
 
 /**
@@ -55,8 +60,8 @@ public class FirstStartWorker extends Worker {
 
         registerPeriodicWork(appContext);
 
-        getApplicationContext().startService(new Intent(getApplicationContext(), foundation.e.drive.services.SynchronizationService.class));
-        getApplicationContext().startService(new Intent(getApplicationContext(), foundation.e.drive.services.ObserverService.class));
+        getApplicationContext().startService(new Intent(getApplicationContext(), SynchronizationService.class));
+        getApplicationContext().startService(new Intent(getApplicationContext(), ObserverService.class));
 
         ((EdriveApplication) getApplicationContext()).startRecursiveFileObserver();
 
diff --git a/app/src/main/java/foundation/e/drive/work/LocalFileDeleter.java b/app/src/main/java/foundation/e/drive/synchronizations/LocalFileDeleter.java
similarity index 97%
rename from app/src/main/java/foundation/e/drive/work/LocalFileDeleter.java
rename to app/src/main/java/foundation/e/drive/synchronizations/LocalFileDeleter.java
index bfbc1c350dcd21d92c34400d97e5665a7ea45956..24465d31ad59a46d9c9d6c47a79d4a5317d8989e 100644
--- a/app/src/main/java/foundation/e/drive/work/LocalFileDeleter.java
+++ b/app/src/main/java/foundation/e/drive/synchronizations/LocalFileDeleter.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.work;
+package foundation.e.drive.synchronizations;
 
 import android.content.Context;
 import android.os.Handler;
diff --git a/app/src/main/java/foundation/e/drive/services/SynchronizationService.java b/app/src/main/java/foundation/e/drive/synchronizations/SynchronizationService.java
similarity index 97%
rename from app/src/main/java/foundation/e/drive/services/SynchronizationService.java
rename to app/src/main/java/foundation/e/drive/synchronizations/SynchronizationService.java
index 78c87b07e86f748415d8f713305332b3c89f9e8e..8759ebb96779b6199689b724938c50114c63e5c1 100644
--- a/app/src/main/java/foundation/e/drive/services/SynchronizationService.java
+++ b/app/src/main/java/foundation/e/drive/synchronizations/SynchronizationService.java
@@ -5,9 +5,9 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.services;
+package foundation.e.drive.synchronizations;
 
-import static foundation.e.drive.operations.UploadFileOperation.FILE_SIZE_FLOOR_FOR_CHUNKED;
+import static foundation.e.drive.synchronizations.operations.UploadFileOperation.FILE_SIZE_FLOOR_FOR_CHUNKED;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -37,13 +37,12 @@ import foundation.e.drive.database.DbHelper;
 import foundation.e.drive.database.FailedSyncPrefsManager;
 import foundation.e.drive.models.SyncRequest;
 import foundation.e.drive.models.SyncWrapper;
-import foundation.e.drive.operations.DownloadFileOperation;
-import foundation.e.drive.operations.RemoveFileOperation;
-import foundation.e.drive.operations.UploadFileOperation;
+import foundation.e.drive.synchronizations.operations.DownloadFileOperation;
+import foundation.e.drive.synchronizations.operations.RemoveFileOperation;
+import foundation.e.drive.synchronizations.operations.UploadFileOperation;
 import foundation.e.drive.utils.AppConstants;
 import foundation.e.drive.utils.CommonUtils;
 import foundation.e.drive.utils.DavClientProvider;
-import foundation.e.drive.work.LocalFileDeleter;
 import timber.log.Timber;
 
 /**
diff --git a/app/src/main/java/foundation/e/drive/utils/SynchronizationServiceConnection.java b/app/src/main/java/foundation/e/drive/synchronizations/SynchronizationServiceConnection.java
similarity index 96%
rename from app/src/main/java/foundation/e/drive/utils/SynchronizationServiceConnection.java
rename to app/src/main/java/foundation/e/drive/synchronizations/SynchronizationServiceConnection.java
index 370ed76e25f423e4ba7e2e772a38fc0677ea024a..c4a22d91d237829815f6f69ee29fcad991418044 100644
--- a/app/src/main/java/foundation/e/drive/utils/SynchronizationServiceConnection.java
+++ b/app/src/main/java/foundation/e/drive/synchronizations/SynchronizationServiceConnection.java
@@ -6,7 +6,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.utils;
+package foundation.e.drive.synchronizations;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -16,7 +16,6 @@ import android.os.IBinder;
 
 import androidx.annotation.NonNull;
 
-import foundation.e.drive.services.SynchronizationService;
 import timber.log.Timber;
 
 /**
diff --git a/app/src/main/java/foundation/e/drive/operations/DownloadFileOperation.java b/app/src/main/java/foundation/e/drive/synchronizations/operations/DownloadFileOperation.java
similarity index 99%
rename from app/src/main/java/foundation/e/drive/operations/DownloadFileOperation.java
rename to app/src/main/java/foundation/e/drive/synchronizations/operations/DownloadFileOperation.java
index a5b271d508e6f6c497437b456cf85c15ccce546a..c61e06c4c6845af2a51e0407bcff7c2fa903f868 100644
--- a/app/src/main/java/foundation/e/drive/operations/DownloadFileOperation.java
+++ b/app/src/main/java/foundation/e/drive/synchronizations/operations/DownloadFileOperation.java
@@ -7,7 +7,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.operations;
+package foundation.e.drive.synchronizations.operations;
 
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.FILE_NOT_FOUND;
 import static com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode.FORBIDDEN;
diff --git a/app/src/main/java/foundation/e/drive/operations/GetAliasOperation.java b/app/src/main/java/foundation/e/drive/synchronizations/operations/GetAliasOperation.java
similarity index 98%
rename from app/src/main/java/foundation/e/drive/operations/GetAliasOperation.java
rename to app/src/main/java/foundation/e/drive/synchronizations/operations/GetAliasOperation.java
index 0602b6e27ccf9f521aa1b0ab75c29b297fb018a8..b435a0177267efb12b3c268b14c296ba8c9924e1 100644
--- a/app/src/main/java/foundation/e/drive/operations/GetAliasOperation.java
+++ b/app/src/main/java/foundation/e/drive/synchronizations/operations/GetAliasOperation.java
@@ -6,7 +6,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.operations;
+package foundation.e.drive.synchronizations.operations;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
diff --git a/app/src/main/java/foundation/e/drive/operations/RemoveFileOperation.java b/app/src/main/java/foundation/e/drive/synchronizations/operations/RemoveFileOperation.java
similarity index 94%
rename from app/src/main/java/foundation/e/drive/operations/RemoveFileOperation.java
rename to app/src/main/java/foundation/e/drive/synchronizations/operations/RemoveFileOperation.java
index 29b0d0a9df3b4f0d41772f615c18464ed17e8556..05e891d9956f649de20cedc709182f0746f66c4a 100644
--- a/app/src/main/java/foundation/e/drive/operations/RemoveFileOperation.java
+++ b/app/src/main/java/foundation/e/drive/synchronizations/operations/RemoveFileOperation.java
@@ -7,7 +7,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.operations;
+package foundation.e.drive.synchronizations.operations;
 
 import com.owncloud.android.lib.resources.files.RemoveFileRemoteOperation;
 import foundation.e.drive.models.SyncedFileState;
diff --git a/app/src/main/java/foundation/e/drive/operations/UploadFileOperation.java b/app/src/main/java/foundation/e/drive/synchronizations/operations/UploadFileOperation.java
similarity index 99%
rename from app/src/main/java/foundation/e/drive/operations/UploadFileOperation.java
rename to app/src/main/java/foundation/e/drive/synchronizations/operations/UploadFileOperation.java
index caa1874b3373270ff86de13b87958f88b8496f1b..29150f6013cd432e2c196893439980528d903423 100644
--- a/app/src/main/java/foundation/e/drive/operations/UploadFileOperation.java
+++ b/app/src/main/java/foundation/e/drive/synchronizations/operations/UploadFileOperation.java
@@ -7,7 +7,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.operations;
+package foundation.e.drive.synchronizations.operations;
 
 import android.accounts.Account;
 import android.content.Context;
diff --git a/app/src/main/java/foundation/e/drive/activity/AccountsActivity.java b/app/src/main/java/foundation/e/drive/ui/activity/AccountsActivity.java
similarity index 95%
rename from app/src/main/java/foundation/e/drive/activity/AccountsActivity.java
rename to app/src/main/java/foundation/e/drive/ui/activity/AccountsActivity.java
index 47c45896751b3940663df41ac37daccf609f5ae6..4d723081e3aa7d930fa14e9e8839e8b0b37ad25c 100644
--- a/app/src/main/java/foundation/e/drive/activity/AccountsActivity.java
+++ b/app/src/main/java/foundation/e/drive/ui/activity/AccountsActivity.java
@@ -6,16 +6,16 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.activity;
+package foundation.e.drive.ui.activity;
 
 import static foundation.e.drive.utils.AppConstants.ACCOUNT_DATA_ALIAS_KEY;
 import static foundation.e.drive.utils.AppConstants.ACCOUNT_DATA_EMAIL;
 import static foundation.e.drive.utils.AppConstants.ACCOUNT_DATA_NAME;
 import static foundation.e.drive.utils.AppConstants.ACCOUNT_DATA_TOTAL_QUOTA_KEY;
 import static foundation.e.drive.utils.AppConstants.ACCOUNT_DATA_USED_QUOTA_KEY;
-import static foundation.e.drive.widgets.EDriveWidget.buildIntent;
-import static foundation.e.drive.widgets.EDriveWidget.convertIntoMB;
-import static foundation.e.drive.widgets.EDriveWidget.dataForWeb;
+import static foundation.e.drive.ui.widgets.EDriveWidget.buildIntent;
+import static foundation.e.drive.ui.widgets.EDriveWidget.convertIntoMB;
+import static foundation.e.drive.ui.widgets.EDriveWidget.dataForWeb;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -36,7 +36,7 @@ import foundation.e.drive.databinding.ActivityAccountsBinding;
 import foundation.e.drive.utils.AccountUtils;
 import foundation.e.drive.utils.CommonUtils;
 import foundation.e.drive.utils.DavClientProvider;
-import foundation.e.drive.widgets.EDriveWidget;
+import foundation.e.drive.ui.widgets.EDriveWidget;
 import timber.log.Timber;
 
 public class AccountsActivity extends AppCompatActivity {
diff --git a/app/src/main/java/foundation/e/drive/configurations/ApplicationGlideModule.java b/app/src/main/java/foundation/e/drive/ui/configurations/ApplicationGlideModule.java
similarity index 96%
rename from app/src/main/java/foundation/e/drive/configurations/ApplicationGlideModule.java
rename to app/src/main/java/foundation/e/drive/ui/configurations/ApplicationGlideModule.java
index 15f6dac80cbfdfb407fa26622991b6fc10013b27..95d6f821e0446bf230bc995968aec87f7c8a63b5 100644
--- a/app/src/main/java/foundation/e/drive/configurations/ApplicationGlideModule.java
+++ b/app/src/main/java/foundation/e/drive/ui/configurations/ApplicationGlideModule.java
@@ -14,7 +14,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package foundation.e.drive.configurations;
+package foundation.e.drive.ui.configurations;
 
 import android.content.Context;
 import android.util.Log;
diff --git a/app/src/main/java/foundation/e/drive/providers/MediasSyncProvider.java b/app/src/main/java/foundation/e/drive/ui/providers/MediasSyncProvider.java
similarity index 97%
rename from app/src/main/java/foundation/e/drive/providers/MediasSyncProvider.java
rename to app/src/main/java/foundation/e/drive/ui/providers/MediasSyncProvider.java
index 876b252a2085f4b906d3e0012cfc8fed3b64ec3f..961677ea50dcdad848f0142b777684b195bc27ee 100644
--- a/app/src/main/java/foundation/e/drive/providers/MediasSyncProvider.java
+++ b/app/src/main/java/foundation/e/drive/ui/providers/MediasSyncProvider.java
@@ -7,7 +7,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.providers;
+package foundation.e.drive.ui.providers;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
diff --git a/app/src/main/java/foundation/e/drive/providers/MeteredConnectionAllowedProvider.java b/app/src/main/java/foundation/e/drive/ui/providers/MeteredConnectionAllowedProvider.java
similarity index 97%
rename from app/src/main/java/foundation/e/drive/providers/MeteredConnectionAllowedProvider.java
rename to app/src/main/java/foundation/e/drive/ui/providers/MeteredConnectionAllowedProvider.java
index 1d119a2db4ef28cf6f14138da969d2d3a1eddc71..ca34a876ce4da9bde72b52e1bd6d06a20fdffc4a 100644
--- a/app/src/main/java/foundation/e/drive/providers/MeteredConnectionAllowedProvider.java
+++ b/app/src/main/java/foundation/e/drive/ui/providers/MeteredConnectionAllowedProvider.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.providers;
+package foundation.e.drive.ui.providers;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
diff --git a/app/src/main/java/foundation/e/drive/providers/SettingsSyncProvider.java b/app/src/main/java/foundation/e/drive/ui/providers/SettingsSyncProvider.java
similarity index 97%
rename from app/src/main/java/foundation/e/drive/providers/SettingsSyncProvider.java
rename to app/src/main/java/foundation/e/drive/ui/providers/SettingsSyncProvider.java
index e35d204398f3ef25cae6bab190efe4d14e941374..993712f067175cf3e6b4a2834a8728888b1e5a71 100644
--- a/app/src/main/java/foundation/e/drive/providers/SettingsSyncProvider.java
+++ b/app/src/main/java/foundation/e/drive/ui/providers/SettingsSyncProvider.java
@@ -7,7 +7,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.providers;
+package foundation.e.drive.ui.providers;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
diff --git a/app/src/main/java/foundation/e/drive/widgets/EDriveWidget.java b/app/src/main/java/foundation/e/drive/ui/widgets/EDriveWidget.java
similarity index 99%
rename from app/src/main/java/foundation/e/drive/widgets/EDriveWidget.java
rename to app/src/main/java/foundation/e/drive/ui/widgets/EDriveWidget.java
index a9b88e7d1c5da098ed7073204a11154a4d49b94c..675e701be3a93c9f0c6cbf569c9d33537493723b 100644
--- a/app/src/main/java/foundation/e/drive/widgets/EDriveWidget.java
+++ b/app/src/main/java/foundation/e/drive/ui/widgets/EDriveWidget.java
@@ -6,7 +6,7 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.widgets;
+package foundation.e.drive.ui.widgets;
 
 import static foundation.e.drive.utils.AppConstants.ACCOUNT_DATA_ALIAS_KEY;
 import static foundation.e.drive.utils.AppConstants.ACCOUNT_DATA_EMAIL;
diff --git a/app/src/main/java/foundation/e/drive/utils/CommonUtils.java b/app/src/main/java/foundation/e/drive/utils/CommonUtils.java
index 9a6ba862ad24e38c3afad6d106a2e28ef893caf6..fb38b2414c0168a2e6aafe71759691136901424d 100644
--- a/app/src/main/java/foundation/e/drive/utils/CommonUtils.java
+++ b/app/src/main/java/foundation/e/drive/utils/CommonUtils.java
@@ -40,9 +40,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import foundation.e.drive.R;
+import foundation.e.drive.utils.logs.ServiceExceptionHandler;
 import foundation.e.drive.models.SyncedFolder;
-import foundation.e.drive.work.AccountUserInfoWorker;
-import foundation.e.drive.work.WorkRequestFactory;
+import foundation.e.drive.workers.AccountUserInfoWorker;
+import foundation.e.drive.workers.WorkRequestFactory;
 import timber.log.Timber;
 
 import static foundation.e.drive.utils.AppConstants.MEDIASYNC_PROVIDER_AUTHORITY;
diff --git a/app/src/main/java/foundation/e/drive/utils/ReleaseTree.java b/app/src/main/java/foundation/e/drive/utils/logs/ReleaseTree.java
similarity index 95%
rename from app/src/main/java/foundation/e/drive/utils/ReleaseTree.java
rename to app/src/main/java/foundation/e/drive/utils/logs/ReleaseTree.java
index 48e3385d04da198290355299a103e6fa30017222..5bbdb23787c513ec0fe28d9dfc8220a6b2c155a4 100644
--- a/app/src/main/java/foundation/e/drive/utils/ReleaseTree.java
+++ b/app/src/main/java/foundation/e/drive/utils/logs/ReleaseTree.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.utils;
+package foundation.e.drive.utils.logs;
 
 import android.util.Log;
 
diff --git a/app/src/main/java/foundation/e/drive/utils/ServiceExceptionHandler.java b/app/src/main/java/foundation/e/drive/utils/logs/ServiceExceptionHandler.java
similarity index 98%
rename from app/src/main/java/foundation/e/drive/utils/ServiceExceptionHandler.java
rename to app/src/main/java/foundation/e/drive/utils/logs/ServiceExceptionHandler.java
index 24074649b2c3f8fb045e2ebc13b99c6d97bb7c48..cec161fd789fe9769237c0bcb0eb976633e81ebe 100644
--- a/app/src/main/java/foundation/e/drive/utils/ServiceExceptionHandler.java
+++ b/app/src/main/java/foundation/e/drive/utils/logs/ServiceExceptionHandler.java
@@ -6,7 +6,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.utils;
+package foundation.e.drive.utils.logs;
 import android.app.Service;
 import android.os.Environment;
 
diff --git a/app/src/main/java/foundation/e/drive/work/AccountUserInfoWorker.java b/app/src/main/java/foundation/e/drive/workers/AccountUserInfoWorker.java
similarity index 97%
rename from app/src/main/java/foundation/e/drive/work/AccountUserInfoWorker.java
rename to app/src/main/java/foundation/e/drive/workers/AccountUserInfoWorker.java
index 2326515fa52a1dfea45cab07d6251bb7f75c2233..46c3d83d9193b6bb89bfe08219841eefff8e13f9 100644
--- a/app/src/main/java/foundation/e/drive/work/AccountUserInfoWorker.java
+++ b/app/src/main/java/foundation/e/drive/workers/AccountUserInfoWorker.java
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.work;
+package foundation.e.drive.workers;
 
 import static foundation.e.drive.utils.AppConstants.ACCOUNT_DATA_ALIAS_KEY;
 import static foundation.e.drive.utils.AppConstants.ACCOUNT_DATA_EMAIL;
@@ -41,12 +41,12 @@ import com.owncloud.android.lib.resources.users.GetUserInfoRemoteOperation;
 import java.util.ArrayList;
 
 import foundation.e.drive.R;
-import foundation.e.drive.activity.AccountsActivity;
-import foundation.e.drive.operations.GetAliasOperation;
+import foundation.e.drive.ui.activity.AccountsActivity;
+import foundation.e.drive.synchronizations.operations.GetAliasOperation;
 import foundation.e.drive.utils.AppConstants;
 import foundation.e.drive.utils.CommonUtils;
 import foundation.e.drive.utils.DavClientProvider;
-import foundation.e.drive.widgets.EDriveWidget;
+import foundation.e.drive.ui.widgets.EDriveWidget;
 import timber.log.Timber;
 
 /**
diff --git a/app/src/main/java/foundation/e/drive/work/RecycleBinCleaningWorker.kt b/app/src/main/java/foundation/e/drive/workers/RecycleBinCleaningWorker.kt
similarity index 96%
rename from app/src/main/java/foundation/e/drive/work/RecycleBinCleaningWorker.kt
rename to app/src/main/java/foundation/e/drive/workers/RecycleBinCleaningWorker.kt
index 45328ed3589a82b870153b36ebee9c798d234632..1983cc9c9171f4be7381c45d7bf82e06c61b7252 100644
--- a/app/src/main/java/foundation/e/drive/work/RecycleBinCleaningWorker.kt
+++ b/app/src/main/java/foundation/e/drive/workers/RecycleBinCleaningWorker.kt
@@ -5,7 +5,7 @@
  * which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/gpl.html
  */
-package foundation.e.drive.work
+package foundation.e.drive.workers
 
 import android.content.Context
 import androidx.work.Worker
diff --git a/app/src/main/java/foundation/e/drive/work/WorkRequestFactory.java b/app/src/main/java/foundation/e/drive/workers/WorkRequestFactory.java
similarity index 88%
rename from app/src/main/java/foundation/e/drive/work/WorkRequestFactory.java
rename to app/src/main/java/foundation/e/drive/workers/WorkRequestFactory.java
index 3b6a0892151eb1c74ff88426269270f2271c4fd1..fafa15db3641518d1bfe8b891d595d97858f939a 100644
--- a/app/src/main/java/foundation/e/drive/work/WorkRequestFactory.java
+++ b/app/src/main/java/foundation/e/drive/workers/WorkRequestFactory.java
@@ -6,18 +6,18 @@
  * http://www.gnu.org/licenses/gpl.html
  */
 
-package foundation.e.drive.work;
-
-import static foundation.e.drive.work.CreateRemoteFolderWorker.DATA_KEY_ENABLE;
-import static foundation.e.drive.work.CreateRemoteFolderWorker.DATA_KEY_ID;
-import static foundation.e.drive.work.CreateRemoteFolderWorker.DATA_KEY_LAST_ETAG;
-import static foundation.e.drive.work.CreateRemoteFolderWorker.DATA_KEY_LAST_MODIFIED;
-import static foundation.e.drive.work.CreateRemoteFolderWorker.DATA_KEY_LIBELLE;
-import static foundation.e.drive.work.CreateRemoteFolderWorker.DATA_KEY_LOCAL_PATH;
-import static foundation.e.drive.work.CreateRemoteFolderWorker.DATA_KEY_MEDIATYPE;
-import static foundation.e.drive.work.CreateRemoteFolderWorker.DATA_KEY_REMOTE_PATH;
-import static foundation.e.drive.work.CreateRemoteFolderWorker.DATA_KEY_SCAN_LOCAL;
-import static foundation.e.drive.work.CreateRemoteFolderWorker.DATA_KEY_SCAN_REMOTE;
+package foundation.e.drive.workers;
+
+import static foundation.e.drive.setup.worker.CreateRemoteFolderWorker.DATA_KEY_ENABLE;
+import static foundation.e.drive.setup.worker.CreateRemoteFolderWorker.DATA_KEY_ID;
+import static foundation.e.drive.setup.worker.CreateRemoteFolderWorker.DATA_KEY_LAST_ETAG;
+import static foundation.e.drive.setup.worker.CreateRemoteFolderWorker.DATA_KEY_LAST_MODIFIED;
+import static foundation.e.drive.setup.worker.CreateRemoteFolderWorker.DATA_KEY_LIBELLE;
+import static foundation.e.drive.setup.worker.CreateRemoteFolderWorker.DATA_KEY_LOCAL_PATH;
+import static foundation.e.drive.setup.worker.CreateRemoteFolderWorker.DATA_KEY_MEDIATYPE;
+import static foundation.e.drive.setup.worker.CreateRemoteFolderWorker.DATA_KEY_REMOTE_PATH;
+import static foundation.e.drive.setup.worker.CreateRemoteFolderWorker.DATA_KEY_SCAN_LOCAL;
+import static foundation.e.drive.setup.worker.CreateRemoteFolderWorker.DATA_KEY_SCAN_REMOTE;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -31,7 +31,12 @@ import androidx.work.PeriodicWorkRequest;
 import java.security.InvalidParameterException;
 import java.util.concurrent.TimeUnit;
 
+import foundation.e.drive.detections.workers.FullScanWorker;
+import foundation.e.drive.detections.workers.ListAppsWorker;
+import foundation.e.drive.detections.workers.PeriodicWorker;
 import foundation.e.drive.models.SyncedFolder;
+import foundation.e.drive.setup.worker.CreateRemoteFolderWorker;
+import foundation.e.drive.setup.worker.FirstStartWorker;
 import foundation.e.drive.utils.AppConstants;
 
 public class WorkRequestFactory {
diff --git a/app/src/test/java/foundation/e/drive/contentScanner/LocalContentScannerTest.java b/app/src/test/java/foundation/e/drive/contentScanner/LocalContentScannerTest.java
index 118dd6a24bd509888f0191afd49ba06959414f11..e468a80974bb124d259f238e388b10301af9ed37 100644
--- a/app/src/test/java/foundation/e/drive/contentScanner/LocalContentScannerTest.java
+++ b/app/src/test/java/foundation/e/drive/contentScanner/LocalContentScannerTest.java
@@ -29,6 +29,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import foundation.e.drive.detections.contentScanners.LocalContentScanner;
 import foundation.e.drive.models.SyncRequest;
 import foundation.e.drive.models.SyncedFileState;
 import foundation.e.drive.models.SyncedFolder;
diff --git a/app/src/test/java/foundation/e/drive/contentScanner/LocalFileListerTest.java b/app/src/test/java/foundation/e/drive/contentScanner/LocalFileListerTest.java
index ee0d7b75692b9c4357da686aef73cefca8d0fa44..55c712500abca80c15bbd28ecadc63ba955e85cf 100644
--- a/app/src/test/java/foundation/e/drive/contentScanner/LocalFileListerTest.java
+++ b/app/src/test/java/foundation/e/drive/contentScanner/LocalFileListerTest.java
@@ -31,6 +31,8 @@ import java.util.List;
 
 import foundation.e.drive.TestUtils;
 import foundation.e.drive.database.DbHelper;
+import foundation.e.drive.detections.listers.FolderWrapper;
+import foundation.e.drive.detections.listers.LocalFileLister;
 import foundation.e.drive.models.SyncedFileState;
 import foundation.e.drive.models.SyncedFolder;
 
diff --git a/app/src/test/java/foundation/e/drive/contentScanner/RemoteContentScannerTest.java b/app/src/test/java/foundation/e/drive/contentScanner/RemoteContentScannerTest.java
index ae291d142ad98c460f753647c765780cf0b10e85..25ef006d33e2a2e01a507a521adc4fdb5bd437f4 100644
--- a/app/src/test/java/foundation/e/drive/contentScanner/RemoteContentScannerTest.java
+++ b/app/src/test/java/foundation/e/drive/contentScanner/RemoteContentScannerTest.java
@@ -31,6 +31,7 @@ import java.util.List;
 
 import foundation.e.drive.TestUtils;
 import foundation.e.drive.database.DbHelper;
+import foundation.e.drive.detections.contentScanners.RemoteContentScanner;
 import foundation.e.drive.models.SyncRequest;
 import foundation.e.drive.models.SyncedFileState;
 import foundation.e.drive.models.SyncedFolder;
diff --git a/app/src/test/java/foundation/e/drive/contentScanner/RemoteFileListerTest.java b/app/src/test/java/foundation/e/drive/contentScanner/RemoteFileListerTest.java
index 5e3e2431f60024b808e207585e0b1732a74d3ad5..909c17cbd113f570eeb6b1d476ead016dc996ecf 100644
--- a/app/src/test/java/foundation/e/drive/contentScanner/RemoteFileListerTest.java
+++ b/app/src/test/java/foundation/e/drive/contentScanner/RemoteFileListerTest.java
@@ -37,6 +37,7 @@ import java.util.List;
 
 import foundation.e.drive.TestUtils;
 import foundation.e.drive.database.DbHelper;
+import foundation.e.drive.detections.listers.RemoteFileLister;
 import foundation.e.drive.models.SyncedFileState;
 import foundation.e.drive.models.SyncedFolder;
 import foundation.e.drive.utils.DavClientProvider;
diff --git a/app/src/test/java/foundation/e/drive/operations/UploadFileOperationTest.java b/app/src/test/java/foundation/e/drive/operations/UploadFileOperationTest.java
index 2ba3e269162d81417df1d3c48c747eee32e78e38..aa1a8afc25c20ea08402435fa239d7fc3e4eed4f 100644
--- a/app/src/test/java/foundation/e/drive/operations/UploadFileOperationTest.java
+++ b/app/src/test/java/foundation/e/drive/operations/UploadFileOperationTest.java
@@ -38,7 +38,7 @@ import foundation.e.drive.database.DbHelper;
 import foundation.e.drive.models.SyncedFileState;
 import foundation.e.drive.models.SyncedFolder;
 import foundation.e.drive.TestUtils;
-import foundation.e.drive.utils.CommonUtils;
+import foundation.e.drive.synchronizations.operations.UploadFileOperation;
 import foundation.e.drive.utils.DavClientProvider;
 
 
diff --git a/app/src/test/java/foundation/e/drive/services/InitializerServiceTest.java b/app/src/test/java/foundation/e/drive/services/InitializerServiceTest.java
index 725d8bd8d080d4297568813adaecf2db5dd36099..6963501f8802903c9cf71da4d467b58d1a58a68d 100644
--- a/app/src/test/java/foundation/e/drive/services/InitializerServiceTest.java
+++ b/app/src/test/java/foundation/e/drive/services/InitializerServiceTest.java
@@ -10,15 +10,14 @@ import android.net.ConnectivityManager;
 
 
 import androidx.test.core.app.ApplicationProvider;
-import androidx.work.WorkManager;
 
 import org.junit.Test;
 import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadows.ShadowLog;
 
 import foundation.e.drive.TestUtils;
 import foundation.e.drive.database.DbHelper;
+import foundation.e.drive.setup.InitializerService;
 import foundation.e.drive.utils.AppConstants;
 
 public class InitializerServiceTest extends AbstractServiceIT<InitializerService>{
diff --git a/app/src/test/java/foundation/e/drive/services/ObserverServiceTest.java b/app/src/test/java/foundation/e/drive/services/ObserverServiceTest.java
index 2a25755e1a07f0b0b5c2e9a8b4ae1c1c92218b6d..27428cb771761f5af570187daa74881c61f12c11 100644
--- a/app/src/test/java/foundation/e/drive/services/ObserverServiceTest.java
+++ b/app/src/test/java/foundation/e/drive/services/ObserverServiceTest.java
@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
-import com.nextcloud.common.NextcloudClient;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.resources.files.CreateFolderRemoteOperation;
 
@@ -20,12 +19,14 @@ import org.robolectric.shadows.ShadowLog;
 import org.robolectric.shadows.ShadowNetworkInfo;
 
 import java.io.File;
-import android.net.Uri;
 import java.util.List;
 
 import foundation.e.drive.TestUtils;
 import foundation.e.drive.database.DbHelper;
+import foundation.e.drive.detections.ObserverService;
 import foundation.e.drive.models.SyncedFolder;
+import foundation.e.drive.setup.InitializerService;
+import foundation.e.drive.synchronizations.SynchronizationService;
 import foundation.e.drive.utils.AppConstants;
 import foundation.e.drive.utils.CommonUtils;