diff --git a/hbmqtt/utils.py b/hbmqtt/codecs/utils.py
similarity index 94%
rename from hbmqtt/utils.py
rename to hbmqtt/codecs/utils.py
index 3262136..f44c645 100644
--- a/hbmqtt/utils.py
+++ b/hbmqtt/codecs/utils.py
@@ -2,7 +2,7 @@
 #
 # See the file license.txt for copying permission.
 import asyncio
-from hbmqtt.streams.errors import NoDataException
+from hbmqtt.codecs.errors import NoDataException
 
 def bytes_to_hex_str(data):
     """
diff --git a/tests/test_utils.py b/tests/codecs/test_utils.py
similarity index 88%
rename from tests/test_utils.py
rename to tests/codecs/test_utils.py
index 4a38929..5b8e0fd 100644
--- a/tests/test_utils.py
+++ b/tests/codecs/test_utils.py
@@ -3,12 +3,13 @@
 # See the file license.txt for copying permission.
 import unittest
 import asyncio
-from hbmqtt.utils import (
+
+from hbmqtt.codecs.utils import (
     bytes_to_hex_str,
     bytes_to_int,
     read_string,
 )
-from hbmqtt.message import MessageType
+
 
 class TestUtils(unittest.TestCase):
     def setUp(self):