diff --git a/framework/base/Formatter.php b/framework/i18n/Formatter.php
similarity index 94%
rename from framework/base/Formatter.php
rename to framework/i18n/Formatter.php
index 14644b9..6c7b596 100644
--- a/framework/base/Formatter.php
+++ b/framework/i18n/Formatter.php
@@ -5,12 +5,15 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace yii\base;
+namespace yii\i18n;
 
 use Yii;
 use DateTime;
 use IntlDateFormatter;
 use NumberFormatter;
+use yii\base\Component;
+use yii\base\InvalidConfigException;
+use yii\base\InvalidParamException;
 use yii\helpers\HtmlPurifier;
 use yii\helpers\Html;
 
diff --git a/tests/unit/framework/base/FormatterTest.php b/tests/unit/framework/i18n/FormatterTest.php
similarity index 98%
rename from tests/unit/framework/base/FormatterTest.php
rename to tests/unit/framework/i18n/FormatterTest.php
index f0933be..519ebba 100644
--- a/tests/unit/framework/base/FormatterTest.php
+++ b/tests/unit/framework/i18n/FormatterTest.php
@@ -5,10 +5,10 @@
  * @license http://www.yiiframework.com/license/
  */
 
-namespace yii\base;
+namespace yii\i18n;
 
 // override information about intl
-use yiiunit\framework\base\FormatterTest;
+use yiiunit\framework\i18n\FormatterTest;
 
 function extension_loaded($name)
 {
@@ -18,15 +18,15 @@ function extension_loaded($name)
     return \extension_loaded($name);
 }
 
-namespace yiiunit\framework\base;
+namespace yiiunit\framework\i18n;
 
-use yii\base\Formatter;
+use yii\i18n\Formatter;
 use yiiunit\TestCase;
 use DateTime;
 use DateInterval;
 
 /**
- * @group base
+ * @group i18n
  */
 class FormatterTest extends TestCase
 {