diff --git a/framework/yii/data/ActiveDataProvider.php b/framework/yii/data/ActiveDataProvider.php
index 0943be47d1..89a7cf6d75 100644
--- a/framework/yii/data/ActiveDataProvider.php
+++ b/framework/yii/data/ActiveDataProvider.php
@@ -8,7 +8,7 @@
 namespace yii\data;
 
 use Yii;
-use yii\ar\ActiveQueryInterface;
+use yii\db\ActiveQueryInterface;
 use yii\base\InvalidConfigException;
 use yii\base\Model;
 use yii\db\Connection;
diff --git a/framework/yii/db/ActiveQuery.php b/framework/yii/db/ActiveQuery.php
index 3995b1bd74..4d21fbea82 100644
--- a/framework/yii/db/ActiveQuery.php
+++ b/framework/yii/db/ActiveQuery.php
@@ -7,8 +7,6 @@
  */
 
 namespace yii\db;
-use yii\ar\ActiveQueryInterface;
-use yii\ar\ActiveQueryTrait;
 
 /**
  * ActiveQuery represents a DB query associated with an Active Record class.
diff --git a/framework/yii/ar/ActiveQueryInterface.php b/framework/yii/db/ActiveQueryInterface.php
similarity index 98%
rename from framework/yii/ar/ActiveQueryInterface.php
rename to framework/yii/db/ActiveQueryInterface.php
index 7a1efa1f85..a2e132f679 100644
--- a/framework/yii/ar/ActiveQueryInterface.php
+++ b/framework/yii/db/ActiveQueryInterface.php
@@ -5,8 +5,7 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace yii\ar;
-use yii\db\QueryInterface;
+namespace yii\db;
 
 /**
  * ActiveQueryInterface defines the common interface to be implemented by active record query classes.
diff --git a/framework/yii/ar/ActiveQueryTrait.php b/framework/yii/db/ActiveQueryTrait.php
similarity index 99%
rename from framework/yii/ar/ActiveQueryTrait.php
rename to framework/yii/db/ActiveQueryTrait.php
index 98e7870094..51135d8792 100644
--- a/framework/yii/ar/ActiveQueryTrait.php
+++ b/framework/yii/db/ActiveQueryTrait.php
@@ -5,9 +5,7 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace yii\ar;
-
-use yii\db\ActiveRecord;
+namespace yii\db;
 
 /**
  * ActiveQueryTrait implements the common methods and properties for active record query classes.
diff --git a/framework/yii/db/ActiveRecord.php b/framework/yii/db/ActiveRecord.php
index 852d6f51e6..9edc824b5b 100644
--- a/framework/yii/db/ActiveRecord.php
+++ b/framework/yii/db/ActiveRecord.php
@@ -8,7 +8,6 @@
 
 namespace yii\db;
 
-use yii\ar\ActiveRelationInterface;
 use yii\base\InvalidConfigException;
 use yii\base\Model;
 use yii\base\InvalidParamException;
diff --git a/framework/yii/db/ActiveRelation.php b/framework/yii/db/ActiveRelation.php
index 7bc449a3cd..ea9b87aed9 100644
--- a/framework/yii/db/ActiveRelation.php
+++ b/framework/yii/db/ActiveRelation.php
@@ -7,8 +7,6 @@
  */
 
 namespace yii\db;
-use yii\ar\ActiveRelationInterface;
-use yii\ar\ActiveRelationTrait;
 
 /**
  * ActiveRelation represents a relation between two Active Record classes.
diff --git a/framework/yii/ar/ActiveRelationInterface.php b/framework/yii/db/ActiveRelationInterface.php
similarity index 98%
rename from framework/yii/ar/ActiveRelationInterface.php
rename to framework/yii/db/ActiveRelationInterface.php
index 706d3948a1..84e0648161 100644
--- a/framework/yii/ar/ActiveRelationInterface.php
+++ b/framework/yii/db/ActiveRelationInterface.php
@@ -5,7 +5,7 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace yii\ar;
+namespace yii\db;
 
 /**
  * ActiveRelationInterface defines the common interface to be implemented by active record relation classes.
diff --git a/framework/yii/ar/ActiveRelationTrait.php b/framework/yii/db/ActiveRelationTrait.php
similarity index 99%
rename from framework/yii/ar/ActiveRelationTrait.php
rename to framework/yii/db/ActiveRelationTrait.php
index d87b22d11d..27963d0f46 100644
--- a/framework/yii/ar/ActiveRelationTrait.php
+++ b/framework/yii/db/ActiveRelationTrait.php
@@ -5,10 +5,9 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace yii\ar;
+namespace yii\db;
 
 use yii\base\InvalidConfigException;
-use yii\db\ActiveRecord;
 
 /**
  * ActiveRelationTrait implements the common methods and properties for active record relation classes.