diff --git a/composer.json b/composer.json
index 6d3bb86c..160e8c6d 100644
--- a/composer.json
+++ b/composer.json
@@ -36,11 +36,11 @@
     "psr-4": {
       "Kiri\\": "core/",
       "Http\\": "http-helper/",
-      "Server\\": "server/",
-      "Console\\": "console/",
-      "Gii\\": "gii/",
-      "Kafka\\": "kafka/",
-      "Annotation\\": "annotation/"
+      "Server\\": "http-server/",
+      "Console\\": "kiri-console/",
+      "Gii\\": "kiri-gii/",
+      "Kafka\\": "kiri-kafka/",
+      "Annotation\\": "note/"
     },
     "files": [
       "error.php",
diff --git a/Server/Abstracts/CustomProcess.php b/http-server/Abstracts/CustomProcess.php
similarity index 100%
rename from Server/Abstracts/CustomProcess.php
rename to http-server/Abstracts/CustomProcess.php
diff --git a/Server/Abstracts/EventDispatchHelper.php b/http-server/Abstracts/EventDispatchHelper.php
similarity index 100%
rename from Server/Abstracts/EventDispatchHelper.php
rename to http-server/Abstracts/EventDispatchHelper.php
diff --git a/Server/Abstracts/Http.php b/http-server/Abstracts/Http.php
similarity index 100%
rename from Server/Abstracts/Http.php
rename to http-server/Abstracts/Http.php
diff --git a/Server/Abstracts/PageNotFoundException.php b/http-server/Abstracts/PageNotFoundException.php
similarity index 100%
rename from Server/Abstracts/PageNotFoundException.php
rename to http-server/Abstracts/PageNotFoundException.php
diff --git a/Server/Abstracts/ResponseHelper.php b/http-server/Abstracts/ResponseHelper.php
similarity index 100%
rename from Server/Abstracts/ResponseHelper.php
rename to http-server/Abstracts/ResponseHelper.php
diff --git a/Server/Abstracts/Server.php b/http-server/Abstracts/Server.php
similarity index 100%
rename from Server/Abstracts/Server.php
rename to http-server/Abstracts/Server.php
diff --git a/Server/Abstracts/Tcp.php b/http-server/Abstracts/Tcp.php
similarity index 100%
rename from Server/Abstracts/Tcp.php
rename to http-server/Abstracts/Tcp.php
diff --git a/Server/Abstracts/Udp.php b/http-server/Abstracts/Udp.php
similarity index 100%
rename from Server/Abstracts/Udp.php
rename to http-server/Abstracts/Udp.php
diff --git a/Server/Abstracts/Websocket.php b/http-server/Abstracts/Websocket.php
similarity index 100%
rename from Server/Abstracts/Websocket.php
rename to http-server/Abstracts/Websocket.php
diff --git a/Server/ApplicationStore.php b/http-server/ApplicationStore.php
similarity index 100%
rename from Server/ApplicationStore.php
rename to http-server/ApplicationStore.php
diff --git a/Server/Constant.php b/http-server/Constant.php
similarity index 100%
rename from Server/Constant.php
rename to http-server/Constant.php
diff --git a/Server/Constrict/DownloadEmitter.php b/http-server/Constrict/DownloadEmitter.php
similarity index 100%
rename from Server/Constrict/DownloadEmitter.php
rename to http-server/Constrict/DownloadEmitter.php
diff --git a/Server/Constrict/Emitter.php b/http-server/Constrict/Emitter.php
similarity index 100%
rename from Server/Constrict/Emitter.php
rename to http-server/Constrict/Emitter.php
diff --git a/Server/Constrict/Request.php b/http-server/Constrict/Request.php
similarity index 100%
rename from Server/Constrict/Request.php
rename to http-server/Constrict/Request.php
diff --git a/Server/Constrict/Response.php b/http-server/Constrict/Response.php
similarity index 100%
rename from Server/Constrict/Response.php
rename to http-server/Constrict/Response.php
diff --git a/Server/Constrict/ResponseEmitter.php b/http-server/Constrict/ResponseEmitter.php
similarity index 100%
rename from Server/Constrict/ResponseEmitter.php
rename to http-server/Constrict/ResponseEmitter.php
diff --git a/Server/Constrict/TcpEmitter.php b/http-server/Constrict/TcpEmitter.php
similarity index 100%
rename from Server/Constrict/TcpEmitter.php
rename to http-server/Constrict/TcpEmitter.php
diff --git a/Server/Constrict/UdpEmitter.php b/http-server/Constrict/UdpEmitter.php
similarity index 100%
rename from Server/Constrict/UdpEmitter.php
rename to http-server/Constrict/UdpEmitter.php
diff --git a/Server/Constrict/WebSocketEmitter.php b/http-server/Constrict/WebSocketEmitter.php
similarity index 100%
rename from Server/Constrict/WebSocketEmitter.php
rename to http-server/Constrict/WebSocketEmitter.php
diff --git a/Server/Events/OnAfterCommandExecute.php b/http-server/Events/OnAfterCommandExecute.php
similarity index 100%
rename from Server/Events/OnAfterCommandExecute.php
rename to http-server/Events/OnAfterCommandExecute.php
diff --git a/Server/Events/OnAfterReload.php b/http-server/Events/OnAfterReload.php
similarity index 100%
rename from Server/Events/OnAfterReload.php
rename to http-server/Events/OnAfterReload.php
diff --git a/Server/Events/OnAfterRequest.php b/http-server/Events/OnAfterRequest.php
similarity index 100%
rename from Server/Events/OnAfterRequest.php
rename to http-server/Events/OnAfterRequest.php
diff --git a/Server/Events/OnAfterWorkerStart.php b/http-server/Events/OnAfterWorkerStart.php
similarity index 100%
rename from Server/Events/OnAfterWorkerStart.php
rename to http-server/Events/OnAfterWorkerStart.php
diff --git a/Server/Events/OnBeforeCommandExecute.php b/http-server/Events/OnBeforeCommandExecute.php
similarity index 100%
rename from Server/Events/OnBeforeCommandExecute.php
rename to http-server/Events/OnBeforeCommandExecute.php
diff --git a/Server/Events/OnBeforeReload.php b/http-server/Events/OnBeforeReload.php
similarity index 100%
rename from Server/Events/OnBeforeReload.php
rename to http-server/Events/OnBeforeReload.php
diff --git a/Server/Events/OnBeforeRequest.php b/http-server/Events/OnBeforeRequest.php
similarity index 100%
rename from Server/Events/OnBeforeRequest.php
rename to http-server/Events/OnBeforeRequest.php
diff --git a/Server/Events/OnManagerStart.php b/http-server/Events/OnManagerStart.php
similarity index 100%
rename from Server/Events/OnManagerStart.php
rename to http-server/Events/OnManagerStart.php
diff --git a/Server/Events/OnManagerStop.php b/http-server/Events/OnManagerStop.php
similarity index 100%
rename from Server/Events/OnManagerStop.php
rename to http-server/Events/OnManagerStop.php
diff --git a/Server/Events/OnShutdown.php b/http-server/Events/OnShutdown.php
similarity index 100%
rename from Server/Events/OnShutdown.php
rename to http-server/Events/OnShutdown.php
diff --git a/Server/Events/OnStart.php b/http-server/Events/OnStart.php
similarity index 100%
rename from Server/Events/OnStart.php
rename to http-server/Events/OnStart.php
diff --git a/Server/Events/OnWorkerError.php b/http-server/Events/OnWorkerError.php
similarity index 100%
rename from Server/Events/OnWorkerError.php
rename to http-server/Events/OnWorkerError.php
diff --git a/Server/Events/OnWorkerExit.php b/http-server/Events/OnWorkerExit.php
similarity index 100%
rename from Server/Events/OnWorkerExit.php
rename to http-server/Events/OnWorkerExit.php
diff --git a/Server/Events/OnWorkerStart.php b/http-server/Events/OnWorkerStart.php
similarity index 100%
rename from Server/Events/OnWorkerStart.php
rename to http-server/Events/OnWorkerStart.php
diff --git a/Server/Events/OnWorkerStop.php b/http-server/Events/OnWorkerStop.php
similarity index 100%
rename from Server/Events/OnWorkerStop.php
rename to http-server/Events/OnWorkerStop.php
diff --git a/Server/ExceptionHandlerDispatcher.php b/http-server/ExceptionHandlerDispatcher.php
similarity index 100%
rename from Server/ExceptionHandlerDispatcher.php
rename to http-server/ExceptionHandlerDispatcher.php
diff --git a/Server/ExceptionHandlerInterface.php b/http-server/ExceptionHandlerInterface.php
similarity index 100%
rename from Server/ExceptionHandlerInterface.php
rename to http-server/ExceptionHandlerInterface.php
diff --git a/Server/Manager/OnPipeMessage.php b/http-server/Manager/OnPipeMessage.php
similarity index 100%
rename from Server/Manager/OnPipeMessage.php
rename to http-server/Manager/OnPipeMessage.php
diff --git a/Server/Manager/OnServer.php b/http-server/Manager/OnServer.php
similarity index 100%
rename from Server/Manager/OnServer.php
rename to http-server/Manager/OnServer.php
diff --git a/Server/Manager/OnServerManager.php b/http-server/Manager/OnServerManager.php
similarity index 100%
rename from Server/Manager/OnServerManager.php
rename to http-server/Manager/OnServerManager.php
diff --git a/Server/Manager/OnServerReload.php b/http-server/Manager/OnServerReload.php
similarity index 100%
rename from Server/Manager/OnServerReload.php
rename to http-server/Manager/OnServerReload.php
diff --git a/Server/Protocol/Protocol.php b/http-server/Protocol/Protocol.php
similarity index 100%
rename from Server/Protocol/Protocol.php
rename to http-server/Protocol/Protocol.php
diff --git a/Server/Protocol/WebSocket.php b/http-server/Protocol/WebSocket.php
similarity index 100%
rename from Server/Protocol/WebSocket.php
rename to http-server/Protocol/WebSocket.php
diff --git a/Server/RequestInterface.php b/http-server/RequestInterface.php
similarity index 100%
rename from Server/RequestInterface.php
rename to http-server/RequestInterface.php
diff --git a/Server/ResponseInterface.php b/http-server/ResponseInterface.php
similarity index 100%
rename from Server/ResponseInterface.php
rename to http-server/ResponseInterface.php
diff --git a/Server/SInterface/CustomProcess.php b/http-server/SInterface/CustomProcess.php
similarity index 100%
rename from Server/SInterface/CustomProcess.php
rename to http-server/SInterface/CustomProcess.php
diff --git a/Server/SInterface/OnClose.php b/http-server/SInterface/OnClose.php
similarity index 100%
rename from Server/SInterface/OnClose.php
rename to http-server/SInterface/OnClose.php
diff --git a/Server/SInterface/OnConnect.php b/http-server/SInterface/OnConnect.php
similarity index 100%
rename from Server/SInterface/OnConnect.php
rename to http-server/SInterface/OnConnect.php
diff --git a/Server/SInterface/OnHandshake.php b/http-server/SInterface/OnHandshake.php
similarity index 100%
rename from Server/SInterface/OnHandshake.php
rename to http-server/SInterface/OnHandshake.php
diff --git a/Server/SInterface/OnMessage.php b/http-server/SInterface/OnMessage.php
similarity index 100%
rename from Server/SInterface/OnMessage.php
rename to http-server/SInterface/OnMessage.php
diff --git a/Server/SInterface/OnPacket.php b/http-server/SInterface/OnPacket.php
similarity index 100%
rename from Server/SInterface/OnPacket.php
rename to http-server/SInterface/OnPacket.php
diff --git a/Server/SInterface/OnReceive.php b/http-server/SInterface/OnReceive.php
similarity index 100%
rename from Server/SInterface/OnReceive.php
rename to http-server/SInterface/OnReceive.php
diff --git a/Server/SInterface/OnRequest.php b/http-server/SInterface/OnRequest.php
similarity index 100%
rename from Server/SInterface/OnRequest.php
rename to http-server/SInterface/OnRequest.php
diff --git a/Server/SInterface/PipeMessage.php b/http-server/SInterface/PipeMessage.php
similarity index 100%
rename from Server/SInterface/PipeMessage.php
rename to http-server/SInterface/PipeMessage.php
diff --git a/Server/SInterface/TaskExecute.php b/http-server/SInterface/TaskExecute.php
similarity index 100%
rename from Server/SInterface/TaskExecute.php
rename to http-server/SInterface/TaskExecute.php
diff --git a/Server/ServerManager.php b/http-server/ServerManager.php
similarity index 100%
rename from Server/ServerManager.php
rename to http-server/ServerManager.php
diff --git a/Server/Service/Http.php b/http-server/Service/Http.php
similarity index 100%
rename from Server/Service/Http.php
rename to http-server/Service/Http.php
diff --git a/Server/Service/Tcp.php b/http-server/Service/Tcp.php
similarity index 100%
rename from Server/Service/Tcp.php
rename to http-server/Service/Tcp.php
diff --git a/Server/Service/Udp.php b/http-server/Service/Udp.php
similarity index 100%
rename from Server/Service/Udp.php
rename to http-server/Service/Udp.php
diff --git a/Server/Service/WebSocket.php b/http-server/Service/WebSocket.php
similarity index 100%
rename from Server/Service/WebSocket.php
rename to http-server/Service/WebSocket.php
diff --git a/Server/SwooleServerInterface.php b/http-server/SwooleServerInterface.php
similarity index 100%
rename from Server/SwooleServerInterface.php
rename to http-server/SwooleServerInterface.php
diff --git a/Server/Task/OnServerTask.php b/http-server/Task/OnServerTask.php
similarity index 100%
rename from Server/Task/OnServerTask.php
rename to http-server/Task/OnServerTask.php
diff --git a/Server/Worker/OnServerWorker.php b/http-server/Worker/OnServerWorker.php
similarity index 100%
rename from Server/Worker/OnServerWorker.php
rename to http-server/Worker/OnServerWorker.php
diff --git a/Console/AbstractConsole.php b/kiri-console/AbstractConsole.php
similarity index 100%
rename from Console/AbstractConsole.php
rename to kiri-console/AbstractConsole.php
diff --git a/Console/Command.php b/kiri-console/Command.php
similarity index 100%
rename from Console/Command.php
rename to kiri-console/Command.php
diff --git a/Console/CommandInterface.php b/kiri-console/CommandInterface.php
similarity index 100%
rename from Console/CommandInterface.php
rename to kiri-console/CommandInterface.php
diff --git a/Console/Console.php b/kiri-console/Console.php
similarity index 100%
rename from Console/Console.php
rename to kiri-console/Console.php
diff --git a/Console/ConsoleProviders.php b/kiri-console/ConsoleProviders.php
similarity index 100%
rename from Console/ConsoleProviders.php
rename to kiri-console/ConsoleProviders.php
diff --git a/Console/DefaultCommand.php b/kiri-console/DefaultCommand.php
similarity index 100%
rename from Console/DefaultCommand.php
rename to kiri-console/DefaultCommand.php
diff --git a/Console/ICommand.php b/kiri-console/ICommand.php
similarity index 100%
rename from Console/ICommand.php
rename to kiri-console/ICommand.php
diff --git a/Gii/Command.php b/kiri-gii/Command.php
similarity index 100%
rename from Gii/Command.php
rename to kiri-gii/Command.php
diff --git a/Gii/Gii.php b/kiri-gii/Gii.php
similarity index 100%
rename from Gii/Gii.php
rename to kiri-gii/Gii.php
diff --git a/Gii/GiiBase.php b/kiri-gii/GiiBase.php
similarity index 100%
rename from Gii/GiiBase.php
rename to kiri-gii/GiiBase.php
diff --git a/Gii/GiiController.php b/kiri-gii/GiiController.php
similarity index 100%
rename from Gii/GiiController.php
rename to kiri-gii/GiiController.php
diff --git a/Gii/GiiInterceptor.php b/kiri-gii/GiiInterceptor.php
similarity index 100%
rename from Gii/GiiInterceptor.php
rename to kiri-gii/GiiInterceptor.php
diff --git a/Gii/GiiLimits.php b/kiri-gii/GiiLimits.php
similarity index 100%
rename from Gii/GiiLimits.php
rename to kiri-gii/GiiLimits.php
diff --git a/Gii/GiiMiddleware.php b/kiri-gii/GiiMiddleware.php
similarity index 100%
rename from Gii/GiiMiddleware.php
rename to kiri-gii/GiiMiddleware.php
diff --git a/Gii/GiiModel.php b/kiri-gii/GiiModel.php
similarity index 100%
rename from Gii/GiiModel.php
rename to kiri-gii/GiiModel.php
diff --git a/Gii/GiiProviders.php b/kiri-gii/GiiProviders.php
similarity index 100%
rename from Gii/GiiProviders.php
rename to kiri-gii/GiiProviders.php
diff --git a/Gii/GiiRpcClient.php b/kiri-gii/GiiRpcClient.php
similarity index 100%
rename from Gii/GiiRpcClient.php
rename to kiri-gii/GiiRpcClient.php
diff --git a/Gii/GiiRpcService.php b/kiri-gii/GiiRpcService.php
similarity index 100%
rename from Gii/GiiRpcService.php
rename to kiri-gii/GiiRpcService.php
diff --git a/Gii/GiiTask.php b/kiri-gii/GiiTask.php
similarity index 100%
rename from Gii/GiiTask.php
rename to kiri-gii/GiiTask.php
diff --git a/Kafka/Annotation/Kafka.php b/kiri-kafka/Annotation/Kafka.php
similarity index 100%
rename from Kafka/Annotation/Kafka.php
rename to kiri-kafka/Annotation/Kafka.php
diff --git a/Kafka/Configuration.php b/kiri-kafka/Configuration.php
similarity index 100%
rename from Kafka/Configuration.php
rename to kiri-kafka/Configuration.php
diff --git a/Kafka/Constant.php b/kiri-kafka/Constant.php
similarity index 100%
rename from Kafka/Constant.php
rename to kiri-kafka/Constant.php
diff --git a/Kafka/ConsumerInterface.php b/kiri-kafka/ConsumerInterface.php
similarity index 100%
rename from Kafka/ConsumerInterface.php
rename to kiri-kafka/ConsumerInterface.php
diff --git a/Kafka/Kafka.php b/kiri-kafka/Kafka.php
similarity index 100%
rename from Kafka/Kafka.php
rename to kiri-kafka/Kafka.php
diff --git a/Kafka/KafkaClient.php b/kiri-kafka/KafkaClient.php
similarity index 100%
rename from Kafka/KafkaClient.php
rename to kiri-kafka/KafkaClient.php
diff --git a/Kafka/KafkaImports.php b/kiri-kafka/KafkaImports.php
similarity index 100%
rename from Kafka/KafkaImports.php
rename to kiri-kafka/KafkaImports.php
diff --git a/Kafka/KafkaProvider.php b/kiri-kafka/KafkaProvider.php
similarity index 100%
rename from Kafka/KafkaProvider.php
rename to kiri-kafka/KafkaProvider.php
diff --git a/Kafka/Logger.php b/kiri-kafka/Logger.php
similarity index 100%
rename from Kafka/Logger.php
rename to kiri-kafka/Logger.php
diff --git a/Kafka/Struct.php b/kiri-kafka/Struct.php
similarity index 100%
rename from Kafka/Struct.php
rename to kiri-kafka/Struct.php
diff --git a/Kafka/TopicConfig.php b/kiri-kafka/TopicConfig.php
similarity index 100%
rename from Kafka/TopicConfig.php
rename to kiri-kafka/TopicConfig.php
diff --git a/Kafka/config.php b/kiri-kafka/config.php
similarity index 100%
rename from Kafka/config.php
rename to kiri-kafka/config.php
diff --git a/Annotation/Annotation.php b/note/Annotation.php
similarity index 99%
rename from Annotation/Annotation.php
rename to note/Annotation.php
index de76411e..4f53cd0e 100644
--- a/Annotation/Annotation.php
+++ b/note/Annotation.php
@@ -19,7 +19,6 @@ class Annotation extends Component
 
 	private Loader $_loader;
 
-
 	private array $_model_sets = [];
 	private array $_model_gets = [];
 	private array $_model_relate = [];
diff --git a/Annotation/Aspect.php b/note/Aspect.php
similarity index 100%
rename from Annotation/Aspect.php
rename to note/Aspect.php
diff --git a/Annotation/Asynchronous.php b/note/Asynchronous.php
similarity index 100%
rename from Annotation/Asynchronous.php
rename to note/Asynchronous.php
diff --git a/Annotation/Attribute.php b/note/Attribute.php
similarity index 100%
rename from Annotation/Attribute.php
rename to note/Attribute.php
diff --git a/Annotation/Event.php b/note/Event.php
similarity index 100%
rename from Annotation/Event.php
rename to note/Event.php
diff --git a/Annotation/IAnnotation.php b/note/IAnnotation.php
similarity index 100%
rename from Annotation/IAnnotation.php
rename to note/IAnnotation.php
diff --git a/Annotation/Inject.php b/note/Inject.php
similarity index 100%
rename from Annotation/Inject.php
rename to note/Inject.php
diff --git a/Annotation/Loader.php b/note/Loader.php
similarity index 100%
rename from Annotation/Loader.php
rename to note/Loader.php
diff --git a/Annotation/LocalService.php b/note/LocalService.php
similarity index 100%
rename from Annotation/LocalService.php
rename to note/LocalService.php
diff --git a/Annotation/Porters.php b/note/Porters.php
similarity index 100%
rename from Annotation/Porters.php
rename to note/Porters.php
diff --git a/Annotation/Route/Document.php b/note/Route/Document.php
similarity index 100%
rename from Annotation/Route/Document.php
rename to note/Route/Document.php
diff --git a/Annotation/Route/Filter.php b/note/Route/Filter.php
similarity index 100%
rename from Annotation/Route/Filter.php
rename to note/Route/Filter.php
diff --git a/Annotation/Route/Middleware.php b/note/Route/Middleware.php
similarity index 100%
rename from Annotation/Route/Middleware.php
rename to note/Route/Middleware.php
diff --git a/Annotation/Route/Route.php b/note/Route/Route.php
similarity index 100%
rename from Annotation/Route/Route.php
rename to note/Route/Route.php
diff --git a/Annotation/Route/Socket.php b/note/Route/Socket.php
similarity index 100%
rename from Annotation/Route/Socket.php
rename to note/Route/Socket.php
diff --git a/Annotation/Target.php b/note/Target.php
similarity index 100%
rename from Annotation/Target.php
rename to note/Target.php