diff --git a/ui/nG6/Classes/Controller/class.tx_nG6_pi6_purge.php b/ui/nG6/Classes/Controller/class.tx_nG6_pi6_purge.php
index d5dbcb342743deea629185e37bc364588567497e..dd8345eb0b0c35bd41dcbcf8ba4ea6cb6dc67ddd 100644
--- a/ui/nG6/Classes/Controller/class.tx_nG6_pi6_purge.php
+++ b/ui/nG6/Classes/Controller/class.tx_nG6_pi6_purge.php
@@ -27,9 +27,11 @@ namespace ng6\Controller;
  *
  * @author	PF bioinformatique de Toulouse <>
  */
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_utils.php');
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_db.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/class.tx_nG6_utils.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/tx_nG6_db.php');
 use TYPO3\CMS\Core\Context\Context;
+use nG6\Controller\tx_nG6_db;
+use nG6\Controller\tx_nG6_utils;
 class tx_nG6_pi6_purge {
 
  static function send_purge_demand_mail($project_ids, $extension_allowed = 1){
diff --git a/ui/nG6/Classes/Controller/tx_nG6_db.php b/ui/nG6/Classes/Controller/tx_nG6_db.php
index 517305d53ad1d4bc414f30c5866cdb84e1bdaad3..8a0130aa7d0f390158e2207f4051cff419dca3f4 100644
--- a/ui/nG6/Classes/Controller/tx_nG6_db.php
+++ b/ui/nG6/Classes/Controller/tx_nG6_db.php
@@ -23,8 +23,8 @@ namespace ng6\Controller;
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
 
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_utils.php');
-
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/class.tx_nG6_utils.php');
+use nG6\Controller\tx_nG6_utils;
 /**
  * Class_nG6_db' for the 'nG6' extension.
  * This class is in charge of all communication with the database
diff --git a/ui/nG6/lib/class.tx_nG6_upgrade.php b/ui/nG6/lib/class.tx_nG6_upgrade.php
index 49943051cc7671c382a117a2404b12e1eb28d3d6..a91a69a92900ba2a84be3fa486b8a0c2b5ef84f1 100644
--- a/ui/nG6/lib/class.tx_nG6_upgrade.php
+++ b/ui/nG6/lib/class.tx_nG6_upgrade.php
@@ -22,8 +22,7 @@
 *  This copyright notice MUST APPEAR in all copies of the script!
 ***************************************************************/
 
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_db.php');
-
+use nG6\Controller\tx_nG6_db;
 /**
  * Class_nG6_db' for the 'nG6' extension.
  * Allows to migrate usergroups system to (users) rights system.
diff --git a/ui/nG6/pi1/class.tx_nG6_pi1.php b/ui/nG6/pi1/class.tx_nG6_pi1.php
index 73c7062e16185ca812d351f2da098ec76b63e5cb..c46221e1119a62f8559fc04acebd0f9b8e2c4ee0 100644
--- a/ui/nG6/pi1/class.tx_nG6_pi1.php
+++ b/ui/nG6/pi1/class.tx_nG6_pi1.php
@@ -27,13 +27,14 @@
  * @author	PF bioinformatique de Toulouse <>
  */
 
-
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_db.php');
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_utils.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/class.tx_nG6_utils.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/tx_nG6_db.php');
 require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_upgrade.php');
 require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/res/smarty/libs/Smarty.class.php'); 
 use TYPO3\CMS\Core\Context\Context;
 use \TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use nG6\Controller\tx_nG6_db;
+use nG6\Controller\tx_nG6_utils;
 
 class tx_nG6_pi1 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	
diff --git a/ui/nG6/pi3/class.tx_nG6_pi3.php b/ui/nG6/pi3/class.tx_nG6_pi3.php
index 25f181e24394e5d0602c2aa7cc6f956fd69cb4fe..1e1e666354b3fafbf7a43a01ddb68bd9291ccbbc 100644
--- a/ui/nG6/pi3/class.tx_nG6_pi3.php
+++ b/ui/nG6/pi3/class.tx_nG6_pi3.php
@@ -26,9 +26,10 @@
  *
  * @author	PF bioinformatique de Toulouse <>
  */
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/tx_nG6_db.php');
 use TYPO3\CMS\Core\Context\Context;
+use nG6\Controller\tx_nG6_db;
 
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_db.php');
 
 class tx_nG6_pi3 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	var $prefixId = 'tx_nG6_pi3';		// Same as class name
diff --git a/ui/nG6/pi4/class.tx_nG6_pi4.php b/ui/nG6/pi4/class.tx_nG6_pi4.php
index 3a04e39c14f541dd1404ce8b183d644ab262292d..6af88468d42628d8bfc46b500b78988abeca160f 100644
--- a/ui/nG6/pi4/class.tx_nG6_pi4.php
+++ b/ui/nG6/pi4/class.tx_nG6_pi4.php
@@ -26,10 +26,11 @@
  *
  * @author	PF bioinformatique de Toulouse <>
  */
-
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_utils.php');
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_db.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/class.tx_nG6_utils.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/tx_nG6_db.php');
 use TYPO3\CMS\Core\Context\Context;
+use nG6\Controller\tx_nG6_db;
+use nG6\Controller\tx_nG6_utils;
 class tx_nG6_pi4 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	var $prefixId = 'tx_nG6_pi1';		// Same as class name
 	var $scriptRelPath = 'pi4/class.tx_nG6_pi4.php';	// Path to this script relative to the extension dir.
diff --git a/ui/nG6/pi5/class.tx_nG6_pi5.php b/ui/nG6/pi5/class.tx_nG6_pi5.php
index 738b32c80223cc2a4ed1709c912e51795db4e297..a5a593f57988f90b8cf2c571d28bbe4ef6c63484 100755
--- a/ui/nG6/pi5/class.tx_nG6_pi5.php
+++ b/ui/nG6/pi5/class.tx_nG6_pi5.php
@@ -26,12 +26,13 @@
  *
  * @author	PF bioinformatique de Toulouse <>
  */
-
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_utils.php');
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_db.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/class.tx_nG6_utils.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/tx_nG6_db.php');
 require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/res/smarty/libs/Smarty.class.php'); 
 use TYPO3\CMS\Core\Context\Context;
 use \TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use nG6\Controller\tx_nG6_db;
+use nG6\Controller\tx_nG6_utils;
 
 class tx_nG6_pi5 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	var $prefixId = 'tx_nG6_pi5';		// Same as class name
diff --git a/ui/nG6/pi6/class.tx_nG6_pi6.php b/ui/nG6/pi6/class.tx_nG6_pi6.php
index 706e2693cfe33afb1d571c3d629882a386124643..ab5a337e5f653c1e974bab1e8040a1b3c90ad0d7 100755
--- a/ui/nG6/pi6/class.tx_nG6_pi6.php
+++ b/ui/nG6/pi6/class.tx_nG6_pi6.php
@@ -27,11 +27,13 @@
  *
  * @author	PF bioinformatique de Toulouse <>
  */
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_utils.php');
-require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/lib/class.tx_nG6_db.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/class.tx_nG6_utils.php');
+require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/Classes/Controller/tx_nG6_db.php');
 require_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('nG6').'/res/smarty/libs/Smarty.class.php'); 
 use \TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Context\Context;
+use nG6\Controller\tx_nG6_db;
+use nG6\Controller\tx_nG6_utils;
 class tx_nG6_pi6 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	var $prefixId = 'tx_nG6_pi6';		// Same as class name
 	var $scriptRelPath = 'pi6/class.tx_nG6_pi6.php';	// Path to this script relative to the extension dir.