Move all Metrics to Columns folder.

3 files changed, 13 insertions, 13 deletions

diff --git a/core/DataTable/Filter/AddColumnsProcessedMetrics.php b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
index e95c351f4e..a3a9bd9776 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetrics.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
@@ -12,10 +12,10 @@ use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable\Row;
 use Piwik\DataTable;
 use Piwik\Plugin\Metric;
-use Piwik\Plugins\CoreHome\Metrics\ActionsPerVisit;
-use Piwik\Plugins\CoreHome\Metrics\AverageTimeOnSite;
-use Piwik\Plugins\CoreHome\Metrics\BounceRate;
-use Piwik\Plugins\CoreHome\Metrics\ConversionRate;
+use Piwik\Plugins\CoreHome\Columns\Metrics\ActionsPerVisit;
+use Piwik\Plugins\CoreHome\Columns\Metrics\AverageTimeOnSite;
+use Piwik\Plugins\CoreHome\Columns\Metrics\BounceRate;
+use Piwik\Plugins\CoreHome\Columns\Metrics\ConversionRate;
 
 /**
  * Adds processed metrics columns to a {@link DataTable} using metrics that already exist.
diff --git a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
index 51d7698bd2..16fc2db1bf 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
@@ -12,13 +12,13 @@ use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Piwik;
 use Piwik\Plugin\Metric;
-use Piwik\Plugins\Goals\Metrics\GoalSpecific\AverageOrderRevenue;
-use Piwik\Plugins\Goals\Metrics\GoalSpecific\ConversionRate;
-use Piwik\Plugins\Goals\Metrics\GoalSpecific\Conversions;
-use Piwik\Plugins\Goals\Metrics\GoalSpecific\ItemsCount;
-use Piwik\Plugins\Goals\Metrics\GoalSpecific\Revenue;
-use Piwik\Plugins\Goals\Metrics\GoalSpecific\RevenuePerVisit as GoalSpecificRevenuePerVisit;
-use Piwik\Plugins\Goals\Metrics\RevenuePerVisit;
+use Piwik\Plugins\Goals\Columns\Metrics\GoalSpecific\AverageOrderRevenue;
+use Piwik\Plugins\Goals\Columns\Metrics\GoalSpecific\ConversionRate;
+use Piwik\Plugins\Goals\Columns\Metrics\GoalSpecific\Conversions;
+use Piwik\Plugins\Goals\Columns\Metrics\GoalSpecific\ItemsCount;
+use Piwik\Plugins\Goals\Columns\Metrics\GoalSpecific\Revenue;
+use Piwik\Plugins\Goals\Columns\Metrics\GoalSpecific\RevenuePerVisit as GoalSpecificRevenuePerVisit;
+use Piwik\Plugins\Goals\Columns\Metrics\RevenuePerVisit;
 
 /**
  * Adds goal related metrics to a {@link DataTable} using metrics that already exist.
diff --git a/core/DataTable/Filter/CalculateEvolutionFilter.php b/core/DataTable/Filter/CalculateEvolutionFilter.php
index acde0643c4..719d4fa777 100755
--- a/core/DataTable/Filter/CalculateEvolutionFilter.php
+++ b/core/DataTable/Filter/CalculateEvolutionFilter.php
@@ -10,7 +10,7 @@ namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\Plugins\CoreHome\Metrics\EvolutionMetric;
+use Piwik\Plugins\CoreHome\Columns\Metrics\EvolutionMetric;
 
 /**
  * A {@link DataTable} filter that calculates the evolution of a metric and adds
@@ -30,7 +30,7 @@ use Piwik\Plugins\CoreHome\Metrics\EvolutionMetric;
 class CalculateEvolutionFilter extends ColumnCallbackAddColumnPercentage
 {
     /**
-     * @var EvolutionMetric
+     * @var \Piwik\Plugins\CoreHome\Columns\Metrics\EvolutionMetric
      */
     protected $evolutionMetric;