diff --git a/heat/engine/resources/__init__.py b/heat/engine/resources/__init__.py
index 81ca5cdb3..b639a7724 100644
--- a/heat/engine/resources/__init__.py
+++ b/heat/engine/resources/__init__.py
@@ -89,5 +89,5 @@ def _load_global_resources(env):
 
 
 def list_opts():
-    from heat.engine.resources import loadbalancer
+    from heat.engine.resources.aws.lb import loadbalancer
     yield None, loadbalancer.loadbalancer_opts
diff --git a/heat/engine/resources/aws/iam/__init__.py b/heat/engine/resources/aws/iam/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/heat/engine/resources/aws/user.py b/heat/engine/resources/aws/iam/user.py
similarity index 100%
rename from heat/engine/resources/aws/user.py
rename to heat/engine/resources/aws/iam/user.py
diff --git a/heat/engine/resources/aws/lb/__init__.py b/heat/engine/resources/aws/lb/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/heat/engine/resources/loadbalancer.py b/heat/engine/resources/aws/lb/loadbalancer.py
similarity index 100%
rename from heat/engine/resources/loadbalancer.py
rename to heat/engine/resources/aws/lb/loadbalancer.py
diff --git a/heat/engine/resources/aws/s3/__init__.py b/heat/engine/resources/aws/s3/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/heat/engine/resources/s3.py b/heat/engine/resources/aws/s3/s3.py
similarity index 100%
rename from heat/engine/resources/s3.py
rename to heat/engine/resources/aws/s3/s3.py
diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py
index 616cc8d4b..2f90c5420 100644
--- a/heat/tests/test_loadbalancer.py
+++ b/heat/tests/test_loadbalancer.py
@@ -19,7 +19,7 @@ from oslo_config import cfg
 from heat.common import exception
 from heat.common import template_format
 from heat.engine.clients.os import nova
-from heat.engine.resources import loadbalancer as lb
+from heat.engine.resources.aws.lb import loadbalancer as lb
 from heat.engine import rsrc_defn
 from heat.tests import common
 from heat.tests import utils
diff --git a/heat/tests/test_s3.py b/heat/tests/test_s3.py
index dd5338781..59cdb45a3 100644
--- a/heat/tests/test_s3.py
+++ b/heat/tests/test_s3.py
@@ -16,7 +16,7 @@ import swiftclient.client as sc
 
 from heat.common import exception
 from heat.common import template_format
-from heat.engine.resources import s3
+from heat.engine.resources.aws.s3 import s3
 from heat.engine import scheduler
 from heat.tests import common
 from heat.tests import utils
diff --git a/heat/tests/test_user.py b/heat/tests/test_user.py
index 94be35163..ef7775fad 100644
--- a/heat/tests/test_user.py
+++ b/heat/tests/test_user.py
@@ -17,7 +17,7 @@ from heat.common import exception
 from heat.common import short_id
 from heat.common import template_format
 from heat.db import api as db_api
-from heat.engine.resources.aws import user
+from heat.engine.resources.aws.iam import user
 from heat.engine.resources.openstack import access_policy as ap
 from heat.engine import scheduler
 from heat.tests import common