diff --git a/hbmqtt/messages/__init__.py b/hbmqtt/mqtt/__init__.py
similarity index 100%
rename from hbmqtt/messages/__init__.py
rename to hbmqtt/mqtt/__init__.py
diff --git a/hbmqtt/messages/connack.py b/hbmqtt/mqtt/connack.py
similarity index 94%
rename from hbmqtt/messages/connack.py
rename to hbmqtt/mqtt/connack.py
index e1c1c5e..9072c64 100644
--- a/hbmqtt/messages/connack.py
+++ b/hbmqtt/mqtt/connack.py
@@ -2,7 +2,7 @@
 #
 # See the file license.txt for copying permission.
 import asyncio
-from hbmqtt.messages.packet import MQTTPacket, MQTTFixedHeader, PacketType, MQTTVariableHeader, MQTTPayload
+from hbmqtt.mqtt.packet import MQTTPacket, MQTTFixedHeader, PacketType, MQTTVariableHeader, MQTTPayload
 from hbmqtt.codecs import int_to_bytes, read_or_raise
 from hbmqtt.errors import HBMQTTException
 from enum import Enum
diff --git a/hbmqtt/messages/connect.py b/hbmqtt/mqtt/connect.py
similarity index 98%
rename from hbmqtt/messages/connect.py
rename to hbmqtt/mqtt/connect.py
index c9cc1da..67e38aa 100644
--- a/hbmqtt/messages/connect.py
+++ b/hbmqtt/mqtt/connect.py
@@ -2,7 +2,7 @@
 #
 # See the file license.txt for copying permission.
 import asyncio
-from hbmqtt.messages.packet import MQTTPacket, MQTTFixedHeader, PacketType, MQTTVariableHeader, MQTTPayload
+from hbmqtt.mqtt.packet import MQTTPacket, MQTTFixedHeader, PacketType, MQTTVariableHeader, MQTTPayload
 from hbmqtt.codecs import *
 from hbmqtt.errors import MQTTException, CodecException, HBMQTTException
 from hbmqtt.session import Session
diff --git a/hbmqtt/messages/packet.py b/hbmqtt/mqtt/packet.py
similarity index 100%
rename from hbmqtt/messages/packet.py
rename to hbmqtt/mqtt/packet.py
diff --git a/tests/messages/__init__.py b/tests/mqtt/__init__.py
similarity index 100%
rename from tests/messages/__init__.py
rename to tests/mqtt/__init__.py
diff --git a/tests/messages/test_packet.py b/tests/mqtt/test_packet.py
similarity index 96%
rename from tests/messages/test_packet.py
rename to tests/mqtt/test_packet.py
index f17467a..4972359 100644
--- a/tests/messages/test_packet.py
+++ b/tests/mqtt/test_packet.py
@@ -4,7 +4,7 @@
 import unittest
 import asyncio
 
-from hbmqtt.messages.packet import PacketType, MQTTPacket, MQTTFixedHeader
+from hbmqtt.mqtt.packet import PacketType, MQTTPacket, MQTTFixedHeader
 from hbmqtt.errors import MQTTException