diff --git a/hbmqtt/message.py b/hbmqtt/fixedheader.py
similarity index 93%
rename from hbmqtt/message.py
rename to hbmqtt/fixedheader.py
index 38a53da..56aba82 100644
--- a/hbmqtt/message.py
+++ b/hbmqtt/fixedheader.py
@@ -25,7 +25,7 @@ class MessageType(Enum):
 def get_message_type(byte):
     return MessageType(byte)
 
-class Message:
+class FixedHeader:
     def __init__(self, msg_type, length, dup_flag=False, qos=0, retain_flag=False):
         if isinstance(msg_type, int):
             enum_type = msg_type
@@ -35,4 +35,4 @@ class Message:
         self.remainingLength = length
         self.dupFlag = dup_flag
         self.qos = qos
-        self.retain = retain_flag
\ No newline at end of file
+        self.retain = retain_flag
diff --git a/hbmqtt/streams/base.py b/hbmqtt/streams/fixed_header.py
similarity index 83%
rename from hbmqtt/streams/base.py
rename to hbmqtt/streams/fixed_header.py
index 23a18ff..a39559a 100644
--- a/hbmqtt/streams/base.py
+++ b/hbmqtt/streams/fixed_header.py
@@ -6,19 +6,19 @@ from hbmqtt.utils import (
     bytes_to_hex_str,
     hex_to_int,
 )
-from hbmqtt.message import Message
+from hbmqtt.fixedheader import FixedHeader
 from hbmqtt.streams.errors import FixedHeaderException
 
-class BaseStream:
+class FixedHeaderStream:
     def __init__(self):
         pass
 
     def decode(self, reader):
         b1 = yield from reader.read(1)
-        msg_type = BaseStream.get_message_type(b1)
-        (dup_flag, qos, retain_flag) = BaseStream.get_flags(b1)
+        msg_type = FixedHeaderStream.get_message_type(b1)
+        (dup_flag, qos, retain_flag) = FixedHeaderStream.get_flags(b1)
         remain_length = yield from self.decode_remaining_length(b1, reader)
-        return Message(msg_type, remain_length, dup_flag, qos, retain_flag)
+        return FixedHeader(msg_type, remain_length, dup_flag, qos, retain_flag)
 
     @staticmethod
     def get_message_type(byte):
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e1bd617
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1 @@
+__author__ = 'nico'
diff --git a/tests/streams/__init__.py b/tests/streams/__init__.py
new file mode 100644
index 0000000..e1bd617
--- /dev/null
+++ b/tests/streams/__init__.py
@@ -0,0 +1 @@
+__author__ = 'nico'
diff --git a/tests/errors/test_base_stream.py b/tests/streams/test_fixed_header.py
similarity index 81%
rename from tests/errors/test_base_stream.py
rename to tests/streams/test_fixed_header.py
index 440a6bc..14adfd8 100644
--- a/tests/errors/test_base_stream.py
+++ b/tests/streams/test_fixed_header.py
@@ -3,19 +3,19 @@
 # See the file license.txt for copying permission.
 import unittest
 import asyncio
-from hbmqtt.streams.base import BaseStream
+from hbmqtt.streams.fixed_header import FixedHeaderStream
 from hbmqtt.streams.errors import FixedHeaderException
 
-class TestBaseStream(unittest.TestCase):
+class TestFixedHeader(unittest.TestCase):
     def setUp(self):
         self.loop = asyncio.new_event_loop()
 
     def test_get_message_type(self):
-        m_type = BaseStream.get_message_type(b'\x10')
+        m_type = FixedHeaderStream.get_message_type(b'\x10')
         self.assertEqual(m_type, 1)
 
     def test_get_flags(self):
-        (dup_flag, qos, retain_flag) = BaseStream.get_flags(b'\x1f')
+        (dup_flag, qos, retain_flag) = FixedHeaderStream.get_flags(b'\x1f')
         self.assertTrue(dup_flag)
         self.assertEqual(qos, 3)
         self.assertTrue(retain_flag)
@@ -23,34 +23,34 @@ class TestBaseStream(unittest.TestCase):
     def test_decode_remaining_length1(self):
         stream = asyncio.StreamReader(loop=self.loop)
         stream.feed_data(b'\x7f')
-        s = BaseStream()
+        s = FixedHeaderStream()
         length = self.loop.run_until_complete(s.decode_remaining_length(stream))
         self.assertEqual(length, 127)
 
     def test_decode_remaining_length2(self):
         stream = asyncio.StreamReader(loop=self.loop)
         stream.feed_data(b'\xff\x7f')
-        s = BaseStream()
+        s = FixedHeaderStream()
         length = self.loop.run_until_complete(s.decode_remaining_length(stream))
         self.assertEqual(length, 16383)
 
     def test_decode_remaining_length3(self):
         stream = asyncio.StreamReader(loop=self.loop)
         stream.feed_data(b'\xff\xff\x7f')
-        s = BaseStream()
+        s = FixedHeaderStream()
         length = self.loop.run_until_complete(s.decode_remaining_length(stream))
         self.assertEqual(length, 2097151)
 
     def test_decode_remaining_length4(self):
         stream = asyncio.StreamReader(loop=self.loop)
         stream.feed_data(b'\xff\xff\xff\x7f')
-        s = BaseStream()
+        s = FixedHeaderStream()
         length = self.loop.run_until_complete(s.decode_remaining_length(stream))
         self.assertEqual(length, 268435455)
 
     def test_decode_remaining_length5(self):
         stream = asyncio.StreamReader(loop=self.loop)
         stream.feed_data(b'\xff\xff\xff\xff\x7f')
-        s = BaseStream()
+        s = FixedHeaderStream()
         with self.assertRaises(FixedHeaderException):
             self.loop.run_until_complete(s.decode_remaining_length(stream))