diff --git a/core/Segment.php b/core/Segment.php
index 420946794da028e8890c7906058a82399dd74d75..d990ed16ffd21490eadeadddc5664550f5d206c4 100644
--- a/core/Segment.php
+++ b/core/Segment.php
@@ -10,6 +10,7 @@ namespace Piwik;
 
 use Exception;
 use Piwik\Plugins\API\API;
+use Piwik\Segment\SegmentExpression;
 
 /**
  * Limits the set of visits Piwik uses when aggregating analytics data.
diff --git a/core/SegmentExpression.php b/core/Segment/SegmentExpression.php
similarity index 99%
rename from core/SegmentExpression.php
rename to core/Segment/SegmentExpression.php
index cbd2a3eb9e1ff2e8acdf8a7e24c49380e91b5204..e32bbe87232a4e0b551f196d523d4f16281b048d 100644
--- a/core/SegmentExpression.php
+++ b/core/Segment/SegmentExpression.php
@@ -7,7 +7,7 @@
  *
  */
 
-namespace Piwik;
+namespace Piwik\Segment;
 
 use Exception;
 
diff --git a/core/Tracker/TableLogAction.php b/core/Tracker/TableLogAction.php
index 709936f2a5ecfb5475fac128d9f6174477ee6d40..fe620035d7207bf3e4a9ce02554d913b4bb00c24 100644
--- a/core/Tracker/TableLogAction.php
+++ b/core/Tracker/TableLogAction.php
@@ -10,7 +10,7 @@
 namespace Piwik\Tracker;
 
 use Piwik\Common;
-use Piwik\SegmentExpression;
+use Piwik\Segment\SegmentExpression;
 use Piwik\Tracker;
 
 /**
diff --git a/plugins/API/API.php b/plugins/API/API.php
index f9f60dd26169693b8fc689e36616f7cc5ba1afa6..f7aa20d08b02289cd12f4cb450a6e6f40d88fef3 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -23,7 +23,7 @@ use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Plugin\Dimension\VisitDimension;
 use Piwik\Plugins\CoreAdminHome\CustomLogo;
-use Piwik\SegmentExpression;
+use Piwik\Segment\SegmentExpression;
 use Piwik\Translate;
 use Piwik\Version;
 
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index 32abffdc06e690d5b98c1ec05b1a1902dfa85c97..44a39fdcf52a03f28acc42a1f19e23fc470e48ea 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -24,7 +24,7 @@ use Piwik\Plugins\Actions\Actions;
 use Piwik\Plugins\Actions\ArchivingHelper;
 use Piwik\RankingQuery;
 use Piwik\Segment;
-use Piwik\SegmentExpression;
+use Piwik\Segment\SegmentExpression;
 use Piwik\Site;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\PageUrl;
diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php
index 97a98f27f80e460a602f77c21601827c50bfa179..a6f99714800f5e416ada5e6e288d3770595669a5 100644
--- a/plugins/VisitFrequency/API.php
+++ b/plugins/VisitFrequency/API.php
@@ -13,7 +13,7 @@ use Piwik\Archive;
 use Piwik\DataTable;
 use Piwik\Piwik;
 use Piwik\Plugins\VisitsSummary\API as APIVisitsSummary;
-use Piwik\SegmentExpression;
+use Piwik\Segment\SegmentExpression;
 
 /**
  * VisitFrequency API lets you access a list of metrics related to Returning Visitors.
diff --git a/tests/PHPUnit/Unit/SegmentExpressionTest.php b/tests/PHPUnit/Unit/Segment/SegmentExpressionTest.php
similarity index 99%
rename from tests/PHPUnit/Unit/SegmentExpressionTest.php
rename to tests/PHPUnit/Unit/Segment/SegmentExpressionTest.php
index aadecc8f0eae4523911c4b6395d0e19fb0e527f0..ede256707b5ae472858cc15a64f3291899161700 100644
--- a/tests/PHPUnit/Unit/SegmentExpressionTest.php
+++ b/tests/PHPUnit/Unit/Segment/SegmentExpressionTest.php
@@ -8,7 +8,7 @@
 
 namespace Piwik\Tests\Unit;
 
-use Piwik\SegmentExpression;
+use Piwik\Segment\SegmentExpression;
 
 class SegmentExpressionTest extends \PHPUnit_Framework_TestCase
 {