Move other aws resources to corresponding directory

Change-Id: I857b8058058f07a0f3067f7573828b2d66fa979b
Implements: blueprint reorganize-resources-code-structure

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

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

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

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