diff --git a/configutilities/configutilities/configutilities/__init__.py b/configutilities/configutilities/configutilities/__init__.py
index 85236ba68a..bd7610e820 100755
--- a/configutilities/configutilities/configutilities/__init__.py
+++ b/configutilities/configutilities/configutilities/__init__.py
@@ -3,17 +3,30 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-# flake8: noqa
 #
 
-from common.validator import validate
-from common.configobjects import (Network, DEFAULT_CONFIG, REGION_CONFIG,
-                                  DEFAULT_NAMES, HP_NAMES, SUBCLOUD_CONFIG,
-                                  MGMT_TYPE, INFRA_TYPE, OAM_TYPE,
-                                  NETWORK_PREFIX_NAMES, HOST_XML_ATTRIBUTES,
-                                  DEFAULT_DOMAIN_NAME)
-from common.exceptions import ConfigError, ConfigFail, ValidateFail
-from common.utils import is_valid_vlan, is_mtu_valid, \
-    validate_network_str, validate_address_str, validate_address, \
-    ip_version_to_string, lag_mode_to_str, \
-    validate_openstack_password, extract_openstack_password_rules_from_file
+from configutilities.common.validator import validate  # noqa: F401
+from configutilities.common.configobjects import Network  # noqa: F401
+from configutilities.common.configobjects import DEFAULT_CONFIG  # noqa: F401
+from configutilities.common.configobjects import REGION_CONFIG  # noqa: F401
+from configutilities.common.configobjects import DEFAULT_NAMES  # noqa: F401
+from configutilities.common.configobjects import HP_NAMES  # noqa: F401
+from configutilities.common.configobjects import SUBCLOUD_CONFIG  # noqa: F401
+from configutilities.common.configobjects import MGMT_TYPE  # noqa: F401
+from configutilities.common.configobjects import INFRA_TYPE  # noqa: F401
+from configutilities.common.configobjects import OAM_TYPE  # noqa: F401
+from configutilities.common.configobjects import NETWORK_PREFIX_NAMES  # noqa: F401
+from configutilities.common.configobjects import HOST_XML_ATTRIBUTES  # noqa: F401
+from configutilities.common.configobjects import DEFAULT_DOMAIN_NAME  # noqa: F401
+from configutilities.common.exceptions import ConfigError  # noqa: F401
+from configutilities.common.exceptions import ConfigFail  # noqa: F401
+from configutilities.common.exceptions import ValidateFail  # noqa: F401
+from configutilities.common.utils import is_valid_vlan  # noqa: F401
+from configutilities.common.utils import is_mtu_valid  # noqa: F401
+from configutilities.common.utils import validate_network_str  # noqa: F401
+from configutilities.common.utils import validate_address_str  # noqa: F401
+from configutilities.common.utils import validate_address  # noqa: F401
+from configutilities.common.utils import ip_version_to_string  # noqa: F401
+from configutilities.common.utils import lag_mode_to_str  # noqa: F401
+from configutilities.common.utils import validate_openstack_password  # noqa: F401
+from configutilities.common.utils import extract_openstack_password_rules_from_file  # noqa: F401
diff --git a/configutilities/configutilities/configutilities/common/configobjects.py b/configutilities/configutilities/configutilities/common/configobjects.py
index 5c9464f703..679f583672 100755
--- a/configutilities/configutilities/configutilities/common/configobjects.py
+++ b/configutilities/configutilities/configutilities/common/configobjects.py
@@ -6,9 +6,12 @@ SPDX-License-Identifier: Apache-2.0
 """
 
 from netaddr import IPRange
-from exceptions import ConfigFail, ValidateFail
-from utils import is_mtu_valid, is_valid_vlan, \
-    validate_network_str, validate_address_str
+from configutilities.common.exceptions import ConfigFail
+from configutilities.common.exceptions import ValidateFail
+from configutilities.common.utils import is_mtu_valid
+from configutilities.common.utils import is_valid_vlan
+from configutilities.common.utils import validate_network_str
+from configutilities.common.utils import validate_address_str
 
 DEFAULT_CONFIG = 0
 REGION_CONFIG = 1
diff --git a/configutilities/configutilities/configutilities/common/guicomponents.py b/configutilities/configutilities/configutilities/common/guicomponents.py
index 8cc67f814d..443b677155 100755
--- a/configutilities/configutilities/configutilities/common/guicomponents.py
+++ b/configutilities/configutilities/configutilities/common/guicomponents.py
@@ -6,8 +6,8 @@
 
 import wx
 
-from exceptions import ValidateFail
-import wrs_ico
+from configutilities.common.exceptions import ValidateFail
+from configutilities.common import wrs_ico
 
 TEXT_BOX_SIZE = (150, -1)
 TEXT_WIDTH = 450
diff --git a/configutilities/configutilities/configutilities/common/utils.py b/configutilities/configutilities/configutilities/common/utils.py
index 7022439e3b..12540c431d 100644
--- a/configutilities/configutilities/configutilities/common/utils.py
+++ b/configutilities/configutilities/configutilities/common/utils.py
@@ -8,11 +8,11 @@ SPDX-License-Identifier: Apache-2.0
 from six.moves import configparser
 import re
 import six
-from netaddr import (IPNetwork,
-                     IPAddress,
-                     AddrFormatError)
+from netaddr import IPNetwork
+from netaddr import IPAddress
+from netaddr import AddrFormatError
 
-from exceptions import ValidateFail
+from configutilities.common.exceptions import ValidateFail
 
 EXPECTED_SERVICE_NAME_AND_TYPE = (
     {"KEYSTONE_SERVICE_NAME": "keystone",
diff --git a/configutilities/configutilities/configutilities/common/validator.py b/configutilities/configutilities/configutilities/common/validator.py
index be7ba0da70..afa404bfa2 100755
--- a/configutilities/configutilities/configutilities/common/validator.py
+++ b/configutilities/configutilities/configutilities/common/validator.py
@@ -4,15 +4,26 @@ Copyright (c) 2015-2017 Wind River Systems, Inc.
 SPDX-License-Identifier: Apache-2.0
 
 """
-from configobjects import DEFAULT_NAMES, NETWORK_PREFIX_NAMES, OAM_TYPE, \
-    MGMT_TYPE, Network, REGION_CONFIG, INFRA_TYPE, \
-    DEFAULT_DOMAIN_NAME, HP_NAMES, SUBCLOUD_CONFIG
+from configutilities.common.configobjects import DEFAULT_NAMES
+from configutilities.common.configobjects import NETWORK_PREFIX_NAMES
+from configutilities.common.configobjects import OAM_TYPE
+from configutilities.common.configobjects import MGMT_TYPE
+from configutilities.common.configobjects import Network
+from configutilities.common.configobjects import REGION_CONFIG
+from configutilities.common.configobjects import INFRA_TYPE
+from configutilities.common.configobjects import DEFAULT_DOMAIN_NAME
+from configutilities.common.configobjects import HP_NAMES
+from configutilities.common.configobjects import SUBCLOUD_CONFIG
 from netaddr import IPRange
-from utils import lag_mode_to_str, validate_network_str, \
-    check_network_overlap, is_mtu_valid, get_service, \
-    get_optional, validate_address_str
-
-from exceptions import ConfigFail, ValidateFail
+from configutilities.common.utils import lag_mode_to_str
+from configutilities.common.utils import validate_network_str
+from configutilities.common.utils import check_network_overlap
+from configutilities.common.utils import is_mtu_valid
+from configutilities.common.utils import get_service
+from configutilities.common.utils import get_optional
+from configutilities.common.utils import validate_address_str
+from configutilities.common.exceptions import ConfigFail
+from configutilities.common.exceptions import ValidateFail
 
 
 # Constants
diff --git a/configutilities/configutilities/configutilities/config_validator.py b/configutilities/configutilities/configutilities/config_validator.py
index 040e8fe094..1ef65c38e4 100755
--- a/configutilities/configutilities/configutilities/config_validator.py
+++ b/configutilities/configutilities/configutilities/config_validator.py
@@ -9,9 +9,11 @@ from __future__ import print_function
 import sys
 import os
 from six.moves import configparser
-from common.validator import validate
-from common.configobjects import DEFAULT_CONFIG, REGION_CONFIG
-from common.exceptions import ConfigFail, ValidateFail
+from configutilities.common.validator import validate
+from configutilities.common.configobjects import DEFAULT_CONFIG
+from configutilities.common.configobjects import REGION_CONFIG
+from configutilities.common.exceptions import ConfigFail
+from configutilities.common.exceptions import ValidateFail
 
 
 def parse_config(config_file):
diff --git a/configutilities/configutilities/configutilities/configfiletool.py b/configutilities/configutilities/configutilities/configfiletool.py
index eab59d2179..bd85d8d7bb 100755
--- a/configutilities/configutilities/configutilities/configfiletool.py
+++ b/configutilities/configutilities/configutilities/configfiletool.py
@@ -12,11 +12,20 @@ import wx.wizard as wiz
 import wx.lib.dialogs
 import wx.lib.scrolledpanel
 
-from common.configobjects import REGION_CONFIG, DEFAULT_CONFIG
-from common.exceptions import ValidateFail
-from common.guicomponents import Field, TYPES, prepare_fields, on_change, \
-    debug, set_icons, TEXT_WIDTH, VGAP, HGAP
-from common.validator import ConfigValidator, TiS_VERSION
+from configutilities.common.configobjects import REGION_CONFIG
+from configutilities.common.configobjects import DEFAULT_CONFIG
+from configutilities.common.exceptions import ValidateFail
+from configutilities.common.guicomponents import Field
+from configutilities.common.guicomponents import TYPES
+from configutilities.common.guicomponents import prepare_fields
+from configutilities.common.guicomponents import on_change
+from configutilities.common.guicomponents import debug
+from configutilities.common.guicomponents import set_icons
+from configutilities.common.guicomponents import TEXT_WIDTH
+from configutilities.common.guicomponents import VGAP
+from configutilities.common.guicomponents import HGAP
+from configutilities.common.validator import ConfigValidator
+from configutilities.common.validator import TiS_VERSION
 
 PADDING = 5
 CONFIG_TYPE = DEFAULT_CONFIG
diff --git a/configutilities/configutilities/configutilities/configgui.py b/configutilities/configutilities/configutilities/configgui.py
index b8eb56d85d..9260a15ee7 100755
--- a/configutilities/configutilities/configutilities/configgui.py
+++ b/configutilities/configutilities/configutilities/configgui.py
@@ -7,10 +7,10 @@ SPDX-License-Identifier: Apache-2.0
 
 import wx
 
-from common.guicomponents import set_icons
-from common.validator import TiS_VERSION
-import configfiletool
-import hostfiletool
+from configutilities.common.guicomponents import set_icons
+from configutilities.common.validator import TiS_VERSION
+from configutilities import configfiletool
+from configutilities import hostfiletool
 
 TEXT_WIDTH = 560
 BTN_SIZE = (200, -1)
diff --git a/configutilities/configutilities/configutilities/hostfiletool.py b/configutilities/configutilities/configutilities/hostfiletool.py
index 997b28f029..3f4e4356cf 100755
--- a/configutilities/configutilities/configutilities/hostfiletool.py
+++ b/configutilities/configutilities/configutilities/hostfiletool.py
@@ -11,11 +11,16 @@ import xml.etree.ElementTree as ET
 
 import wx
 
-from common import utils, exceptions
-from common.guicomponents import Field, TYPES, prepare_fields, on_change, \
-    set_icons, handle_sub_show
-from common.configobjects import HOST_XML_ATTRIBUTES
-from common.validator import TiS_VERSION
+from configutilities.common import utils
+from configutilities.common import exceptions
+from configutilities.common.guicomponents import Field
+from configutilities.common.guicomponents import TYPES
+from configutilities.common.guicomponents import prepare_fields
+from configutilities.common.guicomponents import on_change
+from configutilities.common.guicomponents import set_icons
+from configutilities.common.guicomponents import handle_sub_show
+from configutilities.common.configobjects import HOST_XML_ATTRIBUTES
+from configutilities.common.validator import TiS_VERSION
 
 PAGE_SIZE = (200, 200)
 WINDOW_SIZE = (570, 700)
diff --git a/configutilities/configutilities/configutilities/setup.py b/configutilities/configutilities/configutilities/setup.py
index 91aeb8392f..bceb533bdc 100755
--- a/configutilities/configutilities/configutilities/setup.py
+++ b/configutilities/configutilities/configutilities/setup.py
@@ -5,7 +5,8 @@ SPDX-License-Identifier: Apache-2.0
 
 """
 
-from setuptools import setup, find_packages
+from setuptools import setup
+from setuptools import find_packages
 
 setup(
     name='wrs-configutility',
diff --git a/configutilities/configutilities/setup.py b/configutilities/configutilities/setup.py
index 8579b1c396..8c2d8109a9 100755
--- a/configutilities/configutilities/setup.py
+++ b/configutilities/configutilities/setup.py
@@ -5,7 +5,8 @@ SPDX-License-Identifier: Apache-2.0
 
 """
 
-from setuptools import setup, find_packages
+from setuptools import setup
+from setuptools import find_packages
 
 setup(
     name='configutilities',
diff --git a/configutilities/configutilities/tox.ini b/configutilities/configutilities/tox.ini
index 2f207dcb03..b32f381429 100644
--- a/configutilities/configutilities/tox.ini
+++ b/configutilities/configutilities/tox.ini
@@ -24,12 +24,11 @@ commands = flake8 {posargs}
 # H series are hacking
 # H102: Apache 2.0 license header not found
 # H104: File contains nothing but comments
-# H301: one import per line
 # H306: imports not in alphabetical order
 # H401: docstring should not start with a space
 # H403: multi line docstrings should end on a new line
 # H404: multi line docstring should start without a leading new line
 # H405: multi line docstring summary not separated with an empty line
 [flake8]
-ignore = H102,H104,H301,H306,H401,H403,H404,H405
-exclude = dist
+ignore = H102,H104,H306,H401,H403,H404,H405
+exclude = dist,build
diff --git a/controllerconfig/controllerconfig/controllerconfig/backup_restore.py b/controllerconfig/controllerconfig/controllerconfig/backup_restore.py
index 6e141ef765..127bccb73a 100644
--- a/controllerconfig/controllerconfig/controllerconfig/backup_restore.py
+++ b/controllerconfig/controllerconfig/controllerconfig/backup_restore.py
@@ -26,14 +26,16 @@ from fm_api import constants as fm_constants
 from fm_api import fm_api
 from sysinv.common import constants as sysinv_constants
 
-from common import log
-from common import constants
-from common.exceptions import BackupFail, RestoreFail
-from common.exceptions import KeystoneFail, SysInvFail
-import openstack
+from controllerconfig.common import log
+from controllerconfig.common import constants
+from controllerconfig.common.exceptions import BackupFail
+from controllerconfig.common.exceptions import RestoreFail
+from controllerconfig.common.exceptions import KeystoneFail
+from controllerconfig.common.exceptions import SysInvFail
+from controllerconfig import openstack
 import tsconfig.tsconfig as tsconfig
-import utils
-import sysinv_api as sysinv
+from controllerconfig import utils
+from controllerconfig import sysinv_api as sysinv
 from six.moves import input
 
 LOG = log.get_logger(__name__)
diff --git a/controllerconfig/controllerconfig/controllerconfig/clone.py b/controllerconfig/controllerconfig/controllerconfig/clone.py
index d99e092481..3e62e265fb 100644
--- a/controllerconfig/controllerconfig/controllerconfig/clone.py
+++ b/controllerconfig/controllerconfig/controllerconfig/clone.py
@@ -20,14 +20,15 @@ import tempfile
 import fileinput
 import subprocess
 
-from common import constants
+from controllerconfig.common import constants
 from sysinv.common import constants as si_const
-import sysinv_api
+from controllerconfig import sysinv_api
 import tsconfig.tsconfig as tsconfig
-from common import log
-from common.exceptions import CloneFail, BackupFail
-import utils
-import backup_restore
+from controllerconfig.common import log
+from controllerconfig.common.exceptions import CloneFail
+from controllerconfig.common.exceptions import BackupFail
+from controllerconfig import utils
+from controllerconfig import backup_restore
 
 DEBUG = False
 LOG = log.get_logger(__name__)
diff --git a/controllerconfig/controllerconfig/controllerconfig/common/dcmanager.py b/controllerconfig/controllerconfig/controllerconfig/common/dcmanager.py
index 50e3c8231c..02ef188742 100755
--- a/controllerconfig/controllerconfig/controllerconfig/common/dcmanager.py
+++ b/controllerconfig/controllerconfig/controllerconfig/common/dcmanager.py
@@ -8,7 +8,7 @@
 DC Manager Interactions
 """
 
-import log
+from controllerconfig.common import log
 
 from Crypto.Hash import MD5
 from configutilities.common import crypt
diff --git a/controllerconfig/controllerconfig/controllerconfig/common/keystone.py b/controllerconfig/controllerconfig/controllerconfig/common/keystone.py
index e03a907f04..34e86063ec 100755
--- a/controllerconfig/controllerconfig/controllerconfig/common/keystone.py
+++ b/controllerconfig/controllerconfig/controllerconfig/common/keystone.py
@@ -11,8 +11,8 @@ OpenStack Keystone Interactions
 import datetime
 import iso8601
 
-from exceptions import KeystoneFail
-import log
+from controllerconfig.common.exceptions import KeystoneFail
+from controllerconfig.common import log
 
 
 LOG = log.get_logger(__name__)
diff --git a/controllerconfig/controllerconfig/controllerconfig/common/rest_api_utils.py b/controllerconfig/controllerconfig/controllerconfig/common/rest_api_utils.py
index 267f8e336b..2c130dc778 100755
--- a/controllerconfig/controllerconfig/controllerconfig/common/rest_api_utils.py
+++ b/controllerconfig/controllerconfig/controllerconfig/common/rest_api_utils.py
@@ -8,10 +8,10 @@ import httplib
 import json
 import urllib2
 
-from exceptions import KeystoneFail
-import dcmanager
-import keystone
-import log
+from controllerconfig.common.exceptions import KeystoneFail
+from controllerconfig.common import dcmanager
+from controllerconfig.common import keystone
+from controllerconfig.common import log
 
 LOG = log.get_logger(__name__)
 
diff --git a/controllerconfig/controllerconfig/controllerconfig/configassistant.py b/controllerconfig/controllerconfig/controllerconfig/configassistant.py
index 4fa3b4db02..43a204d2cf 100644
--- a/controllerconfig/controllerconfig/controllerconfig/configassistant.py
+++ b/controllerconfig/controllerconfig/controllerconfig/configassistant.py
@@ -20,27 +20,33 @@ import textwrap
 import time
 
 import pyudev
-from configutilities import ConfigFail, ValidateFail
-from configutilities import is_valid_vlan, is_mtu_valid, \
-    validate_network_str, validate_address_str, validate_address, \
-    ip_version_to_string, validate_openstack_password
+from configutilities import ConfigFail
+from configutilities import ValidateFail
+from configutilities import is_valid_vlan
+from configutilities import is_mtu_valid
+from configutilities import validate_network_str
+from configutilities import validate_address_str
+from configutilities import validate_address
+from configutilities import ip_version_to_string
+from configutilities import validate_openstack_password
 from configutilities import DEFAULT_DOMAIN_NAME
-from netaddr import (IPNetwork,
-                     IPAddress,
-                     IPRange,
-                     AddrFormatError)
+from netaddr import IPNetwork
+from netaddr import IPAddress
+from netaddr import IPRange
+from netaddr import AddrFormatError
 from sysinv.common import constants as sysinv_constants
 from tsconfig.tsconfig import SW_VERSION
 
-import openstack
-import sysinv_api as sysinv
-import utils
-import progress
+from controllerconfig import openstack
+from controllerconfig import sysinv_api as sysinv
+from controllerconfig import utils
+from controllerconfig import progress
 
-from common import constants
-from common import log
-from common.exceptions import KeystoneFail, SysInvFail
-from common.exceptions import UserQuit
+from controllerconfig.common import constants
+from controllerconfig.common import log
+from controllerconfig.common.exceptions import KeystoneFail
+from controllerconfig.common.exceptions import SysInvFail
+from controllerconfig.common.exceptions import UserQuit
 from six.moves import input
 
 LOG = log.get_logger(__name__)
diff --git a/controllerconfig/controllerconfig/controllerconfig/openstack.py b/controllerconfig/controllerconfig/controllerconfig/openstack.py
index 0a7ec944d1..ab25ae2779 100755
--- a/controllerconfig/controllerconfig/controllerconfig/openstack.py
+++ b/controllerconfig/controllerconfig/controllerconfig/openstack.py
@@ -12,10 +12,10 @@ import os
 import time
 import subprocess
 
-from common import log
-from common.exceptions import SysInvFail
-from common.rest_api_utils import get_token
-import sysinv_api as sysinv
+from controllerconfig.common import log
+from controllerconfig.common.exceptions import SysInvFail
+from controllerconfig.common.rest_api_utils import get_token
+from controllerconfig import sysinv_api as sysinv
 
 
 LOG = log.get_logger(__name__)
diff --git a/controllerconfig/controllerconfig/controllerconfig/progress.py b/controllerconfig/controllerconfig/controllerconfig/progress.py
index e9485d3e67..72e4e7fcc6 100644
--- a/controllerconfig/controllerconfig/controllerconfig/progress.py
+++ b/controllerconfig/controllerconfig/controllerconfig/progress.py
@@ -1,6 +1,6 @@
 import sys
 
-from common import log
+from controllerconfig.common import log
 
 LOG = log.get_logger(__name__)
 
diff --git a/controllerconfig/controllerconfig/controllerconfig/regionconfig.py b/controllerconfig/controllerconfig/controllerconfig/regionconfig.py
index 4c0eebc35f..ccee546a73 100755
--- a/controllerconfig/controllerconfig/controllerconfig/regionconfig.py
+++ b/controllerconfig/controllerconfig/controllerconfig/regionconfig.py
@@ -12,20 +12,22 @@ import subprocess
 import sys
 import textwrap
 import time
-import utils
+from controllerconfig import utils
 import uuid
 
-from common import constants
-from common import log
-from common import rest_api_utils as rutils
-from common.exceptions import KeystoneFail
+from controllerconfig.common import constants
+from controllerconfig.common import log
+from controllerconfig.common import rest_api_utils as rutils
+from controllerconfig.common.exceptions import KeystoneFail
 from configutilities.common import utils as cutils
-from configutilities.common.configobjects import REGION_CONFIG, SUBCLOUD_CONFIG
+from configutilities.common.configobjects import REGION_CONFIG
+from configutilities.common.configobjects import SUBCLOUD_CONFIG
 from configutilities import ConfigFail
-from configassistant import ConfigAssistant
+from controllerconfig.configassistant import ConfigAssistant
 from netaddr import IPAddress
-from systemconfig import parse_system_config, configure_management_interface, \
-    create_cgcs_config_file
+from controllerconfig.systemconfig import parse_system_config
+from controllerconfig.systemconfig import configure_management_interface
+from controllerconfig.systemconfig import create_cgcs_config_file
 from configutilities import DEFAULT_DOMAIN_NAME
 
 # Temporary file for building cgcs_config
diff --git a/controllerconfig/controllerconfig/controllerconfig/sysinv_api.py b/controllerconfig/controllerconfig/controllerconfig/sysinv_api.py
index 97a835db69..dda3b45109 100644
--- a/controllerconfig/controllerconfig/controllerconfig/sysinv_api.py
+++ b/controllerconfig/controllerconfig/controllerconfig/sysinv_api.py
@@ -12,8 +12,8 @@ import json
 import openstack
 import urllib2
 
-from common import log
-from common.exceptions import KeystoneFail
+from controllerconfig.common import log
+from controllerconfig.common.exceptions import KeystoneFail
 
 LOG = log.get_logger(__name__)
 
diff --git a/controllerconfig/controllerconfig/controllerconfig/systemconfig.py b/controllerconfig/controllerconfig/controllerconfig/systemconfig.py
index 8bbf629dce..bc0685bf13 100644
--- a/controllerconfig/controllerconfig/controllerconfig/systemconfig.py
+++ b/controllerconfig/controllerconfig/controllerconfig/systemconfig.py
@@ -12,17 +12,26 @@ import readline
 import sys
 import textwrap
 
-from common import constants
-from common import log
-from common.exceptions import (BackupFail, RestoreFail, UserQuit, CloneFail)
-from configutilities import lag_mode_to_str, Network, validate
+from controllerconfig.common import constants
+from controllerconfig.common import log
+from controllerconfig.common.exceptions import BackupFail
+from controllerconfig.common.exceptions import RestoreFail
+from controllerconfig.common.exceptions import UserQuit
+from controllerconfig.common.exceptions import CloneFail
+from configutilities import lag_mode_to_str
+from configutilities import Network
+from configutilities import validate
 from configutilities import ConfigFail
-from configutilities import DEFAULT_CONFIG, REGION_CONFIG, SUBCLOUD_CONFIG
-from configutilities import MGMT_TYPE, HP_NAMES, DEFAULT_NAMES
-from configassistant import ConfigAssistant
-import backup_restore
-import utils
-import clone
+from configutilities import DEFAULT_CONFIG
+from configutilities import REGION_CONFIG
+from configutilities import SUBCLOUD_CONFIG
+from configutilities import MGMT_TYPE
+from configutilities import HP_NAMES
+from configutilities import DEFAULT_NAMES
+from controllerconfig.configassistant import ConfigAssistant
+from controllerconfig import backup_restore
+from controllerconfig import utils
+from controllerconfig import clone
 
 # Temporary file for building cgcs_config
 TEMP_CGCS_CONFIG_FILE = "/tmp/cgcs_config"
diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/test_region_config.py b/controllerconfig/controllerconfig/controllerconfig/tests/test_region_config.py
index a89410b29c..d6c45a370d 100644
--- a/controllerconfig/controllerconfig/controllerconfig/tests/test_region_config.py
+++ b/controllerconfig/controllerconfig/controllerconfig/tests/test_region_config.py
@@ -18,9 +18,10 @@ import shutil
 import sys
 
 import configutilities.common.exceptions as exceptions
-from configutilities import validate, REGION_CONFIG
+from configutilities import REGION_CONFIG
+from configutilities import validate
 import controllerconfig.common.keystone as keystone
-import test_answerfile
+from controllerconfig.tests import test_answerfile
 
 sys.modules['fm_core'] = mock.Mock()
 
diff --git a/controllerconfig/controllerconfig/controllerconfig/tests/test_system_config.py b/controllerconfig/controllerconfig/controllerconfig/tests/test_system_config.py
index 8c17f319ab..c662607213 100644
--- a/controllerconfig/controllerconfig/controllerconfig/tests/test_system_config.py
+++ b/controllerconfig/controllerconfig/controllerconfig/tests/test_system_config.py
@@ -12,7 +12,8 @@ import pytest
 import sys
 
 import configutilities.common.exceptions as exceptions
-from configutilities import validate, DEFAULT_CONFIG
+from configutilities import validate
+from configutilities import DEFAULT_CONFIG
 
 sys.modules['fm_core'] = mock.Mock()
 
diff --git a/controllerconfig/controllerconfig/controllerconfig/upgrades/controller.py b/controllerconfig/controllerconfig/controllerconfig/upgrades/controller.py
index 5b3c574e20..c3aef41fcb 100644
--- a/controllerconfig/controllerconfig/controllerconfig/upgrades/controller.py
+++ b/controllerconfig/controllerconfig/controllerconfig/upgrades/controller.py
@@ -30,21 +30,25 @@ from sysinv.common import constants as sysinv_constants
 # WARNING: The controller-1 upgrade is done before any puppet manifests
 # have been applied, so only the static entries from tsconfig can be used
 # (the platform.conf file will not have been updated with dynamic values).
-from tsconfig.tsconfig import (SW_VERSION, PLATFORM_PATH, KEYRING_PATH,
-                               PLATFORM_CONF_FILE, PLATFORM_CONF_PATH,
-                               CGCS_PATH, CONFIG_PATH, CONTROLLER_UPGRADE_FLAG,
-                               CONTROLLER_UPGRADE_COMPLETE_FLAG,
-                               CONTROLLER_UPGRADE_FAIL_FLAG,
-                               CONTROLLER_UPGRADE_STARTED_FLAG,
-                               RESTORE_IN_PROGRESS_FLAG)
-
+from tsconfig.tsconfig import SW_VERSION
+from tsconfig.tsconfig import PLATFORM_PATH
+from tsconfig.tsconfig import KEYRING_PATH
+from tsconfig.tsconfig import PLATFORM_CONF_FILE
+from tsconfig.tsconfig import PLATFORM_CONF_PATH
+from tsconfig.tsconfig import CGCS_PATH
+from tsconfig.tsconfig import CONFIG_PATH
+from tsconfig.tsconfig import CONTROLLER_UPGRADE_FLAG
+from tsconfig.tsconfig import CONTROLLER_UPGRADE_COMPLETE_FLAG
+from tsconfig.tsconfig import CONTROLLER_UPGRADE_FAIL_FLAG
+from tsconfig.tsconfig import CONTROLLER_UPGRADE_STARTED_FLAG
+from tsconfig.tsconfig import RESTORE_IN_PROGRESS_FLAG
 
 from controllerconfig.common import constants
 from controllerconfig.common import log
 from controllerconfig import utils as cutils
 from controllerconfig import backup_restore
 
-import utils
+from controllerconfig.upgrades import utils
 
 LOG = log.get_logger(__name__)
 
diff --git a/controllerconfig/controllerconfig/controllerconfig/upgrades/management.py b/controllerconfig/controllerconfig/controllerconfig/upgrades/management.py
index b4e6130a76..b85f08334f 100644
--- a/controllerconfig/controllerconfig/controllerconfig/upgrades/management.py
+++ b/controllerconfig/controllerconfig/controllerconfig/upgrades/management.py
@@ -19,7 +19,7 @@ from controllerconfig import backup_restore
 from controllerconfig.common import log
 from controllerconfig.common import constants
 from sysinv.common import constants as sysinv_constants
-import utils
+from controllerconfig.upgrades import utils
 
 LOG = log.get_logger(__name__)
 
diff --git a/controllerconfig/controllerconfig/controllerconfig/upgrades/utils.py b/controllerconfig/controllerconfig/controllerconfig/upgrades/utils.py
index 2187c99200..bca695478d 100644
--- a/controllerconfig/controllerconfig/controllerconfig/upgrades/utils.py
+++ b/controllerconfig/controllerconfig/controllerconfig/upgrades/utils.py
@@ -18,11 +18,13 @@ import yaml
 # WARNING: The controller-1 upgrade is done before any puppet manifests
 # have been applied, so only the static entries from tsconfig can be used.
 # (the platform.conf file will not have been updated with dynamic values).
-from tsconfig.tsconfig import SW_VERSION, PLATFORM_PATH
+from tsconfig.tsconfig import SW_VERSION
+from tsconfig.tsconfig import PLATFORM_PATH
 
 from configutilities import DEFAULT_DOMAIN_NAME
 from controllerconfig import utils as cutils
-from controllerconfig.common import log, constants
+from controllerconfig.common import log
+from controllerconfig.common import constants
 from sysinv.common import constants as sysinv_constants
 
 
diff --git a/controllerconfig/controllerconfig/controllerconfig/utils.py b/controllerconfig/controllerconfig/controllerconfig/utils.py
index 15c5598abe..9776da0ae2 100644
--- a/controllerconfig/controllerconfig/controllerconfig/utils.py
+++ b/controllerconfig/controllerconfig/controllerconfig/utils.py
@@ -24,8 +24,8 @@ from tsconfig import tsconfig
 from configutilities.common.utils import is_valid_mac
 from sysinv.common import constants as sysinv_constants
 
-from common import constants
-from common import log
+from controllerconfig.common import constants
+from controllerconfig.common import log
 
 LOOPBACK_IFNAME = 'lo'
 
diff --git a/controllerconfig/controllerconfig/setup.py b/controllerconfig/controllerconfig/setup.py
index 4f50d7a667..b8ddf8a94c 100644
--- a/controllerconfig/controllerconfig/setup.py
+++ b/controllerconfig/controllerconfig/setup.py
@@ -3,7 +3,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from setuptools import setup, find_packages
+from setuptools import setup
+from setuptools import find_packages
 
 setup(
     name='controllerconfig',
diff --git a/controllerconfig/controllerconfig/tox.ini b/controllerconfig/controllerconfig/tox.ini
index c50ca416b6..d84b136954 100644
--- a/controllerconfig/controllerconfig/tox.ini
+++ b/controllerconfig/controllerconfig/tox.ini
@@ -39,13 +39,12 @@ commands = flake8 {posargs}
 # H102: Apache 2.0 license header not found
 # H104: File contains nothing but comments
 # H238: old style class declaration, use new style (inherit from `object`)
-# H301: one import per line
 # H306: imports not in alphabetical order
 # H401: docstring should not start with a space
 # H403: multi line docstrings should end on a new line
 # H404: multi line docstring should start without a leading new line
 # H405: multi line docstring summary not separated with an empty line
-ignore = H101,H102,H104,H238,H301,H306,H401,H403,H404,H405
+ignore = H101,H102,H104,H238,H306,H401,H403,H404,H405
 exclude = build
 
 [testenv:py27]
diff --git a/sysinv/sysinv/sysinv/sysinv/agent/node.py b/sysinv/sysinv/sysinv/sysinv/agent/node.py
index a17dd50e1b..0a1d4cd3e0 100644
--- a/sysinv/sysinv/sysinv/sysinv/agent/node.py
+++ b/sysinv/sysinv/sysinv/sysinv/agent/node.py
@@ -13,7 +13,8 @@
 
 import os
 from os import listdir
-from os.path import isfile, join
+from os.path import isfile
+from os.path import join
 import re
 import subprocess
 
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/certificate.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/certificate.py
index a70a182eed..db7a9a5faf 100644
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/certificate.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/certificate.py
@@ -27,7 +27,8 @@ import wsme
 import wsmeext.pecan as wsme_pecan
 from cryptography import x509
 from cryptography.hazmat.backends import default_backend
-from pecan import expose, rest
+from pecan import expose
+from pecan import rest
 from sysinv import objects
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/dns.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/dns.py
index 71c4e818d5..bc55e4e06c 100644
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/dns.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/dns.py
@@ -41,7 +41,8 @@ from sysinv import objects
 from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
-from netaddr import IPAddress, AddrFormatError
+from netaddr import IPAddress
+from netaddr import AddrFormatError
 
 
 LOG = log.getLogger(__name__)
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/host.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/host.py
index bb69b030ea..077dc06bf6 100644
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/host.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/host.py
@@ -45,7 +45,8 @@ from wsme import types as wtypes
 from configutilities import HOST_XML_ATTRIBUTES
 from fm_api import constants as fm_constants
 from fm_api import fm_api
-from pecan import expose, rest
+from pecan import expose
+from pecan import rest
 from sysinv import objects
 
 from sysinv.api.controllers.v1 import ethernet_port
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/hwmon_api.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/hwmon_api.py
index 037837c69f..f0dca1a42e 100755
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/hwmon_api.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/hwmon_api.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 import json
-from rest_api import rest_api_request
+from sysinv.api.controllers.v1.rest_api import rest_api_request
 
 from sysinv.openstack.common import log
 LOG = log.getLogger(__name__)
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/mtce_api.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/mtce_api.py
index 88848ef4ac..7b7c35aecf 100755
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/mtce_api.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/mtce_api.py
@@ -5,7 +5,7 @@
 #
 import time
 import json
-from rest_api import rest_api_request
+from sysinv.api.controllers.v1.rest_api import rest_api_request
 from sysinv.common import exception as si_exception
 from sysinv.openstack.common import log
 LOG = log.getLogger(__name__)
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/network_infra.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/network_infra.py
index b3dfc3815f..753b97c711 100644
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/network_infra.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/network_infra.py
@@ -30,7 +30,9 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
-from netaddr import IPNetwork, IPAddress, AddrFormatError
+from netaddr import IPNetwork
+from netaddr import IPAddress
+from netaddr import AddrFormatError
 
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/network_oam.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/network_oam.py
index fdf20dbfae..d4b3d05561 100644
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/network_oam.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/network_oam.py
@@ -28,7 +28,10 @@ import wsme
 from wsme import types as wtypes
 import wsmeext.pecan as wsme_pecan
 
-from netaddr import IPNetwork, IPAddress, IPRange, AddrFormatError
+from netaddr import IPNetwork
+from netaddr import IPAddress
+from netaddr import IPRange
+from netaddr import AddrFormatError
 
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/ntp.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/ntp.py
index 48b896ed16..a6540d61dc 100644
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/ntp.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/ntp.py
@@ -41,7 +41,8 @@ from sysinv import objects
 from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
-from netaddr import IPAddress, AddrFormatError
+from netaddr import IPAddress
+from netaddr import AddrFormatError
 
 
 LOG = log.getLogger(__name__)
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/patch_api.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/patch_api.py
index 5f9f1c4d2e..0a0bd89e58 100644
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/patch_api.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/patch_api.py
@@ -3,7 +3,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from rest_api import rest_api_request, get_token
+from sysinv.api.controllers.v1.rest_api import rest_api_request
+from sysinv.api.controllers.v1.rest_api import get_token
 
 from sysinv.openstack.common import log
 LOG = log.getLogger(__name__)
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/remotelogging.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/remotelogging.py
index 09387bbc8c..df64f5a2d8 100644
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/remotelogging.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/remotelogging.py
@@ -42,7 +42,8 @@ from sysinv import objects
 from sysinv.openstack.common.gettextutils import _
 from sysinv.openstack.common import log
 
-from netaddr import IPAddress, AddrFormatError
+from netaddr import IPAddress
+from netaddr import AddrFormatError
 
 
 LOG = log.getLogger(__name__)
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/sm_api.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/sm_api.py
index 2863ee6308..9a6b78a883 100755
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/sm_api.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/sm_api.py
@@ -6,8 +6,8 @@
 import json
 import pecan
 import socket
-from rest_api import get_token
-from rest_api import rest_api_request
+from sysinv.api.controllers.v1.rest_api import get_token
+from sysinv.api.controllers.v1.rest_api import rest_api_request
 from sysinv.openstack.common import log
 
 LOG = log.getLogger(__name__)
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_ceph.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_ceph.py
index ebdc0fbb8e..c24ab6313d 100644
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_ceph.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_ceph.py
@@ -36,6 +36,7 @@ import wsmeext.pecan as wsme_pecan
 
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
+from sysinv.api.controllers.v1 import controller_fs as controller_fs_api
 from sysinv.api.controllers.v1 import link
 from sysinv.api.controllers.v1 import types
 from sysinv.api.controllers.v1 import utils
@@ -50,7 +51,6 @@ from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
 from sysinv.openstack.common.gettextutils import _
 
-import controller_fs as controller_fs_api
 
 LOG = log.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_lvm.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_lvm.py
index 2f41299628..fb2a5b9666 100644
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_lvm.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/storage_lvm.py
@@ -35,6 +35,7 @@ import wsmeext.pecan as wsme_pecan
 
 from sysinv.api.controllers.v1 import base
 from sysinv.api.controllers.v1 import collection
+from sysinv.api.controllers.v1 import controller_fs as controller_fs_api
 from sysinv.api.controllers.v1 import link
 from sysinv.api.controllers.v1 import types
 from sysinv.api.controllers.v1 import utils
@@ -48,7 +49,6 @@ from sysinv.openstack.common import log
 from sysinv.openstack.common import uuidutils
 from sysinv.openstack.common.gettextutils import _
 
-import controller_fs as controller_fs_api
 
 LOG = log.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/upgrade.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/upgrade.py
index 834b51982c..49a7b0ba24 100755
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/upgrade.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/upgrade.py
@@ -8,7 +8,8 @@
 # coding=utf-8
 #
 import pecan
-from pecan import rest, expose
+from pecan import rest
+from pecan import expose
 import os
 import six
 import socket
diff --git a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/vim_api.py b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/vim_api.py
index 73d54547cb..feffab97dd 100644
--- a/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/vim_api.py
+++ b/sysinv/sysinv/sysinv/sysinv/api/controllers/v1/vim_api.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 import json
-from rest_api import rest_api_request
+from sysinv.api.controllers.v1.rest_api import rest_api_request
 from sysinv.common import constants
 
 from sysinv.openstack.common import log
diff --git a/sysinv/sysinv/sysinv/sysinv/cluster/cluster_services.py b/sysinv/sysinv/sysinv/sysinv/cluster/cluster_services.py
index 8e4669af76..af84e445f5 100644
--- a/sysinv/sysinv/sysinv/sysinv/cluster/cluster_services.py
+++ b/sysinv/sysinv/sysinv/sysinv/cluster/cluster_services.py
@@ -9,7 +9,7 @@ Cluster Services
 """
 
 import sys
-import cluster_xml as xml
+from sysinv.cluster import cluster_xml as xml
 import logging
 
 from lxml import etree
diff --git a/sysinv/sysinv/sysinv/sysinv/cluster/cluster_services_api.py b/sysinv/sysinv/sysinv/sysinv/cluster/cluster_services_api.py
index 4dc3232d38..abcdf1fc5d 100644
--- a/sysinv/sysinv/sysinv/sysinv/cluster/cluster_services_api.py
+++ b/sysinv/sysinv/sysinv/sysinv/cluster/cluster_services_api.py
@@ -10,8 +10,8 @@ Cluster Services API
 
 import json
 
-import pacemaker as crm
-import cluster_services as cluster
+from sysinv.cluster import pacemaker as crm
+from sysinv.cluster import cluster_services as cluster
 import logging
 
 LOG = logging.getLogger(__name__)
diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/ceph.py b/sysinv/sysinv/sysinv/sysinv/conductor/ceph.py
index 9803b2c571..23903244b2 100644
--- a/sysinv/sysinv/sysinv/sysinv/conductor/ceph.py
+++ b/sysinv/sysinv/sysinv/sysinv/conductor/ceph.py
@@ -16,7 +16,8 @@ import os
 import uuid
 import copy
 import tsconfig.tsconfig as tsc
-from requests.exceptions import RequestException, ReadTimeout
+from requests.exceptions import RequestException
+from requests.exceptions import ReadTimeout
 
 from cephclient import wrapper as ceph
 from fm_api import fm_api
diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py
index 142565431e..e6381e74e8 100644
--- a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py
+++ b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py
@@ -55,7 +55,8 @@ from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
 from fm_api import constants as fm_constants
 from fm_api import fm_api
-from netaddr import IPAddress, IPNetwork
+from netaddr import IPAddress
+from netaddr import IPNetwork
 from oslo_config import cfg
 from platform_util.license import license
 from sqlalchemy.orm import exc
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/aodh.py b/sysinv/sysinv/sysinv/sysinv/helm/aodh.py
index 55b48e2b58..7ec9411f93 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/aodh.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/aodh.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/barbican.py b/sysinv/sysinv/sysinv/sysinv/helm/barbican.py
index 3c4eca77fe..9f04018779 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/barbican.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/barbican.py
@@ -6,8 +6,8 @@
 
 from sysinv.common import constants
 from sysinv.common import exception
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 
 class BarbicanHelm(openstack.OpenstackBaseHelm):
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/base.py b/sysinv/sysinv/sysinv/sysinv/helm/base.py
index c756c42af7..a42073a808 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/base.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/base.py
@@ -15,8 +15,8 @@ from sysinv.common.storage_backend_conf import StorageBackendConfig
 
 from sysinv.openstack.common import log as logging
 
-from . import common
-from . import quoted_str
+from sysinv.helm import common
+from sysinv.helm import quoted_str
 
 LOG = logging.getLogger('object')
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py b/sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py
index 8fbb5760b6..f4568d5e75 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/ceilometer.py
@@ -8,8 +8,8 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/cinder.py b/sysinv/sysinv/sysinv/sysinv/helm/cinder.py
index 913548ad7e..e521064e70 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/cinder.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/cinder.py
@@ -9,8 +9,8 @@ from sysinv.common import exception
 from sysinv.common.storage_backend_conf import StorageBackendConfig
 
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/glance.py b/sysinv/sysinv/sysinv/sysinv/helm/glance.py
index 54b2121aad..607f501ec2 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/glance.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/glance.py
@@ -8,8 +8,8 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
 
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py b/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py
index 07e8cc5226..c49fb18c2a 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/gnocchi.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/heat.py b/sysinv/sysinv/sysinv/sysinv/helm/heat.py
index a242a5a579..6971d43248 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/heat.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/heat.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/helm.py b/sysinv/sysinv/sysinv/sysinv/helm/helm.py
index 825f5428a8..72fa0957c4 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/helm.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/helm.py
@@ -19,7 +19,7 @@ from stevedore import extension
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import common
+from sysinv.helm import common
 
 
 LOG = logging.getLogger(__name__)
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/horizon.py b/sysinv/sysinv/sysinv/sysinv/helm/horizon.py
index 88efc23fda..b51ddd8ca3 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/horizon.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/horizon.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/ingress.py b/sysinv/sysinv/sysinv/sysinv/helm/ingress.py
index f7507476d6..21f77a3c9a 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/ingress.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/ingress.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import common
-from . import base
+from sysinv.helm import common
+from sysinv.helm import base
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/ironic.py b/sysinv/sysinv/sysinv/sysinv/helm/ironic.py
index ac30151100..1ed5b9fe45 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/ironic.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/ironic.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import exception
 
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 
 class IronicHelm(openstack.OpenstackBaseHelm):
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/keystone.py b/sysinv/sysinv/sysinv/sysinv/helm/keystone.py
index 9a66a2662d..266cd96967 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/keystone.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/keystone.py
@@ -10,8 +10,8 @@ import os
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/libvirt.py b/sysinv/sysinv/sysinv/sysinv/helm/libvirt.py
index e0e8f08821..602b1640e2 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/libvirt.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/libvirt.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/magnum.py b/sysinv/sysinv/sysinv/sysinv/helm/magnum.py
index f9bac1127c..eced879bfb 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/magnum.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/magnum.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import exception
 
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 
 class MagnumHelm(openstack.OpenstackBaseHelm):
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/mariadb.py b/sysinv/sysinv/sysinv/sysinv/helm/mariadb.py
index 08584fe245..9d6e091358 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/mariadb.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/mariadb.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/memcached.py b/sysinv/sysinv/sysinv/sysinv/helm/memcached.py
index 8b66ecb6dc..63c5e0825f 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/memcached.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/memcached.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import common
-from . import base
+from sysinv.helm import common
+from sysinv.helm import base
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/neutron.py b/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
index 0dbf6abf0d..b9e2759a11 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/neutron.py
@@ -8,8 +8,8 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 from sqlalchemy.orm.exc import NoResultFound
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/nova.py b/sysinv/sysinv/sysinv/sysinv/helm/nova.py
index 0c23c13ad5..b5cd58f71f 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/nova.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/nova.py
@@ -11,8 +11,8 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/nova_api_proxy.py b/sysinv/sysinv/sysinv/sysinv/helm/nova_api_proxy.py
index 9b3ce24dde..2214d5dc06 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/nova_api_proxy.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/nova_api_proxy.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/openstack.py b/sysinv/sysinv/sysinv/sysinv/helm/openstack.py
index 4120c81fce..a74cf36ecb 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/openstack.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/openstack.py
@@ -7,8 +7,8 @@
 import keyring
 import subprocess
 
-from . import base
-from . import common
+from sysinv.helm import base
+from sysinv.helm import common
 
 from oslo_log import log
 from sysinv.common import constants
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/openvswitch.py b/sysinv/sysinv/sysinv/sysinv/helm/openvswitch.py
index 8ee9abdb16..932aa8024b 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/openvswitch.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/openvswitch.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/panko.py b/sysinv/sysinv/sysinv/sysinv/helm/panko.py
index 2a304fb107..4b78ec3718 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/panko.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/panko.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/rabbitmq.py b/sysinv/sysinv/sysinv/sysinv/helm/rabbitmq.py
index 6229ee0b25..0c4d8b87bf 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/rabbitmq.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/rabbitmq.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import common
-from . import openstack
+from sysinv.helm import common
+from sysinv.helm import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/helm/rbd_provisioner.py b/sysinv/sysinv/sysinv/sysinv/helm/rbd_provisioner.py
index a8830cf33d..7fba85b3fd 100644
--- a/sysinv/sysinv/sysinv/sysinv/helm/rbd_provisioner.py
+++ b/sysinv/sysinv/sysinv/sysinv/helm/rbd_provisioner.py
@@ -9,8 +9,8 @@ from sysinv.common import exception
 from sysinv.common.storage_backend_conf import K8RbdProvisioner
 from sysinv.openstack.common import log as logging
 
-from . import base
-from . import common
+from sysinv.helm import base
+from sysinv.helm import common
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/aodh.py b/sysinv/sysinv/sysinv/sysinv/puppet/aodh.py
index d1339a1ab4..ea3129bdc8 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/aodh.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/aodh.py
@@ -6,7 +6,7 @@
 
 from sysinv.common import constants
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 class AodhPuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/barbican.py b/sysinv/sysinv/sysinv/sysinv/puppet/barbican.py
index d1da20aa41..c7d2f23853 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/barbican.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/barbican.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 class BarbicanPuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/base.py b/sysinv/sysinv/sysinv/sysinv/puppet/base.py
index 65ed0f3e58..bfd32e7d50 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/base.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/base.py
@@ -14,7 +14,7 @@ from sysinv.common import constants
 from sysinv.common import utils
 from sysinv.common import exception
 
-from . import quoted_str
+from sysinv.puppet import quoted_str
 
 
 @six.add_metaclass(abc.ABCMeta)
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/ceilometer.py b/sysinv/sysinv/sysinv/sysinv/puppet/ceilometer.py
index 8f1c5167c8..928e5ecb2c 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/ceilometer.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/ceilometer.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 class CeilometerPuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/ceph.py b/sysinv/sysinv/sysinv/sysinv/puppet/ceph.py
index 05695e733c..6a926004b2 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/ceph.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/ceph.py
@@ -11,7 +11,7 @@ from sysinv.api.controllers.v1 import utils
 from sysinv.common import constants
 from sysinv.common.storage_backend_conf import StorageBackendConfig
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 # NOTE: based on openstack service for providing swift object storage services
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/cinder.py b/sysinv/sysinv/sysinv/sysinv/puppet/cinder.py
index d6629bef12..f2df9b25ac 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/cinder.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/cinder.py
@@ -10,7 +10,7 @@ from sysinv.common import exception
 from sysinv.common import utils
 from sysinv.openstack.common import log as logging
 
-from . import openstack
+from sysinv.puppet import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/dcmanager.py b/sysinv/sysinv/sysinv/sysinv/puppet/dcmanager.py
index 52ca4db797..5f9b7e3b8d 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/dcmanager.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/dcmanager.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from . import openstack
+from sysinv.puppet import openstack
 
 from sysinv.common import constants
 
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/dcorch.py b/sysinv/sysinv/sysinv/sysinv/puppet/dcorch.py
index 2c529df025..d102c28172 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/dcorch.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/dcorch.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from . import openstack
+from sysinv.puppet import openstack
 
 from sysinv.common import constants
 
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/device.py b/sysinv/sysinv/sysinv/sysinv/puppet/device.py
index e17b05f09b..c8cea3393f 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/device.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/device.py
@@ -7,7 +7,7 @@
 import collections
 from sysinv.common import constants
 
-from . import base
+from sysinv.puppet import base
 
 
 class DevicePuppet(base.BasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/fm.py b/sysinv/sysinv/sysinv/sysinv/puppet/fm.py
index 508e7b8ffc..c6c60ec678 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/fm.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/fm.py
@@ -5,7 +5,7 @@
 #
 
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 class FmPuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/glance.py b/sysinv/sysinv/sysinv/sysinv/puppet/glance.py
index 5429f5a064..0ae93f5fbe 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/glance.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/glance.py
@@ -11,7 +11,7 @@ from urlparse import urlparse
 from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
-from . import openstack
+from sysinv.puppet import openstack
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/gnocchi.py b/sysinv/sysinv/sysinv/sysinv/puppet/gnocchi.py
index a83cf4054c..ebc2fae6fa 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/gnocchi.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/gnocchi.py
@@ -6,7 +6,7 @@
 
 from sysinv.common import constants
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 class GnocchiPuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/heat.py b/sysinv/sysinv/sysinv/sysinv/puppet/heat.py
index b038234e8e..8f01c902b3 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/heat.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/heat.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from . import openstack
+from sysinv.puppet import openstack
 from sysinv.common import constants
 
 
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/horizon.py b/sysinv/sysinv/sysinv/sysinv/puppet/horizon.py
index 34d67f8696..cad27eede0 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/horizon.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/horizon.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from . import openstack
+from sysinv.puppet import openstack
 
 from sysinv.common import exception
 
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/interface.py b/sysinv/sysinv/sysinv/sysinv/puppet/interface.py
index 2054849a7d..6b305f4395 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/interface.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/interface.py
@@ -17,7 +17,7 @@ from sysinv.common import utils
 from sysinv.conductor import openstack
 from sysinv.openstack.common import log
 
-from . import base
+from sysinv.puppet import base
 
 
 LOG = log.getLogger(__name__)
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/inventory.py b/sysinv/sysinv/sysinv/sysinv/puppet/inventory.py
index 6db5a3828b..0a3aab38e6 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/inventory.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/inventory.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from . import openstack
+from sysinv.puppet import openstack
 
 from sysinv.common import constants
 
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/ironic.py b/sysinv/sysinv/sysinv/sysinv/puppet/ironic.py
index b2e8df0044..c631c90ea9 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/ironic.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/ironic.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 class IronicPuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/keystone.py b/sysinv/sysinv/sysinv/sysinv/puppet/keystone.py
index 4f8be8bbd3..2cbcbe42a0 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/keystone.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/keystone.py
@@ -12,7 +12,7 @@ from sysinv.common import constants
 from tsconfig import tsconfig
 from urlparse import urlparse
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 OPENSTACK_PASSWORD_RULES_FILE = '/etc/keystone/password-rules.conf'
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/kubernetes.py b/sysinv/sysinv/sysinv/sysinv/puppet/kubernetes.py
index 6b103f05a8..a1c3fe76d0 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/kubernetes.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/kubernetes.py
@@ -11,7 +11,7 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.openstack.common import log as logging
 
-from . import base
+from sysinv.puppet import base
 
 LOG = logging.getLogger(__name__)
 
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/ldap.py b/sysinv/sysinv/sysinv/sysinv/puppet/ldap.py
index 92e25665e6..b15a996c13 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/ldap.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/ldap.py
@@ -8,7 +8,7 @@ from passlib.hash import ldap_salted_sha1 as hash
 
 from sysinv.common import constants
 
-from . import base
+from sysinv.puppet import base
 
 
 class LdapPuppet(base.BasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/magnum.py b/sysinv/sysinv/sysinv/sysinv/puppet/magnum.py
index e4ec2ff694..afe30b2e31 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/magnum.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/magnum.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 class MagnumPuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/mtce.py b/sysinv/sysinv/sysinv/sysinv/puppet/mtce.py
index f5a3e9d8df..723fac3a76 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/mtce.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/mtce.py
@@ -6,7 +6,7 @@
 
 from tsconfig.tsconfig import KEYRING_PATH
 from sysinv.common import constants
-from . import openstack
+from sysinv.puppet import openstack
 
 
 class MtcePuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/murano.py b/sysinv/sysinv/sysinv/sysinv/puppet/murano.py
index 93a91f792f..f32dc35cd2 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/murano.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/murano.py
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 class MuranoPuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/networking.py b/sysinv/sysinv/sysinv/sysinv/puppet/networking.py
index d450ee69de..96132d91e0 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/networking.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/networking.py
@@ -9,8 +9,8 @@ import netaddr
 from sysinv.common import constants
 from sysinv.common import exception
 
-from . import base
-from . import interface
+from sysinv.puppet import base
+from sysinv.puppet import interface
 
 
 class NetworkingPuppet(base.BasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/neutron.py b/sysinv/sysinv/sysinv/sysinv/puppet/neutron.py
index c09c2596e5..15ee1e3999 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/neutron.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/neutron.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import utils
 
-from . import interface
-from . import openstack
+from sysinv.puppet import interface
+from sysinv.puppet import openstack
 
 
 class NeutronPuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py b/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py
index 49592314d6..306c3d355e 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py
@@ -8,7 +8,7 @@ from sysinv.common import constants
 from sysinv.common import utils
 from sysinv.helm import helm
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 class NfvPuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/nova.py b/sysinv/sysinv/sysinv/sysinv/puppet/nova.py
index e16edd7f03..90ca787825 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/nova.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/nova.py
@@ -14,8 +14,8 @@ from sysinv.common import constants
 from sysinv.common import exception
 from sysinv.common import utils
 
-from . import openstack
-from . import interface
+from sysinv.puppet import openstack
+from sysinv.puppet import interface
 
 
 SCHEDULER_FILTERS_COMMON = [
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/openstack.py b/sysinv/sysinv/sysinv/sysinv/puppet/openstack.py
index 95d46e6c13..1ce36ebda0 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/openstack.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/openstack.py
@@ -9,7 +9,7 @@ import keyring
 
 from sysinv.common import constants
 
-from . import base
+from sysinv.puppet import base
 
 
 class OpenstackBasePuppet(base.BasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/ovs.py b/sysinv/sysinv/sysinv/sysinv/puppet/ovs.py
index a77ee06f76..0fffffb52a 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/ovs.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/ovs.py
@@ -7,8 +7,8 @@
 from sysinv.common import constants
 from sysinv.common import utils
 
-from . import base
-from . import interface
+from sysinv.puppet import base
+from sysinv.puppet import interface
 
 
 class OVSPuppet(base.BasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/panko.py b/sysinv/sysinv/sysinv/sysinv/puppet/panko.py
index b7a4cc4f35..b7dcc64a69 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/panko.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/panko.py
@@ -6,7 +6,7 @@
 
 from sysinv.common import constants
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 class PankoPuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/patching.py b/sysinv/sysinv/sysinv/sysinv/puppet/patching.py
index e43d2dc63f..ce10512fa3 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/patching.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/patching.py
@@ -6,7 +6,7 @@
 
 from sysinv.common import constants
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 class PatchingPuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/platform.py b/sysinv/sysinv/sysinv/sysinv/puppet/platform.py
index a471f54986..93ccf4f6a7 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/platform.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/platform.py
@@ -15,7 +15,7 @@ from sysinv.common import utils
 
 from tsconfig import tsconfig
 
-from . import base
+from sysinv.puppet import base
 
 HOSTNAME_INFRA_SUFFIX = '-infra'
 
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/service_parameter.py b/sysinv/sysinv/sysinv/sysinv/puppet/service_parameter.py
index d39a671e86..6c33787748 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/service_parameter.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/service_parameter.py
@@ -6,7 +6,7 @@
 
 from sysinv.common import service_parameter
 
-from . import base
+from sysinv.puppet import base
 
 from sysinv.openstack.common import log as logging
 LOG = logging.getLogger(__name__)
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/smapi.py b/sysinv/sysinv/sysinv/sysinv/puppet/smapi.py
index 73fd4fbc39..06a61fb351 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/smapi.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/smapi.py
@@ -7,7 +7,7 @@
 from sysinv.common import constants
 from sysinv.common import utils
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 class SmPuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/storage.py b/sysinv/sysinv/sysinv/sysinv/puppet/storage.py
index 41ecd4915c..45f2da1496 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/storage.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/storage.py
@@ -8,7 +8,7 @@ import json
 
 from sysinv.common import constants
 
-from . import base
+from sysinv.puppet import base
 
 
 class StoragePuppet(base.BasePuppet):
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/swift.py b/sysinv/sysinv/sysinv/sysinv/puppet/swift.py
index 596a5f8783..5c818fa8e6 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/swift.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/swift.py
@@ -5,7 +5,7 @@
 #
 
 
-from . import openstack
+from sysinv.puppet import openstack
 
 
 class SwiftPuppet(openstack.OpenstackBasePuppet):
diff --git a/sysinv/sysinv/sysinv/tox.ini b/sysinv/sysinv/sysinv/tox.ini
index fbd39cadf7..31bb84eee7 100644
--- a/sysinv/sysinv/sysinv/tox.ini
+++ b/sysinv/sysinv/sysinv/tox.ini
@@ -63,7 +63,6 @@ commands =
 # H104 file contains only comments (ie: license)
 # H105 author tags
 # H232..H238 are python3 compatability
-# H301 one import per line
 # H306 imports not in alphabetical order
 # H401 docstring should not start with a space
 # H403 multi line docstrings should end on a new line
@@ -73,8 +72,8 @@ commands =
 # H701 Empty localization string
 # H702 Formatting operation should be outside of localization method call
 # H703 Multiple positional placeholders
-ignore = E126,E127,E128,E226,E402,E501,H101,H102,H104,H105,H236,H237,H238,H301,H306,H401,H403,H404,H405,H501,H701,H702,H703
-exclude = build,dist
+ignore = E126,E127,E128,E226,E402,E501,H101,H102,H104,H105,H236,H237,H238,H306,H401,H403,H404,H405,H501,H701,H702,H703
+exclude = build,dist,tools
 
 [testenv:flake8]
 basepython = python2.7