diff --git a/dev/translation/autotranslator.php b/dev/translation/autotranslator.php
index 17ec9feb824..78d89b691a9 100644
--- a/dev/translation/autotranslator.php
+++ b/dev/translation/autotranslator.php
@@ -36,7 +36,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
 
 // Include Dolibarr environment
 require_once($path.'../../htdocs/master.inc.php');
-require_once($path.'../../htdocs/lib/files.lib.php');
+require_once($path.'../../htdocs/core/lib/files.lib.php');
 // After this $db is an opened handler to database. We close it at end of file.
 
 // Load main language strings
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index b5602c26ce1..b3bc6a9a68f 100755
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -23,7 +23,7 @@
  *	\brief      Page to output members business cards
  */
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/cards/modules_cards.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/member/labels/modules_labels.php");
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 4111d66e0ff..6aa62243a85 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -26,7 +26,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
 require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php");
@@ -67,7 +67,7 @@ $upload_dir = $conf->adherent->dir_output . "/" . get_exdir($id,2,0,1) . '/' . $
 // Envoie fichier
 if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	if (create_exdir($upload_dir) >= 0)
 	{
diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php
index 96adf248ab4..1b8a3876d7e 100644
--- a/htdocs/adherents/fiche.php
+++ b/htdocs/adherents/fiche.php
@@ -206,7 +206,7 @@ if ($_REQUEST["action"] == 'confirm_sendinfo' && $_REQUEST["confirm"] == 'yes')
 
 if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->adherent->creer)
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	$datenaiss='';
 	if (isset($_POST["naissday"]) && $_POST["naissday"]
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index e26f56e088b..41da98b8ac9 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -47,7 +47,7 @@ accessforbidden();
 if ( (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["cancel"]))
 || (isset($_POST["action"]) && $_POST["action"] == 'updateedit') )
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     $new_pays_id=$_POST["pays_id"];
     $new_pays_code=getCountry($new_pays_id,2);
@@ -201,7 +201,7 @@ if ($_GET["action"] == 'addthumb')
 
 if ($_GET["action"] == 'removelogo')
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     $logofile=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
     dol_delete_file($logofile);
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 5231c0c6235..66e41488edc 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -23,7 +23,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 $langs->load("companies");
 $langs->load("products");
@@ -74,7 +74,7 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update' && empty($_POST["can
  */
 if ($_POST['addfile'] || $_POST['addfilehtml'])
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	// Set tmp user directory
 	$vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index 7ec5d5ef5d8..28a59e6c57e 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -41,7 +41,7 @@ $upload_dir=$conf->admin->dir_temp;
 
 if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     $result=create_exdir($upload_dir);	// Create dir if not exists
     if ($result >= 0)
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index aa3c0260424..fd3fee5a12d 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -22,7 +22,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 
 $what=$_REQUEST["what"];
diff --git a/htdocs/admin/tools/purge.php b/htdocs/admin/tools/purge.php
index de654b71832..62f536bcba7 100644
--- a/htdocs/admin/tools/purge.php
+++ b/htdocs/admin/tools/purge.php
@@ -21,7 +21,7 @@
  */
 
 require("../../main.inc.php");
-include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 
 $langs->load("admin");
 
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index e9cdbbfb423..17eadcaa563 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -22,7 +22,7 @@
  */
 
 require("../../main.inc.php");
-include_once $dolibarr_main_document_root."/lib/files.lib.php";
+include_once $dolibarr_main_document_root."/core/lib/files.lib.php";
 
 $langs->load("admin");
 $langs->load("other");
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index a0dbbca0e7a..ab58b71972c 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1201,7 +1201,7 @@ class Categorie
 	 */
 	function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120)
 	{
-		require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+		require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 		$dir = $sdir .'/'. get_exdir($this->id,2) . $this->id ."/";
 		$dir .= "photos/";
@@ -1306,7 +1306,7 @@ class Categorie
 	 */
 	function delete_photo($file)
 	{
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	    $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
 		$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 0b79eca3148..673724ea157 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -695,7 +695,7 @@ class ActionComm extends CommonObject
 		if ($cachedelay)
 		{
 			$nowgmt = dol_now();
-            include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+            include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 			if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay))
 			{
 				dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 4e5ebb4003d..542aac2679a 100755
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -30,7 +30,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/lib/agenda.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/class/cactioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
 
@@ -67,7 +67,7 @@ if (! $sortfield) $sortfield="name";
  */
 if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	// Creation repertoire si n'existe pas
 	$upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($objectid);
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 840442f99b4..6ecc759472b 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -25,7 +25,7 @@
  */
 
 require("../../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/action/rapport.pdf.php");
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 2e25be7e3ea..543537efe41 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -25,7 +25,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
 
diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index 22556691b4b..6fbade0ac8c 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -23,8 +23,8 @@
  */
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php");
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 require_once(DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/mailing/class/mailing.class.php");
@@ -450,7 +450,7 @@ if (! empty($_POST["removedfileid"]))
 // Action update emailing
 if ($_POST["action"] == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"]))
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	$mil = new Mailing($db);
 	$mil->fetch($_POST["id"]);
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index ecff22ad16a..632120ac5ec 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -25,7 +25,7 @@
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT ."/comm/mailing/class/mailing.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/emailing.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/emailing.lib.php");
 
 $langs->load("mails");
 
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index cb8de4ddf23..162154e8a2f 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -399,7 +399,7 @@ if (GETPOST('action') == 'setstatut' && $user->rights->propale->cloturer)
  */
 if ($_POST['addfile'])
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	// Set tmp user directory TODO Use a dedicated directory for temp mails files
 	$vardir=$conf->user->dir_output."/".$user->id;
@@ -416,7 +416,7 @@ if ($_POST['addfile'])
  */
 if (! empty($_POST['removedfile']))
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	// Set tmp user directory
 	$vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php
index a7556454a3c..0143761af27 100644
--- a/htdocs/comm/propal/apercu.php
+++ b/htdocs/comm/propal/apercu.php
@@ -27,7 +27,7 @@
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
 
 $langs->load('propal');
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 4731f0343da..840e94658cd 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -1734,7 +1734,7 @@ class Propal extends CommonObject
 	function delete($user, $notrigger=0)
 	{
 		global $conf,$langs;
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 		$error=0;
 
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 3a3d41b2fcb..8686b5a8491 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -27,7 +27,7 @@
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/propal.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 
 $langs->load('compta');
diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php
index 348e0000ba7..cf9a67efc77 100644
--- a/htdocs/commande/apercu.php
+++ b/htdocs/commande/apercu.php
@@ -26,7 +26,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/order.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php');
 if ($conf->propal->enabled) require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index ba39d848325..3175f3d753b 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -174,7 +174,7 @@ class Commande extends CommonObject
     function valid($user)
     {
         global $conf,$langs;
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
         $error=0;
 
@@ -2290,7 +2290,7 @@ class Commande extends CommonObject
     function delete($user)
     {
         global $conf, $langs;
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
         $err = 0;
 
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index bc5feec9fc7..1742b72d913 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -26,7 +26,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php");
 
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index 0120bb75ae6..b3616574156 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -892,7 +892,7 @@ if ($action == 'remove_file')
 {
     if ($object->fetch($id))
     {
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
         $upload_dir = $conf->commande->dir_output;
         $file = $upload_dir . '/' . $_GET['file'];
@@ -906,7 +906,7 @@ if ($action == 'remove_file')
  */
 if ($_POST['addfile'])
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     // Set tmp user directory TODO Use a dedicated directory for temp mails files
     $vardir=$conf->user->dir_output."/".$user->id;
@@ -922,7 +922,7 @@ if ($_POST['addfile'])
  */
 if (! empty($_POST['removedfile']))
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     // Set tmp user directory
     $vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 7926805d3bc..d2269bf4013 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -1177,7 +1177,7 @@ if ($action == 'down' && $user->rights->facture->creer)
  */
 if ($_POST['addfile'])
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     // Set tmp user directory
     $vardir=$conf->user->dir_output."/".$user->id;
@@ -1193,7 +1193,7 @@ if ($_POST['addfile'])
  */
 if (! empty($_POST['removedfile']))
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     // Set tmp user directory
     $vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index 1a33f00cde2..3ca545162aa 100644
--- a/htdocs/compta/facture/apercu.php
+++ b/htdocs/compta/facture/apercu.php
@@ -28,7 +28,7 @@
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/invoice.lib.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 if ($conf->projet->enabled) require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
 
 $langs->load("bills");
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index aa1f4b48816..b500e9cecc2 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1488,7 +1488,7 @@ class Facture extends CommonObject
     function validate($user, $force_number='')
     {
         global $conf,$langs;
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
         $error=0;
 
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index a2df7ced07e..d276287a6fc 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -28,7 +28,7 @@ require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/core/class/discount.class.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/invoice.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 
 $langs->load('propal');
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 9b49f27c7e1..1d0c0f96023 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -28,7 +28,7 @@ require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
 
 
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index cb72c923efb..18309fd1713 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -24,7 +24,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/rapport/pdf_paiement.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 // Security check
 if (! $user->rights->facture->lire)
diff --git a/htdocs/compta/prelevement/bon.php b/htdocs/compta/prelevement/bon.php
index f23b09fdfb2..548e88a3bc8 100644
--- a/htdocs/compta/prelevement/bon.php
+++ b/htdocs/compta/prelevement/bon.php
@@ -25,7 +25,7 @@
 
 require("../bank/pre.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/prelevement.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once DOL_DOCUMENT_ROOT."/compta/prelevement/class/bon-prelevement.class.php";
 
 $langs->load("bills");
diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php
index 8ccde5bf97d..f939a9a356c 100644
--- a/htdocs/compta/prelevement/fiche.php
+++ b/htdocs/compta/prelevement/fiche.php
@@ -58,7 +58,7 @@ if ( $action == 'confirm_credite' && GETPOST("confirm") == 'yes')
 
 if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	$bon = new BonPrelevement($db,"");
 	$bon->fetch($id);
diff --git a/htdocs/contact/exportimport.php b/htdocs/contact/exportimport.php
index 6a93b254d11..e75b099a861 100644
--- a/htdocs/contact/exportimport.php
+++ b/htdocs/contact/exportimport.php
@@ -24,7 +24,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php");
 
 $langs->load("companies");
 
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 9e30170a702..514ca3a29a3 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -28,7 +28,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/comm/action/class/actioncomm.class.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
 
diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php
index 242866b7a7e..ad802afa59f 100644
--- a/htdocs/contact/info.php
+++ b/htdocs/contact/info.php
@@ -25,7 +25,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php");
 
 $langs->load("companies");
 
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index c7aa3ea5038..3daa1b3b0de 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -24,7 +24,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/ldap.lib.php");
 
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 2c37327330b..9b6481b309b 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -24,7 +24,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/contact.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/contact.lib.php");
 
 $langs->load("companies");
 $langs->load("other");
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index 858d531cbf6..bee4163db93 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -23,7 +23,7 @@
  */
 
 require ("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php');
 require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index b9e7686a0ec..c8a7e6b6b0c 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -26,9 +26,9 @@
  */
 
 require ("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/contract.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/contract.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 
 $langs->load("other");
@@ -69,7 +69,7 @@ $modulepart='contract';
  */
 if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	if (create_exdir($upload_dir) >= 0)
 	{
diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php
index 4f95788c0dc..ad1ce4afc29 100644
--- a/htdocs/contrat/fiche.php
+++ b/htdocs/contrat/fiche.php
@@ -27,7 +27,7 @@
 
 require ("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php');
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/contract/modules_contract.php");
 if ($conf->projet->enabled)  require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
 if ($conf->propal->enabled)  require_once(DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php");
diff --git a/htdocs/contrat/info.php b/htdocs/contrat/info.php
index 839e738f10b..315dc569432 100644
--- a/htdocs/contrat/info.php
+++ b/htdocs/contrat/info.php
@@ -23,7 +23,7 @@
 
 require ("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php');
 require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
 
 $langs->load("contracts");
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 748b309286d..8c4cc75f721 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -23,7 +23,7 @@
  */
 
 require ("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/contract.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php');
 if ($conf->contrat->enabled) require_once(DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php");
 
 $socid=isset($_GET["socid"])?$_GET["socid"]:isset($_POST["socid"])?$_POST["socid"]:"";
diff --git a/htdocs/core/ajaxfileupload.php b/htdocs/core/ajaxfileupload.php
index 7c9ebe6a298..5a066d8b783 100644
--- a/htdocs/core/ajaxfileupload.php
+++ b/htdocs/core/ajaxfileupload.php
@@ -35,7 +35,7 @@ if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't nee
 
 require("../main.inc.php");
 
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
 
 error_reporting(E_ALL | E_STRICT);
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 3383a3ce8ca..52580882ccc 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -182,7 +182,7 @@ class FormFile
     function showdocuments($modulepart,$filename,$filedir,$urlsource,$genallowed,$delallowed=0,$modelselected='',$allowgenifempty=1,$forcenomultilang=0,$iconPDF=0,$maxfilenamelength=28,$noform=0,$param='',$title='',$buttonlabel='',$codelang='',$hookmanager=false)
     {
         // filedir = conf->...dir_ouput."/".get_exdir(id)
-        include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+        include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 
         global $langs,$bc,$conf;
 
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index fd98f27f37d..590282a5358 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -107,7 +107,7 @@ class FormMail
     function clear_attached_files()
     {
         global $conf,$user;
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
         // Set tmp user directory
         $vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index c1ea9e4a6b1..6735e9c91c2 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -161,7 +161,7 @@ class Notify
 
                 if (dol_strlen($sendto))
                 {
-                	include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+                	include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
                 	$application=($conf->global->MAIN_APPLICATION_TITLE?$conf->global->MAIN_APPLICATION_TITLE:'Dolibarr ERP/CRM');
 
                 	$subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification");
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index 75dc5ce5eff..cdcbcbd7282 100755
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -80,7 +80,7 @@ class RssParser
 	 */
 	public function parser($urlRSS, $maxNb=0, $cachedelay=60, $cachedir='')
 	{
-	    include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+	    include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 
 	    $str='';    // This will contain content of feed
 
diff --git a/htdocs/lib/doxygen.php b/htdocs/core/doxygen.php
similarity index 100%
rename from htdocs/lib/doxygen.php
rename to htdocs/core/doxygen.php
diff --git a/htdocs/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
similarity index 97%
rename from htdocs/lib/contact.lib.php
rename to htdocs/core/lib/contact.lib.php
index 87e25f70550..de6db84af94 100644
--- a/htdocs/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *	    \file       htdocs/lib/contact.lib.php
+ *	    \file       htdocs/core/lib/contact.lib.php
  *		\brief      Ensemble de fonctions de base pour les contacts
  */
 
diff --git a/htdocs/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
similarity index 97%
rename from htdocs/lib/contract.lib.php
rename to htdocs/core/lib/contract.lib.php
index 0c0027a2bc1..00b34678f93 100644
--- a/htdocs/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -18,7 +18,7 @@
  */
 
 /**
- * \file       htdocs/lib/contract.lib.php
+ * \file       htdocs/core/lib/contract.lib.php
  * \brief      Ensemble de fonctions de base pour le module contrat
  */
 
diff --git a/htdocs/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
similarity index 97%
rename from htdocs/lib/ecm.lib.php
rename to htdocs/core/lib/ecm.lib.php
index e425fc9f686..f7c267c8d3c 100644
--- a/htdocs/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *  \file       htdocs/lib/ecm.lib.php
+ *  \file       htdocs/core/lib/ecm.lib.php
  *  \brief      Ensemble de fonctions de base pour le module ecm
  *  \ingroup    ecm
  */
diff --git a/htdocs/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php
similarity index 96%
rename from htdocs/lib/emailing.lib.php
rename to htdocs/core/lib/emailing.lib.php
index 1780e0a2eed..b847d2c512e 100644
--- a/htdocs/lib/emailing.lib.php
+++ b/htdocs/core/lib/emailing.lib.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	    \file       htdocs/lib/emailing.lib.php
+ *	    \file       htdocs/core/lib/emailing.lib.php
  *		\brief      Library file with function for emailing module
  */
 
diff --git a/htdocs/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
similarity index 98%
rename from htdocs/lib/fichinter.lib.php
rename to htdocs/core/lib/fichinter.lib.php
index ab6d36cf286..53ac8662738 100644
--- a/htdocs/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *	\file       htdocs/lib/fichinter.lib.php
+ *	\file       htdocs/core/lib/fichinter.lib.php
  *	\brief      Ensemble de fonctions de base pour le module fichinter
  *	\ingroup    fichinter
  */
diff --git a/htdocs/lib/files.lib.php b/htdocs/core/lib/files.lib.php
similarity index 99%
rename from htdocs/lib/files.lib.php
rename to htdocs/core/lib/files.lib.php
index ee08274abc8..717a6ba4ec4 100644
--- a/htdocs/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *  \file		htdocs/lib/files.lib.php
+ *  \file		htdocs/core/lib/files.lib.php
  *  \brief		Library for file managing functions
  */
 
@@ -724,7 +724,7 @@ function dol_delete_dir_recursive($dir,$count=0,$nophperrors=0)
 function dol_delete_preview($object)
 {
 	global $langs,$conf;
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     if ($object->element == 'commande') $dir = $conf->commande->dir_output;
     if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index db317b4a549..7483cbd8e0f 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1059,7 +1059,7 @@ function getListOfModels($db,$type,$maxfilenamelength=0)
             // with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).
             if (! empty($obj->description))	// List of directories to scan is defined
             {
-                include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+                include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 
                 $const=$obj->description;
                 $dirtoscan.=($dirtoscan?',':'').preg_replace('/[\r\n]+/',',',trim($conf->global->$const));
diff --git a/htdocs/document.php b/htdocs/document.php
index 8c06ea3078c..6a96f4c97e5 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -47,7 +47,7 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
 function llxHeader() { }
 
 require("./main.inc.php");	// Load $user and permissions
-require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 
 $encoding = '';
 $action = GETPOST("action");
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index ac8429d0c0d..31adb1bca7c 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -322,7 +322,7 @@ class EcmDirectory // extends CommonObject
 	function delete($user)
 	{
 		global $conf, $langs;
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 		$relativepath=$this->getRelativePath(1);	// Ex: dir1/dir2/dir3
 
@@ -643,7 +643,7 @@ class EcmDirectory // extends CommonObject
 	function refreshcachenboffile($all=0)
 	{
 		global $conf;
-		include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+		include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 
 		$dir=$conf->ecm->dir_output.'/'.$this->getRelativePath();
 		$filelist=dol_dir_list($dir,'files',0,'','\.meta$');
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index feb37ef27f7..ec851c6e2fa 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -25,8 +25,8 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php");
 
 // Load traductions files
 $langs->load("ecm");
diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php
index 2fd20a9ed26..c0ffe1aa7dd 100644
--- a/htdocs/ecm/docmine.php
+++ b/htdocs/ecm/docmine.php
@@ -26,8 +26,8 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php");
 
 
 // Load traductions files
@@ -83,7 +83,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
 // Upload file
 if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	if (create_exdir($upload_dir) >= 0)
 	{
diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php
index 1d98e484af1..973ee2a4e4a 100644
--- a/htdocs/ecm/docother.php
+++ b/htdocs/ecm/docother.php
@@ -11,7 +11,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 // Load traductions files
 $langs->load("ecm");
@@ -46,7 +46,7 @@ $upload_dir = $conf->ecm->dir_output.'/'.$section;
 // Envoie fichier
 if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	if (create_exdir($upload_dir) >= 0)
 	{
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 83a283fde35..2609e5eb723 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -27,8 +27,8 @@ if (! defined('REQUIRE_JQUERY_LAYOUT'))  define('REQUIRE_JQUERY_LAYOUT','1');
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
 
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 7b1005493de..f3e0016ee9d 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -25,8 +25,8 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/ecm.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/ecm.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/ecm/class/ecmdirectory.class.php");
 
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index cb9da1f7989..30a50678796 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -421,7 +421,7 @@ class Expedition extends CommonObject
 	{
 		global $conf, $langs;
 
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 		dol_syslog("Expedition::valid");
 
@@ -770,7 +770,7 @@ class Expedition extends CommonObject
 	{
 		global $conf, $langs, $user;
 
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
diff --git a/htdocs/expedition/fiche.php b/htdocs/expedition/fiche.php
index d049528d8e4..4468bde7944 100644
--- a/htdocs/expedition/fiche.php
+++ b/htdocs/expedition/fiche.php
@@ -287,7 +287,7 @@ if ($action == 'builddoc')	// En get ou en post
  */
 if ($_POST['addfile'])
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     // Set tmp user directory TODO Use a dedicated directory for temp mails files
     $vardir=$conf->user->dir_output."/".$user->id;
@@ -303,7 +303,7 @@ if ($_POST['addfile'])
  */
 if (! empty($_POST['removedfile']))
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     // Set tmp user directory
     $vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php
index b58b40c9e3e..7fe564aa948 100644
--- a/htdocs/fichinter/apercu.php
+++ b/htdocs/fichinter/apercu.php
@@ -24,8 +24,8 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php');
 if ($conf->projet->enabled)	require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
 
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 6d240bfb31d..cac377c7b35 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -555,7 +555,7 @@ class Fichinter extends CommonObject
 	function delete($user)
 	{
 		global $conf;
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 		$error=0;
 
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index 77c2aa75d98..a5893d6f419 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -25,7 +25,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
 require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
 require_once(DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php');
 
 $langs->load("interventions");
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index d55461e5fc2..872d191cd1f 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -28,8 +28,8 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 
 $langs->load("other");
@@ -69,7 +69,7 @@ $modulepart='fichinter';
  */
 if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	if (create_exdir($upload_dir) >= 0)
 	{
diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
index 5535aeaffba..a6e4aab328a 100644
--- a/htdocs/fichinter/fiche.php
+++ b/htdocs/fichinter/fiche.php
@@ -28,7 +28,7 @@ require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/fichinter/modules_fichinter.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
 if ($conf->projet->enabled)
 {
@@ -458,7 +458,7 @@ if ($action == 'down' && $user->rights->ficheinter->creer)
  */
 if ($_POST['addfile'])
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     // Set tmp user directory TODO Use a dedicated directory for temp mails files
     $vardir=$conf->user->dir_output."/".$user->id;
@@ -474,7 +474,7 @@ if ($_POST['addfile'])
  */
 if (! empty($_POST['removedfile']))
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     // Set tmp user directory
     $vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
index baea3fa8ec5..05c74544d24 100644
--- a/htdocs/fichinter/info.php
+++ b/htdocs/fichinter/info.php
@@ -26,7 +26,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
 
 $langs->load('companies');
 $langs->load("interventions");
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index 65a6b9c6e47..764e02bba0b 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -24,7 +24,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/fichinter.lib.php");
 
 $langs->load('companies');
 $langs->load("interventions");
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index f92cd5b2f00..1ec2d969e15 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -272,7 +272,7 @@ class CommandeFournisseur extends Commande
     function valid($user)
     {
         global $langs,$conf;
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
         $error=0;
 
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index d28530f1348..18e8d46c366 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -26,7 +26,7 @@
 
 require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/order.lib.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/fourn.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 require_once DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php";
@@ -74,7 +74,7 @@ if ($commande->fetch($_GET['id'],$_GET['ref']) < 0)
 // Envoi fichier
 if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	$upload_dir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref);
 
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 486ee57581f..8e72bf98f25 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -524,7 +524,7 @@ if ($action == 'builddoc')	// En get ou en	post
 // Delete file in doc form
 if ($action=='remove_file')
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     if ($object->fetch($id))
     {
@@ -574,7 +574,7 @@ if ($action	== 'create')
  */
 if ($_POST['addfile'])
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     // Set tmp user directory TODO Use a dedicated directory for temp mails files
     $vardir=$conf->user->dir_output."/".$user->id;
@@ -590,7 +590,7 @@ if ($_POST['addfile'])
  */
 if (! empty($_POST['removedfile']))
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     // Set tmp user directory
     $vardir=$conf->user->dir_output."/".$user->id;
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index fd7b4de18c5..3eb02e7578d 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -28,7 +28,7 @@ require("../../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php');
 require_once(DOL_DOCUMENT_ROOT.'/lib/fourn.lib.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 
 $langs->load('bills');
@@ -62,7 +62,7 @@ if (! $sortfield) $sortfield="name";
 // Envoi fichier
 if ($_POST['sendit'] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	$facture = new FactureFournisseur($db);
 	if ($facture->fetch($facid))
diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
index 8b3be30dc79..2494c6fdcad 100644
--- a/htdocs/fourn/facture/fiche.php
+++ b/htdocs/fourn/facture/fiche.php
@@ -620,7 +620,7 @@ if ($action == 'reopen' && $user->rights->fournisseur->facture->creer)
  */
 if ($_POST['addfile'])
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     // Set tmp user directory TODO Use a dedicated directory for temp mails files
     $vardir=$conf->user->dir_output."/".$user->id;
@@ -636,7 +636,7 @@ if ($_POST['addfile'])
  */
 if (! empty($_POST['removedfile']))
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     // Set tmp user directory
     $vardir=$conf->user->dir_output."/".$user->id;
@@ -838,7 +838,7 @@ if ($action	== 'builddoc')
 // Delete file in doc form
 if ($action == 'remove_file')
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     if ($object->fetch($id))
     {
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index 1c45855c89f..0ea5c62a2d7 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -25,7 +25,7 @@
 
 require("./pre.inc.php");	// We use pre.inc.php to have a dynamic menu
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/treeview.lib.php");
 
 // Load traductions files
@@ -82,7 +82,7 @@ $conn_id=0;	// FTP connection ID
 // Envoie fichier
 if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	$result=$ecmdir->fetch($_REQUEST["section"]);
 	if (! $result > 0)
diff --git a/htdocs/imports/emptyexample.php b/htdocs/imports/emptyexample.php
index 1421d116343..a730fd23a5d 100644
--- a/htdocs/imports/emptyexample.php
+++ b/htdocs/imports/emptyexample.php
@@ -33,7 +33,7 @@ function llxHeader() { print '<html><title>Build an import example file</title><
 function llxFooter() { print '</body></html>'; }
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/imports/class/import.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php');
 
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 25d1e087bd1..db9847090c1 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formother.class.php");
 require_once(DOL_DOCUMENT_ROOT."/imports/class/import.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/includes/modules/import/modules_import.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/import.lib.php");
 
 $langs->load("exports");
@@ -191,7 +191,7 @@ if ($action == 'add_import_model')
 
 if ($step == 3 && $datatoimport)
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 	{
diff --git a/htdocs/includes/modules/commande/modules_commande.php b/htdocs/includes/modules/commande/modules_commande.php
index 744c9196b0c..cb8e4259721 100644
--- a/htdocs/includes/modules/commande/modules_commande.php
+++ b/htdocs/includes/modules/commande/modules_commande.php
@@ -203,7 +203,7 @@ function commande_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0
 			$outputlangs->charset_output=$sav_charset_output;
 
 			// we delete preview files
-        	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 			dol_delete_preview($object);
 
 			// Appel des triggers
diff --git a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
index bf83dd74d1a..84336a0fe05 100644
--- a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -27,7 +27,7 @@ require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
 require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/functions2.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 
 /**
diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php
index f0ec7568380..8cda5e5dd36 100644
--- a/htdocs/includes/modules/facture/modules_facture.php
+++ b/htdocs/includes/modules/facture/modules_facture.php
@@ -306,7 +306,7 @@ function facture_meta_create($db, $facid, $message="")
 function facture_delete_preview($db, $facid)
 {
 	global $langs,$conf;
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	$fac = new Facture($db);
 	$fac->fetch($facid);
diff --git a/htdocs/includes/modules/fichinter/modules_fichinter.php b/htdocs/includes/modules/fichinter/modules_fichinter.php
index 9dd588eccec..cd735982099 100644
--- a/htdocs/includes/modules/fichinter/modules_fichinter.php
+++ b/htdocs/includes/modules/fichinter/modules_fichinter.php
@@ -206,7 +206,7 @@ function fichinter_create($db, $object, $modele='', $outputlangs='')
 function fichinter_delete_preview($db, $fichinterid, $fichinterref='')
 {
 	global $langs,$conf;
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	if (!$fichinterref)
 	{
diff --git a/htdocs/includes/modules/livraison/modules_livraison.php b/htdocs/includes/modules/livraison/modules_livraison.php
index f2d4a06af40..a748ae7fa6e 100644
--- a/htdocs/includes/modules/livraison/modules_livraison.php
+++ b/htdocs/includes/modules/livraison/modules_livraison.php
@@ -197,7 +197,7 @@ function delivery_order_pdf_create($db, $object, $model='', $outputlangs='')
 function delivery_order_delete_preview($db, $deliveryid)
 {
 	global $langs,$conf;
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	$delivery = new Livraison($db,"",$deliveryid);
 	$delivery->fetch($deliveryid);
diff --git a/htdocs/includes/modules/mailings/peche.modules.php b/htdocs/includes/modules/mailings/peche.modules.php
index c7c79d80928..1a9ca96c6a5 100644
--- a/htdocs/includes/modules/mailings/peche.modules.php
+++ b/htdocs/includes/modules/mailings/peche.modules.php
@@ -104,7 +104,7 @@ class mailing_peche extends MailingTargets
 	{
 		global $conf,$langs,$_FILES;
 
-		require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+		require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 		// For compatibility with Unix, MS-Dos or Macintosh
 		ini_set('auto_detect_line_endings', true);
diff --git a/htdocs/includes/modules/modFacture.class.php b/htdocs/includes/modules/modFacture.class.php
index 48a27f933f4..7ac03cf74b1 100644
--- a/htdocs/includes/modules/modFacture.class.php
+++ b/htdocs/includes/modules/modFacture.class.php
@@ -214,7 +214,7 @@ class modFacture extends DolibarrModules
 		// Remove permissions and default values
 		$this->remove($options);
 
-		require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+		require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 		$dirodt=DOL_DATA_ROOT.'/doctemplates/invoices';
 		create_exdir($dirodt);
 		dol_copy(DOL_DOCUMENT_ROOT.'/install/doctemplates/invoices/template_invoice.odt',$dirodt.'/template_invoice.odt',0,0);
diff --git a/htdocs/includes/modules/modSociete.class.php b/htdocs/includes/modules/modSociete.class.php
index d02511f7cdf..4aa343a1f03 100644
--- a/htdocs/includes/modules/modSociete.class.php
+++ b/htdocs/includes/modules/modSociete.class.php
@@ -305,7 +305,7 @@ class modSociete extends DolibarrModules
 		// We disable this to prevent pb of modules not correctly disabled
 		//$this->remove($options);
 
-		require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+		require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 		$dirodt=DOL_DATA_ROOT.'/doctemplates/thirdparties';
 		create_exdir($dirodt);
 		dol_copy(DOL_DOCUMENT_ROOT.'/install/doctemplates/thirdparties/template_thirdparty.odt',$dirodt.'/template_thirdparty.odt',0,0);
diff --git a/htdocs/includes/modules/project/modules_project.php b/htdocs/includes/modules/project/modules_project.php
index c42449728c1..2c67de1c2c0 100644
--- a/htdocs/includes/modules/project/modules_project.php
+++ b/htdocs/includes/modules/project/modules_project.php
@@ -205,7 +205,7 @@ function project_pdf_create($db, $object, $model,$outputlangs)
 function project_delete_preview($db, $objectid)
 {
 	global $langs,$conf;
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	$project = new Project($db);
 	$project->fetch($objectid);
diff --git a/htdocs/includes/modules/propale/modules_propale.php b/htdocs/includes/modules/propale/modules_propale.php
index f179cbb0400..773d47697b0 100644
--- a/htdocs/includes/modules/propale/modules_propale.php
+++ b/htdocs/includes/modules/propale/modules_propale.php
@@ -248,7 +248,7 @@ function propale_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0,
 function propale_delete_preview($db, $propalid, $propalref='')
 {
 	global $langs,$conf;
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	if (!$propalref)
 	{
diff --git a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
index a336fd0c1ca..708b601895d 100644
--- a/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/includes/modules/societe/doc/doc_generic_odt.modules.php
@@ -26,7 +26,7 @@
 require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
 require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 
 /**
diff --git a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
index a84517bd1f1..32de721358f 100755
--- a/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/includes/modules/supplier_invoice/modules_facturefournisseur.php
@@ -128,7 +128,7 @@ function supplier_invoice_pdf_create($db, $object, $model, $outputlangs)
 function supplier_invoice_delete_preview($db, $objectid)
 {
 	global $langs,$conf;
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	$comfourn = new FactureFournisseur($db);
 	$comfourn->fetch($objectid);
diff --git a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
index 7909c4497cc..9d55e32c6ce 100644
--- a/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/includes/modules/supplier_order/modules_commandefournisseur.php
@@ -235,7 +235,7 @@ function supplier_order_pdf_create($db, $object, $model, $outputlangs, $hidedeta
 function supplier_order_delete_preview($db, $comfournid, $comfournref='')
 {
 	global $langs,$conf;
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	if (!$comfournref)
 	{
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index e4c5a8d79a9..3885dc324df 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -37,7 +37,7 @@ if (! defined('ADODB_PATH'))
 require_once('../core/class/translate.class.php');
 require_once('../lib/functions.lib.php');
 require_once('../core/lib/admin.lib.php');
-require_once('../lib/files.lib.php');
+require_once('../core/lib/files.lib.php');
 require_once(ADODB_PATH.'adodb-time.inc.php');
 
 error_reporting(E_ALL);	// To have all errors without disabled E_STRICT
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index bee0e48e43e..3e00044961e 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -36,7 +36,7 @@ require_once($dolibarr_main_document_root . '/commande/class/commande.class.php'
 require_once($dolibarr_main_document_root . '/fourn/class/fournisseur.commande.class.php');
 require_once($dolibarr_main_document_root . '/lib/price.lib.php');
 require_once($dolibarr_main_document_root . '/core/class/menubase.class.php');
-require_once($dolibarr_main_document_root . '/lib/files.lib.php');
+require_once($dolibarr_main_document_root . '/core/lib/files.lib.php');
 
 $grant_query='';
 $etape = 2;
diff --git a/htdocs/lib/fourn.lib.php b/htdocs/lib/fourn.lib.php
index 9987d260112..0e1130afe03 100644
--- a/htdocs/lib/fourn.lib.php
+++ b/htdocs/lib/fourn.lib.php
@@ -58,7 +58,7 @@ function facturefourn_prepare_head($object)
 
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
 	/*$filesdir = $conf->fournisseur->dir_output.'/facture/'.get_exdir($fac->id,2).$fac->id;
-	include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+	include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 	$listoffiles=dol_dir_list($filesdir,'files',1);
 	$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
 	$head[$h][1] = $langs->trans('Documents');
@@ -112,7 +112,7 @@ function ordersupplier_prepare_head($object)
 
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
 	/*$filesdir = $conf->fournisseur->dir_output . "/commande/" . dol_sanitizeFileName($commande->ref);
-	include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+	include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 	$listoffiles=dol_dir_list($filesdir,'files',1);
 	$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
 	$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index 3828662d34f..aa0d4c183a7 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -2081,7 +2081,7 @@ function img_allow($allow,$alt='default')
  */
 function img_mime($file,$alt='')
 {
-    require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+    require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 
     $mimetype=dol_mimetype($file,'',1);
     $mimeimg=dol_mimetype($file,'',2);
@@ -3812,7 +3812,7 @@ function complete_substitutions_array(&$substitutionarray,$outputlangs,$object='
 {
     global $conf,$user;
 
-    require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+    require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 
     // Check if there is external substitution to do asked by plugins
     // We look files into the includes/modules/substitutions directory
diff --git a/htdocs/lib/invoice.lib.php b/htdocs/lib/invoice.lib.php
index 22b0b276571..c53d96cb711 100644
--- a/htdocs/lib/invoice.lib.php
+++ b/htdocs/lib/invoice.lib.php
@@ -74,7 +74,7 @@ function facture_prepare_head($object)
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;
 	/*$filesdir = $conf->facture->dir_output . "/" . dol_sanitizeFileName($fac->ref);
-	include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+	include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 	$listoffiles=dol_dir_list($filesdir,'files',1);
 	$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
 	$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/lib/order.lib.php b/htdocs/lib/order.lib.php
index f6bb5d33aa9..e42bafce734 100644
--- a/htdocs/lib/order.lib.php
+++ b/htdocs/lib/order.lib.php
@@ -75,7 +75,7 @@ function commande_prepare_head($object)
 
     $head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id;
 	/*$filesdir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($commande->ref);
-	include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+	include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 	$listoffiles=dol_dir_list($filesdir,'files',1);
 	$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
 	$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/lib/project.lib.php b/htdocs/lib/project.lib.php
index 4f9eb49b112..937568cc4f3 100644
--- a/htdocs/lib/project.lib.php
+++ b/htdocs/lib/project.lib.php
@@ -59,7 +59,7 @@ function project_prepare_head($object)
 
     $head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
 	/*$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+	include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 	$listoffiles=dol_dir_list($filesdir,'files',1);
 	$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
 	$head[$h][1] = $langs->trans('Documents');
@@ -127,7 +127,7 @@ function task_prepare_head($object)
 
     $head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id;
 	/*$filesdir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
-	include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+	include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 	$listoffiles=dol_dir_list($filesdir,'files',1);
 	$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
 	$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/lib/propal.lib.php b/htdocs/lib/propal.lib.php
index fc82d7df4cd..f50f71e7311 100644
--- a/htdocs/lib/propal.lib.php
+++ b/htdocs/lib/propal.lib.php
@@ -81,7 +81,7 @@ function propal_prepare_head($object)
 
 	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id;
 	/*$filesdir = $conf->propale->dir_output . "/" . dol_sanitizeFileName($propal->ref);
-	include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+	include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 	$listoffiles=dol_dir_list($filesdir,'files',1);
 	$head[$h][1] = (count($listoffiles)?$langs->trans('DocumentsNb',count($listoffiles)):$langs->trans('Documents'));*/
 	$head[$h][1] = $langs->trans('Documents');
diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php
index 97c3a72d4b2..3d0fa964e6f 100644
--- a/htdocs/livraison/class/livraison.class.php
+++ b/htdocs/livraison/class/livraison.class.php
@@ -314,7 +314,7 @@ class Livraison extends CommonObject
 	function valid($user)
 	{
 		global $conf;
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 		dol_syslog("livraison.class.php::valid begin");
 
@@ -526,7 +526,7 @@ class Livraison extends CommonObject
 	 */
 	function delete()
 	{
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 		$this->db->begin();
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."livraisondet";
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index d8b33fb3c1f..6fb35027c98 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2459,7 +2459,7 @@ class Product extends CommonObject
 	 */
 	function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120)
 	{
-		require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+		require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 		$dir = $sdir .'/'. get_exdir($this->id,2) . $this->id ."/photos";
 
@@ -2544,7 +2544,7 @@ class Product extends CommonObject
 	 */
 	function is_photo_available($sdir)
 	{
-		include_once(DOL_DOCUMENT_ROOT ."/lib/files.lib.php");
+		include_once(DOL_DOCUMENT_ROOT ."/core/lib/files.lib.php");
 
 		$pdir = get_exdir($this->id,2) . $this->id ."/photos/";
 		$dir = $sdir . '/'. $pdir;
@@ -2585,7 +2585,7 @@ class Product extends CommonObject
 	{
 		global $conf,$user,$langs;
 
-		include_once(DOL_DOCUMENT_ROOT ."/lib/files.lib.php");
+		include_once(DOL_DOCUMENT_ROOT ."/core/lib/files.lib.php");
 		include_once(DOL_DOCUMENT_ROOT ."/core/lib/images.lib.php");
 
 		$pdir = get_exdir($this->id,2) . $this->id ."/photos/";
@@ -2745,7 +2745,7 @@ class Product extends CommonObject
 	 */
 	function liste_photos($dir,$nbmax=0)
 	{
-		include_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+		include_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 
 		$nbphoto=0;
 		$tabobj=array();
@@ -2797,7 +2797,7 @@ class Product extends CommonObject
 	 */
 	function delete_photo($file)
 	{
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
         $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine
 		$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
index 855f641b906..99905a75082 100755
--- a/htdocs/product/document.php
+++ b/htdocs/product/document.php
@@ -28,7 +28,7 @@
 require('../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/lib/product.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/product/class/product.class.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 
 $langs->load("other");
@@ -74,7 +74,7 @@ $modulepart='produit';
 
 if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	if (create_exdir($upload_dir) >= 0)
 	{
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 4583e20a4a5..11fe01ace16 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -383,7 +383,7 @@ class Project extends CommonObject
 	function delete($user, $notrigger=0)
 	{
 		global $langs,$conf;
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 		$error=0;
 
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 5aea22728a1..60bc60a116e 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -24,7 +24,7 @@
 require('../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 
 $langs->load('projects');
@@ -69,7 +69,7 @@ if (! $project->fetch($_GET['id'],$_GET['ref']) > 0)
 // Envoi fichier
 if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	$upload_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($project->ref);
 
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 68c08ae6e71..acb9a7a3fdd 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -25,7 +25,7 @@ require('../../main.inc.php');
 require_once(DOL_DOCUMENT_ROOT."/projet/class/project.class.php");
 require_once(DOL_DOCUMENT_ROOT."/projet/class/task.class.php");
 require_once(DOL_DOCUMENT_ROOT.'/lib/project.lib.php');
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 
 
@@ -84,7 +84,7 @@ else
 // Envoi fichier
 if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+	require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
 	if (create_exdir($upload_dir) >= 0)
 	{
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 068b864bd64..25d5a378562 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -866,7 +866,7 @@ class Societe extends CommonObject
     function delete($id)
     {
         global $user,$langs,$conf;
-        require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+        require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
         dol_syslog(get_class($this)."::delete", LOG_DEBUG);
         $error = 0;
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index 57c57637dca..9058601728d 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -26,7 +26,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 821901460d2..fc9a466e337 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -30,7 +30,7 @@
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/lib/images.lib.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index c1118c35cd3..52b85356cb3 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -37,7 +37,7 @@ if (! defined('ADODB_PATH'))
 require_once('../core/class/translate.class.php');
 require_once('../lib/functions.lib.php');
 require_once('../core/lib/admin.lib.php');
-require_once('../lib/files.lib.php');
+require_once('../core/lib/files.lib.php');
 require_once(ADODB_PATH.'adodb-time.inc.php');
 
 
diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php
index cad5412cb7c..89c410fc5f1 100644
--- a/htdocs/user/fiche.php
+++ b/htdocs/user/fiche.php
@@ -267,7 +267,7 @@ if (($action == 'addgroup' || $action == 'removegroup') && $caneditfield)
 
 if ($action == 'update' && ! $_POST["cancel"])
 {
-    require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php");
+    require_once(DOL_DOCUMENT_ROOT."/core/lib/files.lib.php");
 
     if ($caneditfield)	// Case we can edit all field
     {
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index c42ff64e79a..03f4847fb08 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -51,7 +51,7 @@ function llxHeader() { }
 
 
 require("./main.inc.php");
-require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php');
 
 // Security check
 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');