diff --git a/linphone-desktop/CMakeLists.txt b/linphone-desktop/CMakeLists.txt
index 6498a3ab9..9850262cc 100644
--- a/linphone-desktop/CMakeLists.txt
+++ b/linphone-desktop/CMakeLists.txt
@@ -78,12 +78,12 @@ endif()
 
 set(SOURCES
   src/app/App.cpp
-  src/app/AsyncObjectBuilder.cpp
-  src/app/AvatarProvider.cpp
-  src/app/DefaultTranslator.cpp
-  src/app/Logger.cpp
-  src/app/Paths.cpp
-  src/app/ThumbnailProvider.cpp
+  src/app/logger/Logger.cpp
+  src/app/object-builders/AsyncObjectBuilder.cpp
+  src/app/paths/Paths.cpp
+  src/app/providers/AvatarProvider.cpp
+  src/app/providers/ThumbnailProvider.cpp
+  src/app/translator/DefaultTranslator.cpp
   src/components/camera/Camera.cpp
   src/components/camera/MSFunctions.cpp
   src/components/call/CallModel.cpp
@@ -112,12 +112,12 @@ set(SOURCES
 
 set(HEADERS
   src/app/App.hpp
-  src/app/AsyncObjectBuilder.hpp
-  src/app/AvatarProvider.hpp
-  src/app/DefaultTranslator.hpp
-  src/app/Logger.hpp
-  src/app/Paths.hpp
-  src/app/ThumbnailProvider.hpp
+  src/app/logger/Logger.hpp
+  src/app/object-builders/AsyncObjectBuilder.hpp
+  src/app/paths/Paths.hpp
+  src/app/providers/AvatarProvider.hpp
+  src/app/providers/ThumbnailProvider.hpp
+  src/app/translator/DefaultTranslator.hpp
   src/components/camera/Camera.hpp
   src/components/camera/MSFunctions.hpp
   src/components/call/CallModel.hpp
diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp
index 0c1a2efab..9788872f8 100644
--- a/linphone-desktop/src/app/App.cpp
+++ b/linphone-desktop/src/app/App.cpp
@@ -31,11 +31,12 @@
 #include "../components/timeline/TimelineModel.hpp"
 #include "../utils.hpp"
 
+#include "logger/Logger.hpp"
+#include "providers/AvatarProvider.hpp"
+#include "providers/ThumbnailProvider.hpp"
+#include "translator/DefaultTranslator.hpp"
+
 #include "App.hpp"
-#include "AvatarProvider.hpp"
-#include "DefaultTranslator.hpp"
-#include "Logger.hpp"
-#include "ThumbnailProvider.hpp"
 
 #include <QDir>
 #include <QFileSelector>
diff --git a/linphone-desktop/src/app/App.hpp b/linphone-desktop/src/app/App.hpp
index ce9b23984..960c2847e 100644
--- a/linphone-desktop/src/app/App.hpp
+++ b/linphone-desktop/src/app/App.hpp
@@ -25,7 +25,7 @@
 
 #include "../components/notifier/Notifier.hpp"
 #include "../externals/single-application/SingleApplication.hpp"
-#include "AsyncObjectBuilder.hpp"
+#include "object-builders/AsyncObjectBuilder.hpp"
 
 #include <QCommandLineParser>
 #include <QQmlApplicationEngine>
diff --git a/linphone-desktop/src/app/Logger.cpp b/linphone-desktop/src/app/logger/Logger.cpp
similarity index 98%
rename from linphone-desktop/src/app/Logger.cpp
rename to linphone-desktop/src/app/logger/Logger.cpp
index 0944dd457..647141bd8 100644
--- a/linphone-desktop/src/app/Logger.cpp
+++ b/linphone-desktop/src/app/logger/Logger.cpp
@@ -24,8 +24,8 @@
 #include <linphone/linphonecore.h>
 #include <QDateTime>
 
-#include "../utils.hpp"
-#include "Paths.hpp"
+#include "../../utils.hpp"
+#include "../paths/Paths.hpp"
 
 #include "Logger.hpp"
 
diff --git a/linphone-desktop/src/app/Logger.hpp b/linphone-desktop/src/app/logger/Logger.hpp
similarity index 100%
rename from linphone-desktop/src/app/Logger.hpp
rename to linphone-desktop/src/app/logger/Logger.hpp
diff --git a/linphone-desktop/src/app/AsyncObjectBuilder.cpp b/linphone-desktop/src/app/object-builders/AsyncObjectBuilder.cpp
similarity index 100%
rename from linphone-desktop/src/app/AsyncObjectBuilder.cpp
rename to linphone-desktop/src/app/object-builders/AsyncObjectBuilder.cpp
diff --git a/linphone-desktop/src/app/AsyncObjectBuilder.hpp b/linphone-desktop/src/app/object-builders/AsyncObjectBuilder.hpp
similarity index 100%
rename from linphone-desktop/src/app/AsyncObjectBuilder.hpp
rename to linphone-desktop/src/app/object-builders/AsyncObjectBuilder.hpp
index 9d1f1227b..b53d76f95 100644
--- a/linphone-desktop/src/app/AsyncObjectBuilder.hpp
+++ b/linphone-desktop/src/app/object-builders/AsyncObjectBuilder.hpp
@@ -25,8 +25,8 @@
 
 #include <functional>
 
-#include <QQmlEngine>
 #include <QQmlComponent>
+#include <QQmlEngine>
 
 // =============================================================================
 
diff --git a/linphone-desktop/src/app/Paths.cpp b/linphone-desktop/src/app/paths/Paths.cpp
similarity index 99%
rename from linphone-desktop/src/app/Paths.cpp
rename to linphone-desktop/src/app/paths/Paths.cpp
index d289cc91f..49b7a4624 100644
--- a/linphone-desktop/src/app/Paths.cpp
+++ b/linphone-desktop/src/app/paths/Paths.cpp
@@ -25,7 +25,7 @@
 #include <QStandardPaths>
 #include <QtDebug>
 
-#include "../utils.hpp"
+#include "../../utils.hpp"
 
 #include "Paths.hpp"
 
diff --git a/linphone-desktop/src/app/Paths.hpp b/linphone-desktop/src/app/paths/Paths.hpp
similarity index 100%
rename from linphone-desktop/src/app/Paths.hpp
rename to linphone-desktop/src/app/paths/Paths.hpp
diff --git a/linphone-desktop/src/app/AvatarProvider.cpp b/linphone-desktop/src/app/providers/AvatarProvider.cpp
similarity index 96%
rename from linphone-desktop/src/app/AvatarProvider.cpp
rename to linphone-desktop/src/app/providers/AvatarProvider.cpp
index 06544a97a..018ba7cb7 100644
--- a/linphone-desktop/src/app/AvatarProvider.cpp
+++ b/linphone-desktop/src/app/providers/AvatarProvider.cpp
@@ -20,8 +20,8 @@
  *      Author: Ronan Abhamon
  */
 
-#include "Paths.hpp"
-#include "../utils.hpp"
+#include "../../utils.hpp"
+#include "../paths/Paths.hpp"
 
 #include "AvatarProvider.hpp"
 
diff --git a/linphone-desktop/src/app/AvatarProvider.hpp b/linphone-desktop/src/app/providers/AvatarProvider.hpp
similarity index 100%
rename from linphone-desktop/src/app/AvatarProvider.hpp
rename to linphone-desktop/src/app/providers/AvatarProvider.hpp
diff --git a/linphone-desktop/src/app/ThumbnailProvider.cpp b/linphone-desktop/src/app/providers/ThumbnailProvider.cpp
similarity index 96%
rename from linphone-desktop/src/app/ThumbnailProvider.cpp
rename to linphone-desktop/src/app/providers/ThumbnailProvider.cpp
index 26db9f4a2..0ef32d564 100644
--- a/linphone-desktop/src/app/ThumbnailProvider.cpp
+++ b/linphone-desktop/src/app/providers/ThumbnailProvider.cpp
@@ -20,8 +20,8 @@
  *      Author: Ronan Abhamon
  */
 
-#include "Paths.hpp"
-#include "../utils.hpp"
+#include "../../utils.hpp"
+#include "../paths/Paths.hpp"
 
 #include "ThumbnailProvider.hpp"
 
diff --git a/linphone-desktop/src/app/ThumbnailProvider.hpp b/linphone-desktop/src/app/providers/ThumbnailProvider.hpp
similarity index 100%
rename from linphone-desktop/src/app/ThumbnailProvider.hpp
rename to linphone-desktop/src/app/providers/ThumbnailProvider.hpp
diff --git a/linphone-desktop/src/app/DefaultTranslator.cpp b/linphone-desktop/src/app/translator/DefaultTranslator.cpp
similarity index 100%
rename from linphone-desktop/src/app/DefaultTranslator.cpp
rename to linphone-desktop/src/app/translator/DefaultTranslator.cpp
diff --git a/linphone-desktop/src/app/DefaultTranslator.hpp b/linphone-desktop/src/app/translator/DefaultTranslator.hpp
similarity index 100%
rename from linphone-desktop/src/app/DefaultTranslator.hpp
rename to linphone-desktop/src/app/translator/DefaultTranslator.hpp
diff --git a/linphone-desktop/src/components/chat/ChatModel.cpp b/linphone-desktop/src/components/chat/ChatModel.cpp
index 7b3a12052..a25e3e0c8 100644
--- a/linphone-desktop/src/components/chat/ChatModel.cpp
+++ b/linphone-desktop/src/components/chat/ChatModel.cpp
@@ -31,8 +31,8 @@
 #include <QUuid>
 
 #include "../../app/App.hpp"
-#include "../../app/Paths.hpp"
-#include "../../app/ThumbnailProvider.hpp"
+#include "../../app/paths/Paths.hpp"
+#include "../../app/providers/ThumbnailProvider.hpp"
 #include "../../utils.hpp"
 #include "../core/CoreManager.hpp"
 
diff --git a/linphone-desktop/src/components/contact/VcardModel.cpp b/linphone-desktop/src/components/contact/VcardModel.cpp
index e64cfc6af..e548f90fc 100644
--- a/linphone-desktop/src/components/contact/VcardModel.cpp
+++ b/linphone-desktop/src/components/contact/VcardModel.cpp
@@ -27,8 +27,8 @@
 #include <QUuid>
 
 #include "../../app/App.hpp"
-#include "../../app/AvatarProvider.hpp"
-#include "../../app/Paths.hpp"
+#include "../../app/paths/Paths.hpp"
+#include "../../app/providers/AvatarProvider.hpp"
 #include "../../utils.hpp"
 #include "../core/CoreManager.hpp"
 
diff --git a/linphone-desktop/src/components/core/CoreManager.cpp b/linphone-desktop/src/components/core/CoreManager.cpp
index 5687caaba..22462a267 100644
--- a/linphone-desktop/src/components/core/CoreManager.cpp
+++ b/linphone-desktop/src/components/core/CoreManager.cpp
@@ -20,8 +20,8 @@
  *      Author: Ronan Abhamon
  */
 
+#include "../../app/paths/Paths.hpp"
 #include "../../utils.hpp"
-#include "../../app/Paths.hpp"
 
 #include "CoreManager.hpp"
 
diff --git a/linphone-desktop/src/components/settings/SettingsModel.cpp b/linphone-desktop/src/components/settings/SettingsModel.cpp
index 638d742df..5c886e0b7 100644
--- a/linphone-desktop/src/components/settings/SettingsModel.cpp
+++ b/linphone-desktop/src/components/settings/SettingsModel.cpp
@@ -22,7 +22,7 @@
 
 #include <QDir>
 
-#include "../../app/Paths.hpp"
+#include "../../app/paths/Paths.hpp"
 #include "../../utils.hpp"
 #include "../core/CoreManager.hpp"