Move all Metrics to Columns folder.

10 files changed, 37 insertions, 37 deletions

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
 {