diff --git a/contrib/extraroute/extraroute/resources/extraroute.py b/contrib/extraroute/extraroute/resources/extraroute.py
index b4dafacb7..08eea458e 100644
--- a/contrib/extraroute/extraroute/resources/extraroute.py
+++ b/contrib/extraroute/extraroute/resources/extraroute.py
@@ -15,7 +15,7 @@
 from heat.common import exception
 from heat.common.i18n import _
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 
 
 class ExtraRoute(neutron.NeutronResource):
diff --git a/heat/engine/resources/aws/ec2/route_table.py b/heat/engine/resources/aws/ec2/route_table.py
index 463ff8168..a3b0de6dd 100644
--- a/heat/engine/resources/aws/ec2/route_table.py
+++ b/heat/engine/resources/aws/ec2/route_table.py
@@ -15,7 +15,7 @@ from heat.common.i18n import _
 from heat.engine import properties
 from heat.engine import resource
 from heat.engine.resources.aws.ec2 import vpc
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 
diff --git a/heat/engine/resources/aws/ec2/vpc.py b/heat/engine/resources/aws/ec2/vpc.py
index 3a16e7469..2d39e83d7 100644
--- a/heat/engine/resources/aws/ec2/vpc.py
+++ b/heat/engine/resources/aws/ec2/vpc.py
@@ -16,7 +16,7 @@ from heat.common.i18n import _
 from heat.engine import constraints
 from heat.engine import properties
 from heat.engine import resource
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 
 
 class VPC(resource.Resource):
diff --git a/heat/engine/resources/neutron/__init__.py b/heat/engine/resources/openstack/neutron/__init__.py
similarity index 100%
rename from heat/engine/resources/neutron/__init__.py
rename to heat/engine/resources/openstack/neutron/__init__.py
diff --git a/heat/engine/resources/neutron/firewall.py b/heat/engine/resources/openstack/neutron/firewall.py
similarity index 99%
rename from heat/engine/resources/neutron/firewall.py
rename to heat/engine/resources/openstack/neutron/firewall.py
index 1dfd6db96..ba9a8943d 100644
--- a/heat/engine/resources/neutron/firewall.py
+++ b/heat/engine/resources/openstack/neutron/firewall.py
@@ -15,7 +15,7 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 
diff --git a/heat/engine/resources/neutron/floatingip.py b/heat/engine/resources/openstack/neutron/floatingip.py
similarity index 98%
rename from heat/engine/resources/neutron/floatingip.py
rename to heat/engine/resources/openstack/neutron/floatingip.py
index 8ec7ca4f3..c3ef621b6 100644
--- a/heat/engine/resources/neutron/floatingip.py
+++ b/heat/engine/resources/openstack/neutron/floatingip.py
@@ -17,9 +17,9 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
-from heat.engine.resources.neutron import port
-from heat.engine.resources.neutron import router
+from heat.engine.resources.openstack.neutron import neutron
+from heat.engine.resources.openstack.neutron import port
+from heat.engine.resources.openstack.neutron import router
 from heat.engine import support
 
 
diff --git a/heat/engine/resources/neutron/loadbalancer.py b/heat/engine/resources/openstack/neutron/loadbalancer.py
similarity index 99%
rename from heat/engine/resources/neutron/loadbalancer.py
rename to heat/engine/resources/openstack/neutron/loadbalancer.py
index d8f905207..b5052f803 100644
--- a/heat/engine/resources/neutron/loadbalancer.py
+++ b/heat/engine/resources/openstack/neutron/loadbalancer.py
@@ -17,7 +17,7 @@ from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
 from heat.engine import resource
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 
diff --git a/heat/engine/resources/neutron/metering.py b/heat/engine/resources/openstack/neutron/metering.py
similarity index 98%
rename from heat/engine/resources/neutron/metering.py
rename to heat/engine/resources/openstack/neutron/metering.py
index 2ef158447..d1c3b52a6 100644
--- a/heat/engine/resources/neutron/metering.py
+++ b/heat/engine/resources/openstack/neutron/metering.py
@@ -15,7 +15,7 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 
diff --git a/heat/engine/resources/neutron/net.py b/heat/engine/resources/openstack/neutron/net.py
similarity index 99%
rename from heat/engine/resources/neutron/net.py
rename to heat/engine/resources/openstack/neutron/net.py
index d6b560272..7f107b1d4 100644
--- a/heat/engine/resources/neutron/net.py
+++ b/heat/engine/resources/openstack/neutron/net.py
@@ -14,7 +14,7 @@
 from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 
 
 class Net(neutron.NeutronResource):
diff --git a/heat/engine/resources/neutron/network_gateway.py b/heat/engine/resources/openstack/neutron/network_gateway.py
similarity index 99%
rename from heat/engine/resources/neutron/network_gateway.py
rename to heat/engine/resources/openstack/neutron/network_gateway.py
index 4c654d380..4c1452e63 100644
--- a/heat/engine/resources/neutron/network_gateway.py
+++ b/heat/engine/resources/openstack/neutron/network_gateway.py
@@ -19,7 +19,7 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 
diff --git a/heat/engine/resources/neutron/neutron.py b/heat/engine/resources/openstack/neutron/neutron.py
similarity index 100%
rename from heat/engine/resources/neutron/neutron.py
rename to heat/engine/resources/openstack/neutron/neutron.py
diff --git a/heat/engine/resources/neutron/port.py b/heat/engine/resources/openstack/neutron/port.py
similarity index 99%
rename from heat/engine/resources/neutron/port.py
rename to heat/engine/resources/openstack/neutron/port.py
index c479b1aa3..803beff03 100644
--- a/heat/engine/resources/neutron/port.py
+++ b/heat/engine/resources/openstack/neutron/port.py
@@ -19,8 +19,8 @@ from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
 from heat.engine import resource
-from heat.engine.resources.neutron import neutron
-from heat.engine.resources.neutron import subnet
+from heat.engine.resources.openstack.neutron import neutron
+from heat.engine.resources.openstack.neutron import subnet
 from heat.engine import support
 
 LOG = logging.getLogger(__name__)
diff --git a/heat/engine/resources/neutron/provider_net.py b/heat/engine/resources/openstack/neutron/provider_net.py
similarity index 98%
rename from heat/engine/resources/neutron/provider_net.py
rename to heat/engine/resources/openstack/neutron/provider_net.py
index 2823d20d2..6de339386 100644
--- a/heat/engine/resources/neutron/provider_net.py
+++ b/heat/engine/resources/openstack/neutron/provider_net.py
@@ -16,7 +16,7 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import net
+from heat.engine.resources.openstack.neutron import net
 from heat.engine import support
 
 
diff --git a/heat/engine/resources/neutron/router.py b/heat/engine/resources/openstack/neutron/router.py
similarity index 99%
rename from heat/engine/resources/neutron/router.py
rename to heat/engine/resources/openstack/neutron/router.py
index b5abdebb8..ba3913d10 100644
--- a/heat/engine/resources/neutron/router.py
+++ b/heat/engine/resources/openstack/neutron/router.py
@@ -16,8 +16,8 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
-from heat.engine.resources.neutron import subnet
+from heat.engine.resources.openstack.neutron import neutron
+from heat.engine.resources.openstack.neutron import subnet
 from heat.engine import support
 
 
diff --git a/heat/engine/resources/neutron/security_group.py b/heat/engine/resources/openstack/neutron/security_group.py
similarity index 99%
rename from heat/engine/resources/neutron/security_group.py
rename to heat/engine/resources/openstack/neutron/security_group.py
index 9b4cd679c..99db1d860 100644
--- a/heat/engine/resources/neutron/security_group.py
+++ b/heat/engine/resources/openstack/neutron/security_group.py
@@ -15,7 +15,7 @@ from heat.common import exception
 from heat.common.i18n import _
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 
diff --git a/heat/engine/resources/neutron/subnet.py b/heat/engine/resources/openstack/neutron/subnet.py
similarity index 99%
rename from heat/engine/resources/neutron/subnet.py
rename to heat/engine/resources/openstack/neutron/subnet.py
index 4f641243d..4455577c2 100644
--- a/heat/engine/resources/neutron/subnet.py
+++ b/heat/engine/resources/openstack/neutron/subnet.py
@@ -16,7 +16,7 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 
diff --git a/heat/engine/resources/neutron/vpnservice.py b/heat/engine/resources/openstack/neutron/vpnservice.py
similarity index 99%
rename from heat/engine/resources/neutron/vpnservice.py
rename to heat/engine/resources/openstack/neutron/vpnservice.py
index dd3f17860..58853423a 100644
--- a/heat/engine/resources/neutron/vpnservice.py
+++ b/heat/engine/resources/openstack/neutron/vpnservice.py
@@ -15,7 +15,7 @@ from heat.common.i18n import _
 from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.neutron import neutron
+from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import support
 
 
diff --git a/heat/engine/resources/openstack/nova/server.py b/heat/engine/resources/openstack/nova/server.py
index e15917706..5bf3a346f 100644
--- a/heat/engine/resources/openstack/nova/server.py
+++ b/heat/engine/resources/openstack/nova/server.py
@@ -27,7 +27,7 @@ from heat.engine import attributes
 from heat.engine import constraints
 from heat.engine import properties
 from heat.engine import resource
-from heat.engine.resources.neutron import subnet
+from heat.engine.resources.openstack.neutron import subnet
 from heat.engine import scheduler
 from heat.engine import stack_user
 from heat.engine import support
diff --git a/heat/tests/test_neutron.py b/heat/tests/test_neutron.py
index b8fb10c86..f703e4184 100644
--- a/heat/tests/test_neutron.py
+++ b/heat/tests/test_neutron.py
@@ -27,11 +27,11 @@ from heat.engine.clients.os import neutron
 from heat.engine.hot import functions
 from heat.engine import properties
 from heat.engine import resource
-from heat.engine.resources.neutron import net
-from heat.engine.resources.neutron import neutron as nr
-from heat.engine.resources.neutron import provider_net
-from heat.engine.resources.neutron import router
-from heat.engine.resources.neutron import subnet
+from heat.engine.resources.openstack.neutron import net
+from heat.engine.resources.openstack.neutron import neutron as nr
+from heat.engine.resources.openstack.neutron import provider_net
+from heat.engine.resources.openstack.neutron import router
+from heat.engine.resources.openstack.neutron import subnet
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.tests import common
diff --git a/heat/tests/test_neutron_firewall.py b/heat/tests/test_neutron_firewall.py
index 6eecb64c7..eba814d10 100644
--- a/heat/tests/test_neutron_firewall.py
+++ b/heat/tests/test_neutron_firewall.py
@@ -19,7 +19,7 @@ import six
 
 from heat.common import exception
 from heat.common import template_format
-from heat.engine.resources.neutron import firewall
+from heat.engine.resources.openstack.neutron import firewall
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils
diff --git a/heat/tests/test_neutron_loadbalancer.py b/heat/tests/test_neutron_loadbalancer.py
index 965682386..84145a579 100644
--- a/heat/tests/test_neutron_loadbalancer.py
+++ b/heat/tests/test_neutron_loadbalancer.py
@@ -24,7 +24,7 @@ from heat.common import exception
 from heat.common.i18n import _
 from heat.common import template_format
 from heat.engine.clients.os import nova
-from heat.engine.resources.neutron import loadbalancer
+from heat.engine.resources.openstack.neutron import loadbalancer
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils
diff --git a/heat/tests/test_neutron_metering.py b/heat/tests/test_neutron_metering.py
index 0a800e136..62a8d8d6a 100644
--- a/heat/tests/test_neutron_metering.py
+++ b/heat/tests/test_neutron_metering.py
@@ -17,7 +17,7 @@ import six
 
 from heat.common import exception
 from heat.common import template_format
-from heat.engine.resources.neutron import metering
+from heat.engine.resources.openstack.neutron import metering
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils
diff --git a/heat/tests/test_neutron_network_gateway.py b/heat/tests/test_neutron_network_gateway.py
index f268142b9..454010085 100644
--- a/heat/tests/test_neutron_network_gateway.py
+++ b/heat/tests/test_neutron_network_gateway.py
@@ -22,7 +22,7 @@ import six
 
 from heat.common import exception
 from heat.common import template_format
-from heat.engine.resources.neutron import network_gateway
+from heat.engine.resources.openstack.neutron import network_gateway
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.tests import common
diff --git a/heat/tests/test_neutron_vpnservice.py b/heat/tests/test_neutron_vpnservice.py
index 1f527c90d..9804e64e4 100644
--- a/heat/tests/test_neutron_vpnservice.py
+++ b/heat/tests/test_neutron_vpnservice.py
@@ -21,7 +21,7 @@ import six
 
 from heat.common import exception
 from heat.common import template_format
-from heat.engine.resources.neutron import vpnservice
+from heat.engine.resources.openstack.neutron import vpnservice
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils