diff --git a/orm/services/resource_distributor/rds/tests/__init__.py b/orm/services/resource_distributor/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/__init__.py
rename to orm/services/resource_distributor/__init__.py
diff --git a/orm/services/resource_distributor/rds/app.py b/orm/services/resource_distributor/rds/app.py
index a90ebbc3..3294ac6c 100755
--- a/orm/services/resource_distributor/rds/app.py
+++ b/orm/services/resource_distributor/rds/app.py
@@ -1,7 +1,7 @@
 import logging
 import os
 
-from audit_client.api import audit
+from orm.common.client.audit.audit_client.api import audit
 from pecan import conf, make_app
 from pecan.commands import CommandRunner
 from services import region_resource_id_status
diff --git a/orm/services/resource_distributor/rds/controllers/root.py b/orm/services/resource_distributor/rds/controllers/root.py
index f67f8b6c..48153833 100644
--- a/orm/services/resource_distributor/rds/controllers/root.py
+++ b/orm/services/resource_distributor/rds/controllers/root.py
@@ -1,5 +1,5 @@
 """controller moudle."""
-from rds.controllers.v1 import root as v1
+from orm.services.resource_distributor.rds.controllers.v1 import root as v1
 
 
 class RootController(object):
diff --git a/orm/services/resource_distributor/rds/controllers/v1/configuration/root.py b/orm/services/resource_distributor/rds/controllers/v1/configuration/root.py
index 4e758929..ddeb71ed 100644
--- a/orm/services/resource_distributor/rds/controllers/v1/configuration/root.py
+++ b/orm/services/resource_distributor/rds/controllers/v1/configuration/root.py
@@ -2,7 +2,7 @@
 
 import logging
 
-from orm_common.utils import utils
+from orm.common.orm_common.utils import utils
 from pecan import conf, rest
 from wsmeext.pecan import wsexpose
 
diff --git a/orm/services/resource_distributor/rds/controllers/v1/resources/root.py b/orm/services/resource_distributor/rds/controllers/v1/resources/root.py
index a9889788..4be19580 100755
--- a/orm/services/resource_distributor/rds/controllers/v1/resources/root.py
+++ b/orm/services/resource_distributor/rds/controllers/v1/resources/root.py
@@ -4,12 +4,13 @@ import ast
 import logging.handlers
 import time
 
+from orm.services.resource_distributor.rds.controllers.v1.base import (ClientSideError, LockedEntity,
+                                                                       NotAllowedError)
+from orm.services.resource_distributor.rds.services.base import ConflictValue
+from orm.services.resource_distributor.rds.services import resource as ResourceService
+
 import pecan
 from pecan import rest
-from rds.controllers.v1.base import (ClientSideError, LockedEntity,
-                                     NotAllowedError)
-from rds.services.base import ConflictValue
-from rds.services import resource as ResourceService
 import wsme
 from wsme import types as wtypes
 from wsmeext.pecan import wsexpose
diff --git a/orm/services/resource_distributor/rds/controllers/v1/root.py b/orm/services/resource_distributor/rds/controllers/v1/root.py
index 68631860..baee76dd 100755
--- a/orm/services/resource_distributor/rds/controllers/v1/root.py
+++ b/orm/services/resource_distributor/rds/controllers/v1/root.py
@@ -1,8 +1,8 @@
 """v1 controller."""
-from rds.controllers.v1.configuration import root as config_root
-from rds.controllers.v1 import logs
-from rds.controllers.v1.resources import root as Rds
-from rds.controllers.v1.status import resource_status
+from orm.services.resource_distributor.rds.controllers.v1.configuration import root as config_root
+from orm.services.resource_distributor.rds.controllers.v1 import logs
+from orm.services.resource_distributor.rds.controllers.v1.resources import root as Rds
+from orm.services.resource_distributor.rds.controllers.v1.status import resource_status
 
 
 class RDS(object):
diff --git a/orm/services/resource_distributor/rds/controllers/v1/status/get_resource.py b/orm/services/resource_distributor/rds/controllers/v1/status/get_resource.py
index e2f516ce..634ae333 100755
--- a/orm/services/resource_distributor/rds/controllers/v1/status/get_resource.py
+++ b/orm/services/resource_distributor/rds/controllers/v1/status/get_resource.py
@@ -1,9 +1,10 @@
 """handle get resource module."""
 import logging
 
+from orm.services.resource_distributor.rds.controllers.v1.base import EntityNotFoundError
+from orm.services.resource_distributor.rds.services import region_resource_id_status as regionResourceIdStatus
+
 from pecan import rest
-from rds.controllers.v1.base import EntityNotFoundError
-from rds.services import region_resource_id_status as regionResourceIdStatus
 import wsme
 from wsme import types as wtypes
 from wsmeext.pecan import wsexpose
diff --git a/orm/services/resource_distributor/rds/controllers/v1/status/resource_status.py b/orm/services/resource_distributor/rds/controllers/v1/status/resource_status.py
index 7d369a2b..6a527da4 100755
--- a/orm/services/resource_distributor/rds/controllers/v1/status/resource_status.py
+++ b/orm/services/resource_distributor/rds/controllers/v1/status/resource_status.py
@@ -2,12 +2,13 @@
 import logging
 import time
 
+from orm.services.resource_distributor.rds.controllers.v1.base import InputValueError
+from orm.services.resource_distributor.rds.controllers.v1.status import get_resource
+from orm.services.resource_distributor.rds.services.base import ErrorMesage, InputError
+from orm.services.resource_distributor.rds.services import region_resource_id_status as regionResourceIdStatus
+from orm.services.resource_distributor.rds.utils import utils
+
 from pecan import rest
-from rds.controllers.v1.base import InputValueError
-from rds.controllers.v1.status import get_resource
-from rds.services.base import ErrorMesage, InputError
-from rds.services import region_resource_id_status as regionResourceIdStatus
-from rds.utils import utils
 import wsme
 from wsme import types as wtypes
 from wsmeext.pecan import wsexpose
diff --git a/orm/services/resource_distributor/rds/ordupdate/ord_notifier.py b/orm/services/resource_distributor/rds/ordupdate/ord_notifier.py
index 538cc0a7..5d47e0f3 100755
--- a/orm/services/resource_distributor/rds/ordupdate/ord_notifier.py
+++ b/orm/services/resource_distributor/rds/ordupdate/ord_notifier.py
@@ -2,13 +2,13 @@
 
 import json
 import logging
+import requests
 import time
 
-import requests
+from orm.common.client.audit.audit_client.api import audit
+from orm.services.resource_distributor.rds.services import region_resource_id_status as regionResourceIdStatus
 
-from audit_client.api import audit
 from pecan import conf
-from rds.services import region_resource_id_status as regionResourceIdStatus
 
 # REST API constants
 OK_CODE = 200
diff --git a/orm/services/resource_distributor/rds/proxies/ims_proxy.py b/orm/services/resource_distributor/rds/proxies/ims_proxy.py
index 39cca688..4397a556 100755
--- a/orm/services/resource_distributor/rds/proxies/ims_proxy.py
+++ b/orm/services/resource_distributor/rds/proxies/ims_proxy.py
@@ -1,11 +1,11 @@
 import json
 import logging
-
 import requests
 
+from orm.services.resource_distributor.rds.services.base import ErrorMesage
+from orm.services.resource_distributor.rds.utils import authentication as AuthService
+
 from pecan import conf
-from rds.services.base import ErrorMesage
-from rds.utils import authentication as AuthService
 
 logger = logging.getLogger(__name__)
 
@@ -55,6 +55,6 @@ def send_image_metadata(meta_data, region, resource_id, action='post'):
 
     if response.status_code != 200:
         raise ErrorMesage(
-            "Got error from rds server, code: {0} message: {1}".format(
+            "Got error from orm.services.resource_distributor.rds server, code: {0} message: {1}".format(
                 response.status_code, response.content))
     return
diff --git a/orm/services/resource_distributor/rds/services/region_resource_id_status.py b/orm/services/resource_distributor/rds/services/region_resource_id_status.py
index 6fc9f04f..53ee5322 100755
--- a/orm/services/resource_distributor/rds/services/region_resource_id_status.py
+++ b/orm/services/resource_distributor/rds/services/region_resource_id_status.py
@@ -1,8 +1,8 @@
 import logging
 import sys
 
-from rds.services.base import Error, InputError
-from rds.storage import factory
+from orm.services.resource_distributor.rds.services.base import Error, InputError
+from orm.services.resource_distributor.rds.storage import factory
 
 logger = logging.getLogger(__name__)
 config = {
diff --git a/orm/services/resource_distributor/rds/services/resource.py b/orm/services/resource_distributor/rds/services/resource.py
index 195bc9ca..b866f1e2 100755
--- a/orm/services/resource_distributor/rds/services/resource.py
+++ b/orm/services/resource_distributor/rds/services/resource.py
@@ -2,14 +2,15 @@
 import logging
 import time
 
+from orm.services.resource_distributor.rds.services import region_resource_id_status as regionResourceIdStatus
+from orm.services.resource_distributor.rds.services import (yaml_customer_builder, yaml_flavor_bulder,
+                                                            yaml_image_builder)
+from orm.services.resource_distributor.rds.services.base import ConflictValue, ErrorMesage
+from orm.services.resource_distributor.rds.services.model.resource_input import ResourceData as InputData
+from orm.services.resource_distributor.rds.sot import sot_factory
+from orm.services.resource_distributor.rds.utils import utils, uuid_utils
+
 from pecan import conf, request
-from rds.services import region_resource_id_status as regionResourceIdStatus
-from rds.services import (yaml_customer_builder, yaml_flavor_bulder,
-                          yaml_image_builder)
-from rds.services.base import ConflictValue, ErrorMesage
-from rds.services.model.resource_input import ResourceData as InputData
-from rds.sot import sot_factory
-from rds.utils import utils, uuid_utils
 
 my_logger = logging.getLogger(__name__)
 
diff --git a/orm/services/resource_distributor/rds/sot/git_sot/git_sot.py b/orm/services/resource_distributor/rds/sot/git_sot/git_sot.py
index d359ba88..3a5e884a 100755
--- a/orm/services/resource_distributor/rds/sot/git_sot/git_sot.py
+++ b/orm/services/resource_distributor/rds/sot/git_sot/git_sot.py
@@ -5,9 +5,9 @@ import threading
 import git_factory
 from git_base import (GitInitError, GitResetError, GitUploadError,
                       GitValidateError)
-from rds.ordupdate.ord_notifier import notify_ord
-from rds.sot import base_sot
-from rds.sot.base_sot import SoTError
+from orm.services.resource_distributor.rds.ordupdate.ord_notifier import notify_ord
+from orm.services.resource_distributor.rds.sot import base_sot
+from orm.services.resource_distributor.rds.sot.base_sot import SoTError
 
 logger = logging.getLogger(__name__)
 lock = threading.Lock()
diff --git a/orm/services/resource_distributor/rds/sot/sot_factory.py b/orm/services/resource_distributor/rds/sot/sot_factory.py
index 83500433..e0d9fca2 100644
--- a/orm/services/resource_distributor/rds/sot/sot_factory.py
+++ b/orm/services/resource_distributor/rds/sot/sot_factory.py
@@ -1,4 +1,4 @@
-from rds.sot.git_sot import git_sot
+from orm.services.resource_distributor.rds.sot.git_sot import git_sot
 
 sot_type = ""
 local_repository_path = ""
diff --git a/orm/services/resource_distributor/rds/storage/factory.py b/orm/services/resource_distributor/rds/storage/factory.py
index 3e010821..b7e4e938 100644
--- a/orm/services/resource_distributor/rds/storage/factory.py
+++ b/orm/services/resource_distributor/rds/storage/factory.py
@@ -1,4 +1,4 @@
-from rds.storage.mysql.region_resource_id_status import \
+from orm.services.resource_distributor.rds.storage.mysql.region_resource_id_status import \
     Connection as RegionResourceIdStatusConnection
 
 database = {
diff --git a/orm/services/resource_distributor/rds/storage/mysql/region_resource_id_status.py b/orm/services/resource_distributor/rds/storage/mysql/region_resource_id_status.py
index eef9a49f..f0cdcf3b 100755
--- a/orm/services/resource_distributor/rds/storage/mysql/region_resource_id_status.py
+++ b/orm/services/resource_distributor/rds/storage/mysql/region_resource_id_status.py
@@ -4,8 +4,8 @@ import time
 import oslo_db
 from oslo_db.sqlalchemy import session as db_session
 from pecan import conf
-from rds.services.model.region_resource_id_status import Model, StatusModel
-from rds.storage import region_resource_id_status
+from orm.services.resource_distributor.rds.services.model.region_resource_id_status import Model, StatusModel
+from orm.services.resource_distributor.rds.storage import region_resource_id_status
 from sqlalchemy import BigInteger, Column, ForeignKey, Integer, Text
 from sqlalchemy.ext.declarative.api import declarative_base
 from sqlalchemy.orm import relationship
diff --git a/orm/services/resource_distributor/rds/utils/authentication.py b/orm/services/resource_distributor/rds/utils/authentication.py
index 359f14ae..6a3ab5f8 100755
--- a/orm/services/resource_distributor/rds/utils/authentication.py
+++ b/orm/services/resource_distributor/rds/utils/authentication.py
@@ -1,11 +1,11 @@
 import json
 import logging
-
 import requests
 
-from keystone_utils import tokens
+from orm.common.client.keystone.keystone_utils import tokens
+from orm.services.resource_distributor.rds.proxies import rms_proxy as RmsService
+
 from pecan import conf
-from rds.proxies import rms_proxy as RmsService
 
 enabled = False
 mech_id = ""
diff --git a/orm/services/resource_distributor/rds/utils/utils.py b/orm/services/resource_distributor/rds/utils/utils.py
index a9a20de5..929d0207 100755
--- a/orm/services/resource_distributor/rds/utils/utils.py
+++ b/orm/services/resource_distributor/rds/utils/utils.py
@@ -1,11 +1,11 @@
 """module"""
 import logging
-
 import requests
 
+from orm.services.resource_distributor.rds.proxies import ims_proxy
+from orm.services.resource_distributor.rds.services.base import ErrorMesage
+
 from pecan import conf
-from rds.proxies import ims_proxy
-from rds.services.base import ErrorMesage
 
 logger = logging.getLogger(__name__)
 
diff --git a/orm/services/resource_distributor/rds/tests/controllers/__init__.py b/orm/tests/unit/rds/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/controllers/__init__.py
rename to orm/tests/unit/rds/__init__.py
diff --git a/orm/services/resource_distributor/rds/tests/base.py b/orm/tests/unit/rds/base.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/base.py
rename to orm/tests/unit/rds/base.py
diff --git a/orm/services/resource_distributor/rds/tests/config.py b/orm/tests/unit/rds/config.py
similarity index 96%
rename from orm/services/resource_distributor/rds/tests/config.py
rename to orm/tests/unit/rds/config.py
index b5e5bd10..1b42a799 100755
--- a/orm/services/resource_distributor/rds/tests/config.py
+++ b/orm/tests/unit/rds/config.py
@@ -1,7 +1,7 @@
 # Pecan Application configurations
 app = {
-    'root': 'rds.controllers.root.RootController',
-    'modules': ['rds'],
+    'root': 'orm.services.resource_distributor.rds.controllers.root.RootController',
+    'modules': ['orm.services.resource_distributor.rds'],
     'service_name': 'RDS'
 }
 
diff --git a/orm/services/resource_distributor/rds/tests/controllers/v1/__init__.py b/orm/tests/unit/rds/controllers/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/controllers/v1/__init__.py
rename to orm/tests/unit/rds/controllers/__init__.py
diff --git a/orm/services/resource_distributor/rds/tests/controllers/v1/configuration/__init__.py b/orm/tests/unit/rds/controllers/v1/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/controllers/v1/configuration/__init__.py
rename to orm/tests/unit/rds/controllers/v1/__init__.py
diff --git a/orm/services/resource_distributor/rds/tests/controllers/v1/resources/__init__.py b/orm/tests/unit/rds/controllers/v1/configuration/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/controllers/v1/resources/__init__.py
rename to orm/tests/unit/rds/controllers/v1/configuration/__init__.py
diff --git a/orm/services/resource_distributor/rds/tests/controllers/v1/configuration/test_get_configuration.py b/orm/tests/unit/rds/controllers/v1/configuration/test_get_configuration.py
similarity index 83%
rename from orm/services/resource_distributor/rds/tests/controllers/v1/configuration/test_get_configuration.py
rename to orm/tests/unit/rds/controllers/v1/configuration/test_get_configuration.py
index 401c09dc..1efcc433 100755
--- a/orm/services/resource_distributor/rds/tests/controllers/v1/configuration/test_get_configuration.py
+++ b/orm/tests/unit/rds/controllers/v1/configuration/test_get_configuration.py
@@ -1,7 +1,7 @@
 """Get configuration module unittests."""
 from mock import patch
-from rds.controllers.v1.configuration import root
-from rds.tests.controllers.v1.functional_test import FunctionalTest
+from orm.services.resource_distributor.rds.controllers.v1.configuration import root
+from orm.tests.unit.rds.controllers.v1.functional_test import FunctionalTest
 
 
 class TestGetConfiguration(FunctionalTest):
diff --git a/orm/services/resource_distributor/rds/tests/controllers/v1/functional_test.py b/orm/tests/unit/rds/controllers/v1/functional_test.py
similarity index 50%
rename from orm/services/resource_distributor/rds/tests/controllers/v1/functional_test.py
rename to orm/tests/unit/rds/controllers/v1/functional_test.py
index 0ab2d732..d370705d 100644
--- a/orm/services/resource_distributor/rds/tests/controllers/v1/functional_test.py
+++ b/orm/tests/unit/rds/controllers/v1/functional_test.py
@@ -1,4 +1,4 @@
-from rds.tests.functional_test import FunctionalTest
+from orm.tests.unit.rds.functional_test import FunctionalTest
 
 
 class FunctionalTest(FunctionalTest):
diff --git a/orm/services/resource_distributor/rds/tests/controllers/v1/status/__init__.py b/orm/tests/unit/rds/controllers/v1/resources/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/controllers/v1/status/__init__.py
rename to orm/tests/unit/rds/controllers/v1/resources/__init__.py
diff --git a/orm/services/resource_distributor/rds/tests/controllers/v1/resources/test_create_resource.py b/orm/tests/unit/rds/controllers/v1/resources/test_create_resource.py
similarity index 98%
rename from orm/services/resource_distributor/rds/tests/controllers/v1/resources/test_create_resource.py
rename to orm/tests/unit/rds/controllers/v1/resources/test_create_resource.py
index f26e73a5..d92e8c7c 100755
--- a/orm/services/resource_distributor/rds/tests/controllers/v1/resources/test_create_resource.py
+++ b/orm/tests/unit/rds/controllers/v1/resources/test_create_resource.py
@@ -1,7 +1,7 @@
 """unittest get resource."""
 from mock import patch
-import rds.controllers.v1.resources.root as root
-from rds.tests.controllers.v1.functional_test import FunctionalTest
+import orm.services.resource_distributor.rds.controllers.v1.resources.root as root
+from orm.tests.unit.rds.controllers.v1.functional_test import FunctionalTest
 
 
 class TestCreateResource(FunctionalTest):
diff --git a/orm/services/resource_distributor/rds/tests/ordupdate/__init__.py b/orm/tests/unit/rds/controllers/v1/status/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/ordupdate/__init__.py
rename to orm/tests/unit/rds/controllers/v1/status/__init__.py
diff --git a/orm/services/resource_distributor/rds/tests/controllers/v1/status/test_base.py b/orm/tests/unit/rds/controllers/v1/status/test_base.py
similarity index 80%
rename from orm/services/resource_distributor/rds/tests/controllers/v1/status/test_base.py
rename to orm/tests/unit/rds/controllers/v1/status/test_base.py
index 7d0a6ed2..240a746e 100644
--- a/orm/services/resource_distributor/rds/tests/controllers/v1/status/test_base.py
+++ b/orm/tests/unit/rds/controllers/v1/status/test_base.py
@@ -1,6 +1,6 @@
 import unittest
 
-from rds.controllers.v1.base import ClientSideError
+from orm.services.resource_distributor.rds.controllers.v1.base import ClientSideError
 
 
 class Test(unittest.TestCase):
diff --git a/orm/services/resource_distributor/rds/tests/controllers/v1/status/test_get_resource_status.py b/orm/tests/unit/rds/controllers/v1/status/test_get_resource_status.py
similarity index 81%
rename from orm/services/resource_distributor/rds/tests/controllers/v1/status/test_get_resource_status.py
rename to orm/tests/unit/rds/controllers/v1/status/test_get_resource_status.py
index 792576a7..7f07661a 100755
--- a/orm/services/resource_distributor/rds/tests/controllers/v1/status/test_get_resource_status.py
+++ b/orm/tests/unit/rds/controllers/v1/status/test_get_resource_status.py
@@ -1,8 +1,8 @@
 """unittest get resource status."""
 from mock import MagicMock
-import rds.controllers.v1.status.get_resource as resource
-from rds.services.model.region_resource_id_status import Model, StatusModel
-from rds.tests.controllers.v1.functional_test import FunctionalTest
+import orm.services.resource_distributor.rds.controllers.v1.status.get_resource as resource
+from orm.services.resource_distributor.rds.services.model.region_resource_id_status import Model, StatusModel
+from orm.tests.unit.rds.controllers.v1.functional_test import FunctionalTest
 
 
 class EmptyModel(object):
diff --git a/orm/services/resource_distributor/rds/tests/controllers/v1/status/test_resource_status.py b/orm/tests/unit/rds/controllers/v1/status/test_resource_status.py
similarity index 92%
rename from orm/services/resource_distributor/rds/tests/controllers/v1/status/test_resource_status.py
rename to orm/tests/unit/rds/controllers/v1/status/test_resource_status.py
index 4559d35d..536c96fd 100644
--- a/orm/services/resource_distributor/rds/tests/controllers/v1/status/test_resource_status.py
+++ b/orm/tests/unit/rds/controllers/v1/status/test_resource_status.py
@@ -1,7 +1,7 @@
 """unittest for post resource."""
 from mock import patch
-import rds.controllers.v1.status.resource_status as resource
-from rds.tests.controllers.v1.functional_test import FunctionalTest
+import orm.services.resource_distributor.rds.controllers.v1.status.resource_status as resource
+from orm.tests.unit.rds.controllers.v1.functional_test import FunctionalTest
 
 
 class PostResourceStatus(FunctionalTest):
diff --git a/orm/services/resource_distributor/rds/tests/controllers/v1/test_logs.py b/orm/tests/unit/rds/controllers/v1/test_logs.py
similarity index 92%
rename from orm/services/resource_distributor/rds/tests/controllers/v1/test_logs.py
rename to orm/tests/unit/rds/controllers/v1/test_logs.py
index 15631eb7..a29253fe 100755
--- a/orm/services/resource_distributor/rds/tests/controllers/v1/test_logs.py
+++ b/orm/tests/unit/rds/controllers/v1/test_logs.py
@@ -1,5 +1,5 @@
 """Logs module unittests."""
-from rds.tests.controllers.v1.functional_test import FunctionalTest
+from orm.tests.unit.rds.controllers.v1.functional_test import FunctionalTest
 
 
 class TestLogs(FunctionalTest):
diff --git a/orm/services/resource_distributor/rds/tests/functional_test.py b/orm/tests/unit/rds/functional_test.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/functional_test.py
rename to orm/tests/unit/rds/functional_test.py
diff --git a/orm/services/resource_distributor/rds/tests/services/__init__.py b/orm/tests/unit/rds/ordupdate/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/services/__init__.py
rename to orm/tests/unit/rds/ordupdate/__init__.py
diff --git a/orm/services/resource_distributor/rds/tests/ordupdate/test_ord_notifier.py b/orm/tests/unit/rds/ordupdate/test_ord_notifier.py
similarity index 98%
rename from orm/services/resource_distributor/rds/tests/ordupdate/test_ord_notifier.py
rename to orm/tests/unit/rds/ordupdate/test_ord_notifier.py
index 46cf91cd..09c3ea36 100755
--- a/orm/services/resource_distributor/rds/tests/ordupdate/test_ord_notifier.py
+++ b/orm/tests/unit/rds/ordupdate/test_ord_notifier.py
@@ -2,7 +2,7 @@ import unittest
 
 import mock
 from mock import patch
-from rds.ordupdate import ord_notifier
+from orm.services.resource_distributor.rds.ordupdate import ord_notifier
 
 
 class MyResponse(object):
diff --git a/orm/services/resource_distributor/rds/tests/services/model/__init__.py b/orm/tests/unit/rds/services/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/services/model/__init__.py
rename to orm/tests/unit/rds/services/__init__.py
diff --git a/orm/services/resource_distributor/rds/tests/sot/__init__.py b/orm/tests/unit/rds/services/model/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/sot/__init__.py
rename to orm/tests/unit/rds/services/model/__init__.py
diff --git a/orm/services/resource_distributor/rds/tests/services/model/test_region_resource_id_status.py b/orm/tests/unit/rds/services/model/test_region_resource_id_status.py
similarity index 94%
rename from orm/services/resource_distributor/rds/tests/services/model/test_region_resource_id_status.py
rename to orm/tests/unit/rds/services/model/test_region_resource_id_status.py
index 0e0e5da2..b9697d50 100755
--- a/orm/services/resource_distributor/rds/tests/services/model/test_region_resource_id_status.py
+++ b/orm/tests/unit/rds/services/model/test_region_resource_id_status.py
@@ -1,6 +1,6 @@
 import unittest
 
-from rds.services.model import region_resource_id_status
+from orm.services.resource_distributor.rds.services.model import region_resource_id_status
 
 
 class TestModel(unittest.TestCase):
diff --git a/orm/services/resource_distributor/rds/tests/services/test_create_resource.py b/orm/tests/unit/rds/services/test_create_resource.py
similarity index 98%
rename from orm/services/resource_distributor/rds/tests/services/test_create_resource.py
rename to orm/tests/unit/rds/services/test_create_resource.py
index 4b8d5b5f..91be5710 100755
--- a/orm/services/resource_distributor/rds/tests/services/test_create_resource.py
+++ b/orm/tests/unit/rds/services/test_create_resource.py
@@ -2,10 +2,10 @@
 import unittest
 
 from mock import patch
-from rds.services import resource as ResourceService
-from rds.services.model.region_resource_id_status import (Model,
-                                                          ResourceMetaData,
-                                                          StatusModel)
+from orm.services.resource_distributor.rds.services import resource as ResourceService
+from orm.services.resource_distributor.rds.services.model.region_resource_id_status import (Model,
+                                                                                            ResourceMetaData,
+                                                                                            StatusModel)
 
 result = Model(
     status="success", timestamp="123456789", region="name",
diff --git a/orm/services/resource_distributor/rds/tests/services/test_customer_yaml.py b/orm/tests/unit/rds/services/test_customer_yaml.py
similarity index 99%
rename from orm/services/resource_distributor/rds/tests/services/test_customer_yaml.py
rename to orm/tests/unit/rds/services/test_customer_yaml.py
index de4fedbd..193e4fef 100755
--- a/orm/services/resource_distributor/rds/tests/services/test_customer_yaml.py
+++ b/orm/tests/unit/rds/services/test_customer_yaml.py
@@ -4,7 +4,7 @@ import unittest
 import yaml
 
 from mock import patch
-from rds.services import yaml_customer_builder as CustomerBuild
+from orm.services.resource_distributor.rds.services import yaml_customer_builder as CustomerBuild
 
 alldata = {
     'uuid': '1e24981a-fa51-11e5-86aa-5e5517507c66',
diff --git a/orm/services/resource_distributor/rds/tests/services/test_flavor_yaml.py b/orm/tests/unit/rds/services/test_flavor_yaml.py
similarity index 98%
rename from orm/services/resource_distributor/rds/tests/services/test_flavor_yaml.py
rename to orm/tests/unit/rds/services/test_flavor_yaml.py
index 56adf81e..d3eb69f4 100755
--- a/orm/services/resource_distributor/rds/tests/services/test_flavor_yaml.py
+++ b/orm/tests/unit/rds/services/test_flavor_yaml.py
@@ -4,7 +4,7 @@ import unittest
 import yaml
 
 from mock import patch
-from rds.services import yaml_flavor_bulder as FlavorBuild
+from orm.services.resource_distributor.rds.services import yaml_flavor_bulder as FlavorBuild
 
 alldata = {'status': 'complete', 'series': 'P2',
            'description': 'First flavor for AMAR',
diff --git a/orm/services/resource_distributor/rds/tests/services/test_image_yaml.py b/orm/tests/unit/rds/services/test_image_yaml.py
similarity index 94%
rename from orm/services/resource_distributor/rds/tests/services/test_image_yaml.py
rename to orm/tests/unit/rds/services/test_image_yaml.py
index b175304f..b80e84ce 100755
--- a/orm/services/resource_distributor/rds/tests/services/test_image_yaml.py
+++ b/orm/tests/unit/rds/services/test_image_yaml.py
@@ -3,7 +3,7 @@ import unittest
 import yaml
 
 from mock import patch
-from rds.services import yaml_image_builder as ImageBuild
+from orm.services.resource_distributor.rds.services import yaml_image_builder as ImageBuild
 
 json_input = {
     'status': 'complete', 'name': 'Ubuntu', 'internal_id': 1,
@@ -47,7 +47,7 @@ yaml_output = {
                 'copy_from': 'https://mirrors.it.att.com/images/image-name',
                 'min_disk': 2,
                 'min_ram': 0,
-                'name': 'North',
+                'name': 'Ubuntu',
                 'owner': 'unknown',
                 'protected': True,
                 'tenants': ['abcd-efgh-ijkl-4567', 'abcd-efgh-ijkl-4567']},
diff --git a/orm/services/resource_distributor/rds/tests/services/test_region_resource_id_status.py b/orm/tests/unit/rds/services/test_region_resource_id_status.py
similarity index 98%
rename from orm/services/resource_distributor/rds/tests/services/test_region_resource_id_status.py
rename to orm/tests/unit/rds/services/test_region_resource_id_status.py
index 9d1458f2..2a3767ca 100755
--- a/orm/services/resource_distributor/rds/tests/services/test_region_resource_id_status.py
+++ b/orm/tests/unit/rds/services/test_region_resource_id_status.py
@@ -1,8 +1,8 @@
 import unittest
 
 import mock
-from rds.services import region_resource_id_status
-from rds.tests import config as conf
+from orm.services.resource_distributor.rds.services import region_resource_id_status
+from orm.tests.unit.rds import config as conf
 
 
 class MyResult(object):
diff --git a/orm/services/resource_distributor/rds/tests/sot/git_sot/__init__.py b/orm/tests/unit/rds/sot/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/sot/git_sot/__init__.py
rename to orm/tests/unit/rds/sot/__init__.py
diff --git a/orm/services/resource_distributor/rds/tests/storage/__init__.py b/orm/tests/unit/rds/sot/git_sot/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/storage/__init__.py
rename to orm/tests/unit/rds/sot/git_sot/__init__.py
diff --git a/orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_base.py b/orm/tests/unit/rds/sot/git_sot/test_git_base.py
similarity index 96%
rename from orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_base.py
rename to orm/tests/unit/rds/sot/git_sot/test_git_base.py
index 2580de2c..265ca576 100644
--- a/orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_base.py
+++ b/orm/tests/unit/rds/sot/git_sot/test_git_base.py
@@ -1,6 +1,6 @@
 import unittest
 
-from rds.sot.git_sot.git_base import BaseGit
+from orm.services.resource_distributor.rds.sot.git_sot.git_base import BaseGit
 
 
 class BaseGitTests(unittest.TestCase):
diff --git a/orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_factory.py b/orm/tests/unit/rds/sot/git_sot/test_git_factory.py
similarity index 75%
rename from orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_factory.py
rename to orm/tests/unit/rds/sot/git_sot/test_git_factory.py
index 1c4df9bc..938a6381 100644
--- a/orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_factory.py
+++ b/orm/tests/unit/rds/sot/git_sot/test_git_factory.py
@@ -1,8 +1,8 @@
 import unittest
 
-from rds.sot.git_sot import git_factory
-from rds.sot.git_sot.git_gittle import GitGittle
-from rds.sot.git_sot.git_native import GitNative
+from orm.services.resource_distributor.rds.sot.git_sot import git_factory
+from orm.services.resource_distributor.rds.sot.git_sot.git_gittle import GitGittle
+from orm.services.resource_distributor.rds.sot.git_sot.git_native import GitNative
 
 
 class GitFactoryTests(unittest.TestCase):
diff --git a/orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_gittle.py b/orm/tests/unit/rds/sot/git_sot/test_git_gittle.py
similarity index 87%
rename from orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_gittle.py
rename to orm/tests/unit/rds/sot/git_sot/test_git_gittle.py
index bfce37f1..e77aada5 100644
--- a/orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_gittle.py
+++ b/orm/tests/unit/rds/sot/git_sot/test_git_gittle.py
@@ -2,9 +2,9 @@ import unittest
 
 import mock
 from mock import patch
-from rds.sot.git_sot import git_gittle
-from rds.sot.git_sot.git_base import GitInitError, GitUploadError
-from rds.sot.git_sot.git_gittle import GitGittle
+from orm.services.resource_distributor.rds.sot.git_sot import git_gittle
+from orm.services.resource_distributor.rds.sot.git_sot.git_base import GitInitError, GitUploadError
+from orm.services.resource_distributor.rds.sot.git_sot.git_gittle import GitGittle
 
 
 class GitGittleTests(unittest.TestCase):
diff --git a/orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_native.py b/orm/tests/unit/rds/sot/git_sot/test_git_native.py
similarity index 95%
rename from orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_native.py
rename to orm/tests/unit/rds/sot/git_sot/test_git_native.py
index bce79427..2cffb4b7 100644
--- a/orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_native.py
+++ b/orm/tests/unit/rds/sot/git_sot/test_git_native.py
@@ -3,8 +3,8 @@ import unittest
 
 import mock
 from mock import patch
-from rds.sot.git_sot import git_native
-from rds.sot.git_sot.git_native import GitNativeError, GitValidateError
+from orm.services.resource_distributor.rds.sot.git_sot import git_native
+from orm.services.resource_distributor.rds.sot.git_sot.git_native import GitNativeError, GitValidateError
 
 
 class GitNativeTest(unittest.TestCase):
diff --git a/orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_sot.py b/orm/tests/unit/rds/sot/git_sot/test_git_sot.py
similarity index 95%
rename from orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_sot.py
rename to orm/tests/unit/rds/sot/git_sot/test_git_sot.py
index 64d7f596..cb0a4218 100755
--- a/orm/services/resource_distributor/rds/tests/sot/git_sot/test_git_sot.py
+++ b/orm/tests/unit/rds/sot/git_sot/test_git_sot.py
@@ -4,12 +4,12 @@ import unittest
 
 import mock
 from mock import patch
-from rds.sot.base_sot import SoTError
-from rds.sot.git_sot.git_base import (GitInitError, GitResetError,
-                                      GitUploadError, GitValidateError)
-from rds.sot.git_sot import git_sot as sot
-from rds.sot import sot_factory
-from rds.tests import config as conf
+from orm.services.resource_distributor.rds.sot.base_sot import SoTError
+from orm.services.resource_distributor.rds.sot.git_sot.git_base import (GitInitError, GitResetError,
+                                                                        GitUploadError, GitValidateError)
+from orm.services.resource_distributor.rds.sot.git_sot import git_sot as sot
+from orm.services.resource_distributor.rds.sot import sot_factory
+from orm.tests.unit.rds import config as conf
 
 lock = mock.MagicMock()
 
diff --git a/orm/services/resource_distributor/rds/tests/sot/test_base_sot.py b/orm/tests/unit/rds/sot/test_base_sot.py
similarity index 88%
rename from orm/services/resource_distributor/rds/tests/sot/test_base_sot.py
rename to orm/tests/unit/rds/sot/test_base_sot.py
index 3642cf9c..c21c61ce 100644
--- a/orm/services/resource_distributor/rds/tests/sot/test_base_sot.py
+++ b/orm/tests/unit/rds/sot/test_base_sot.py
@@ -1,6 +1,6 @@
 import unittest
 
-from rds.sot.base_sot import BaseSoT
+from orm.services.resource_distributor.rds.sot.base_sot import BaseSoT
 
 
 class BaseSoTTests(unittest.TestCase):
diff --git a/orm/services/resource_distributor/rds/tests/sot/test_sot_factory.py b/orm/tests/unit/rds/sot/test_sot_factory.py
similarity index 92%
rename from orm/services/resource_distributor/rds/tests/sot/test_sot_factory.py
rename to orm/tests/unit/rds/sot/test_sot_factory.py
index e0947284..b787fe23 100644
--- a/orm/services/resource_distributor/rds/tests/sot/test_sot_factory.py
+++ b/orm/tests/unit/rds/sot/test_sot_factory.py
@@ -1,8 +1,8 @@
 import unittest
 
 import mock
-from rds.sot.git_sot.git_sot import GitSoT
-from rds.sot import sot_factory
+from orm.services.resource_distributor.rds.sot.git_sot.git_sot import GitSoT
+from orm.services.resource_distributor.rds.sot import sot_factory
 
 
 class SoTFactoryTests(unittest.TestCase):
diff --git a/orm/services/resource_distributor/rds/tests/storage/mysql/__init__.py b/orm/tests/unit/rds/storage/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/storage/mysql/__init__.py
rename to orm/tests/unit/rds/storage/__init__.py
diff --git a/orm/services/resource_distributor/rds/tests/utils/__init__.py b/orm/tests/unit/rds/storage/mysql/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/utils/__init__.py
rename to orm/tests/unit/rds/storage/mysql/__init__.py
diff --git a/orm/services/resource_distributor/rds/tests/storage/mysql/test_region_resource_id_status.py b/orm/tests/unit/rds/storage/mysql/test_region_resource_id_status.py
similarity index 99%
rename from orm/services/resource_distributor/rds/tests/storage/mysql/test_region_resource_id_status.py
rename to orm/tests/unit/rds/storage/mysql/test_region_resource_id_status.py
index a953a4a8..365fa842 100755
--- a/orm/services/resource_distributor/rds/tests/storage/mysql/test_region_resource_id_status.py
+++ b/orm/tests/unit/rds/storage/mysql/test_region_resource_id_status.py
@@ -4,7 +4,7 @@ import unittest
 
 import mock
 from mock import patch
-from rds.storage.mysql import region_resource_id_status
+from orm.services.resource_distributor.rds.storage.mysql import region_resource_id_status
 
 
 class RecordMock(object):
diff --git a/orm/services/resource_distributor/rds/tests/storage/test_region_resource_id_status.py b/orm/tests/unit/rds/storage/test_region_resource_id_status.py
similarity index 90%
rename from orm/services/resource_distributor/rds/tests/storage/test_region_resource_id_status.py
rename to orm/tests/unit/rds/storage/test_region_resource_id_status.py
index 3a2f7b97..fb2dab9f 100644
--- a/orm/services/resource_distributor/rds/tests/storage/test_region_resource_id_status.py
+++ b/orm/tests/unit/rds/storage/test_region_resource_id_status.py
@@ -1,6 +1,6 @@
 import unittest
 
-from rds.storage.region_resource_id_status import Base
+from orm.services.resource_distributor.rds.storage.region_resource_id_status import Base
 
 
 class BaseStorageTests(unittest.TestCase):
diff --git a/orm/services/resource_distributor/_-init__.py b/orm/tests/unit/rds/utils/__init__.py
similarity index 100%
rename from orm/services/resource_distributor/_-init__.py
rename to orm/tests/unit/rds/utils/__init__.py
diff --git a/orm/services/resource_distributor/rds/tests/utils/test_uuid_utils.py b/orm/tests/unit/rds/utils/test_uuid_utils.py
similarity index 100%
rename from orm/services/resource_distributor/rds/tests/utils/test_uuid_utils.py
rename to orm/tests/unit/rds/utils/test_uuid_utils.py
diff --git a/requirements.txt b/requirements.txt
index c8d1bf5b..83096ee5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
+gittle>=0.5.0 # MIT
 pbr>=2.0 # Apache-2.0
 pecan==1.0.2
 netifaces==0.10.4