diff --git a/heat/engine/resources/openstack/sahara/__init__.py b/heat/engine/resources/openstack/sahara/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/heat/engine/resources/sahara_cluster.py b/heat/engine/resources/openstack/sahara/sahara_cluster.py
similarity index 100%
rename from heat/engine/resources/sahara_cluster.py
rename to heat/engine/resources/openstack/sahara/sahara_cluster.py
diff --git a/heat/engine/resources/sahara_templates.py b/heat/engine/resources/openstack/sahara/sahara_templates.py
similarity index 100%
rename from heat/engine/resources/sahara_templates.py
rename to heat/engine/resources/openstack/sahara/sahara_templates.py
diff --git a/heat/tests/test_sahara_cluster.py b/heat/tests/test_sahara_cluster.py
index 7b0ce27d62..93b8fdab8f 100644
--- a/heat/tests/test_sahara_cluster.py
+++ b/heat/tests/test_sahara_cluster.py
@@ -22,7 +22,7 @@ from heat.common import template_format
 from heat.engine.clients.os import glance
 from heat.engine.clients.os import neutron
 from heat.engine.clients.os import sahara
-from heat.engine.resources import sahara_cluster as sc
+from heat.engine.resources.openstack.sahara import sahara_cluster as sc
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils
diff --git a/heat/tests/test_sahara_templates.py b/heat/tests/test_sahara_templates.py
index 4d9e6347b2..caef86d99d 100644
--- a/heat/tests/test_sahara_templates.py
+++ b/heat/tests/test_sahara_templates.py
@@ -21,7 +21,7 @@ from heat.common import template_format
 from heat.engine.clients.os import neutron
 from heat.engine.clients.os import nova
 from heat.engine.clients.os import sahara
-from heat.engine.resources import sahara_templates as st
+from heat.engine.resources.openstack.sahara import sahara_templates as st
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils