diff --git a/htdocs/adherents/admin/adherent.php b/htdocs/adherents/admin/adherent.php
index 91a37a77f3e..8d2ac7a9d70 100644
--- a/htdocs/adherents/admin/adherent.php
+++ b/htdocs/adherents/admin/adherent.php
@@ -417,7 +417,7 @@ function form_constantes($tableau)
             {
                 print '<td>';
                 // List of possible labels (defined into $_Avery_Labels variable set into format_cards.lib.php)
-                require_once(DOL_DOCUMENT_ROOT.'/lib/format_cards.lib.php');
+                require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php');
                 $arrayoflabels=array();
                 foreach(array_keys($_Avery_Labels) as $codecards)
                 {
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
index cc6f20e5454..18e4ff0292d 100644
--- a/htdocs/compta/deplacement/fiche.php
+++ b/htdocs/compta/deplacement/fiche.php
@@ -23,7 +23,7 @@
  */
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/trip.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/trip.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php");
 if ($conf->projet->enabled)
diff --git a/htdocs/compta/deplacement/info.php b/htdocs/compta/deplacement/info.php
index 788759148e9..cf01bcfc153 100644
--- a/htdocs/compta/deplacement/info.php
+++ b/htdocs/compta/deplacement/info.php
@@ -23,7 +23,7 @@
  */
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/trip.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/trip.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/functions2.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php");
 
diff --git a/htdocs/compta/deplacement/note.php b/htdocs/compta/deplacement/note.php
index cb0ef37b83d..d0a81e9e950 100644
--- a/htdocs/compta/deplacement/note.php
+++ b/htdocs/compta/deplacement/note.php
@@ -23,7 +23,7 @@
  */
 
 require("../../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/lib/trip.lib.php");
+require_once(DOL_DOCUMENT_ROOT."/core/lib/trip.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/deplacement/class/deplacement.class.php");
 
 $langs->load("companies");
diff --git a/htdocs/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
similarity index 99%
rename from htdocs/lib/ajax.lib.php
rename to htdocs/core/lib/ajax.lib.php
index 6d29a8e457e..ab8b5228899 100644
--- a/htdocs/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -18,7 +18,7 @@
  */
 
 /**
- *  \file		htdocs/lib/ajax.lib.php
+ *  \file		htdocs/core/lib/ajax.lib.php
  *  \brief		Page called by Ajax request for produts
  */
 
diff --git a/htdocs/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php
similarity index 98%
rename from htdocs/lib/format_cards.lib.php
rename to htdocs/core/lib/format_cards.lib.php
index b291e3c2298..fb758aefb24 100644
--- a/htdocs/lib/format_cards.lib.php
+++ b/htdocs/core/lib/format_cards.lib.php
@@ -19,7 +19,7 @@
  */
 
 /**
- *	\file       htdocs/lib/format_cards.lib.php
+ *	\file       htdocs/core/lib/format_cards.lib.php
  *	\brief      Set of functions used for cards generation
  *	\ingroup    core
  */
diff --git a/htdocs/lib/functions_ch.lib.php b/htdocs/core/lib/functions_ch.lib.php
similarity index 98%
rename from htdocs/lib/functions_ch.lib.php
rename to htdocs/core/lib/functions_ch.lib.php
index d49912ccfe6..41370fa77ac 100644
--- a/htdocs/lib/functions_ch.lib.php
+++ b/htdocs/core/lib/functions_ch.lib.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	\file			htdocs/lib/functions_ch.lib.php
+ *	\file			htdocs/core/lib/functions_ch.lib.php
  *	\brief			A set of swiss functions for Dolibarr
  *					This file contains rare functions.
  */
diff --git a/htdocs/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php
similarity index 97%
rename from htdocs/lib/trip.lib.php
rename to htdocs/core/lib/trip.lib.php
index 726f1575b8e..d7918e98ea6 100644
--- a/htdocs/lib/trip.lib.php
+++ b/htdocs/core/lib/trip.lib.php
@@ -17,7 +17,7 @@
  */
 
 /**
- *	    \file       htdocs/lib/trip.lib.php
+ *	    \file       htdocs/core/lib/trip.lib.php
  *		\brief      Ensemble de fonctions de base pour les deplacements
  */
 
diff --git a/htdocs/includes/modules/member/cards/pdf_standard.class.php b/htdocs/includes/modules/member/cards/pdf_standard.class.php
index 9640abf5da4..c36a1ac05ed 100644
--- a/htdocs/includes/modules/member/cards/pdf_standard.class.php
+++ b/htdocs/includes/modules/member/cards/pdf_standard.class.php
@@ -63,7 +63,7 @@
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
-require_once(DOL_DOCUMENT_ROOT.'/lib/format_cards.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php');
 
 
 /**
diff --git a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
index f9d4733722b..f9256e545da 100644
--- a/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
+++ b/htdocs/includes/modules/member/labels/pdf_standardlabel.class.php
@@ -63,7 +63,7 @@
  */
 
 require_once(DOL_DOCUMENT_ROOT.'/lib/pdf.lib.php');
-require_once(DOL_DOCUMENT_ROOT.'/lib/format_cards.lib.php');
+require_once(DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php');
 
 
 /**
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index cc6502d1924..b4e23e205b5 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -227,7 +227,7 @@ if (! empty($conf->file->main_force_https))
 // Chargement des includes complementaires de presentation
 if (! defined('NOREQUIREMENU')) require_once(DOL_DOCUMENT_ROOT ."/core/class/menu.class.php");			// Need 10ko memory (11ko in 2.2)
 if (! defined('NOREQUIREHTML')) require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php");	    // Need 660ko memory (800ko in 2.2)
-if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once(DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php');	// Need 22ko memory
+if (! defined('NOREQUIREAJAX') && $conf->use_javascript_ajax) require_once(DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php');	// Need 22ko memory
 //dol_stopwithmem();
 
 // If install or upgrade process not done or not completely finished, we call the install page.
@@ -904,7 +904,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 		if (! $disablejs && $conf->use_javascript_ajax)
 		{
 			// Other external js
-			require_once DOL_DOCUMENT_ROOT.'/lib/ajax.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 
 			$ext='.js';
 			if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x01)) { $ext='.jgz'; }	// mini='_mini', ext='.gz'