diff --git a/nonebot/adapters/__init__.py b/nonebot/adapters/__init__.py
index 751cf7d6..0adff3e6 100644
--- a/nonebot/adapters/__init__.py
+++ b/nonebot/adapters/__init__.py
@@ -22,12 +22,12 @@ except ImportError:
 except Exception:
     pass
 
-from nonebot.internal.bot import Bot as Bot
-from nonebot.internal.event import Event as Event
+from nonebot.internal.adapter import Bot as Bot
+from nonebot.internal.adapter import Event as Event
 from nonebot.internal.adapter import Adapter as Adapter
-from nonebot.internal.message import Message as Message
-from nonebot.internal.message import MessageSegment as MessageSegment
-from nonebot.internal.template import MessageTemplate as MessageTemplate
+from nonebot.internal.adapter import Message as Message
+from nonebot.internal.adapter import MessageSegment as MessageSegment
+from nonebot.internal.adapter import MessageTemplate as MessageTemplate
 
 __autodoc__ = {
     "Bot": True,
diff --git a/nonebot/drivers/__init__.py b/nonebot/drivers/__init__.py
index a15be0da..5c6b3ab1 100644
--- a/nonebot/drivers/__init__.py
+++ b/nonebot/drivers/__init__.py
@@ -7,19 +7,19 @@ FrontMatter:
     description: nonebot.drivers 模块
 """
 
-from nonebot.internal.model import URL as URL
+from nonebot.internal.driver import URL as URL
 from nonebot.internal.driver import Driver as Driver
-from nonebot.internal.model import Cookies as Cookies
-from nonebot.internal.model import Request as Request
-from nonebot.internal.model import Response as Response
-from nonebot.internal.model import WebSocket as WebSocket
-from nonebot.internal.model import HTTPVersion as HTTPVersion
+from nonebot.internal.driver import Cookies as Cookies
+from nonebot.internal.driver import Request as Request
+from nonebot.internal.driver import Response as Response
+from nonebot.internal.driver import WebSocket as WebSocket
+from nonebot.internal.driver import HTTPVersion as HTTPVersion
 from nonebot.internal.driver import ForwardMixin as ForwardMixin
 from nonebot.internal.driver import ForwardDriver as ForwardDriver
 from nonebot.internal.driver import ReverseDriver as ReverseDriver
 from nonebot.internal.driver import combine_driver as combine_driver
-from nonebot.internal.model import HTTPServerSetup as HTTPServerSetup
-from nonebot.internal.model import WebSocketServerSetup as WebSocketServerSetup
+from nonebot.internal.driver import HTTPServerSetup as HTTPServerSetup
+from nonebot.internal.driver import WebSocketServerSetup as WebSocketServerSetup
 
 __autodoc__ = {
     "URL": True,
diff --git a/nonebot/drivers/fastapi.py b/nonebot/drivers/fastapi.py
index 6066da38..e714300a 100644
--- a/nonebot/drivers/fastapi.py
+++ b/nonebot/drivers/fastapi.py
@@ -21,8 +21,8 @@ from starlette.websockets import WebSocket, WebSocketState, WebSocketDisconnect
 
 from nonebot.config import Env
 from nonebot.typing import overrides
-from nonebot.internal.model import FileTypes
 from nonebot.exception import WebSocketClosed
+from nonebot.internal.driver import FileTypes
 from nonebot.config import Config as NoneBotConfig
 from nonebot.drivers import Request as BaseRequest
 from nonebot.drivers import WebSocket as BaseWebSocket
diff --git a/nonebot/drivers/quart.py b/nonebot/drivers/quart.py
index 61b5e304..56c940f5 100644
--- a/nonebot/drivers/quart.py
+++ b/nonebot/drivers/quart.py
@@ -24,8 +24,8 @@ from pydantic import BaseSettings
 
 from nonebot.config import Env
 from nonebot.typing import overrides
-from nonebot.internal.model import FileTypes
 from nonebot.exception import WebSocketClosed
+from nonebot.internal.driver import FileTypes
 from nonebot.config import Config as NoneBotConfig
 from nonebot.drivers import Request as BaseRequest
 from nonebot.drivers import WebSocket as BaseWebSocket
diff --git a/nonebot/internal/adapter/__init__.py b/nonebot/internal/adapter/__init__.py
new file mode 100644
index 00000000..fc54a3e0
--- /dev/null
+++ b/nonebot/internal/adapter/__init__.py
@@ -0,0 +1,6 @@
+from .bot import Bot as Bot
+from .event import Event as Event
+from .adapter import Adapter as Adapter
+from .message import Message as Message
+from .message import MessageSegment as MessageSegment
+from .template import MessageTemplate as MessageTemplate
diff --git a/nonebot/internal/adapter.py b/nonebot/internal/adapter/adapter.py
similarity index 98%
rename from nonebot/internal/adapter.py
rename to nonebot/internal/adapter/adapter.py
index e6380a46..9f6c5e65 100644
--- a/nonebot/internal/adapter.py
+++ b/nonebot/internal/adapter/adapter.py
@@ -3,7 +3,7 @@ from contextlib import asynccontextmanager
 from typing import Any, Dict, AsyncGenerator
 
 from nonebot.config import Config
-from nonebot.drivers import (
+from nonebot.internal.driver import (
     Driver,
     Request,
     Response,
diff --git a/nonebot/internal/bot.py b/nonebot/internal/adapter/bot.py
similarity index 100%
rename from nonebot/internal/bot.py
rename to nonebot/internal/adapter/bot.py
diff --git a/nonebot/internal/event.py b/nonebot/internal/adapter/event.py
similarity index 100%
rename from nonebot/internal/event.py
rename to nonebot/internal/adapter/event.py
diff --git a/nonebot/internal/message.py b/nonebot/internal/adapter/message.py
similarity index 100%
rename from nonebot/internal/message.py
rename to nonebot/internal/adapter/message.py
diff --git a/nonebot/internal/template.py b/nonebot/internal/adapter/template.py
similarity index 100%
rename from nonebot/internal/template.py
rename to nonebot/internal/adapter/template.py
diff --git a/nonebot/internal/driver/__init__.py b/nonebot/internal/driver/__init__.py
new file mode 100644
index 00000000..533ecfa7
--- /dev/null
+++ b/nonebot/internal/driver/__init__.py
@@ -0,0 +1,25 @@
+from .model import URL as URL
+from .model import RawURL as RawURL
+from .driver import Driver as Driver
+from .model import Cookies as Cookies
+from .model import Request as Request
+from .model import FileType as FileType
+from .model import Response as Response
+from .model import DataTypes as DataTypes
+from .model import FileTypes as FileTypes
+from .model import WebSocket as WebSocket
+from .model import FilesTypes as FilesTypes
+from .model import QueryTypes as QueryTypes
+from .model import CookieTypes as CookieTypes
+from .model import FileContent as FileContent
+from .model import HTTPVersion as HTTPVersion
+from .model import HeaderTypes as HeaderTypes
+from .model import SimpleQuery as SimpleQuery
+from .model import ContentTypes as ContentTypes
+from .driver import ForwardMixin as ForwardMixin
+from .model import QueryVariable as QueryVariable
+from .driver import ForwardDriver as ForwardDriver
+from .driver import ReverseDriver as ReverseDriver
+from .driver import combine_driver as combine_driver
+from .model import HTTPServerSetup as HTTPServerSetup
+from .model import WebSocketServerSetup as WebSocketServerSetup
diff --git a/nonebot/internal/driver.py b/nonebot/internal/driver/driver.py
similarity index 98%
rename from nonebot/internal/driver.py
rename to nonebot/internal/driver/driver.py
index d4fbc1e5..d48b60d5 100644
--- a/nonebot/internal/driver.py
+++ b/nonebot/internal/driver/driver.py
@@ -8,13 +8,12 @@ from nonebot.utils import escape_tag
 from nonebot.config import Env, Config
 from nonebot.dependencies import Dependent
 from nonebot.typing import T_BotConnectionHook, T_BotDisconnectionHook
+from nonebot.internal.params import BotParam, DependParam, DefaultParam
 
-from .params import BotParam, DependParam, DefaultParam
 from .model import Request, Response, WebSocket, HTTPServerSetup, WebSocketServerSetup
 
 if TYPE_CHECKING:
-    from .bot import Bot
-    from .adapter import Adapter
+    from nonebot.internal.adapter import Bot, Adapter
 
 
 BOT_HOOK_PARAMS = [DependParam, BotParam, DefaultParam]
diff --git a/nonebot/internal/model.py b/nonebot/internal/driver/model.py
similarity index 100%
rename from nonebot/internal/model.py
rename to nonebot/internal/driver/model.py
diff --git a/nonebot/internal/matcher.py b/nonebot/internal/matcher.py
index a839a87f..16ba232f 100644
--- a/nonebot/internal/matcher.py
+++ b/nonebot/internal/matcher.py
@@ -42,12 +42,9 @@ from nonebot.exception import (
     RejectedException,
 )
 
-from .bot import Bot
 from .rule import Rule
-from .event import Event
-from .template import MessageTemplate
 from .permission import USER, Permission
-from .message import Message, MessageSegment
+from .adapter import Bot, Event, Message, MessageSegment, MessageTemplate
 from .params import (
     Depends,
     ArgParam,
diff --git a/nonebot/internal/permission.py b/nonebot/internal/permission.py
index 1f043134..5d43d5b2 100644
--- a/nonebot/internal/permission.py
+++ b/nonebot/internal/permission.py
@@ -2,11 +2,11 @@ import asyncio
 from contextlib import AsyncExitStack
 from typing import Any, Set, Tuple, Union, NoReturn, Optional, Coroutine
 
-from nonebot.adapters import Bot, Event
 from nonebot.dependencies import Dependent
 from nonebot.exception import SkippedException
 from nonebot.typing import T_DependencyCache, T_PermissionChecker
 
+from .adapter import Bot, Event
 from .params import BotParam, EventParam, DependParam, DefaultParam
 
 
diff --git a/nonebot/internal/rule.py b/nonebot/internal/rule.py
index 2bdaf0e7..8d596f39 100644
--- a/nonebot/internal/rule.py
+++ b/nonebot/internal/rule.py
@@ -2,11 +2,11 @@ import asyncio
 from contextlib import AsyncExitStack
 from typing import Set, Union, NoReturn, Optional
 
-from nonebot.adapters import Bot, Event
 from nonebot.dependencies import Dependent
 from nonebot.exception import SkippedException
 from nonebot.typing import T_State, T_RuleChecker, T_DependencyCache
 
+from .adapter import Bot, Event
 from .params import BotParam, EventParam, StateParam, DependParam, DefaultParam