diff --git a/http-core/Constrict/Request.php b/http-core/Constrict/Request.php
index 79a3197c..a1c5861b 100644
--- a/http-core/Constrict/Request.php
+++ b/http-core/Constrict/Request.php
@@ -2,7 +2,7 @@
 
 namespace Http\Constrict;
 
-use Server\Context;
+use Kiri\Context;
 use Http\Handler\AuthIdentity;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Kiri;
diff --git a/http-core/Constrict/Response.php b/http-core/Constrict/Response.php
index f4021e4e..21b1ab67 100644
--- a/http-core/Constrict/Response.php
+++ b/http-core/Constrict/Response.php
@@ -4,7 +4,7 @@
 namespace Http\Constrict;
 
 
-use Server\Context;
+use Kiri\Context;
 use Http\Message\ContentType;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
diff --git a/http-core/Server.php b/http-core/Server.php
index ea061d8a..29527773 100644
--- a/http-core/Server.php
+++ b/http-core/Server.php
@@ -11,7 +11,6 @@ use Http\Abstracts\ResponseHelper;
 use Http\Constrict\RequestInterface;
 use Http\Constrict\ResponseEmitter;
 use Http\Constrict\ResponseInterface;
-use Http\Events\OnAfterRequest;
 use Http\Handler\Abstracts\HandlerManager;
 use Http\Handler\Dispatcher;
 use Http\Handler\Handler;
@@ -21,9 +20,8 @@ use Http\Message\Stream;
 use Kiri\Abstracts\Config;
 use Kiri\Di\ContainerInterface;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
 use Psr\Http\Message\ServerRequestInterface;
-use Server\Context;
+use Kiri\Context;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
 
diff --git a/http-server/Abstracts/BaseContext.php b/kiri-engine/Abstracts/BaseContext.php
similarity index 81%
rename from http-server/Abstracts/BaseContext.php
rename to kiri-engine/Abstracts/BaseContext.php
index c2ece6c6..ca21f946 100644
--- a/http-server/Abstracts/BaseContext.php
+++ b/kiri-engine/Abstracts/BaseContext.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Server\Abstracts;
+namespace Kiri\Abstracts;
 
 
 
diff --git a/kiri-engine/Cache/Base/Redis.php b/kiri-engine/Cache/Base/Redis.php
index da8c634a..91364a04 100644
--- a/kiri-engine/Cache/Base/Redis.php
+++ b/kiri-engine/Cache/Base/Redis.php
@@ -7,7 +7,7 @@ use Kiri\Exception\RedisConnectException;
 use Kiri\Kiri;
 use Kiri\Pool\StopHeartbeatCheck;
 use RedisException;
-use Server\Context;
+use Kiri\Context;
 use Swoole\Timer;
 
 
diff --git a/http-server/Context.php b/kiri-engine/Context.php
similarity index 98%
rename from http-server/Context.php
rename to kiri-engine/Context.php
index 3764beab..8860817d 100644
--- a/http-server/Context.php
+++ b/kiri-engine/Context.php
@@ -1,9 +1,9 @@
 <?php
 
 
-namespace Server;
+namespace Kiri;
 
-use Server\Abstracts\BaseContext;
+use Kiri\Abstracts\BaseContext;
 use Swoole\Coroutine;
 
 /**
diff --git a/kiri-engine/Pool/Connection.php b/kiri-engine/Pool/Connection.php
index dcb96b92..df4ee091 100644
--- a/kiri-engine/Pool/Connection.php
+++ b/kiri-engine/Pool/Connection.php
@@ -6,7 +6,7 @@ namespace Kiri\Pool;
 use Closure;
 use Database\Mysql\PDO;
 use Exception;
-use Server\Context;
+use Kiri\Context;
 use Kiri\Abstracts\Component;
 use Kiri\Kiri;
 use Swoole\Error;
diff --git a/kiri-engine/Pool/Pool.php b/kiri-engine/Pool/Pool.php
index 3d2a6c69..f421b27c 100644
--- a/kiri-engine/Pool/Pool.php
+++ b/kiri-engine/Pool/Pool.php
@@ -5,7 +5,7 @@ namespace Kiri\Pool;
 
 
 use Exception;
-use Server\Context;
+use Kiri\Context;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;
diff --git a/kiri-engine/Pool/Redis.php b/kiri-engine/Pool/Redis.php
index d25917c5..061e0e58 100644
--- a/kiri-engine/Pool/Redis.php
+++ b/kiri-engine/Pool/Redis.php
@@ -8,7 +8,7 @@ namespace Kiri\Pool;
 use Annotation\Inject;
 use Closure;
 use Exception;
-use Server\Context;
+use Kiri\Context;
 use Kiri\Abstracts\Component;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;