diff --git a/htdocs/lib/databases/index.php b/htdocs/core/db/index.php
similarity index 100%
rename from htdocs/lib/databases/index.php
rename to htdocs/core/db/index.php
diff --git a/htdocs/lib/databases/mssql.class.php b/htdocs/core/db/mssql.class.php
similarity index 100%
rename from htdocs/lib/databases/mssql.class.php
rename to htdocs/core/db/mssql.class.php
diff --git a/htdocs/lib/databases/mysql.class.php b/htdocs/core/db/mysql.class.php
similarity index 100%
rename from htdocs/lib/databases/mysql.class.php
rename to htdocs/core/db/mysql.class.php
diff --git a/htdocs/lib/databases/mysqli.class.php b/htdocs/core/db/mysqli.class.php
similarity index 100%
rename from htdocs/lib/databases/mysqli.class.php
rename to htdocs/core/db/mysqli.class.php
diff --git a/htdocs/lib/databases/pgsql.class.php b/htdocs/core/db/pgsql.class.php
similarity index 100%
rename from htdocs/lib/databases/pgsql.class.php
rename to htdocs/core/db/pgsql.class.php
diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php
index e403b6c94ff..0882e33cc6c 100644
--- a/htdocs/install/etape1.php
+++ b/htdocs/install/etape1.php
@@ -116,7 +116,7 @@ if (! $main_data_dir) { $main_data_dir="$main_dir/documents"; }
 // Test database connexion
 if (! $error)
 {
-    $result=@include_once($main_dir."/lib/databases/".$_POST["db_type"].".class.php");
+    $result=@include_once($main_dir."/core/db/".$_POST["db_type"].".class.php");
     if ($result)
     {
         // If we ask database or user creation we need to connect as root
@@ -195,7 +195,7 @@ if (! $error)
     }
     else
     {
-        print "<br>\nFailed to include_once(\"".$main_dir."/lib/databases/".$_POST["db_type"].".class.php\")<br>\n";
+        print "<br>\nFailed to include_once(\"".$main_dir."/core/db/".$_POST["db_type"].".class.php\")<br>\n";
         print '<div class="error">'.$langs->trans("ErrorWrongValueForParameter",$langs->transnoentities("WebPagesDirectory")).'</div>';
         print $langs->trans("ErrorGoBackAndCorrectParameters");
         $error++;
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 9c7141eb407..bac965cbfeb 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -259,7 +259,7 @@ if (! empty($force_install_message))
 		$option='';
 
 		// Scan les drivers
-		$dir=DOL_DOCUMENT_ROOT.'/lib/databases';
+		$dir=DOL_DOCUMENT_ROOT.'/core/db';
 		$handle=opendir($dir);
 		if (is_resource($handle))
 		{
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index e2bfa1307c9..72601c80903 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -111,7 +111,7 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile))
         {
             if (! empty($dolibarr_main_document_root) && ! empty($dolibarr_main_db_type))
             {
-                $result=include_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".class.php");
+                $result=include_once($dolibarr_main_document_root . "/core/db/".$dolibarr_main_db_type.".class.php");
                 if (! $result)
                 {
                     $includeconferror='ErrorBadValueForDolibarrMainDBType';
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index 6ac60b15bd5..3828662d34f 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -44,7 +44,7 @@
  */
 function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
 {
-    require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$type.".class.php");
+    require_once(DOL_DOCUMENT_ROOT ."/core/db/".$type.".class.php");
 
     $class='DoliDB'.ucfirst($type);
     $dolidb=new $class($type, $host, $user, $pass, $name, $port);
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index ecacb1c691d..2bbea6c8764 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -105,7 +105,7 @@ if (! defined('DONOTLOADCONF') && file_exists($conffile))
 		{
 			if (! empty($dolibarr_main_document_root) && ! empty($dolibarr_main_db_type))
 			{
-				$result=include_once($dolibarr_main_document_root . "/lib/databases/".$dolibarr_main_db_type.".class.php");
+				$result=include_once($dolibarr_main_document_root . "/core/db/".$dolibarr_main_db_type.".class.php");
 				if (! $result)
 				{
 					$includeconferror='ErrorBadValueForDolibarrMainDBType';