diff --git a/contrib/marconi/plugin/__init__.py b/contrib/marconi/resources/__init__.py
similarity index 100%
rename from contrib/marconi/plugin/__init__.py
rename to contrib/marconi/resources/__init__.py
diff --git a/contrib/marconi/plugin/queue.py b/contrib/marconi/resources/queue.py
similarity index 100%
rename from contrib/marconi/plugin/queue.py
rename to contrib/marconi/resources/queue.py
diff --git a/contrib/marconi/tests/test_queue.py b/contrib/marconi/tests/test_queue.py
index f48a466d0..efa90252c 100644
--- a/contrib/marconi/tests/test_queue.py
+++ b/contrib/marconi/tests/test_queue.py
@@ -18,7 +18,7 @@ from heat.engine import scheduler
 from heat.tests.common import HeatTestCase
 from heat.tests import utils
 
-from ..plugin import queue  # noqa
+from ..resources import queue  # noqa
 
 wp_template = '''
 {