Move all Metrics to Columns folder.

46 files changed, 90 insertions, 92 deletions

diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
index 4b730c0c07..0cf5bd63a8 100644
--- a/plugins/Actions/API.php
+++ b/plugins/Actions/API.php
@@ -17,10 +17,10 @@ use Piwik\Date;
 use Piwik\Metrics;
 use Piwik\Piwik;
 use Piwik\Plugin\Report;
-use Piwik\Plugins\Actions\Metrics\AveragePageGenerationTime;
-use Piwik\Plugins\Actions\Metrics\AverageTimeOnPage;
-use Piwik\Plugins\Actions\Metrics\BounceRate;
-use Piwik\Plugins\Actions\Metrics\ExitRate;
+use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
+use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
+use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
+use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
 use Piwik\Plugins\CustomVariables\API as APICustomVariables;
 use Piwik\Plugins\Actions\Actions\ActionSiteSearch;
 use Piwik\Tracker\Action;
diff --git a/plugins/Actions/Metrics/AveragePageGenerationTime.php b/plugins/Actions/Columns/Metrics/AveragePageGenerationTime.php
index 50b6cc7227..cf8ea3018d 100644
--- a/plugins/Actions/Metrics/AveragePageGenerationTime.php
+++ b/plugins/Actions/Columns/Metrics/AveragePageGenerationTime.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\Actions\Metrics;
+namespace Piwik\Plugins\Actions\Columns\Metrics;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
diff --git a/plugins/Actions/Metrics/AverageTimeOnPage.php b/plugins/Actions/Columns/Metrics/AverageTimeOnPage.php
index 395f1d0a8e..480964a52a 100644
--- a/plugins/Actions/Metrics/AverageTimeOnPage.php
+++ b/plugins/Actions/Columns/Metrics/AverageTimeOnPage.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\Actions\Metrics;
+namespace Piwik\Plugins\Actions\Columns\Metrics;
 
 use Piwik\DataTable\Row;
 use Piwik\Metrics\Formatter;
diff --git a/plugins/Actions/Metrics/BounceRate.php b/plugins/Actions/Columns/Metrics/BounceRate.php
index f19b701ada..da748b5ea6 100644
--- a/plugins/Actions/Metrics/BounceRate.php
+++ b/plugins/Actions/Columns/Metrics/BounceRate.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\Actions\Metrics;
+namespace Piwik\Plugins\Actions\Columns\Metrics;
 
 use Piwik\DataTable\Row;
 use Piwik\Metrics\Formatter;
diff --git a/plugins/Actions/Metrics/ExitRate.php b/plugins/Actions/Columns/Metrics/ExitRate.php
index 2b570b045e..4f78b2482f 100644
--- a/plugins/Actions/Metrics/ExitRate.php
+++ b/plugins/Actions/Columns/Metrics/ExitRate.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\Actions\Metrics;
+namespace Piwik\Plugins\Actions\Columns\Metrics;
 
 use Piwik\DataTable\Row;
 use Piwik\Metrics\Formatter;
diff --git a/plugins/Actions/Reports/Get.php b/plugins/Actions/Reports/Get.php
index da907315cd..cc97e91c6d 100644
--- a/plugins/Actions/Reports/Get.php
+++ b/plugins/Actions/Reports/Get.php
@@ -9,7 +9,7 @@
 namespace Piwik\Plugins\Actions\Reports;
 
 use Piwik\Piwik;
-use Piwik\Plugins\Actions\Metrics\AveragePageGenerationTime;
+use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
 
 class Get extends Base
 {
diff --git a/plugins/Actions/Reports/GetEntryPageTitles.php b/plugins/Actions/Reports/GetEntryPageTitles.php
index f00ac12fd2..2dbb887c45 100644
--- a/plugins/Actions/Reports/GetEntryPageTitles.php
+++ b/plugins/Actions/Reports/GetEntryPageTitles.php
@@ -11,10 +11,10 @@ namespace Piwik\Plugins\Actions\Reports;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\Actions\Columns\EntryPageTitle;
-use Piwik\Plugins\Actions\Metrics\AveragePageGenerationTime;
-use Piwik\Plugins\Actions\Metrics\AverageTimeOnPage;
-use Piwik\Plugins\Actions\Metrics\BounceRate;
-use Piwik\Plugins\Actions\Metrics\ExitRate;
+use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
+use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
+use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
+use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
 
 class GetEntryPageTitles extends Base
 {
diff --git a/plugins/Actions/Reports/GetEntryPageUrls.php b/plugins/Actions/Reports/GetEntryPageUrls.php
index d37232e21d..de6f042b20 100644
--- a/plugins/Actions/Reports/GetEntryPageUrls.php
+++ b/plugins/Actions/Reports/GetEntryPageUrls.php
@@ -13,10 +13,10 @@ use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\API\Request;
 use Piwik\Plugins\Actions\Columns\EntryPageUrl;
-use Piwik\Plugins\Actions\Metrics\AveragePageGenerationTime;
-use Piwik\Plugins\Actions\Metrics\AverageTimeOnPage;
-use Piwik\Plugins\Actions\Metrics\BounceRate;
-use Piwik\Plugins\Actions\Metrics\ExitRate;
+use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
+use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
+use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
+use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
 
 class GetEntryPageUrls extends Base
 {
diff --git a/plugins/Actions/Reports/GetExitPageTitles.php b/plugins/Actions/Reports/GetExitPageTitles.php
index 1247fc3d4c..2d58a2f911 100644
--- a/plugins/Actions/Reports/GetExitPageTitles.php
+++ b/plugins/Actions/Reports/GetExitPageTitles.php
@@ -11,10 +11,10 @@ namespace Piwik\Plugins\Actions\Reports;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\Actions\Columns\ExitPageTitle;
-use Piwik\Plugins\Actions\Metrics\AveragePageGenerationTime;
-use Piwik\Plugins\Actions\Metrics\AverageTimeOnPage;
-use Piwik\Plugins\Actions\Metrics\BounceRate;
-use Piwik\Plugins\Actions\Metrics\ExitRate;
+use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
+use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
+use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
+use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
 
 class GetExitPageTitles extends Base
 {
diff --git a/plugins/Actions/Reports/GetExitPageUrls.php b/plugins/Actions/Reports/GetExitPageUrls.php
index b6bccaa1f1..80ebcc8546 100644
--- a/plugins/Actions/Reports/GetExitPageUrls.php
+++ b/plugins/Actions/Reports/GetExitPageUrls.php
@@ -13,10 +13,10 @@ use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\API\Request;
 use Piwik\Plugins\Actions\Columns\ExitPageUrl;
-use Piwik\Plugins\Actions\Metrics\AveragePageGenerationTime;
-use Piwik\Plugins\Actions\Metrics\AverageTimeOnPage;
-use Piwik\Plugins\Actions\Metrics\BounceRate;
-use Piwik\Plugins\Actions\Metrics\ExitRate;
+use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
+use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
+use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
+use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
 
 class GetExitPageUrls extends Base
 {
diff --git a/plugins/Actions/Reports/GetPageTitles.php b/plugins/Actions/Reports/GetPageTitles.php
index 010c5cfeac..058d382ee9 100644
--- a/plugins/Actions/Reports/GetPageTitles.php
+++ b/plugins/Actions/Reports/GetPageTitles.php
@@ -13,10 +13,10 @@ use Piwik\Plugin\ViewDataTable;
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Plugins\Actions\Columns\PageTitle;
-use Piwik\Plugins\Actions\Metrics\AveragePageGenerationTime;
-use Piwik\Plugins\Actions\Metrics\AverageTimeOnPage;
-use Piwik\Plugins\Actions\Metrics\BounceRate;
-use Piwik\Plugins\Actions\Metrics\ExitRate;
+use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
+use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
+use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
+use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
 
 class GetPageTitles extends Base
 {
diff --git a/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php b/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
index 63620c51bb..8e7b85ad5e 100644
--- a/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
+++ b/plugins/Actions/Reports/GetPageTitlesFollowingSiteSearch.php
@@ -11,10 +11,10 @@ namespace Piwik\Plugins\Actions\Reports;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\Actions\Columns\DestinationPage;
-use Piwik\Plugins\Actions\Metrics\AveragePageGenerationTime;
-use Piwik\Plugins\Actions\Metrics\AverageTimeOnPage;
-use Piwik\Plugins\Actions\Metrics\BounceRate;
-use Piwik\Plugins\Actions\Metrics\ExitRate;
+use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
+use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
+use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
+use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
 
 class GetPageTitlesFollowingSiteSearch extends SiteSearchBase
 {
diff --git a/plugins/Actions/Reports/GetPageUrls.php b/plugins/Actions/Reports/GetPageUrls.php
index 664e7218a7..0af899ef0e 100644
--- a/plugins/Actions/Reports/GetPageUrls.php
+++ b/plugins/Actions/Reports/GetPageUrls.php
@@ -10,11 +10,11 @@ namespace Piwik\Plugins\Actions\Reports;
 
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\Actions\Metrics\AveragePageGenerationTime;
-use Piwik\Plugins\Actions\Metrics\BounceRate;
+use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
+use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
 use Piwik\Plugins\Actions\Columns\PageUrl;
-use Piwik\Plugins\Actions\Metrics\ExitRate;
-use Piwik\Plugins\Actions\Metrics\AverageTimeOnPage;
+use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
+use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
 
 class GetPageUrls extends Base
 {
diff --git a/plugins/Actions/Reports/GetSiteSearchKeywords.php b/plugins/Actions/Reports/GetSiteSearchKeywords.php
index f3fa86afaf..b78a7ca409 100644
--- a/plugins/Actions/Reports/GetSiteSearchKeywords.php
+++ b/plugins/Actions/Reports/GetSiteSearchKeywords.php
@@ -11,10 +11,10 @@ namespace Piwik\Plugins\Actions\Reports;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\Actions\Columns\Keyword;
-use Piwik\Plugins\Actions\Metrics\AveragePageGenerationTime;
-use Piwik\Plugins\Actions\Metrics\AverageTimeOnPage;
-use Piwik\Plugins\Actions\Metrics\BounceRate;
-use Piwik\Plugins\Actions\Metrics\ExitRate;
+use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
+use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
+use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
+use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
 
 class GetSiteSearchKeywords extends SiteSearchBase
 {
diff --git a/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php b/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php
index 2c2a8f1c31..5070fcd811 100644
--- a/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php
+++ b/plugins/Actions/Reports/GetSiteSearchNoResultKeywords.php
@@ -11,10 +11,10 @@ namespace Piwik\Plugins\Actions\Reports;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\Actions\Columns\KeywordwithNoSearchResult;
-use Piwik\Plugins\Actions\Metrics\AveragePageGenerationTime;
-use Piwik\Plugins\Actions\Metrics\AverageTimeOnPage;
-use Piwik\Plugins\Actions\Metrics\BounceRate;
-use Piwik\Plugins\Actions\Metrics\ExitRate;
+use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
+use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
+use Piwik\Plugins\Actions\Columns\Metrics\BounceRate;
+use Piwik\Plugins\Actions\Columns\Metrics\ExitRate;
 
 class GetSiteSearchNoResultKeywords extends SiteSearchBase
 {
diff --git a/plugins/Contents/Metrics/InteractionRate.php b/plugins/Contents/Columns/Metrics/InteractionRate.php
index 6dfa09eefd..64485fe0e6 100644
--- a/plugins/Contents/Metrics/InteractionRate.php
+++ b/plugins/Contents/Columns/Metrics/InteractionRate.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\Contents\Metrics;
+namespace Piwik\Plugins\Contents\Columns\Metrics;
 
 use Piwik\DataTable\Row;
 use Piwik\Metrics\Formatter;
diff --git a/plugins/Contents/Reports/GetContentNames.php b/plugins/Contents/Reports/GetContentNames.php
index 82672dbcad..d217af5d71 100644
--- a/plugins/Contents/Reports/GetContentNames.php
+++ b/plugins/Contents/Reports/GetContentNames.php
@@ -11,7 +11,7 @@ namespace Piwik\Plugins\Contents\Reports;
 use Piwik\Piwik;
 use Piwik\Plugin\Report;
 use Piwik\Plugins\Contents\Columns\ContentName;
-use Piwik\Plugins\Contents\Metrics\InteractionRate;
+use Piwik\Plugins\Contents\Columns\Metrics\InteractionRate;
 use Piwik\View;
 
 /**
diff --git a/plugins/Contents/Reports/GetContentPieces.php b/plugins/Contents/Reports/GetContentPieces.php
index b977b21630..7ab3f1ed1c 100644
--- a/plugins/Contents/Reports/GetContentPieces.php
+++ b/plugins/Contents/Reports/GetContentPieces.php
@@ -11,7 +11,7 @@ namespace Piwik\Plugins\Contents\Reports;
 use Piwik\Piwik;
 use Piwik\Plugin\Report;
 use Piwik\Plugins\Contents\Columns\ContentPiece;
-use Piwik\Plugins\Contents\Metrics\InteractionRate;
+use Piwik\Plugins\Contents\Columns\Metrics\InteractionRate;
 use Piwik\View;
 
 /**
diff --git a/plugins/CoreHome/Metrics/ActionsPerVisit.php b/plugins/CoreHome/Columns/Metrics/ActionsPerVisit.php
index 658bf6f20c..0ced958086 100644
--- a/plugins/CoreHome/Metrics/ActionsPerVisit.php
+++ b/plugins/CoreHome/Columns/Metrics/ActionsPerVisit.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\CoreHome\Metrics;
+namespace Piwik\Plugins\CoreHome\Columns\Metrics;
 
 use Piwik\DataTable\Row;
 use Piwik\Piwik;
diff --git a/plugins/CoreHome/Metrics/AverageTimeOnSite.php b/plugins/CoreHome/Columns/Metrics/AverageTimeOnSite.php
index 4a908d1a5f..e590e19871 100644
--- a/plugins/CoreHome/Metrics/AverageTimeOnSite.php
+++ b/plugins/CoreHome/Columns/Metrics/AverageTimeOnSite.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\CoreHome\Metrics;
+namespace Piwik\Plugins\CoreHome\Columns\Metrics;
 
 use Piwik\DataTable\Row;
 use Piwik\Metrics\Formatter;
diff --git a/plugins/CoreHome/Metrics/BounceRate.php b/plugins/CoreHome/Columns/Metrics/BounceRate.php
index d39e405cda..65d46fb435 100644
--- a/plugins/CoreHome/Metrics/BounceRate.php
+++ b/plugins/CoreHome/Columns/Metrics/BounceRate.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\CoreHome\Metrics;
+namespace Piwik\Plugins\CoreHome\Columns\Metrics;
 
 use Piwik\DataTable\Row;
 use Piwik\Metrics\Formatter;
diff --git a/plugins/CoreHome/Metrics/ConversionRate.php b/plugins/CoreHome/Columns/Metrics/ConversionRate.php
index 23bca997a0..0865825238 100644
--- a/plugins/CoreHome/Metrics/ConversionRate.php
+++ b/plugins/CoreHome/Columns/Metrics/ConversionRate.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\CoreHome\Metrics;
+namespace Piwik\Plugins\CoreHome\Columns\Metrics;
 
 use Piwik\DataTable\Row;
 use Piwik\Metrics\Formatter;
diff --git a/plugins/CoreHome/Metrics/EvolutionMetric.php b/plugins/CoreHome/Columns/Metrics/EvolutionMetric.php
index 8794604509..537e42a520 100644
--- a/plugins/CoreHome/Metrics/EvolutionMetric.php
+++ b/plugins/CoreHome/Columns/Metrics/EvolutionMetric.php
@@ -6,9 +6,8 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CoreHome\Metrics;
+namespace Piwik\Plugins\CoreHome\Columns\Metrics;
 
-use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Metrics\Formatter;
diff --git a/plugins/CoreHome/Metrics/VisitsPercent.php b/plugins/CoreHome/Columns/Metrics/VisitsPercent.php
index 7d268091b1..fe7f688508 100644
--- a/plugins/CoreHome/Metrics/VisitsPercent.php
+++ b/plugins/CoreHome/Columns/Metrics/VisitsPercent.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\CoreHome\Metrics;
+namespace Piwik\Plugins\CoreHome\Columns\Metrics;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
diff --git a/plugins/Events/Metrics/AverageEventValue.php b/plugins/Events/Columns/Metrics/AverageEventValue.php
index df2f932ba8..7efb513729 100644
--- a/plugins/Events/Metrics/AverageEventValue.php
+++ b/plugins/Events/Columns/Metrics/AverageEventValue.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\Events\Metrics;
+namespace Piwik\Plugins\Events\Columns\Metrics;
 
 use Piwik\DataTable\Row;
 use Piwik\Piwik;
diff --git a/plugins/Events/Reports/Base.php b/plugins/Events/Reports/Base.php
index e49c7815fa..4430b31407 100644
--- a/plugins/Events/Reports/Base.php
+++ b/plugins/Events/Reports/Base.php
@@ -9,7 +9,7 @@
 namespace Piwik\Plugins\Events\Reports;
 
 use Piwik\Plugins\Events\API;
-use Piwik\Plugins\Events\Metrics\AverageEventValue;
+use Piwik\Plugins\Events\Columns\Metrics\AverageEventValue;
 
 abstract class Base extends \Piwik\Plugin\Report
 {
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index fab2ae42f1..c2e979b194 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -17,7 +17,7 @@ use Piwik\Db;
 use Piwik\Metrics;
 use Piwik\Piwik;
 use Piwik\Plugin\Report;
-use Piwik\Plugins\Goals\Metrics\AverageOrderRevenue;
+use Piwik\Plugins\Goals\Columns\Metrics\AverageOrderRevenue;
 use Piwik\Site;
 use Piwik\Tracker\Cache;
 use Piwik\Tracker\GoalManager;
diff --git a/plugins/Goals/Metrics/AverageOrderRevenue.php b/plugins/Goals/Columns/Metrics/AverageOrderRevenue.php
index fed8e7779b..a25d64c7e9 100644
--- a/plugins/Goals/Metrics/AverageOrderRevenue.php
+++ b/plugins/Goals/Columns/Metrics/AverageOrderRevenue.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\Goals\Metrics;
+namespace Piwik\Plugins\Goals\Columns\Metrics;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
diff --git a/plugins/Goals/Metrics/AveragePrice.php b/plugins/Goals/Columns/Metrics/AveragePrice.php
index 1fb83c18bd..0ca06201e9 100644
--- a/plugins/Goals/Metrics/AveragePrice.php
+++ b/plugins/Goals/Columns/Metrics/AveragePrice.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\Goals\Metrics;
+namespace Piwik\Plugins\Goals\Columns\Metrics;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
diff --git a/plugins/Goals/Metrics/AverageQuantity.php b/plugins/Goals/Columns/Metrics/AverageQuantity.php
index 75fbc1c302..dd5de214fb 100644
--- a/plugins/Goals/Metrics/AverageQuantity.php
+++ b/plugins/Goals/Columns/Metrics/AverageQuantity.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\Goals\Metrics;
+namespace Piwik\Plugins\Goals\Columns\Metrics;
 
 use Piwik\DataTable\Row;
 use Piwik\Piwik;
diff --git a/plugins/Goals/Metrics/GoalSpecific/AverageOrderRevenue.php b/plugins/Goals/Columns/Metrics/GoalSpecific/AverageOrderRevenue.php
index b946535580..19c23a5eff 100644
--- a/plugins/Goals/Metrics/GoalSpecific/AverageOrderRevenue.php
+++ b/plugins/Goals/Columns/Metrics/GoalSpecific/AverageOrderRevenue.php
@@ -5,14 +5,14 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\Goals\Metrics\GoalSpecific;
+namespace Piwik\Plugins\Goals\Columns\Metrics\GoalSpecific;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Metrics;
 use Piwik\Metrics\Formatter;
 use Piwik\Piwik;
-use Piwik\Plugins\Goals\Metrics\GoalSpecificProcessedMetric;
+use Piwik\Plugins\Goals\Columns\Metrics\GoalSpecificProcessedMetric;
 use Piwik\Tracker\GoalManager;
 
 /**
diff --git a/plugins/Goals/Metrics/GoalSpecific/ConversionRate.php b/plugins/Goals/Columns/Metrics/GoalSpecific/ConversionRate.php
index 1a1bf80305..2f355c2762 100644
--- a/plugins/Goals/Metrics/GoalSpecific/ConversionRate.php
+++ b/plugins/Goals/Columns/Metrics/GoalSpecific/ConversionRate.php
@@ -5,13 +5,13 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\Goals\Metrics\GoalSpecific;
+namespace Piwik\Plugins\Goals\Columns\Metrics\GoalSpecific;
 
 use Piwik\DataTable\Row;
 use Piwik\Metrics;
 use Piwik\Metrics\Formatter;
 use Piwik\Piwik;
-use Piwik\Plugins\Goals\Metrics\GoalSpecificProcessedMetric;
+use Piwik\Plugins\Goals\Columns\Metrics\GoalSpecificProcessedMetric;
 use Piwik\Tracker\GoalManager;
 
 /**
diff --git a/plugins/Goals/Metrics/GoalSpecific/Conversions.php b/plugins/Goals/Columns/Metrics/GoalSpecific/Conversions.php
index 01bf22cfb4..0a15a94e39 100644
--- a/plugins/Goals/Metrics/GoalSpecific/Conversions.php
+++ b/plugins/Goals/Columns/Metrics/GoalSpecific/Conversions.php
@@ -5,12 +5,12 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\Goals\Metrics\GoalSpecific;
+namespace Piwik\Plugins\Goals\Columns\Metrics\GoalSpecific;
 
 use Piwik\DataTable\Row;
 use Piwik\Metrics;
 use Piwik\Piwik;
-use Piwik\Plugins\Goals\Metrics\GoalSpecificProcessedMetric;
+use Piwik\Plugins\Goals\Columns\Metrics\GoalSpecificProcessedMetric;
 
 /**
  * The conversions for a specific goal. Returns the conversions for a single goal which
diff --git a/plugins/Goals/Metrics/GoalSpecific/ItemsCount.php b/plugins/Goals/Columns/Metrics/GoalSpecific/ItemsCount.php
index 8fcf50097f..49b8184742 100644
--- a/plugins/Goals/Metrics/GoalSpecific/ItemsCount.php
+++ b/plugins/Goals/Columns/Metrics/GoalSpecific/ItemsCount.php
@@ -5,12 +5,12 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\Goals\Metrics\GoalSpecific;
+namespace Piwik\Plugins\Goals\Columns\Metrics\GoalSpecific;
 
 use Piwik\DataTable\Row;
 use Piwik\Metrics;
 use Piwik\Piwik;
-use Piwik\Plugins\Goals\Metrics\GoalSpecificProcessedMetric;
+use Piwik\Plugins\Goals\Columns\Metrics\GoalSpecificProcessedMetric;
 
 /**
  * The number of ecommerce order items for conversions of a goal. Returns the 'items'
diff --git a/plugins/Goals/Metrics/GoalSpecific/Revenue.php b/plugins/Goals/Columns/Metrics/GoalSpecific/Revenue.php
index 814485309c..3d7e419a5d 100644
--- a/plugins/Goals/Metrics/GoalSpecific/Revenue.php
+++ b/plugins/Goals/Columns/Metrics/GoalSpecific/Revenue.php
@@ -5,14 +5,14 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\Goals\Metrics\GoalSpecific;
+namespace Piwik\Plugins\Goals\Columns\Metrics\GoalSpecific;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Metrics;
 use Piwik\Metrics\Formatter;
 use Piwik\Piwik;
-use Piwik\Plugins\Goals\Metrics\GoalSpecificProcessedMetric;
+use Piwik\Plugins\Goals\Columns\Metrics\GoalSpecificProcessedMetric;
 
 /**
  * Revenue for a specific goal.
diff --git a/plugins/Goals/Metrics/GoalSpecific/RevenuePerVisit.php b/plugins/Goals/Columns/Metrics/GoalSpecific/RevenuePerVisit.php
index 3abe443d71..5daceeb9c9 100644
--- a/plugins/Goals/Metrics/GoalSpecific/RevenuePerVisit.php
+++ b/plugins/Goals/Columns/Metrics/GoalSpecific/RevenuePerVisit.php
@@ -5,14 +5,14 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\Goals\Metrics\GoalSpecific;
+namespace Piwik\Plugins\Goals\Columns\Metrics\GoalSpecific;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Metrics;
 use Piwik\Metrics\Formatter;
 use Piwik\Piwik;
-use Piwik\Plugins\Goals\Metrics\GoalSpecificProcessedMetric;
+use Piwik\Plugins\Goals\Columns\Metrics\GoalSpecificProcessedMetric;
 use Piwik\Tracker\GoalManager;
 
 /**
diff --git a/plugins/Goals/Metrics/GoalSpecificProcessedMetric.php b/plugins/Goals/Columns/Metrics/GoalSpecificProcessedMetric.php
index b8d7a9c2a4..353018c234 100644
--- a/plugins/Goals/Metrics/GoalSpecificProcessedMetric.php
+++ b/plugins/Goals/Columns/Metrics/GoalSpecificProcessedMetric.php
@@ -5,14 +5,13 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\Goals\Metrics;
+namespace Piwik\Plugins\Goals\Columns\Metrics;
 
 use Piwik\Common;
 use Piwik\DataTable\Row;
 use Piwik\Piwik;
 use Piwik\Plugin\ProcessedMetric;
 use Piwik\Plugins\Goals\API as GoalsAPI;
-use Piwik\Tracker\GoalManager;
 
 /**
  * Base class for processed metrics that are calculated using metrics that are
diff --git a/plugins/Goals/Metrics/ProductConversionRate.php b/plugins/Goals/Columns/Metrics/ProductConversionRate.php
index 09d9a4ba29..a0cf0b0436 100644
--- a/plugins/Goals/Metrics/ProductConversionRate.php
+++ b/plugins/Goals/Columns/Metrics/ProductConversionRate.php
@@ -6,7 +6,7 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\Goals\Metrics;
+namespace Piwik\Plugins\Goals\Columns\Metrics;
 
 use Piwik\DataTable\Row;
 use Piwik\Metrics\Formatter;
diff --git a/plugins/Goals/Metrics/RevenuePerVisit.php b/plugins/Goals/Columns/Metrics/RevenuePerVisit.php
index 825b6e1033..b1912fe4e2 100644
--- a/plugins/Goals/Metrics/RevenuePerVisit.php
+++ b/plugins/Goals/Columns/Metrics/RevenuePerVisit.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\Goals\Metrics;
+namespace Piwik\Plugins\Goals\Columns\Metrics;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
diff --git a/plugins/Goals/Reports/BaseEcommerceItem.php b/plugins/Goals/Reports/BaseEcommerceItem.php
index ae6d0e87a8..32b2fff770 100644
--- a/plugins/Goals/Reports/BaseEcommerceItem.php
+++ b/plugins/Goals/Reports/BaseEcommerceItem.php
@@ -14,9 +14,9 @@ use Piwik\Piwik;
 use Piwik\Plugin\Report;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\Goals\Goals;
-use Piwik\Plugins\Goals\Metrics\AveragePrice;
-use Piwik\Plugins\Goals\Metrics\AverageQuantity;
-use Piwik\Plugins\Goals\Metrics\ProductConversionRate;
+use Piwik\Plugins\Goals\Columns\Metrics\AveragePrice;
+use Piwik\Plugins\Goals\Columns\Metrics\AverageQuantity;
+use Piwik\Plugins\Goals\Columns\Metrics\ProductConversionRate;
 
 abstract class BaseEcommerceItem extends BaseEcommerce
 {
diff --git a/plugins/MultiSites/Metrics/RevenueEvolution.php b/plugins/MultiSites/Columns/Metrics/RevenueEvolution.php
index f2a5e62a19..df6b476c8c 100644
--- a/plugins/MultiSites/Metrics/RevenueEvolution.php
+++ b/plugins/MultiSites/Columns/Metrics/RevenueEvolution.php
@@ -6,10 +6,10 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
-namespace Piwik\Plugins\MultiSites\Metrics;
+namespace Piwik\Plugins\MultiSites\Columns\Metrics;
 
 use Piwik\DataTable\Row;
-use Piwik\Plugins\CoreHome\Metrics\EvolutionMetric;
+use Piwik\Plugins\CoreHome\Columns\Metrics\EvolutionMetric;
 use Piwik\Site;
 
 /**
diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php
index 57eafdcd2f..a554585dc3 100644
--- a/plugins/UserSettings/API.php
+++ b/plugins/UserSettings/API.php
@@ -13,7 +13,7 @@ use Piwik\DataTable;
 use Piwik\Metrics;
 use Piwik\Piwik;
 use Piwik\Plugins\DevicesDetection\Archiver AS DDArchiver;
-use Piwik\Plugins\CoreHome\Metrics\VisitsPercent;
+use Piwik\Plugins\CoreHome\Columns\Metrics\VisitsPercent;
 
 /**
  * @see plugins/UserSettings/functions.php
diff --git a/plugins/VisitFrequency/Metrics/ReturningMetric.php b/plugins/VisitFrequency/Columns/Metrics/ReturningMetric.php
index 6768523dad..3477667275 100644
--- a/plugins/VisitFrequency/Metrics/ReturningMetric.php
+++ b/plugins/VisitFrequency/Columns/Metrics/ReturningMetric.php
@@ -5,7 +5,7 @@
  * @link http://piwik.org
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
-namespace Piwik\Plugins\VisitFrequency\Metrics;
+namespace Piwik\Plugins\VisitFrequency\Columns\Metrics;
 
 use Piwik\DataTable\Row;
 use Piwik\Metrics\Formatter;
diff --git a/plugins/VisitFrequency/Reports/Get.php b/plugins/VisitFrequency/Reports/Get.php
index 332b9b6e09..d6f06e9fcf 100644
--- a/plugins/VisitFrequency/Reports/Get.php
+++ b/plugins/VisitFrequency/Reports/Get.php
@@ -9,10 +9,10 @@
 namespace Piwik\Plugins\VisitFrequency\Reports;
 
 use Piwik\Piwik;
-use Piwik\Plugins\CoreHome\Metrics\ActionsPerVisit;
-use Piwik\Plugins\CoreHome\Metrics\AverageTimeOnSite;
-use Piwik\Plugins\CoreHome\Metrics\BounceRate;
-use Piwik\Plugins\VisitFrequency\Metrics\ReturningMetric;
+use Piwik\Plugins\CoreHome\Columns\Metrics\ActionsPerVisit;
+use Piwik\Plugins\CoreHome\Columns\Metrics\AverageTimeOnSite;
+use Piwik\Plugins\CoreHome\Columns\Metrics\BounceRate;
+use Piwik\Plugins\VisitFrequency\Columns\Metrics\ReturningMetric;
 
 class Get extends \Piwik\Plugin\Report
 {
diff --git a/plugins/VisitorInterest/Reports/GetNumberOfVisitsByVisitCount.php b/plugins/VisitorInterest/Reports/GetNumberOfVisitsByVisitCount.php
index 981c8b3e68..01ab2ac26d 100644
--- a/plugins/VisitorInterest/Reports/GetNumberOfVisitsByVisitCount.php
+++ b/plugins/VisitorInterest/Reports/GetNumberOfVisitsByVisitCount.php
@@ -12,7 +12,7 @@ use Piwik\Metrics;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\VisitorInterest\Columns\VisitsbyVisitNumber;
-use Piwik\Plugins\CoreHome\Metrics\VisitsPercent;
+use Piwik\Plugins\CoreHome\Columns\Metrics\VisitsPercent;
 
 class GetNumberOfVisitsByVisitCount extends Base
 {
diff --git a/plugins/VisitsSummary/Reports/Get.php b/plugins/VisitsSummary/Reports/Get.php
index e2ba265704..f2a087a517 100644
--- a/plugins/VisitsSummary/Reports/Get.php
+++ b/plugins/VisitsSummary/Reports/Get.php
@@ -9,9 +9,9 @@
 namespace Piwik\Plugins\VisitsSummary\Reports;
 
 use Piwik\Piwik;
-use Piwik\Plugins\CoreHome\Metrics\ActionsPerVisit;
-use Piwik\Plugins\CoreHome\Metrics\AverageTimeOnSite;
-use Piwik\Plugins\CoreHome\Metrics\BounceRate;
+use Piwik\Plugins\CoreHome\Columns\Metrics\ActionsPerVisit;
+use Piwik\Plugins\CoreHome\Columns\Metrics\AverageTimeOnSite;
+use Piwik\Plugins\CoreHome\Columns\Metrics\BounceRate;
 
 class Get extends \Piwik\Plugin\Report
 {