diff --git a/pype/hosts/maya/plugins/create/create_animation.py b/pype/hosts/maya/plugins/create/create_animation.py
index 7bafce774c..6894fffb5d 100644
--- a/pype/hosts/maya/plugins/create/create_animation.py
+++ b/pype/hosts/maya/plugins/create/create_animation.py
@@ -1,5 +1,5 @@
 import avalon.maya
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class CreateAnimation(avalon.maya.Creator):
diff --git a/pype/hosts/maya/plugins/create/create_ass.py b/pype/hosts/maya/plugins/create/create_ass.py
index 7fd66e8e15..b7d5f27114 100644
--- a/pype/hosts/maya/plugins/create/create_ass.py
+++ b/pype/hosts/maya/plugins/create/create_ass.py
@@ -1,7 +1,7 @@
 from collections import OrderedDict
 
 import avalon.maya
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 from maya import cmds
 
diff --git a/pype/hosts/maya/plugins/create/create_camera.py b/pype/hosts/maya/plugins/create/create_camera.py
index acff93c03c..cb438e68ba 100644
--- a/pype/hosts/maya/plugins/create/create_camera.py
+++ b/pype/hosts/maya/plugins/create/create_camera.py
@@ -1,5 +1,5 @@
 import avalon.maya
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class CreateCamera(avalon.maya.Creator):
diff --git a/pype/hosts/maya/plugins/create/create_look.py b/pype/hosts/maya/plugins/create/create_look.py
index 5ea64cc7e4..2d8576a8b4 100644
--- a/pype/hosts/maya/plugins/create/create_look.py
+++ b/pype/hosts/maya/plugins/create/create_look.py
@@ -1,5 +1,5 @@
 import avalon.maya
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class CreateLook(avalon.maya.Creator):
diff --git a/pype/hosts/maya/plugins/create/create_pointcache.py b/pype/hosts/maya/plugins/create/create_pointcache.py
index 1eb561b5ce..271257c85e 100644
--- a/pype/hosts/maya/plugins/create/create_pointcache.py
+++ b/pype/hosts/maya/plugins/create/create_pointcache.py
@@ -1,5 +1,5 @@
 import avalon.maya
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class CreatePointCache(avalon.maya.Creator):
diff --git a/pype/hosts/maya/plugins/create/create_render.py b/pype/hosts/maya/plugins/create/create_render.py
index 2b0b0e19f7..0763b19c17 100644
--- a/pype/hosts/maya/plugins/create/create_render.py
+++ b/pype/hosts/maya/plugins/create/create_render.py
@@ -8,7 +8,7 @@ import requests
 from maya import cmds
 import maya.app.renderSetup.model.renderSetup as renderSetup
 
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 from pype.api import get_system_settings
 import avalon.maya
 
diff --git a/pype/hosts/maya/plugins/create/create_rendersetup.py b/pype/hosts/maya/plugins/create/create_rendersetup.py
index 40e3731bf0..bbf46e2169 100644
--- a/pype/hosts/maya/plugins/create/create_rendersetup.py
+++ b/pype/hosts/maya/plugins/create/create_rendersetup.py
@@ -1,5 +1,5 @@
 import avalon.maya
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 from maya import cmds
 
 
diff --git a/pype/hosts/maya/plugins/create/create_review.py b/pype/hosts/maya/plugins/create/create_review.py
index bfeab33f5b..8619f90964 100644
--- a/pype/hosts/maya/plugins/create/create_review.py
+++ b/pype/hosts/maya/plugins/create/create_review.py
@@ -1,6 +1,6 @@
 from collections import OrderedDict
 import avalon.maya
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class CreateReview(avalon.maya.Creator):
diff --git a/pype/hosts/maya/plugins/create/create_rig.py b/pype/hosts/maya/plugins/create/create_rig.py
index ae1de4243e..4692997934 100644
--- a/pype/hosts/maya/plugins/create/create_rig.py
+++ b/pype/hosts/maya/plugins/create/create_rig.py
@@ -1,6 +1,6 @@
 from maya import cmds
 
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 import avalon.maya
 
 
diff --git a/pype/hosts/maya/plugins/create/create_yeti_cache.py b/pype/hosts/maya/plugins/create/create_yeti_cache.py
index a4b5cc537a..c9edb65d8b 100644
--- a/pype/hosts/maya/plugins/create/create_yeti_cache.py
+++ b/pype/hosts/maya/plugins/create/create_yeti_cache.py
@@ -1,7 +1,7 @@
 from collections import OrderedDict
 
 import avalon.maya
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class CreateYetiCache(avalon.maya.Creator):
diff --git a/pype/hosts/maya/plugins/create/create_yeti_rig.py b/pype/hosts/maya/plugins/create/create_yeti_rig.py
index 0b954f500d..c385ca662d 100644
--- a/pype/hosts/maya/plugins/create/create_yeti_rig.py
+++ b/pype/hosts/maya/plugins/create/create_yeti_rig.py
@@ -1,6 +1,6 @@
 from maya import cmds
 
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 import avalon.maya
 
 
diff --git a/pype/hosts/maya/plugins/load/_load_animation.py b/pype/hosts/maya/plugins/load/_load_animation.py
index 597689ae21..bef97d79bb 100644
--- a/pype/hosts/maya/plugins/load/_load_animation.py
+++ b/pype/hosts/maya/plugins/load/_load_animation.py
@@ -1,7 +1,7 @@
-import pype.hosts.maya.plugin
+import pype.hosts.maya.api.plugin
 
 
-class AbcLoader(pype.hosts.maya.plugin.ReferenceLoader):
+class AbcLoader(pype.hosts.maya.api.plugin.ReferenceLoader):
     """Specific loader of Alembic for the avalon.animation family"""
 
     families = ["animation",
diff --git a/pype/hosts/maya/plugins/load/load_ass.py b/pype/hosts/maya/plugins/load/load_ass.py
index 9b851a3757..8aaa99369c 100644
--- a/pype/hosts/maya/plugins/load/load_ass.py
+++ b/pype/hosts/maya/plugins/load/load_ass.py
@@ -1,11 +1,11 @@
 from avalon import api
-import pype.hosts.maya.plugin
+import pype.hosts.maya.api.plugin
 import os
 from pype.api import get_project_settings
 import clique
 
 
-class AssProxyLoader(pype.hosts.maya.plugin.ReferenceLoader):
+class AssProxyLoader(pype.hosts.maya.api.plugin.ReferenceLoader):
     """Load the Proxy"""
 
     families = ["ass"]
diff --git a/pype/hosts/maya/plugins/load/load_gpucache.py b/pype/hosts/maya/plugins/load/load_gpucache.py
index 0b3daae710..a183a46cd3 100644
--- a/pype/hosts/maya/plugins/load/load_gpucache.py
+++ b/pype/hosts/maya/plugins/load/load_gpucache.py
@@ -1,5 +1,5 @@
 from avalon import api
-import pype.hosts.maya.plugin
+import pype.hosts.maya.api.plugin
 import os
 from pype.api import get_project_settings
 reload(config)
diff --git a/pype/hosts/maya/plugins/load/load_look.py b/pype/hosts/maya/plugins/load/load_look.py
index c5b58c9bd5..ab8f971d62 100644
--- a/pype/hosts/maya/plugins/load/load_look.py
+++ b/pype/hosts/maya/plugins/load/load_look.py
@@ -1,13 +1,13 @@
-import pype.hosts.maya.plugin
+import pype.hosts.maya.api.plugin
 from avalon import api, io
 import json
-import pype.hosts.maya.lib
+import pype.hosts.maya.api.lib
 from collections import defaultdict
 from pype.widgets.message_window import ScrollMessageBox
 from Qt import QtWidgets
 
 
-class LookLoader(pype.hosts.maya.plugin.ReferenceLoader):
+class LookLoader(pype.hosts.maya.api.plugin.ReferenceLoader):
     """Specific loader for lookdev"""
 
     families = ["look"]
@@ -120,7 +120,7 @@ class LookLoader(pype.hosts.maya.plugin.ReferenceLoader):
             cmds.file(cr=reference_node)  # cleanReference
 
             # reapply shading groups from json representation on orig nodes
-            pype.hosts.maya.lib.apply_shaders(relationships,
+            pype.hosts.maya.api.lib.apply_shaders(relationships,
                                               shader_nodes,
                                               orig_nodes)
 
@@ -138,8 +138,8 @@ class LookLoader(pype.hosts.maya.plugin.ReferenceLoader):
         # region compute lookup
         nodes_by_id = defaultdict(list)
         for n in nodes:
-            nodes_by_id[pype.hosts.maya.lib.get_id(n)].append(n)
-        pype.hosts.maya.lib.apply_attributes(attributes, nodes_by_id)
+            nodes_by_id[pype.hosts.maya.api.lib.get_id(n)].append(n)
+        pype.hosts.maya.api.lib.apply_attributes(attributes, nodes_by_id)
 
         # Update metadata
         cmds.setAttr("{}.representation".format(node),
diff --git a/pype/hosts/maya/plugins/load/load_reference.py b/pype/hosts/maya/plugins/load/load_reference.py
index 23b3cedb55..d37579423c 100644
--- a/pype/hosts/maya/plugins/load/load_reference.py
+++ b/pype/hosts/maya/plugins/load/load_reference.py
@@ -1,11 +1,11 @@
-import pype.hosts.maya.plugin
+import pype.hosts.maya.api.plugin
 from avalon import api, maya
 from maya import cmds
 import os
 from pype.api import get_project_settings
 
 
-class ReferenceLoader(pype.hosts.maya.plugin.ReferenceLoader):
+class ReferenceLoader(pype.hosts.maya.api.plugin.ReferenceLoader):
     """Load the model"""
 
     families = ["model",
diff --git a/pype/hosts/maya/plugins/load/load_rendersetup.py b/pype/hosts/maya/plugins/load/load_rendersetup.py
index 45a314a9d1..c540c3880e 100644
--- a/pype/hosts/maya/plugins/load/load_rendersetup.py
+++ b/pype/hosts/maya/plugins/load/load_rendersetup.py
@@ -12,7 +12,7 @@ import sys
 
 from avalon import api
 from avalon.maya import lib
-from pype.hosts.maya import lib as pypelib
+from pype.hosts.maya.api import lib as pypelib
 
 from maya import cmds
 import maya.app.renderSetup.model.renderSetup as renderSetup
@@ -32,7 +32,7 @@ class RenderSetupLoader(api.Loader):
     def load(self, context, name, namespace, data):
         """Load RenderSetup settings."""
         from avalon.maya.pipeline import containerise
-        # from pype.hosts.maya.lib import namespaced
+        # from pype.hosts.maya.api.lib import namespaced
 
         asset = context['asset']['name']
         namespace = namespace or lib.unique_namespace(
diff --git a/pype/hosts/maya/plugins/load/load_vrayproxy.py b/pype/hosts/maya/plugins/load/load_vrayproxy.py
index 73f02b81e4..270d0f9baa 100644
--- a/pype/hosts/maya/plugins/load/load_vrayproxy.py
+++ b/pype/hosts/maya/plugins/load/load_vrayproxy.py
@@ -19,7 +19,7 @@ class VRayProxyLoader(api.Loader):
     def load(self, context, name, namespace, data):
 
         from avalon.maya.pipeline import containerise
-        from pype.hosts.maya.lib import namespaced
+        from pype.hosts.maya.api.lib import namespaced
 
         try:
             family = context["representation"]["context"]["family"]
diff --git a/pype/hosts/maya/plugins/load/load_yeti_cache.py b/pype/hosts/maya/plugins/load/load_yeti_cache.py
index 19cf3920fe..16d51ad56d 100644
--- a/pype/hosts/maya/plugins/load/load_yeti_cache.py
+++ b/pype/hosts/maya/plugins/load/load_yeti_cache.py
@@ -8,7 +8,7 @@ from maya import cmds
 
 from avalon import api, io
 from avalon.maya import lib as avalon_lib, pipeline
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 from pype.api import get_project_settings
 from pprint import pprint
 
diff --git a/pype/hosts/maya/plugins/load/load_yeti_rig.py b/pype/hosts/maya/plugins/load/load_yeti_rig.py
index 3a9339c707..d025ed13cc 100644
--- a/pype/hosts/maya/plugins/load/load_yeti_rig.py
+++ b/pype/hosts/maya/plugins/load/load_yeti_rig.py
@@ -2,11 +2,11 @@ import os
 from collections import defaultdict
 
 from pype.api import get_project_settings
-import pype.hosts.maya.plugin
-from pype.hosts.maya import lib
+import pype.hosts.maya.api.plugin
+from pype.hosts.maya.api import lib
 
 
-class YetiRigLoader(pype.hosts.maya.plugin.ReferenceLoader):
+class YetiRigLoader(pype.hosts.maya.api.plugin.ReferenceLoader):
     """
     This loader will load Yeti rig. You can select something in scene and if it
     has same ID as mesh published with rig, their shapes will be linked
diff --git a/pype/hosts/maya/plugins/publish/collect_assembly.py b/pype/hosts/maya/plugins/publish/collect_assembly.py
index f9a933d8e8..be3408a0bd 100644
--- a/pype/hosts/maya/plugins/publish/collect_assembly.py
+++ b/pype/hosts/maya/plugins/publish/collect_assembly.py
@@ -3,7 +3,7 @@ import pyblish.api
 
 from maya import cmds, mel
 from avalon import maya as avalon
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 # TODO : Publish of assembly: -unique namespace for all assets, VALIDATOR!
 
diff --git a/pype/hosts/maya/plugins/publish/collect_look.py b/pype/hosts/maya/plugins/publish/collect_look.py
index 7df85e4ba7..35abc5a991 100644
--- a/pype/hosts/maya/plugins/publish/collect_look.py
+++ b/pype/hosts/maya/plugins/publish/collect_look.py
@@ -4,7 +4,7 @@ import glob
 
 from maya import cmds
 import pyblish.api
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 SHAPE_ATTRS = ["castsShadows",
                "receiveShadows",
diff --git a/pype/hosts/maya/plugins/publish/collect_render.py b/pype/hosts/maya/plugins/publish/collect_render.py
index 0853473120..208937320d 100644
--- a/pype/hosts/maya/plugins/publish/collect_render.py
+++ b/pype/hosts/maya/plugins/publish/collect_render.py
@@ -49,8 +49,8 @@ import maya.app.renderSetup.model.renderSetup as renderSetup
 import pyblish.api
 
 from avalon import maya, api
-from pype.hosts.maya.expected_files import ExpectedFiles
-from pype.hosts.maya import lib
+from pype.hosts.maya.api.expected_files import ExpectedFiles
+from pype.hosts.maya.api import lib
 
 
 class CollectMayaRender(pyblish.api.ContextPlugin):
diff --git a/pype/hosts/maya/plugins/publish/collect_render_layer_aovs.py b/pype/hosts/maya/plugins/publish/collect_render_layer_aovs.py
index ff44497d6d..d776b43907 100644
--- a/pype/hosts/maya/plugins/publish/collect_render_layer_aovs.py
+++ b/pype/hosts/maya/plugins/publish/collect_render_layer_aovs.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class CollectRenderLayerAOVS(pyblish.api.InstancePlugin):
diff --git a/pype/hosts/maya/plugins/publish/collect_renderable_camera.py b/pype/hosts/maya/plugins/publish/collect_renderable_camera.py
index a7d613517b..893a2cab61 100644
--- a/pype/hosts/maya/plugins/publish/collect_renderable_camera.py
+++ b/pype/hosts/maya/plugins/publish/collect_renderable_camera.py
@@ -2,7 +2,7 @@ import pyblish.api
 
 from maya import cmds
 
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class CollectRenderableCamera(pyblish.api.InstancePlugin):
diff --git a/pype/hosts/maya/plugins/publish/collect_yeti_cache.py b/pype/hosts/maya/plugins/publish/collect_yeti_cache.py
index 26c3f601f6..2cfc56e486 100644
--- a/pype/hosts/maya/plugins/publish/collect_yeti_cache.py
+++ b/pype/hosts/maya/plugins/publish/collect_yeti_cache.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 SETTINGS = {"renderDensity",
             "renderWidth",
diff --git a/pype/hosts/maya/plugins/publish/collect_yeti_rig.py b/pype/hosts/maya/plugins/publish/collect_yeti_rig.py
index 73a84b0073..15bcdc51dd 100644
--- a/pype/hosts/maya/plugins/publish/collect_yeti_rig.py
+++ b/pype/hosts/maya/plugins/publish/collect_yeti_rig.py
@@ -5,7 +5,7 @@ from maya import cmds
 
 import pyblish.api
 
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 SETTINGS = {"renderDensity",
diff --git a/pype/hosts/maya/plugins/publish/extract_animation.py b/pype/hosts/maya/plugins/publish/extract_animation.py
index f7058b34f1..f56ba2f400 100644
--- a/pype/hosts/maya/plugins/publish/extract_animation.py
+++ b/pype/hosts/maya/plugins/publish/extract_animation.py
@@ -4,7 +4,7 @@ from maya import cmds
 
 import avalon.maya
 import pype.api
-from pype.hosts.maya.lib import extract_alembic
+from pype.hosts.maya.api.lib import extract_alembic
 
 
 class ExtractAnimation(pype.api.Extractor):
diff --git a/pype/hosts/maya/plugins/publish/extract_assembly.py b/pype/hosts/maya/plugins/publish/extract_assembly.py
index 8c5264713d..c72f1f1835 100644
--- a/pype/hosts/maya/plugins/publish/extract_assembly.py
+++ b/pype/hosts/maya/plugins/publish/extract_assembly.py
@@ -3,7 +3,7 @@ import json
 import os
 
 import pype.api
-from pype.hosts.maya.lib import extract_alembic
+from pype.hosts.maya.api.lib import extract_alembic
 
 from maya import cmds
 
diff --git a/pype/hosts/maya/plugins/publish/extract_assproxy.py b/pype/hosts/maya/plugins/publish/extract_assproxy.py
index 0f97d047c1..80cca1396b 100644
--- a/pype/hosts/maya/plugins/publish/extract_assproxy.py
+++ b/pype/hosts/maya/plugins/publish/extract_assproxy.py
@@ -5,7 +5,7 @@ import contextlib
 
 import avalon.maya
 import pype.api
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class ExtractAssProxy(pype.api.Extractor):
diff --git a/pype/hosts/maya/plugins/publish/extract_camera_alembic.py b/pype/hosts/maya/plugins/publish/extract_camera_alembic.py
index c0538338dc..c37f2ecb76 100644
--- a/pype/hosts/maya/plugins/publish/extract_camera_alembic.py
+++ b/pype/hosts/maya/plugins/publish/extract_camera_alembic.py
@@ -5,7 +5,7 @@ from maya import cmds
 import avalon.maya
 import pype.api
 
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class ExtractCameraAlembic(pype.api.Extractor):
diff --git a/pype/hosts/maya/plugins/publish/extract_camera_mayaScene.py b/pype/hosts/maya/plugins/publish/extract_camera_mayaScene.py
index a1854b1db0..16ebc39419 100644
--- a/pype/hosts/maya/plugins/publish/extract_camera_mayaScene.py
+++ b/pype/hosts/maya/plugins/publish/extract_camera_mayaScene.py
@@ -7,7 +7,7 @@ from maya import cmds
 
 import avalon.maya
 import pype.api
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 def massage_ma_file(path):
diff --git a/pype/hosts/maya/plugins/publish/extract_look.py b/pype/hosts/maya/plugins/publish/extract_look.py
index 0a7e4fb2ee..2c4837b7a7 100644
--- a/pype/hosts/maya/plugins/publish/extract_look.py
+++ b/pype/hosts/maya/plugins/publish/extract_look.py
@@ -14,7 +14,7 @@ import avalon.maya
 from avalon import io, api
 
 import pype.api
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 # Modes for transfer
 COPY = 1
diff --git a/pype/hosts/maya/plugins/publish/extract_model.py b/pype/hosts/maya/plugins/publish/extract_model.py
index 8276d1a006..1c268a9e0e 100644
--- a/pype/hosts/maya/plugins/publish/extract_model.py
+++ b/pype/hosts/maya/plugins/publish/extract_model.py
@@ -6,7 +6,7 @@ from maya import cmds
 
 import avalon.maya
 import pype.api
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class ExtractModel(pype.api.Extractor):
diff --git a/pype/hosts/maya/plugins/publish/extract_playblast.py b/pype/hosts/maya/plugins/publish/extract_playblast.py
index 39b02a5a83..770b077e41 100644
--- a/pype/hosts/maya/plugins/publish/extract_playblast.py
+++ b/pype/hosts/maya/plugins/publish/extract_playblast.py
@@ -4,7 +4,7 @@ import contextlib
 import clique
 import capture
 
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 import pype.api
 
 from maya import cmds
diff --git a/pype/hosts/maya/plugins/publish/extract_pointcache.py b/pype/hosts/maya/plugins/publish/extract_pointcache.py
index e43685cac8..58742c8567 100644
--- a/pype/hosts/maya/plugins/publish/extract_pointcache.py
+++ b/pype/hosts/maya/plugins/publish/extract_pointcache.py
@@ -4,7 +4,7 @@ from maya import cmds
 
 import avalon.maya
 import pype.api
-from pype.hosts.maya.lib import extract_alembic
+from pype.hosts.maya.api.lib import extract_alembic
 
 
 class ExtractAlembic(pype.api.Extractor):
diff --git a/pype/hosts/maya/plugins/publish/extract_thumbnail.py b/pype/hosts/maya/plugins/publish/extract_thumbnail.py
index 6956341ffd..49511f6af6 100644
--- a/pype/hosts/maya/plugins/publish/extract_thumbnail.py
+++ b/pype/hosts/maya/plugins/publish/extract_thumbnail.py
@@ -4,7 +4,7 @@ import glob
 
 import capture
 
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 import pype.api
 
 from maya import cmds
diff --git a/pype/hosts/maya/plugins/publish/extract_yeti_rig.py b/pype/hosts/maya/plugins/publish/extract_yeti_rig.py
index 71d4cf6198..43908d8742 100644
--- a/pype/hosts/maya/plugins/publish/extract_yeti_rig.py
+++ b/pype/hosts/maya/plugins/publish/extract_yeti_rig.py
@@ -9,7 +9,7 @@ from maya import cmds
 
 import avalon.maya.lib as lib
 import pype.api
-import pype.hosts.maya.lib as maya
+import pype.hosts.maya.api.lib as maya
 
 
 @contextlib.contextmanager
diff --git a/pype/hosts/maya/plugins/publish/submit_maya_muster.py b/pype/hosts/maya/plugins/publish/submit_maya_muster.py
index b10c4ecbbb..e31f989224 100644
--- a/pype/hosts/maya/plugins/publish/submit_maya_muster.py
+++ b/pype/hosts/maya/plugins/publish/submit_maya_muster.py
@@ -10,7 +10,7 @@ from avalon import api
 from avalon.vendor import requests
 
 import pyblish.api
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 from pype.api import get_system_settings
 
 
diff --git a/pype/hosts/maya/plugins/publish/validate_animation_content.py b/pype/hosts/maya/plugins/publish/validate_animation_content.py
index 63f1135fdc..ec6f33c969 100644
--- a/pype/hosts/maya/plugins/publish/validate_animation_content.py
+++ b/pype/hosts/maya/plugins/publish/validate_animation_content.py
@@ -1,6 +1,6 @@
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateAnimationContent(pyblish.api.InstancePlugin):
@@ -15,7 +15,7 @@ class ValidateAnimationContent(pyblish.api.InstancePlugin):
     hosts = ["maya"]
     families = ["animation"]
     label = "Animation Content"
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     @classmethod
     def get_invalid(cls, instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py b/pype/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py
index 4fe676404c..ffafd14bcd 100644
--- a/pype/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py
+++ b/pype/hosts/maya/plugins/publish/validate_animation_out_set_related_node_ids.py
@@ -2,8 +2,8 @@ import maya.cmds as cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
-from pype.hosts.maya import lib
+import pype.hosts.maya.api.action
+from pype.hosts.maya.api import lib
 
 
 class ValidateOutRelatedNodeIds(pyblish.api.InstancePlugin):
@@ -20,7 +20,7 @@ class ValidateOutRelatedNodeIds(pyblish.api.InstancePlugin):
     families = ['animation', "pointcache"]
     hosts = ['maya']
     label = 'Animation Out Set Related Node Ids'
-    actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction, pype.api.RepairAction]
 
     def process(self, instance):
         """Process all meshes"""
diff --git a/pype/hosts/maya/plugins/publish/validate_ass_relative_paths.py b/pype/hosts/maya/plugins/publish/validate_ass_relative_paths.py
index 22ebf52d49..b77a0c1923 100644
--- a/pype/hosts/maya/plugins/publish/validate_ass_relative_paths.py
+++ b/pype/hosts/maya/plugins/publish/validate_ass_relative_paths.py
@@ -5,7 +5,7 @@ import maya.cmds as cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateAssRelativePaths(pyblish.api.InstancePlugin):
diff --git a/pype/hosts/maya/plugins/publish/validate_assembly_name.py b/pype/hosts/maya/plugins/publish/validate_assembly_name.py
index 934275ca47..54479035c5 100644
--- a/pype/hosts/maya/plugins/publish/validate_assembly_name.py
+++ b/pype/hosts/maya/plugins/publish/validate_assembly_name.py
@@ -1,6 +1,6 @@
 import pyblish.api
 import maya.cmds as cmds
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateAssemblyName(pyblish.api.InstancePlugin):
@@ -12,7 +12,7 @@ class ValidateAssemblyName(pyblish.api.InstancePlugin):
     label = "Validate Assembly Name"
     order = pyblish.api.ValidatorOrder
     families = ["assembly"]
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
     active = False
 
     @classmethod
diff --git a/pype/hosts/maya/plugins/publish/validate_assembly_namespaces.py b/pype/hosts/maya/plugins/publish/validate_assembly_namespaces.py
index 50fda1a758..32f4b8db52 100644
--- a/pype/hosts/maya/plugins/publish/validate_assembly_namespaces.py
+++ b/pype/hosts/maya/plugins/publish/validate_assembly_namespaces.py
@@ -1,6 +1,6 @@
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateAssemblyNamespaces(pyblish.api.InstancePlugin):
@@ -18,7 +18,7 @@ class ValidateAssemblyNamespaces(pyblish.api.InstancePlugin):
     label = "Validate Assembly Namespaces"
     order = pyblish.api.ValidatorOrder
     families = ["assembly"]
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     def process(self, instance):
 
diff --git a/pype/hosts/maya/plugins/publish/validate_assembly_transforms.py b/pype/hosts/maya/plugins/publish/validate_assembly_transforms.py
index c033f5374a..146736ba8d 100644
--- a/pype/hosts/maya/plugins/publish/validate_assembly_transforms.py
+++ b/pype/hosts/maya/plugins/publish/validate_assembly_transforms.py
@@ -3,7 +3,7 @@ import pype.api
 
 from maya import cmds
 
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin):
@@ -28,7 +28,7 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin):
     order = pyblish.api.ValidatorOrder + 0.49
     label = "Assembly Model Transforms"
     families = ["assembly"]
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
                pype.api.RepairAction]
 
     prompt_message = ("You are about to reset the matrix to the default values."
@@ -44,7 +44,7 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin):
     @classmethod
     def get_invalid(cls, instance):
 
-        from pype.hosts.maya import lib
+        from pype.hosts.maya.api import lib
 
         # Get all transforms in the loaded containers
         container_roots = cmds.listRelatives(instance.data["hierarchy"],
@@ -89,7 +89,7 @@ class ValidateAssemblyModelTransforms(pyblish.api.InstancePlugin):
 
         """
 
-        from pype.hosts.maya import lib
+        from pype.hosts.maya.api import lib
         from avalon.vendor.Qt import QtWidgets
 
         # Store namespace in variable, cosmetics thingy
diff --git a/pype/hosts/maya/plugins/publish/validate_camera_attributes.py b/pype/hosts/maya/plugins/publish/validate_camera_attributes.py
index 1a1005d0f7..797244ba84 100644
--- a/pype/hosts/maya/plugins/publish/validate_camera_attributes.py
+++ b/pype/hosts/maya/plugins/publish/validate_camera_attributes.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateCameraAttributes(pyblish.api.InstancePlugin):
@@ -18,7 +18,7 @@ class ValidateCameraAttributes(pyblish.api.InstancePlugin):
     families = ['camera']
     hosts = ['maya']
     label = 'Camera Attributes'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     DEFAULTS = [
         ("filmFitOffset", 0.0),
diff --git a/pype/hosts/maya/plugins/publish/validate_camera_contents.py b/pype/hosts/maya/plugins/publish/validate_camera_contents.py
index 27e2031e87..644cfd16bf 100644
--- a/pype/hosts/maya/plugins/publish/validate_camera_contents.py
+++ b/pype/hosts/maya/plugins/publish/validate_camera_contents.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateCameraContents(pyblish.api.InstancePlugin):
@@ -19,7 +19,7 @@ class ValidateCameraContents(pyblish.api.InstancePlugin):
     families = ['camera']
     hosts = ['maya']
     label = 'Camera Contents'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     @classmethod
     def get_invalid(cls, instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_color_sets.py b/pype/hosts/maya/plugins/publish/validate_color_sets.py
index b1d8847f77..aa5901ee0a 100644
--- a/pype/hosts/maya/plugins/publish/validate_color_sets.py
+++ b/pype/hosts/maya/plugins/publish/validate_color_sets.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateColorSets(pyblish.api.Validator):
@@ -18,7 +18,7 @@ class ValidateColorSets(pyblish.api.Validator):
     families = ['model']
     category = 'geometry'
     label = 'Mesh ColorSets'
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
                pype.api.RepairAction]
     optional = True
 
diff --git a/pype/hosts/maya/plugins/publish/validate_instance_has_members.py b/pype/hosts/maya/plugins/publish/validate_instance_has_members.py
index 04e7e1c5eb..b28a056198 100644
--- a/pype/hosts/maya/plugins/publish/validate_instance_has_members.py
+++ b/pype/hosts/maya/plugins/publish/validate_instance_has_members.py
@@ -1,6 +1,6 @@
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateInstanceHasMembers(pyblish.api.InstancePlugin):
@@ -9,7 +9,7 @@ class ValidateInstanceHasMembers(pyblish.api.InstancePlugin):
     order = pype.api.ValidateContentsOrder
     hosts = ["maya"]
     label = 'Instance has members'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     @classmethod
     def get_invalid(cls, instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_instancer_content.py b/pype/hosts/maya/plugins/publish/validate_instancer_content.py
index a398aead02..74ed73ef53 100644
--- a/pype/hosts/maya/plugins/publish/validate_instancer_content.py
+++ b/pype/hosts/maya/plugins/publish/validate_instancer_content.py
@@ -1,7 +1,7 @@
 import maya.cmds as cmds
 
 import pyblish.api
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class ValidateInstancerContent(pyblish.api.InstancePlugin):
diff --git a/pype/hosts/maya/plugins/publish/validate_joints_hidden.py b/pype/hosts/maya/plugins/publish/validate_joints_hidden.py
index 80ca29bfbf..61dfcd563d 100644
--- a/pype/hosts/maya/plugins/publish/validate_joints_hidden.py
+++ b/pype/hosts/maya/plugins/publish/validate_joints_hidden.py
@@ -2,8 +2,8 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
-from pype.hosts.maya import lib
+import pype.hosts.maya.api.action
+from pype.hosts.maya.api import lib
 
 
 class ValidateJointsHidden(pyblish.api.InstancePlugin):
@@ -23,7 +23,7 @@ class ValidateJointsHidden(pyblish.api.InstancePlugin):
     category = 'rig'
     version = (0, 1, 0)
     label = "Joints Hidden"
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
                pype.api.RepairAction]
 
     @staticmethod
diff --git a/pype/hosts/maya/plugins/publish/validate_look_contents.py b/pype/hosts/maya/plugins/publish/validate_look_contents.py
index 577c88a7e3..8893fdfae8 100644
--- a/pype/hosts/maya/plugins/publish/validate_look_contents.py
+++ b/pype/hosts/maya/plugins/publish/validate_look_contents.py
@@ -1,6 +1,6 @@
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateLookContents(pyblish.api.InstancePlugin):
@@ -21,7 +21,7 @@ class ValidateLookContents(pyblish.api.InstancePlugin):
     families = ['look']
     hosts = ['maya']
     label = 'Look Data Contents'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     def process(self, instance):
         """Process all the nodes in the instance"""
diff --git a/pype/hosts/maya/plugins/publish/validate_look_id_reference_edits.py b/pype/hosts/maya/plugins/publish/validate_look_id_reference_edits.py
index de44a3b31a..8cf5493d20 100644
--- a/pype/hosts/maya/plugins/publish/validate_look_id_reference_edits.py
+++ b/pype/hosts/maya/plugins/publish/validate_look_id_reference_edits.py
@@ -3,7 +3,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateLookIdReferenceEdits(pyblish.api.InstancePlugin):
@@ -20,7 +20,7 @@ class ValidateLookIdReferenceEdits(pyblish.api.InstancePlugin):
     families = ['look']
     hosts = ['maya']
     label = 'Look Id Reference Edits'
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
                pype.api.RepairAction]
 
     def process(self, instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_look_members_unique.py b/pype/hosts/maya/plugins/publish/validate_look_members_unique.py
index 8b6dd60e70..0b0b50715a 100644
--- a/pype/hosts/maya/plugins/publish/validate_look_members_unique.py
+++ b/pype/hosts/maya/plugins/publish/validate_look_members_unique.py
@@ -2,7 +2,7 @@ from collections import defaultdict
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateUniqueRelationshipMembers(pyblish.api.InstancePlugin):
@@ -25,8 +25,8 @@ class ValidateUniqueRelationshipMembers(pyblish.api.InstancePlugin):
     hosts = ['maya']
     families = ['look']
 
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
-               pype.hosts.maya.action.GenerateUUIDsOnInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
+               pype.hosts.maya.api.action.GenerateUUIDsOnInvalidAction]
 
     def process(self, instance):
         """Process all meshes"""
diff --git a/pype/hosts/maya/plugins/publish/validate_look_no_default_shaders.py b/pype/hosts/maya/plugins/publish/validate_look_no_default_shaders.py
index 87859d390f..0d6a1ca562 100644
--- a/pype/hosts/maya/plugins/publish/validate_look_no_default_shaders.py
+++ b/pype/hosts/maya/plugins/publish/validate_look_no_default_shaders.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateLookNoDefaultShaders(pyblish.api.InstancePlugin):
@@ -27,7 +27,7 @@ class ValidateLookNoDefaultShaders(pyblish.api.InstancePlugin):
     families = ['look']
     hosts = ['maya']
     label = 'Look No Default Shaders'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     DEFAULT_SHADERS = {"lambert1", "initialShadingGroup",
                       "initialParticleSE", "particleCloud1"}
diff --git a/pype/hosts/maya/plugins/publish/validate_look_sets.py b/pype/hosts/maya/plugins/publish/validate_look_sets.py
index 4e06b564ed..d044d8ad2e 100644
--- a/pype/hosts/maya/plugins/publish/validate_look_sets.py
+++ b/pype/hosts/maya/plugins/publish/validate_look_sets.py
@@ -1,5 +1,5 @@
-import pype.hosts.maya.action
-from pype.hosts.maya import lib
+import pype.hosts.maya.api.action
+from pype.hosts.maya.api import lib
 
 import pyblish.api
 import pype.api
@@ -42,7 +42,7 @@ class ValidateLookSets(pyblish.api.InstancePlugin):
     families = ['look']
     hosts = ['maya']
     label = 'Look Sets'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     def process(self, instance):
         """Process all the nodes in the instance"""
diff --git a/pype/hosts/maya/plugins/publish/validate_look_shading_group.py b/pype/hosts/maya/plugins/publish/validate_look_shading_group.py
index e8911e3f2f..8d4e3ccf70 100644
--- a/pype/hosts/maya/plugins/publish/validate_look_shading_group.py
+++ b/pype/hosts/maya/plugins/publish/validate_look_shading_group.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateShadingEngine(pyblish.api.InstancePlugin):
@@ -16,7 +16,7 @@ class ValidateShadingEngine(pyblish.api.InstancePlugin):
     hosts = ["maya"]
     label = "Look Shading Engine Naming"
     actions = [
-        pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction
+        pype.hosts.maya.api.action.SelectInvalidAction, pype.api.RepairAction
     ]
 
     # The default connections to check
diff --git a/pype/hosts/maya/plugins/publish/validate_look_single_shader.py b/pype/hosts/maya/plugins/publish/validate_look_single_shader.py
index 600652d16d..8c4835c5bf 100644
--- a/pype/hosts/maya/plugins/publish/validate_look_single_shader.py
+++ b/pype/hosts/maya/plugins/publish/validate_look_single_shader.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateSingleShader(pyblish.api.InstancePlugin):
@@ -16,7 +16,7 @@ class ValidateSingleShader(pyblish.api.InstancePlugin):
     families = ['look']
     hosts = ['maya']
     label = 'Look Single Shader Per Shape'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     # The default connections to check
     def process(self, instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_maya_units.py b/pype/hosts/maya/plugins/publish/validate_maya_units.py
index 8712a90f44..c99b8eb813 100644
--- a/pype/hosts/maya/plugins/publish/validate_maya_units.py
+++ b/pype/hosts/maya/plugins/publish/validate_maya_units.py
@@ -3,7 +3,7 @@ import maya.cmds as cmds
 import pyblish.api
 import pype.api
 from pype import lib
-import pype.hosts.maya.lib as mayalib
+import pype.hosts.maya.api.lib as mayalib
 from math import ceil
 
 
diff --git a/pype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py b/pype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py
index 04a3cf3c79..a2792693af 100644
--- a/pype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py
+++ b/pype/hosts/maya/plugins/publish/validate_mesh_arnold_attributes.py
@@ -2,7 +2,7 @@ import pymel.core as pc
 from maya import cmds
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 from avalon import maya
 
 
@@ -19,7 +19,7 @@ class ValidateMeshArnoldAttributes(pyblish.api.InstancePlugin):
     category = "geometry"
     label = "Mesh Arnold Attributes"
     actions = [
-        pype.hosts.maya.action.SelectInvalidAction,
+        pype.hosts.maya.api.action.SelectInvalidAction,
         pype.api.RepairAction
     ]
     optional = True
diff --git a/pype/hosts/maya/plugins/publish/validate_mesh_has_uv.py b/pype/hosts/maya/plugins/publish/validate_mesh_has_uv.py
index f7b9b8503d..ae80b6a8f2 100644
--- a/pype/hosts/maya/plugins/publish/validate_mesh_has_uv.py
+++ b/pype/hosts/maya/plugins/publish/validate_mesh_has_uv.py
@@ -4,7 +4,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 def len_flattened(components):
@@ -50,7 +50,7 @@ class ValidateMeshHasUVs(pyblish.api.InstancePlugin):
     families = ['model']
     category = 'geometry'
     label = 'Mesh Has UVs'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
     optional = True
 
     @classmethod
diff --git a/pype/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py b/pype/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py
index 5ebb41b6f9..5628008a38 100644
--- a/pype/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py
+++ b/pype/hosts/maya/plugins/publish/validate_mesh_lamina_faces.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateMeshLaminaFaces(pyblish.api.InstancePlugin):
@@ -18,7 +18,7 @@ class ValidateMeshLaminaFaces(pyblish.api.InstancePlugin):
     category = 'geometry'
     version = (0, 1, 0)
     label = 'Mesh Lamina Faces'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     @staticmethod
     def get_invalid(instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py b/pype/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py
index 988c94e4ef..8446808459 100644
--- a/pype/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py
+++ b/pype/hosts/maya/plugins/publish/validate_mesh_no_negative_scale.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateMeshNoNegativeScale(pyblish.api.Validator):
@@ -21,7 +21,7 @@ class ValidateMeshNoNegativeScale(pyblish.api.Validator):
     hosts = ['maya']
     families = ['model']
     label = 'Mesh No Negative Scale'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     @staticmethod
     def get_invalid(instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_mesh_non_manifold.py b/pype/hosts/maya/plugins/publish/validate_mesh_non_manifold.py
index 7559e9e17b..4a2773671d 100644
--- a/pype/hosts/maya/plugins/publish/validate_mesh_non_manifold.py
+++ b/pype/hosts/maya/plugins/publish/validate_mesh_non_manifold.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateMeshNonManifold(pyblish.api.Validator):
@@ -17,7 +17,7 @@ class ValidateMeshNonManifold(pyblish.api.Validator):
     hosts = ['maya']
     families = ['model']
     label = 'Mesh Non-Manifold Vertices/Edges'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     @staticmethod
     def get_invalid(instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py b/pype/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py
index 0d30312cad..0ed02328c8 100644
--- a/pype/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py
+++ b/pype/hosts/maya/plugins/publish/validate_mesh_non_zero_edge.py
@@ -2,8 +2,8 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
-from pype.hosts.maya import lib
+import pype.hosts.maya.api.action
+from pype.hosts.maya.api import lib
 
 
 class ValidateMeshNonZeroEdgeLength(pyblish.api.InstancePlugin):
@@ -22,7 +22,7 @@ class ValidateMeshNonZeroEdgeLength(pyblish.api.InstancePlugin):
     category = 'geometry'
     version = (0, 1, 0)
     label = 'Mesh Edge Length Non Zero'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
     optional = True
 
     __tolerance = 1e-5
diff --git a/pype/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py b/pype/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py
index a764611b5c..d9d740cf13 100644
--- a/pype/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py
+++ b/pype/hosts/maya/plugins/publish/validate_mesh_normals_unlocked.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateMeshNormalsUnlocked(pyblish.api.Validator):
@@ -19,7 +19,7 @@ class ValidateMeshNormalsUnlocked(pyblish.api.Validator):
     category = 'geometry'
     version = (0, 1, 0)
     label = 'Mesh Normals Unlocked'
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
                pype.api.RepairAction]
     optional = True
 
diff --git a/pype/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py b/pype/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py
index c6479675d2..3619d27298 100644
--- a/pype/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py
+++ b/pype/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py
@@ -1,6 +1,6 @@
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 import math
 import maya.api.OpenMaya as om
 import pymel.core as pm
@@ -235,7 +235,7 @@ class ValidateMeshHasOverlappingUVs(pyblish.api.InstancePlugin):
     families = ['model']
     category = 'geometry'
     label = 'Mesh Has Overlapping UVs'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
     optional = True
 
     @classmethod
diff --git a/pype/hosts/maya/plugins/publish/validate_mesh_shader_connections.py b/pype/hosts/maya/plugins/publish/validate_mesh_shader_connections.py
index a31df7c0ae..b9542fe930 100644
--- a/pype/hosts/maya/plugins/publish/validate_mesh_shader_connections.py
+++ b/pype/hosts/maya/plugins/publish/validate_mesh_shader_connections.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 def pairs(iterable):
@@ -77,7 +77,7 @@ class ValidateMeshShaderConnections(pyblish.api.InstancePlugin):
     hosts = ['maya']
     families = ['model']
     label = "Mesh Shader Connections"
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
                pype.api.RepairAction]
 
     def process(self, instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py b/pype/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py
index 87d83c070e..348bcb5fad 100644
--- a/pype/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py
+++ b/pype/hosts/maya/plugins/publish/validate_mesh_single_uv_set.py
@@ -2,8 +2,8 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
-from pype.hosts.maya import lib
+import pype.hosts.maya.api.action
+from pype.hosts.maya.api import lib
 
 
 class ValidateMeshSingleUVSet(pyblish.api.InstancePlugin):
@@ -22,7 +22,7 @@ class ValidateMeshSingleUVSet(pyblish.api.InstancePlugin):
     optional = True
     version = (0, 1, 0)
     label = "Mesh Single UV Set"
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
                pype.api.RepairAction]
 
     @staticmethod
diff --git a/pype/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py b/pype/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py
index 8bf5c55f65..5f954ee917 100644
--- a/pype/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py
+++ b/pype/hosts/maya/plugins/publish/validate_mesh_uv_set_map1.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin):
@@ -20,7 +20,7 @@ class ValidateMeshUVSetMap1(pyblish.api.InstancePlugin):
     families = ['model']
     optional = True
     label = "Mesh has map1 UV Set"
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
                pype.api.RepairAction]
 
     @staticmethod
diff --git a/pype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py b/pype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py
index 2dd65da7d2..8d39c5cae4 100644
--- a/pype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py
+++ b/pype/hosts/maya/plugins/publish/validate_mesh_vertices_have_edges.py
@@ -4,7 +4,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 def len_flattened(components):
@@ -62,7 +62,7 @@ class ValidateMeshVerticesHaveEdges(pyblish.api.InstancePlugin):
     families = ['model']
     category = 'geometry'
     label = 'Mesh Vertices Have Edges'
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
                pype.api.RepairAction]
 
     @classmethod
diff --git a/pype/hosts/maya/plugins/publish/validate_model_content.py b/pype/hosts/maya/plugins/publish/validate_model_content.py
index fd7c69ead7..9bec7187e9 100644
--- a/pype/hosts/maya/plugins/publish/validate_model_content.py
+++ b/pype/hosts/maya/plugins/publish/validate_model_content.py
@@ -2,8 +2,8 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
-from pype.hosts.maya import lib
+import pype.hosts.maya.api.action
+from pype.hosts.maya.api import lib
 
 
 class ValidateModelContent(pyblish.api.InstancePlugin):
@@ -18,7 +18,7 @@ class ValidateModelContent(pyblish.api.InstancePlugin):
     hosts = ["maya"]
     families = ["model"]
     label = "Model Content"
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     @classmethod
     def get_invalid(cls, instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_model_name.py b/pype/hosts/maya/plugins/publish/validate_model_name.py
index 716b7d5f98..f0004dc81e 100644
--- a/pype/hosts/maya/plugins/publish/validate_model_name.py
+++ b/pype/hosts/maya/plugins/publish/validate_model_name.py
@@ -1,7 +1,7 @@
 from maya import cmds
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 import re
 
 
@@ -18,7 +18,7 @@ class ValidateModelName(pyblish.api.InstancePlugin):
     hosts = ["maya"]
     families = ["model"]
     label = "Model Name"
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
     # path to shader names definitions
     # TODO: move it to preset file
     material_file = None
diff --git a/pype/hosts/maya/plugins/publish/validate_muster_connection.py b/pype/hosts/maya/plugins/publish/validate_muster_connection.py
index 35acdb326f..ad1022c71d 100644
--- a/pype/hosts/maya/plugins/publish/validate_muster_connection.py
+++ b/pype/hosts/maya/plugins/publish/validate_muster_connection.py
@@ -5,7 +5,7 @@ import appdirs
 import pyblish.api
 from avalon.vendor import requests
 from pype.plugin import contextplugin_should_run
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateMusterConnection(pyblish.api.ContextPlugin):
diff --git a/pype/hosts/maya/plugins/publish/validate_no_animation.py b/pype/hosts/maya/plugins/publish/validate_no_animation.py
index fc198745c0..a6daf3246e 100644
--- a/pype/hosts/maya/plugins/publish/validate_no_animation.py
+++ b/pype/hosts/maya/plugins/publish/validate_no_animation.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateNoAnimation(pyblish.api.Validator):
@@ -19,7 +19,7 @@ class ValidateNoAnimation(pyblish.api.Validator):
     hosts = ["maya"]
     families = ["model"]
     optional = True
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     def process(self, instance):
 
diff --git a/pype/hosts/maya/plugins/publish/validate_no_default_camera.py b/pype/hosts/maya/plugins/publish/validate_no_default_camera.py
index 876612c076..07ec2e4325 100644
--- a/pype/hosts/maya/plugins/publish/validate_no_default_camera.py
+++ b/pype/hosts/maya/plugins/publish/validate_no_default_camera.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateNoDefaultCameras(pyblish.api.InstancePlugin):
@@ -18,7 +18,7 @@ class ValidateNoDefaultCameras(pyblish.api.InstancePlugin):
     families = ['camera']
     version = (0, 1, 0)
     label = "No Default Cameras"
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     @staticmethod
     def get_invalid(instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_no_namespace.py b/pype/hosts/maya/plugins/publish/validate_no_namespace.py
index 6a6c7792c5..97cd46e68a 100644
--- a/pype/hosts/maya/plugins/publish/validate_no_namespace.py
+++ b/pype/hosts/maya/plugins/publish/validate_no_namespace.py
@@ -3,7 +3,7 @@ import maya.cmds as cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 def get_namespace(node_name):
@@ -22,7 +22,7 @@ class ValidateNoNamespace(pyblish.api.InstancePlugin):
     category = 'cleanup'
     version = (0, 1, 0)
     label = 'No Namespaces'
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
                pype.api.RepairAction]
 
     @staticmethod
diff --git a/pype/hosts/maya/plugins/publish/validate_no_null_transforms.py b/pype/hosts/maya/plugins/publish/validate_no_null_transforms.py
index aa35c47339..78f06bbbd8 100644
--- a/pype/hosts/maya/plugins/publish/validate_no_null_transforms.py
+++ b/pype/hosts/maya/plugins/publish/validate_no_null_transforms.py
@@ -2,7 +2,7 @@ import maya.cmds as cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 def has_shape_children(node):
@@ -44,7 +44,7 @@ class ValidateNoNullTransforms(pyblish.api.InstancePlugin):
     version = (0, 1, 0)
     label = 'No Empty/Null Transforms'
     actions = [pype.api.RepairAction,
-               pype.hosts.maya.action.SelectInvalidAction]
+               pype.hosts.maya.api.action.SelectInvalidAction]
 
     @staticmethod
     def get_invalid(instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_no_unknown_nodes.py b/pype/hosts/maya/plugins/publish/validate_no_unknown_nodes.py
index 04c8fd04bc..6b2f1337d3 100644
--- a/pype/hosts/maya/plugins/publish/validate_no_unknown_nodes.py
+++ b/pype/hosts/maya/plugins/publish/validate_no_unknown_nodes.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateNoUnknownNodes(pyblish.api.InstancePlugin):
@@ -21,7 +21,7 @@ class ValidateNoUnknownNodes(pyblish.api.InstancePlugin):
     families = ['model', 'rig']
     optional = True
     label = "Unknown Nodes"
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     @staticmethod
     def get_invalid(instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_node_ids.py b/pype/hosts/maya/plugins/publish/validate_node_ids.py
index 777d810c80..4942d44d70 100644
--- a/pype/hosts/maya/plugins/publish/validate_node_ids.py
+++ b/pype/hosts/maya/plugins/publish/validate_node_ids.py
@@ -1,8 +1,8 @@
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class ValidateNodeIDs(pyblish.api.InstancePlugin):
@@ -25,8 +25,8 @@ class ValidateNodeIDs(pyblish.api.InstancePlugin):
                 "yetiRig",
                 "assembly"]
 
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
-               pype.hosts.maya.action.GenerateUUIDsOnInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
+               pype.hosts.maya.api.action.GenerateUUIDsOnInvalidAction]
 
     def process(self, instance):
         """Process all meshes"""
diff --git a/pype/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py b/pype/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py
index 49b78f79bc..4bf66a464f 100644
--- a/pype/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py
+++ b/pype/hosts/maya/plugins/publish/validate_node_ids_deformed_shapes.py
@@ -2,8 +2,8 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
-from pype.hosts.maya import lib
+import pype.hosts.maya.api.action
+from pype.hosts.maya.api import lib
 
 
 class ValidateNodeIdsDeformedShape(pyblish.api.InstancePlugin):
@@ -20,7 +20,7 @@ class ValidateNodeIdsDeformedShape(pyblish.api.InstancePlugin):
     families = ['look']
     hosts = ['maya']
     label = 'Deformed shape ids'
-    actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction, pype.api.RepairAction]
 
     def process(self, instance):
         """Process all the nodes in the instance"""
diff --git a/pype/hosts/maya/plugins/publish/validate_node_ids_in_database.py b/pype/hosts/maya/plugins/publish/validate_node_ids_in_database.py
index 15241411b7..154d0c1d38 100644
--- a/pype/hosts/maya/plugins/publish/validate_node_ids_in_database.py
+++ b/pype/hosts/maya/plugins/publish/validate_node_ids_in_database.py
@@ -3,8 +3,8 @@ import pyblish.api
 from avalon import io
 
 import pype.api
-import pype.hosts.maya.action
-from pype.hosts.maya import lib
+import pype.hosts.maya.api.action
+from pype.hosts.maya.api import lib
 
 
 class ValidateNodeIdsInDatabase(pyblish.api.InstancePlugin):
@@ -23,8 +23,8 @@ class ValidateNodeIdsInDatabase(pyblish.api.InstancePlugin):
     hosts = ['maya']
     families = ["*"]
 
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
-               pype.hosts.maya.action.GenerateUUIDsOnInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
+               pype.hosts.maya.api.action.GenerateUUIDsOnInvalidAction]
 
     def process(self, instance):
         invalid = self.get_invalid(instance)
diff --git a/pype/hosts/maya/plugins/publish/validate_node_ids_related.py b/pype/hosts/maya/plugins/publish/validate_node_ids_related.py
index 193e53440a..390e5c157a 100644
--- a/pype/hosts/maya/plugins/publish/validate_node_ids_related.py
+++ b/pype/hosts/maya/plugins/publish/validate_node_ids_related.py
@@ -2,9 +2,9 @@ import pyblish.api
 import pype.api
 
 from avalon import io
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class ValidateNodeIDsRelated(pyblish.api.InstancePlugin):
@@ -20,8 +20,8 @@ class ValidateNodeIDsRelated(pyblish.api.InstancePlugin):
                 "rig"]
     optional = True
 
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
-               pype.hosts.maya.action.GenerateUUIDsOnInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
+               pype.hosts.maya.api.action.GenerateUUIDsOnInvalidAction]
 
     def process(self, instance):
         """Process all nodes in instance (including hierarchy)"""
diff --git a/pype/hosts/maya/plugins/publish/validate_node_ids_unique.py b/pype/hosts/maya/plugins/publish/validate_node_ids_unique.py
index 3a66941f89..20320854f0 100644
--- a/pype/hosts/maya/plugins/publish/validate_node_ids_unique.py
+++ b/pype/hosts/maya/plugins/publish/validate_node_ids_unique.py
@@ -2,8 +2,8 @@ from collections import defaultdict
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
-from pype.hosts.maya import lib
+import pype.hosts.maya.api.action
+from pype.hosts.maya.api import lib
 
 
 class ValidateNodeIdsUnique(pyblish.api.InstancePlugin):
@@ -20,8 +20,8 @@ class ValidateNodeIdsUnique(pyblish.api.InstancePlugin):
                 "rig",
                 "yetiRig"]
 
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
-               pype.hosts.maya.action.GenerateUUIDsOnInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
+               pype.hosts.maya.api.action.GenerateUUIDsOnInvalidAction]
 
     def process(self, instance):
         """Process all meshes"""
diff --git a/pype/hosts/maya/plugins/publish/validate_node_no_ghosting.py b/pype/hosts/maya/plugins/publish/validate_node_no_ghosting.py
index a4b3122b34..3acd5b027d 100644
--- a/pype/hosts/maya/plugins/publish/validate_node_no_ghosting.py
+++ b/pype/hosts/maya/plugins/publish/validate_node_no_ghosting.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateNodeNoGhosting(pyblish.api.InstancePlugin):
@@ -21,7 +21,7 @@ class ValidateNodeNoGhosting(pyblish.api.InstancePlugin):
     hosts = ['maya']
     families = ['model', 'rig']
     label = "No Ghosting"
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     _attributes = {'ghosting': 0}
 
diff --git a/pype/hosts/maya/plugins/publish/validate_render_no_default_cameras.py b/pype/hosts/maya/plugins/publish/validate_render_no_default_cameras.py
index 8c1fb42f1a..38383310a2 100644
--- a/pype/hosts/maya/plugins/publish/validate_render_no_default_cameras.py
+++ b/pype/hosts/maya/plugins/publish/validate_render_no_default_cameras.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateRenderNoDefaultCameras(pyblish.api.InstancePlugin):
@@ -12,7 +12,7 @@ class ValidateRenderNoDefaultCameras(pyblish.api.InstancePlugin):
     hosts = ['maya']
     families = ['renderlayer']
     label = "No Default Cameras Renderable"
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     @staticmethod
     def get_invalid(instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_render_single_camera.py b/pype/hosts/maya/plugins/publish/validate_render_single_camera.py
index 482cf2fb59..268a6599e2 100644
--- a/pype/hosts/maya/plugins/publish/validate_render_single_camera.py
+++ b/pype/hosts/maya/plugins/publish/validate_render_single_camera.py
@@ -2,7 +2,7 @@ import re
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 from maya import cmds
 
@@ -28,7 +28,7 @@ class ValidateRenderSingleCamera(pyblish.api.InstancePlugin):
     hosts = ['maya']
     families = ["renderlayer",
                 "vrayscene"]
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     R_CAMERA_TOKEN = re.compile(r'%c|<camera>', re.IGNORECASE)
 
diff --git a/pype/hosts/maya/plugins/publish/validate_renderlayer_aovs.py b/pype/hosts/maya/plugins/publish/validate_renderlayer_aovs.py
index aba8fdaa96..7fdd8b377c 100644
--- a/pype/hosts/maya/plugins/publish/validate_renderlayer_aovs.py
+++ b/pype/hosts/maya/plugins/publish/validate_renderlayer_aovs.py
@@ -1,6 +1,6 @@
 import pyblish.api
 
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 from avalon import io
 import pype.api
 
@@ -25,7 +25,7 @@ class ValidateRenderLayerAOVs(pyblish.api.InstancePlugin):
     label = "Render Passes / AOVs Are Registered"
     hosts = ["maya"]
     families = ["renderlayer"]
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     def process(self, instance):
         invalid = self.get_invalid(instance)
diff --git a/pype/hosts/maya/plugins/publish/validate_rendersettings.py b/pype/hosts/maya/plugins/publish/validate_rendersettings.py
index 297ead5ebb..88a386db57 100644
--- a/pype/hosts/maya/plugins/publish/validate_rendersettings.py
+++ b/pype/hosts/maya/plugins/publish/validate_rendersettings.py
@@ -6,7 +6,7 @@ import pymel.core as pm
 
 import pyblish.api
 import pype.api
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 
 class ValidateRenderSettings(pyblish.api.InstancePlugin):
diff --git a/pype/hosts/maya/plugins/publish/validate_rig_controllers.py b/pype/hosts/maya/plugins/publish/validate_rig_controllers.py
index a127728155..ef0df2df7c 100644
--- a/pype/hosts/maya/plugins/publish/validate_rig_controllers.py
+++ b/pype/hosts/maya/plugins/publish/validate_rig_controllers.py
@@ -3,8 +3,8 @@ from maya import cmds
 import pyblish.api
 
 import pype.api
-import pype.hosts.maya.action
-from pype.hosts.maya.lib import undo_chunk
+import pype.hosts.maya.api.action
+from pype.hosts.maya.api.lib import undo_chunk
 
 
 class ValidateRigControllers(pyblish.api.InstancePlugin):
@@ -30,7 +30,7 @@ class ValidateRigControllers(pyblish.api.InstancePlugin):
     hosts = ["maya"]
     families = ["rig"]
     actions = [pype.api.RepairAction,
-               pype.hosts.maya.action.SelectInvalidAction]
+               pype.hosts.maya.api.action.SelectInvalidAction]
 
     # Default controller values
     CONTROLLER_DEFAULTS = {
diff --git a/pype/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py b/pype/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
index 8c1f8e4c7b..f19e3fbb61 100644
--- a/pype/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
+++ b/pype/hosts/maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
@@ -3,8 +3,8 @@ from maya import cmds
 import pyblish.api
 import pype.api
 
-from pype.hosts.maya import lib
-import pype.hosts.maya.action
+from pype.hosts.maya.api import lib
+import pype.hosts.maya.api.action
 
 
 class ValidateRigControllersArnoldAttributes(pyblish.api.InstancePlugin):
@@ -31,7 +31,7 @@ class ValidateRigControllersArnoldAttributes(pyblish.api.InstancePlugin):
     hosts = ["maya"]
     families = ["rig"]
     actions = [pype.api.RepairAction,
-               pype.hosts.maya.action.SelectInvalidAction]
+               pype.hosts.maya.api.action.SelectInvalidAction]
 
     attributes = [
         "rcurve",
diff --git a/pype/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py b/pype/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py
index 97dca803ee..d1502f885d 100644
--- a/pype/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py
+++ b/pype/hosts/maya/plugins/publish/validate_rig_out_set_node_ids.py
@@ -2,8 +2,8 @@ import maya.cmds as cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
-from pype.hosts.maya import lib
+import pype.hosts.maya.api.action
+from pype.hosts.maya.api import lib
 
 
 class ValidateRigOutSetNodeIds(pyblish.api.InstancePlugin):
@@ -20,7 +20,7 @@ class ValidateRigOutSetNodeIds(pyblish.api.InstancePlugin):
     families = ["rig"]
     hosts = ['maya']
     label = 'Rig Out Set Node Ids'
-    actions = [pype.hosts.maya.action.SelectInvalidAction, pype.api.RepairAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction, pype.api.RepairAction]
 
     def process(self, instance):
         """Process all meshes"""
diff --git a/pype/hosts/maya/plugins/publish/validate_rig_output_ids.py b/pype/hosts/maya/plugins/publish/validate_rig_output_ids.py
index fe9662d9d9..43d287ae97 100644
--- a/pype/hosts/maya/plugins/publish/validate_rig_output_ids.py
+++ b/pype/hosts/maya/plugins/publish/validate_rig_output_ids.py
@@ -3,8 +3,8 @@ import pymel.core as pc
 import pyblish.api
 
 import pype.api
-import pype.hosts.maya.action
-from pype.hosts.maya.lib import undo_chunk
+import pype.hosts.maya.api.action
+from pype.hosts.maya.api.lib import undo_chunk
 
 
 class ValidateRigOutputIds(pyblish.api.InstancePlugin):
@@ -19,7 +19,7 @@ class ValidateRigOutputIds(pyblish.api.InstancePlugin):
     hosts = ["maya"]
     families = ["rig"]
     actions = [pype.api.RepairAction,
-               pype.hosts.maya.action.SelectInvalidAction]
+               pype.hosts.maya.api.action.SelectInvalidAction]
 
     def process(self, instance):
         invalid = self.get_invalid(instance, compute=True)
diff --git a/pype/hosts/maya/plugins/publish/validate_shader_name.py b/pype/hosts/maya/plugins/publish/validate_shader_name.py
index 094ac0afe9..4a42ec6e35 100644
--- a/pype/hosts/maya/plugins/publish/validate_shader_name.py
+++ b/pype/hosts/maya/plugins/publish/validate_shader_name.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 import re
 
 
@@ -18,7 +18,7 @@ class ValidateShaderName(pyblish.api.InstancePlugin):
     families = ["look"]
     hosts = ['maya']
     label = 'Validate Shaders Name'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
     regex = r'(?P<asset>.*)_(.*)_SHD'
 
     # The default connections to check
diff --git a/pype/hosts/maya/plugins/publish/validate_shape_default_names.py b/pype/hosts/maya/plugins/publish/validate_shape_default_names.py
index c0638863da..cd4e9905d9 100644
--- a/pype/hosts/maya/plugins/publish/validate_shape_default_names.py
+++ b/pype/hosts/maya/plugins/publish/validate_shape_default_names.py
@@ -4,7 +4,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 def short_name(node):
@@ -38,7 +38,7 @@ class ValidateShapeDefaultNames(pyblish.api.InstancePlugin):
     optional = True
     version = (0, 1, 0)
     label = "Shape Default Naming"
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
                pype.api.RepairAction]
 
     @staticmethod
diff --git a/pype/hosts/maya/plugins/publish/validate_shape_render_stats.py b/pype/hosts/maya/plugins/publish/validate_shape_render_stats.py
index af48d664ec..c94becabe9 100644
--- a/pype/hosts/maya/plugins/publish/validate_shape_render_stats.py
+++ b/pype/hosts/maya/plugins/publish/validate_shape_render_stats.py
@@ -3,7 +3,7 @@ import pype.api
 
 from maya import cmds
 
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateShapeRenderStats(pyblish.api.Validator):
@@ -13,7 +13,7 @@ class ValidateShapeRenderStats(pyblish.api.Validator):
     hosts = ['maya']
     families = ['model']
     label = 'Shape Default Render Stats'
-    actions = [pype.hosts.maya.action.SelectInvalidAction,
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction,
                pype.api.RepairAction]
 
     defaults = {'castsShadows': 1,
diff --git a/pype/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py b/pype/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py
index 39870658ad..2d28d26b0f 100644
--- a/pype/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py
+++ b/pype/hosts/maya/plugins/publish/validate_skinCluster_deformer_set.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateSkinclusterDeformerSet(pyblish.api.InstancePlugin):
@@ -18,7 +18,7 @@ class ValidateSkinclusterDeformerSet(pyblish.api.InstancePlugin):
     hosts = ['maya']
     families = ['fbx']
     label = "Skincluster Deformer Relationships"
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     def process(self, instance):
         """Process all the transform nodes in the instance"""
diff --git a/pype/hosts/maya/plugins/publish/validate_step_size.py b/pype/hosts/maya/plugins/publish/validate_step_size.py
index 5e46e7df0b..502a1c37c2 100644
--- a/pype/hosts/maya/plugins/publish/validate_step_size.py
+++ b/pype/hosts/maya/plugins/publish/validate_step_size.py
@@ -1,6 +1,6 @@
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateStepSize(pyblish.api.InstancePlugin):
@@ -15,7 +15,7 @@ class ValidateStepSize(pyblish.api.InstancePlugin):
     families = ['camera',
                 'pointcache',
                 'animation']
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     MIN = 0.01
     MAX = 1.0
diff --git a/pype/hosts/maya/plugins/publish/validate_transform_naming_suffix.py b/pype/hosts/maya/plugins/publish/validate_transform_naming_suffix.py
index 120123af4b..14d4e7d5c8 100644
--- a/pype/hosts/maya/plugins/publish/validate_transform_naming_suffix.py
+++ b/pype/hosts/maya/plugins/publish/validate_transform_naming_suffix.py
@@ -4,7 +4,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateTransformNamingSuffix(pyblish.api.InstancePlugin):
@@ -34,7 +34,7 @@ class ValidateTransformNamingSuffix(pyblish.api.InstancePlugin):
     optional = True
     version = (0, 1, 0)
     label = 'Suffix Naming Conventions'
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
     SUFFIX_NAMING_TABLE = {'mesh': ["_GEO", "_GES", "_GEP", "_OSD"],
                            'nurbsCurve': ["_CRV"],
                            'nurbsSurface': ["_NRB"],
diff --git a/pype/hosts/maya/plugins/publish/validate_transform_zero.py b/pype/hosts/maya/plugins/publish/validate_transform_zero.py
index ac5517061f..0cecc3124b 100644
--- a/pype/hosts/maya/plugins/publish/validate_transform_zero.py
+++ b/pype/hosts/maya/plugins/publish/validate_transform_zero.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateTransformZero(pyblish.api.Validator):
@@ -20,7 +20,7 @@ class ValidateTransformZero(pyblish.api.Validator):
     category = "geometry"
     version = (0, 1, 0)
     label = "Transform Zero (Freeze)"
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     _identity = [1.0, 0.0, 0.0, 0.0,
                  0.0, 1.0, 0.0, 0.0,
diff --git a/pype/hosts/maya/plugins/publish/validate_unicode_strings.py b/pype/hosts/maya/plugins/publish/validate_unicode_strings.py
index bf44d971af..cfcba4f514 100644
--- a/pype/hosts/maya/plugins/publish/validate_unicode_strings.py
+++ b/pype/hosts/maya/plugins/publish/validate_unicode_strings.py
@@ -3,7 +3,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateUnicodeStrings(pyblish.api.Validator):
diff --git a/pype/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py b/pype/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py
index 2cefe27019..9011b584fe 100644
--- a/pype/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py
+++ b/pype/hosts/maya/plugins/publish/validate_unreal_mesh_triangulated.py
@@ -13,7 +13,7 @@ class ValidateUnrealMeshTriangulated(pyblish.api.InstancePlugin):
     families = ["unrealStaticMesh"]
     category = "geometry"
     label = "Mesh is Triangulated"
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     @classmethod
     def get_invalid(cls, instance):
diff --git a/pype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py b/pype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py
index 4116c5f534..8bda849b3f 100644
--- a/pype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py
+++ b/pype/hosts/maya/plugins/publish/validate_unreal_staticmesh_naming.py
@@ -3,7 +3,7 @@
 from maya import cmds
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 import re
 
 
@@ -51,7 +51,7 @@ class ValidateUnrealStaticmeshName(pyblish.api.InstancePlugin):
     hosts = ["maya"]
     families = ["unrealStaticMesh"]
     label = "Unreal StaticMesh Name"
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
     regex_mesh = r"SM_(?P<renderName>.*)_(\d{2})"
     regex_collision = r"((UBX)|(UCP)|(USP)|(UCX))_(?P<renderName>.*)_(\d{2})"
 
diff --git a/pype/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py b/pype/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py
index 6bec0c88dd..0c3086fee0 100644
--- a/pype/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py
+++ b/pype/hosts/maya/plugins/publish/validate_vray_distributed_rendering.py
@@ -1,6 +1,6 @@
 import pyblish.api
 import pype.api
-from pype.hosts.maya import lib
+from pype.hosts.maya.api import lib
 
 from maya import cmds
 
diff --git a/pype/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py b/pype/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py
index 120677021d..f451a08b0b 100644
--- a/pype/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py
+++ b/pype/hosts/maya/plugins/publish/validate_vray_referenced_aovs.py
@@ -4,7 +4,7 @@ import pyblish.api
 import types
 from maya import cmds
 
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateVrayReferencedAOVs(pyblish.api.InstancePlugin):
diff --git a/pype/hosts/maya/plugins/publish/validate_vrayproxy_members.py b/pype/hosts/maya/plugins/publish/validate_vrayproxy_members.py
index 75946a6787..829c2d67ae 100644
--- a/pype/hosts/maya/plugins/publish/validate_vrayproxy_members.py
+++ b/pype/hosts/maya/plugins/publish/validate_vrayproxy_members.py
@@ -3,7 +3,7 @@ import pype.api
 
 from maya import cmds
 
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateVrayProxyMembers(pyblish.api.InstancePlugin):
@@ -13,7 +13,7 @@ class ValidateVrayProxyMembers(pyblish.api.InstancePlugin):
     label = 'VRay Proxy Members'
     hosts = ['maya']
     families = ['vrayproxy']
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     def process(self, instance):
 
diff --git a/pype/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py b/pype/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py
index 1ed145fecd..7eb3153d1e 100644
--- a/pype/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py
+++ b/pype/hosts/maya/plugins/publish/validate_yeti_rig_cache_state.py
@@ -1,7 +1,7 @@
 import pyblish.api
 import pype.action
 import maya.cmds as cmds
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateYetiRigCacheState(pyblish.api.InstancePlugin):
@@ -18,7 +18,7 @@ class ValidateYetiRigCacheState(pyblish.api.InstancePlugin):
     hosts = ["maya"]
     families = ["yetiRig"]
     actions = [pype.action.RepairAction,
-               pype.hosts.maya.action.SelectInvalidAction]
+               pype.hosts.maya.api.action.SelectInvalidAction]
 
     def process(self, instance):
         invalid = self.get_invalid(instance)
diff --git a/pype/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py b/pype/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py
index 647a66cb57..c0bd46efc1 100644
--- a/pype/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py
+++ b/pype/hosts/maya/plugins/publish/validate_yeti_rig_input_in_instance.py
@@ -2,7 +2,7 @@ from maya import cmds
 
 import pyblish.api
 import pype.api
-import pype.hosts.maya.action
+import pype.hosts.maya.api.action
 
 
 class ValidateYetiRigInputShapesInInstance(pyblish.api.Validator):
@@ -12,7 +12,7 @@ class ValidateYetiRigInputShapesInInstance(pyblish.api.Validator):
     hosts = ["maya"]
     families = ["yetiRig"]
     label = "Yeti Rig Input Shapes In Instance"
-    actions = [pype.hosts.maya.action.SelectInvalidAction]
+    actions = [pype.hosts.maya.api.action.SelectInvalidAction]
 
     def process(self, instance):