diff --git a/config/config.inc.php b/config/config.inc.php
index eff82fd74..a1a5a392b 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -62,10 +62,10 @@ require_once(dirname(__FILE__).'/autoload.php');
 
 if (_PS_DEBUG_PROFILING_)
 {
-	include_once(_PS_ROOT_DIR_.'/override/classes/controller/_Controller.php');
-	include_once(_PS_ROOT_DIR_.'/override/classes/_ObjectModel.php');
-	include_once(_PS_ROOT_DIR_.'/override/classes/_Hook.php');
-	include_once(_PS_ROOT_DIR_.'/override/classes/db/_Db.php');
+	include_once(_PS_TOOL_DIR_.'profiling/Controller.php');
+	include_once(_PS_TOOL_DIR_.'profiling/ObjectModel.php');
+	include_once(_PS_TOOL_DIR_.'profiling/Hook.php');
+	include_once(_PS_TOOL_DIR_.'profiling/Db.php');
 }
 
 /* Redefine REQUEST_URI if empty (on some webservers...) */
diff --git a/config/defines.inc.php b/config/defines.inc.php
index e61acc65c..e5fae2103 100755
--- a/config/defines.inc.php
+++ b/config/defines.inc.php
@@ -26,7 +26,7 @@
 */
 
 define('_PS_MODE_DEV_', true);
-define('_PS_DEBUG_PROFILING_', false);
+define('_PS_DEBUG_PROFILING_', true);
 define('_PS_MODE_DEMO_', false);
 
 $currentDir = dirname(__FILE__);
diff --git a/override/classes/SubDomain.php b/override/classes/SubDomain.php
deleted file mode 100644
index 1bc9eda73..000000000
--- a/override/classes/SubDomain.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-class SubDomain extends SubDomainCore
-{
-
-}
-
diff --git a/override/classes/_Tools.php b/override/classes/_Tools.php
index 466f763fc..acea07933 100755
--- a/override/classes/_Tools.php
+++ b/override/classes/_Tools.php
@@ -32,11 +32,11 @@
 // if FB class is already loaded, just enable it. else, enable it only if fb.php exists and is loaded
 if (!defined('PS_USE_FIREPHP') AND class_exists('FB'))
 	define('PS_USE_FIREPHP',true);
-elseif (file_exists(dirname(__FILE__).DIRECTORY_SEPARATOR.'fb.php'))
+elseif (file_exists(_PS_TOOL_DIR_.'FirePHP/fb.php'))
 {
 	if (!defined('PS_USE_FIREPHP'))
 	{
-		require_once(dirname(__FILE__).DIRECTORY_SEPARATOR.'fb.php');
+		require_once(_PS_TOOL_DIR_.'FirePHP/fb.php');
 		define('PS_USE_FIREPHP',true);
 	}
 	else
diff --git a/override/controllers/admin/AdminAddonsMyAccountController.php b/override/controllers/admin/AdminAddonsMyAccountController.php
deleted file mode 100644
index 255e6f233..000000000
--- a/override/controllers/admin/AdminAddonsMyAccountController.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-class AdminAddonsMyAccountController extends AdminAddonsMyAccountControllerCore
-{
-
-}
-
diff --git a/override/controllers/admin/AdminStatsConfController.php b/override/controllers/admin/AdminStatsConfController.php
deleted file mode 100644
index 1cbde160a..000000000
--- a/override/controllers/admin/AdminStatsConfController.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-class AdminStatsConfController extends AdminStatsConfControllerCore
-{
-
-}
-
diff --git a/override/controllers/admin/AdminSubDomainsController.php b/override/controllers/admin/AdminSubDomainsController.php
deleted file mode 100644
index 2d738f287..000000000
--- a/override/controllers/admin/AdminSubDomainsController.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-class AdminSubDomainsController extends AdminSubDomainsControllerCore
-{
-
-}
-
diff --git a/override/classes/FirePHP.class.php b/tools/FirePHP/FirePHP.class.php
similarity index 100%
rename from override/classes/FirePHP.class.php
rename to tools/FirePHP/FirePHP.class.php
diff --git a/override/classes/fb.php b/tools/FirePHP/fb.php
similarity index 100%
rename from override/classes/fb.php
rename to tools/FirePHP/fb.php
diff --git a/tools/FirePHP/index.php b/tools/FirePHP/index.php
new file mode 100644
index 000000000..15aba8204
--- /dev/null
+++ b/tools/FirePHP/index.php
@@ -0,0 +1,11 @@
+<?php
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
diff --git a/override/classes/controller/_Controller.php b/tools/profiling/Controller.php
similarity index 100%
rename from override/classes/controller/_Controller.php
rename to tools/profiling/Controller.php
diff --git a/override/classes/db/_Db.php b/tools/profiling/Db.php
similarity index 100%
rename from override/classes/db/_Db.php
rename to tools/profiling/Db.php
diff --git a/override/classes/_Hook.php b/tools/profiling/Hook.php
similarity index 100%
rename from override/classes/_Hook.php
rename to tools/profiling/Hook.php
diff --git a/override/classes/_ObjectModel.php b/tools/profiling/ObjectModel.php
similarity index 100%
rename from override/classes/_ObjectModel.php
rename to tools/profiling/ObjectModel.php
diff --git a/tools/profiling/index.php b/tools/profiling/index.php
new file mode 100644
index 000000000..15aba8204
--- /dev/null
+++ b/tools/profiling/index.php
@@ -0,0 +1,11 @@
+<?php
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;