diff --git a/marconiclient/queues/v1/__init__.py b/marconiclient/queues/v1/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/marconiclient/queues/transport/http/message.py b/marconiclient/queues/v1/message.py
similarity index 100%
rename from marconiclient/queues/transport/http/message.py
rename to marconiclient/queues/v1/message.py
diff --git a/tests/unit/queues/v1/__init__.py b/tests/unit/queues/v1/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/unit/queues/transport/http/test_message.py b/tests/unit/queues/v1/test_message.py
similarity index 97%
rename from tests/unit/queues/transport/http/test_message.py
rename to tests/unit/queues/v1/test_message.py
index 414ff21d..ee67f38e 100644
--- a/tests/unit/queues/transport/http/test_message.py
+++ b/tests/unit/queues/v1/test_message.py
@@ -16,7 +16,7 @@ import unittest
 
 import mock
 
-from marconiclient.queues.transport.http import message
+from marconiclient.queues.v1 import message
 from marconiclient.tests.mock import message as mock_message