diff --git a/framework/yii/web/Pagination.php b/framework/yii/data/Pagination.php
similarity index 98%
rename from framework/yii/web/Pagination.php
rename to framework/yii/data/Pagination.php
index c4a8106..4e25809 100644
--- a/framework/yii/web/Pagination.php
+++ b/framework/yii/data/Pagination.php
@@ -5,9 +5,10 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace yii\web;
+namespace yii\data;
 
 use Yii;
+use yii\base\Object;
 
 /**
  * Pagination represents information relevant to pagination of data items.
@@ -62,7 +63,7 @@ use Yii;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Pagination extends \yii\base\Object
+class Pagination extends Object
 {
 	/**
 	 * @var string name of the parameter storing the current page index. Defaults to 'page'.
diff --git a/framework/yii/web/Sort.php b/framework/yii/data/Sort.php
similarity index 99%
rename from framework/yii/web/Sort.php
rename to framework/yii/data/Sort.php
index 6014a3e..a46d0ce 100644
--- a/framework/yii/web/Sort.php
+++ b/framework/yii/data/Sort.php
@@ -5,9 +5,10 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace yii\web;
+namespace yii\data;
 
 use Yii;
+use yii\base\Object;
 use yii\helpers\Html;
 
 /**
@@ -68,7 +69,7 @@ use yii\helpers\Html;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Sort extends \yii\base\Object
+class Sort extends Object
 {
 	/**
 	 * Sort ascending
diff --git a/framework/yii/widgets/LinkPager.php b/framework/yii/widgets/LinkPager.php
index 2510579..62d99f6 100644
--- a/framework/yii/widgets/LinkPager.php
+++ b/framework/yii/widgets/LinkPager.php
@@ -11,7 +11,7 @@ use Yii;
 use yii\base\InvalidConfigException;
 use yii\helpers\Html;
 use yii\base\Widget;
-use yii\web\Pagination;
+use yii\data\Pagination;
 
 /**
  * LinkPager displays a list of hyperlinks that lead to different pages of target.
@@ -198,4 +198,4 @@ class LinkPager extends Widget
 		}
 		return array($beginPage, $endPage);
 	}
-}
\ No newline at end of file
+}
diff --git a/framework/yii/widgets/ListPager.php b/framework/yii/widgets/ListPager.php
index 7b16f7d..699126d 100644
--- a/framework/yii/widgets/ListPager.php
+++ b/framework/yii/widgets/ListPager.php
@@ -10,7 +10,7 @@ namespace yii\widgets;
 use yii\base\InvalidConfigException;
 use yii\helpers\Html;
 use yii\base\Widget;
-use yii\web\Pagination;
+use yii\data\Pagination;
 
 /**
  * ListPager displays a drop-down list that contains options leading to different pages.
@@ -92,4 +92,4 @@ class ListPager extends Widget
 		));
 	}
 
-}
\ No newline at end of file
+}