diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 39f7ccc3ffc..034282170cf 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -1069,7 +1069,7 @@ if ($id > 0 || ! empty($ref))
 		$text=$langs->trans('ConfirmValidateProp',$numref);
 		if ($conf->notification->enabled)
 		{
-			require_once(DOL_DOCUMENT_ROOT ."/core/notify.class.php");
+			require_once(DOL_DOCUMENT_ROOT ."/core/class/notify.class.php");
 			$notify=new Notify($db);
 			$text.='<br>';
 			$text.=$notify->confirmMessage('NOTIFY_VAL_PROPAL',$propal->socid);
diff --git a/htdocs/comm/propal/stats/propalestats.class.php b/htdocs/comm/propal/stats/propalestats.class.php
index 713c91de9bb..fd2fa20bfb1 100644
--- a/htdocs/comm/propal/stats/propalestats.class.php
+++ b/htdocs/comm/propal/stats/propalestats.class.php
@@ -25,7 +25,7 @@
  *	\version    $Id$
  */
 
-include_once DOL_DOCUMENT_ROOT . "/core/stats.class.php";
+include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php";
 include_once DOL_DOCUMENT_ROOT . "/comm/propal/propal.class.php";
 
 
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index fe189c4bcf5..63856363aa4 100644
--- a/htdocs/commande/fiche.php
+++ b/htdocs/commande/fiche.php
@@ -1369,7 +1369,7 @@ else
 				$text=$langs->trans('ConfirmValidateOrder',$numref);
 				if ($conf->notification->enabled)
 				{
-					require_once(DOL_DOCUMENT_ROOT ."/core/notify.class.php");
+					require_once(DOL_DOCUMENT_ROOT ."/core/class/notify.class.php");
 					$notify=new Notify($db);
 					$text.='<br>';
 					$text.=$notify->confirmMessage('NOTIFY_VAL_ORDER',$commande->socid);
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index b2a913d24ba..03a7528a7ae 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -27,7 +27,7 @@
 
 require("../main.inc.php");
 require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php");
-require_once(DOL_DOCUMENT_ROOT ."/core/notify.class.php");
+require_once(DOL_DOCUMENT_ROOT ."/core/class/notify.class.php");
 require_once(DOL_DOCUMENT_ROOT ."/commande/class/commande.class.php");
 
 if (!$user->rights->commande->lire) accessforbidden();
diff --git a/htdocs/commande/stats/commandestats.class.php b/htdocs/commande/stats/commandestats.class.php
index 7df443ab4ce..46a9b69f00c 100644
--- a/htdocs/commande/stats/commandestats.class.php
+++ b/htdocs/commande/stats/commandestats.class.php
@@ -24,7 +24,7 @@
  *       \brief      Fichier de la classe de gestion des stats des commandes
  *       \version    $Id$
  */
-include_once DOL_DOCUMENT_ROOT . "/core/stats.class.php";
+include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php";
 include_once DOL_DOCUMENT_ROOT . "/commande/class/commande.class.php";
 include_once DOL_DOCUMENT_ROOT . "/fourn/fournisseur.commande.class.php";
 
diff --git a/htdocs/compta/deplacement/stats/deplacementstats.class.php b/htdocs/compta/deplacement/stats/deplacementstats.class.php
index db687d31955..01b9c27d2dd 100755
--- a/htdocs/compta/deplacement/stats/deplacementstats.class.php
+++ b/htdocs/compta/deplacement/stats/deplacementstats.class.php
@@ -24,7 +24,7 @@
  *       \brief      Fichier de la classe de gestion des stats des deplacement et notes de frais
  *       \version    $Id$
  */
-include_once DOL_DOCUMENT_ROOT . "/core/stats.class.php";
+include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php";
 include_once DOL_DOCUMENT_ROOT . "/compta/deplacement/class/deplacement.class.php";
 
 /**
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 06b98a631ac..bb0ac2870d5 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -2214,7 +2214,7 @@ else
 				$text=$langs->trans('ConfirmValidateBill',$numref);
 				if ($conf->notification->enabled)
 				{
-					require_once(DOL_DOCUMENT_ROOT ."/core/notify.class.php");
+					require_once(DOL_DOCUMENT_ROOT ."/core/class/notify.class.php");
 					$notify=new Notify($db);
 					$text.='<br>';
 					$text.=$notify->confirmMessage('NOTIFY_VAL_FAC',$fac->socid);
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 33eb2bca249..b5e32963a8b 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -26,7 +26,7 @@
  *	\version    $Id$
  */
 
-require_once(DOL_DOCUMENT_ROOT."/core/notify.class.php");
+require_once(DOL_DOCUMENT_ROOT."/core/class/notify.class.php");
 require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
 require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
 
diff --git a/htdocs/compta/facture/stats/facturestats.class.php b/htdocs/compta/facture/stats/facturestats.class.php
index ad21873db83..c18edc8587e 100644
--- a/htdocs/compta/facture/stats/facturestats.class.php
+++ b/htdocs/compta/facture/stats/facturestats.class.php
@@ -24,7 +24,7 @@
  *       \brief      Fichier de la classe de gestion des stats des factures
  *       \version    $Id$
  */
-include_once DOL_DOCUMENT_ROOT . "/core/stats.class.php";
+include_once DOL_DOCUMENT_ROOT . "/core/class/stats.class.php";
 include_once DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php";
 include_once DOL_DOCUMENT_ROOT . "/fourn/fournisseur.facture.class.php";
 
diff --git a/htdocs/core/notify.class.php b/htdocs/core/class/notify.class.php
similarity index 100%
rename from htdocs/core/notify.class.php
rename to htdocs/core/class/notify.class.php
diff --git a/htdocs/core/stats.class.php b/htdocs/core/class/stats.class.php
similarity index 100%
rename from htdocs/core/stats.class.php
rename to htdocs/core/class/stats.class.php
diff --git a/htdocs/core/translate.class.php b/htdocs/core/class/translate.class.php
similarity index 100%
rename from htdocs/core/translate.class.php
rename to htdocs/core/class/translate.class.php
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index 72923db8276..9b216cf5aeb 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -577,7 +577,7 @@ if ($id > 0 || ! empty($ref))
 			$text=$langs->trans('ConfirmValidateOrder',$newref);
 			if ($conf->notification->enabled)
 			{
-				require_once(DOL_DOCUMENT_ROOT ."/core/notify.class.php");
+				require_once(DOL_DOCUMENT_ROOT ."/core/class/notify.class.php");
 				$notify=new	Notify($db);
 				$text.='<br>';
 				$text.=$notify->confirmMessage(3,$commande->socid);
diff --git a/htdocs/includes/triggers/interface_modNotification_Notification.class.php b/htdocs/includes/triggers/interface_modNotification_Notification.class.php
index 59f5bba6ba8..06345d37a7d 100644
--- a/htdocs/includes/triggers/interface_modNotification_Notification.class.php
+++ b/htdocs/includes/triggers/interface_modNotification_Notification.class.php
@@ -97,7 +97,7 @@ class InterfaceNotification
 		// Si module notification non actif, on ne fait rien
 		if (! $conf->notification->enabled) return 0;
 
-		require_once(DOL_DOCUMENT_ROOT .'/core/notify.class.php');
+		require_once(DOL_DOCUMENT_ROOT .'/core/class/notify.class.php');
 
 		if ($action == 'BILL_VALIDATE')
 		{
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 0bbceeb0cdb..f79e8d04bd9 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -27,7 +27,7 @@
 
 define('DOL_VERSION','2.9.0-dev');	// Also defined in htdocs/master.inc.php
 
-require_once('../core/translate.class.php');
+require_once('../core/class/translate.class.php');
 require_once('../lib/functions.lib.php');
 require_once('../lib/admin.lib.php');
 require_once('../lib/files.lib.php');
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index e2dfb4e1f11..8c003ee19ba 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -1801,7 +1801,7 @@ function accessforbidden($message='',$printheader=1,$printfooter=1,$showonlymess
 	global $conf, $db, $user, $langs;
 	if (! is_object($langs))
 	{
-		include_once(DOL_DOCUMENT_ROOT.'/core/translate.class.php');
+		include_once(DOL_DOCUMENT_ROOT.'/core/class/translate.class.php');
 		$langs=new Translate('',$conf);
 	}
 
@@ -1857,7 +1857,7 @@ function dol_print_error($db='',$error='')
 	// Si erreur intervenue avant chargement langue
 	if (! $langs)
 	{
-		require_once(DOL_DOCUMENT_ROOT ."/core/translate.class.php");
+		require_once(DOL_DOCUMENT_ROOT ."/core/class/translate.class.php");
 		$langs = new Translate("", $conf);
 		$langs->load("main");
 	}
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 3c22d88b1fe..6ac1b82841a 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -217,7 +217,7 @@ if (isset($_SERVER["HTTP_USER_AGENT"]))
 
 // Chargement des includes principaux de librairies communes
 if (! defined('NOREQUIREUSER')) require_once(DOL_DOCUMENT_ROOT ."/user/user.class.php");		// Need 500ko memory
-if (! defined('NOREQUIRETRAN')) require_once(DOL_DOCUMENT_ROOT ."/core/translate.class.php");
+if (! defined('NOREQUIRETRAN')) require_once(DOL_DOCUMENT_ROOT ."/core/class/translate.class.php");
 if (! defined('NOREQUIRESOC'))  require_once(DOL_DOCUMENT_ROOT ."/societe/societe.class.php");
 if (! defined('NOREQUIREDB'))   require_once(DOL_DOCUMENT_ROOT ."/lib/databases/".$conf->db->type.".lib.php");
 
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index 0a8483b9e61..e278dd71aa7 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -27,7 +27,7 @@
 
 define('DOL_VERSION','2.5-dev');	// Also defined in htdocs/master.inc.php
 
-require_once('../core/translate.class.php');
+require_once('../core/class/translate.class.php');
 require_once('../lib/functions.lib.php');
 require_once('../lib/admin.lib.php');