diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 692371a06..5e7299545 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,9 +82,9 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
 	db/abstract/abstract-db-p.h
 	db/abstract/abstract-db.h
 	db/events-db.h
-	db/provider/db-session-p.h
-	db/provider/db-session-provider.h
-	db/provider/db-session.h
+	db/session/db-session-p.h
+	db/session/db-session-provider.h
+	db/session/db-session.h
 	enums.h
 	event-log/call-event.h
 	event-log/chat-message-event.h
@@ -159,8 +159,8 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
 	core/core.cpp
 	db/abstract/abstract-db.cpp
 	db/events-db.cpp
-	db/provider/db-session-provider.cpp
-	db/provider/db-session.cpp
+	db/session/db-session-provider.cpp
+	db/session/db-session.cpp
 	event-log/call-event.cpp
 	event-log/chat-message-event.cpp
 	event-log/conference-event.cpp
diff --git a/src/db/abstract/abstract-db-p.h b/src/db/abstract/abstract-db-p.h
index 2348ca74f..ce0887118 100644
--- a/src/db/abstract/abstract-db-p.h
+++ b/src/db/abstract/abstract-db-p.h
@@ -21,7 +21,7 @@
 #define _ABSTRACT_DB_P_H_
 
 #include "abstract-db.h"
-#include "db/provider/db-session.h"
+#include "db/session/db-session.h"
 #include "object/object-p.h"
 
 // =============================================================================
diff --git a/src/db/abstract/abstract-db.cpp b/src/db/abstract/abstract-db.cpp
index 94baefbae..838a2e9a4 100644
--- a/src/db/abstract/abstract-db.cpp
+++ b/src/db/abstract/abstract-db.cpp
@@ -22,7 +22,7 @@
 #endif // ifdef SOCI_ENABLED
 
 #include "abstract-db-p.h"
-#include "db/provider/db-session-provider.h"
+#include "db/session/db-session-provider.h"
 #include "logger/logger.h"
 
 // =============================================================================
diff --git a/src/db/events-db.cpp b/src/db/events-db.cpp
index b3c50d45c..e827d244e 100644
--- a/src/db/events-db.cpp
+++ b/src/db/events-db.cpp
@@ -32,7 +32,7 @@
 #include "conference/participant.h"
 #include "content/content-type.h"
 #include "content/content.h"
-#include "db/provider/db-session-provider.h"
+#include "db/session/db-session-provider.h"
 #include "event-log/call-event.h"
 #include "event-log/chat-message-event.h"
 #include "event-log/event-log-p.h"
diff --git a/src/db/provider/db-session-p.h b/src/db/session/db-session-p.h
similarity index 100%
rename from src/db/provider/db-session-p.h
rename to src/db/session/db-session-p.h
diff --git a/src/db/provider/db-session-provider.cpp b/src/db/session/db-session-provider.cpp
similarity index 100%
rename from src/db/provider/db-session-provider.cpp
rename to src/db/session/db-session-provider.cpp
diff --git a/src/db/provider/db-session-provider.h b/src/db/session/db-session-provider.h
similarity index 100%
rename from src/db/provider/db-session-provider.h
rename to src/db/session/db-session-provider.h
diff --git a/src/db/provider/db-session.cpp b/src/db/session/db-session.cpp
similarity index 100%
rename from src/db/provider/db-session.cpp
rename to src/db/session/db-session.cpp
diff --git a/src/db/provider/db-session.h b/src/db/session/db-session.h
similarity index 100%
rename from src/db/provider/db-session.h
rename to src/db/session/db-session.h