diff --git a/htdocs/core/conf.class.php b/htdocs/core/conf.class.php
index 754703a5ff5..a8ec16b3519 100644
--- a/htdocs/core/conf.class.php
+++ b/htdocs/core/conf.class.php
@@ -39,9 +39,8 @@ class Conf
     /** \public */
 	//! Object with database handler
 	var $db;
-
-	//! Charset for HTML output and for storing data in memory
-	var $character_set_client='UTF-8';	// UTF-8, ISO-8859-1
+	//! To store properties found in conf file
+	var $file;
 
 	var $dol_document_root;
 
@@ -58,6 +57,17 @@ class Conf
 
 	var $logbuffer=array();
 
+	/**
+	 * Constructor
+	 *
+	 * @return Conf
+	 */
+	function Conf()
+	{
+		//! Charset for HTML output and for storing data in memory
+		$this->file->character_set_client='UTF-8';	// UTF-8, ISO-8859-1
+	}
+
 
 	/**
 	*      \brief      Load setup values into conf object
@@ -140,12 +150,8 @@ class Conf
 		}
 		$db->free($result);
 
-		// On reprend parametres du fichier de config conf.php
-		// \TODO Mettre tous les param de conf DB dans une propriete de la classe
-
-
-		// Nettoyage variables des gestionnaires de menu
-		// conf->menu_top et conf->menu_left sont definis dans main.inc.php (selon user)
+		// Clean some variables
+		// conf->menu_top et conf->menu_left are defined in main.inc.php (according to user choice)
 		if (! $this->global->MAIN_MENU_BARRETOP) $this->global->MAIN_MENU_BARRETOP="eldy_backoffice.php";
 		if (! $this->global->MAIN_MENUFRONT_BARRETOP) $this->global->MAIN_MENUFRONT_BARRETOP="eldy_backoffice.php";
 		if (! $this->global->MAIN_MENU_BARRELEFT) $this->global->MAIN_MENU_BARRELEFT="eldy_backoffice.php";
@@ -208,10 +214,6 @@ class Conf
 		$this->societe->dir_logos =$rootfordata."/societe/logos";
 		if (defined('SOCIETE_OUTPUTDIR') && SOCIETE_OUTPUTDIR) { $this->societe->dir_output=SOCIETE_OUTPUTDIR; }    # Pour passer outre le rep par defaut
 
-		// Module taxes et charges sociales
-		$this->tax->dir_output=$rootfordata."/taxes";
-		$this->tax->dir_temp  =$rootfordata."/taxes/temp";
-
 		// Module don
 		$this->don->dir_output=$rootfordata."/dons";
 		$this->don->dir_temp  =$rootfordata."/dons/temp";
diff --git a/htdocs/includes/modules/modTax.class.php b/htdocs/includes/modules/modTax.class.php
index c19258d6431..e6cf3168d8d 100644
--- a/htdocs/includes/modules/modTax.class.php
+++ b/htdocs/includes/modules/modTax.class.php
@@ -66,7 +66,7 @@ class modTax extends DolibarrModules
 		$this->picto='bill';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array("/taxes/temp");
+		$this->dirs = array("/tax/temp");
 
 		// Config pages
 		$this->config_page_url = array("taxes.php");