diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_arnold_standin.py b/server_addon/maya/client/ayon_maya/plugins/load/load_arnold_standin.py
index 087a0a488b..d01cea3ad4 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_arnold_standin.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_arnold_standin.py
@@ -11,7 +11,8 @@ from ayon_maya.api.lib import (
     unique_namespace,
 )
 from ayon_maya.api.pipeline import containerise
-from ayon_maya.api.plugin import Loader, get_load_color_for_product_type
+from ayon_maya.api.plugin import get_load_color_for_product_type
+from ayon_maya.api import plugin
 
 
 def is_sequence(files):
@@ -22,7 +23,7 @@ def is_sequence(files):
     return sequence
 
 
-class ArnoldStandinLoader(Loader):
+class ArnoldStandinLoader(plugin.Loader):
     """Load as Arnold standin"""
 
     product_types = {
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_as_template.py b/server_addon/maya/client/ayon_maya/plugins/load/load_as_template.py
index 8ad3e526d1..b6bd3c3ab6 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_as_template.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_as_template.py
@@ -1,10 +1,10 @@
 from ayon_core.lib import BoolDef
 from ayon_core.pipeline import registered_host
-from ayon_maya.api.plugin import Loader
+from ayon_maya.api import plugin
 from ayon_maya.api.workfile_template_builder import MayaTemplateBuilder
 
 
-class LoadAsTemplate(Loader):
+class LoadAsTemplate(plugin.Loader):
     """Load workfile as a template """
 
     product_types = {"workfile", "mayaScene"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_assembly.py b/server_addon/maya/client/ayon_maya/plugins/load/load_assembly.py
index 8c6edf3aac..490631aa67 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_assembly.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_assembly.py
@@ -3,10 +3,10 @@ from ayon_core.pipeline import remove_container
 from ayon_maya.api import setdress
 from ayon_maya.api.lib import unique_namespace
 from ayon_maya.api.pipeline import containerise
-from ayon_maya.api.plugin import Loader
+from ayon_maya.api import plugin
 
 
-class AssemblyLoader(Loader):
+class AssemblyLoader(plugin.Loader):
 
     product_types = {"assembly"}
     representations = {"json"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_audio.py b/server_addon/maya/client/ayon_maya/plugins/load/load_audio.py
index 5ad3993e57..d9f67fdd90 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_audio.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_audio.py
@@ -1,11 +1,11 @@
 from ayon_core.pipeline import get_representation_path
 from ayon_maya.api.lib import get_container_members, unique_namespace
 from ayon_maya.api.pipeline import containerise
-from ayon_maya.api.plugin import Loader
+from ayon_maya.api import plugin
 from maya import cmds, mel
 
 
-class AudioLoader(Loader):
+class AudioLoader(plugin.Loader):
     """Specific loader of audio."""
 
     product_types = {"audio"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_gpucache.py b/server_addon/maya/client/ayon_maya/plugins/load/load_gpucache.py
index d40b31e885..795d01fd5a 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_gpucache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_gpucache.py
@@ -3,10 +3,11 @@ from ayon_core.pipeline import get_representation_path
 from ayon_core.settings import get_project_settings
 from ayon_maya.api.lib import unique_namespace
 from ayon_maya.api.pipeline import containerise
-from ayon_maya.api.plugin import Loader, get_load_color_for_product_type
+from ayon_maya.api import plugin
+from ayon_maya.api.plugin import get_load_color_for_product_type
 
 
-class GpuCacheLoader(Loader):
+class GpuCacheLoader(plugin.Loader):
     """Load Alembic as gpuCache"""
 
     product_types = {"model", "animation", "proxyAbc", "pointcache"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_image.py b/server_addon/maya/client/ayon_maya/plugins/load/load_image.py
index 3a32237729..453e24a2d5 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_image.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_image.py
@@ -11,7 +11,7 @@ from ayon_core.pipeline.load.utils import get_representation_path_from_context
 from ayon_core.settings import get_project_settings
 from ayon_maya.api.lib import namespaced, unique_namespace
 from ayon_maya.api.pipeline import containerise
-from ayon_maya.api.plugin import Loader
+from ayon_maya.api import plugin
 from maya import cmds
 
 
@@ -81,7 +81,7 @@ def create_stencil():
     return file, place, stencil, place_stencil
 
 
-class FileNodeLoader(Loader):
+class FileNodeLoader(plugin.Loader):
     """File node loader."""
 
     product_types = {"image", "plate", "render"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_image_plane.py b/server_addon/maya/client/ayon_maya/plugins/load/load_image_plane.py
index 21625affca..3da67221e2 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_image_plane.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_image_plane.py
@@ -6,7 +6,7 @@ from ayon_maya.api.lib import (
     unique_namespace,
 )
 from ayon_maya.api.pipeline import containerise
-from ayon_maya.api.plugin import Loader
+from ayon_maya.api import plugin
 from maya import cmds
 from qtpy import QtCore, QtWidgets
 
@@ -80,7 +80,7 @@ class CameraWindow(QtWidgets.QDialog):
         self.close()
 
 
-class ImagePlaneLoader(Loader):
+class ImagePlaneLoader(plugin.Loader):
     """Specific loader of plate for image planes on selected camera."""
 
     product_types = {"image", "plate", "render"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_matchmove.py b/server_addon/maya/client/ayon_maya/plugins/load/load_matchmove.py
index f4aaca6a4d..7689a3ca5e 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_matchmove.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_matchmove.py
@@ -1,8 +1,8 @@
-from ayon_maya.api.plugin import Loader
+from ayon_maya.api import plugin
 from maya import mel
 
 
-class MatchmoveLoader(Loader):
+class MatchmoveLoader(plugin.Loader):
     """
     This will run matchmove script to create track in scene.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_maya_usd.py b/server_addon/maya/client/ayon_maya/plugins/load/load_maya_usd.py
index b3bd2475fd..79fc1fc94f 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_maya_usd.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_maya_usd.py
@@ -4,10 +4,10 @@ from ayon_core.pipeline import get_representation_path
 from ayon_core.pipeline.load import get_representation_path_from_context
 from ayon_maya.api.lib import namespaced, unique_namespace
 from ayon_maya.api.pipeline import containerise
-from ayon_maya.api.plugin import Loader
+from ayon_maya.api import plugin
 
 
-class MayaUsdLoader(Loader):
+class MayaUsdLoader(plugin.Loader):
     """Read USD data in a Maya USD Proxy"""
 
     product_types = {"model", "usd", "pointcache", "animation"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd.py b/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd.py
index ca347697ab..026740a957 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd.py
@@ -4,13 +4,13 @@ import os
 import maya.cmds as cmds
 from ayon_api import get_representation_by_id
 from ayon_core.pipeline import get_representation_path
+from ayon_maya.api import plugin
 from ayon_maya.api.lib import maintained_selection, namespaced, unique_namespace
 from ayon_maya.api.pipeline import containerise
-from ayon_maya.api.plugin import Loader
 from maya import mel
 
 
-class MultiverseUsdLoader(Loader):
+class MultiverseUsdLoader(plugin.Loader):
     """Read USD data in a Multiverse Compound"""
 
     product_types = {
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd_over.py b/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd_over.py
index bdcb771109..a8fff12577 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd_over.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_multiverse_usd_over.py
@@ -5,13 +5,13 @@ import maya.cmds as cmds
 import qargparse
 from ayon_api import get_representation_by_id
 from ayon_core.pipeline import get_representation_path
+from ayon_maya.api import plugin
 from ayon_maya.api.lib import maintained_selection
 from ayon_maya.api.pipeline import containerise
-from ayon_maya.api.plugin import Loader
 from maya import mel
 
 
-class MultiverseUsdOverLoader(Loader):
+class MultiverseUsdOverLoader(plugin.Loader):
     """Reference file"""
 
     product_types = {"mvUsdOverride"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_redshift_proxy.py b/server_addon/maya/client/ayon_maya/plugins/load/load_redshift_proxy.py
index 996d77856d..92bf6dfe26 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_redshift_proxy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_redshift_proxy.py
@@ -6,12 +6,13 @@ import clique
 import maya.cmds as cmds
 from ayon_core.pipeline import get_representation_path
 from ayon_core.settings import get_project_settings
+from ayon_maya.api import plugin
 from ayon_maya.api.lib import maintained_selection, namespaced, unique_namespace
 from ayon_maya.api.pipeline import containerise
-from ayon_maya.api.plugin import Loader, get_load_color_for_product_type
+from ayon_maya.api.plugin import get_load_color_for_product_type
 
 
-class RedshiftProxyLoader(Loader):
+class RedshiftProxyLoader(plugin.Loader):
     """Load Redshift proxy"""
 
     product_types = {"redshiftproxy"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_rendersetup.py b/server_addon/maya/client/ayon_maya/plugins/load/load_rendersetup.py
index 09fda5d2f4..3b323698c4 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_rendersetup.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_rendersetup.py
@@ -15,8 +15,8 @@ import six
 from ayon_core.lib import BoolDef, EnumDef
 from ayon_core.pipeline import get_representation_path
 from ayon_maya.api import lib
+from ayon_maya.api import plugin
 from ayon_maya.api.pipeline import containerise
-from ayon_maya.api.plugin import Loader
 from maya import cmds
 
 
@@ -45,7 +45,7 @@ def mark_all_imported(enabled):
                     cmds.deleteAttr(plug)
 
 
-class RenderSetupLoader(Loader):
+class RenderSetupLoader(plugin.Loader):
     """Load json preset for RenderSetup overwriting current one."""
 
     product_types = {"rendersetup"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_arnold.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_arnold.py
index 832562971f..4515ec499d 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_arnold.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_arnold.py
@@ -8,10 +8,11 @@ import os
 
 from ayon_core.pipeline import get_representation_path
 from ayon_core.settings import get_project_settings
-from ayon_maya.api.plugin import Loader, get_load_color_for_product_type
+from ayon_maya.api import plugin
+from ayon_maya.api.plugin import get_load_color_for_product_type
 
 
-class LoadVDBtoArnold(Loader):
+class LoadVDBtoArnold(plugin.Loader):
     """Load OpenVDB for Arnold in aiVolume"""
 
     product_types = {"vdbcache"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_redshift.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_redshift.py
index 1ea82cbf28..c08004421b 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_redshift.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_redshift.py
@@ -2,10 +2,11 @@ import os
 
 from ayon_core.pipeline import get_representation_path
 from ayon_core.settings import get_project_settings
-from ayon_maya.api.plugin import Loader, get_load_color_for_product_type
+from ayon_maya.api import plugin
+from ayon_maya.api.plugin import get_load_color_for_product_type
 
 
-class LoadVDBtoRedShift(Loader):
+class LoadVDBtoRedShift(plugin.Loader):
     """Load OpenVDB in a Redshift Volume Shape
 
     Note that the RedshiftVolumeShape is created without a RedshiftVolume
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_vray.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_vray.py
index fefbea0e88..f022f8be5e 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_vray.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vdb_to_vray.py
@@ -2,7 +2,8 @@ import os
 
 from ayon_core.pipeline import get_representation_path
 from ayon_core.settings import get_project_settings
-from ayon_maya.api.plugin import Loader, get_load_color_for_product_type
+from ayon_maya.api import plugin
+from ayon_maya.api.plugin import get_load_color_for_product_type
 from maya import cmds
 
 # List of 3rd Party Channels Mapping names for VRayVolumeGrid
@@ -70,7 +71,7 @@ def _fix_duplicate_vvg_callbacks():
                     matched.add(callback)
 
 
-class LoadVDBtoVRay(Loader):
+class LoadVDBtoVRay(plugin.Loader):
     """Load OpenVDB in a V-Ray Volume Grid"""
 
     product_types = {"vdbcache"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_vrayproxy.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vrayproxy.py
index 53995f877b..c71a48247c 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_vrayproxy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vrayproxy.py
@@ -13,10 +13,11 @@ from ayon_core.pipeline import get_representation_path
 from ayon_core.settings import get_project_settings
 from ayon_maya.api.lib import maintained_selection, namespaced, unique_namespace
 from ayon_maya.api.pipeline import containerise
-from ayon_maya.api.plugin import Loader, get_load_color_for_product_type
+from ayon_maya.api import plugin
+from ayon_maya.api.plugin import get_load_color_for_product_type
 
 
-class VRayProxyLoader(Loader):
+class VRayProxyLoader(plugin.Loader):
     """Load VRay Proxy with Alembic or VrayMesh."""
 
     product_types = {"vrayproxy", "model", "pointcache", "animation"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_vrayscene.py b/server_addon/maya/client/ayon_maya/plugins/load/load_vrayscene.py
index acea6cdd63..255ca844ba 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_vrayscene.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_vrayscene.py
@@ -4,10 +4,11 @@ from ayon_core.pipeline import get_representation_path
 from ayon_core.settings import get_project_settings
 from ayon_maya.api.lib import maintained_selection, namespaced, unique_namespace
 from ayon_maya.api.pipeline import containerise
-from ayon_maya.api.plugin import Loader, get_load_color_for_product_type
+from ayon_maya.api import plugin
+from ayon_maya.api.plugin import get_load_color_for_product_type
 
 
-class VRaySceneLoader(Loader):
+class VRaySceneLoader(plugin.Loader):
     """Load Vray scene"""
 
     product_types = {"vrayscene_layer"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_xgen.py b/server_addon/maya/client/ayon_maya/plugins/load/load_xgen.py
index 6f053cd1e6..88d9d550da 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_xgen.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_xgen.py
@@ -1,7 +1,7 @@
 import os
 import shutil
 
-import ayon_maya.api.plugin
+from ayon_maya.api import plugin
 import maya.cmds as cmds
 import xgenm
 from ayon_core.pipeline import get_representation_path
@@ -15,7 +15,7 @@ from ayon_maya.api.lib import (
 from qtpy import QtWidgets
 
 
-class XgenLoader(ayon_maya.api.plugin.ReferenceLoader):
+class XgenLoader(plugin.ReferenceLoader):
     """Load Xgen as reference"""
 
     product_types = {"xgen"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/load/load_yeti_cache.py b/server_addon/maya/client/ayon_maya/plugins/load/load_yeti_cache.py
index b2b5c7c710..6000de2507 100644
--- a/server_addon/maya/client/ayon_maya/plugins/load/load_yeti_cache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/load/load_yeti_cache.py
@@ -8,7 +8,8 @@ from ayon_core.pipeline import get_representation_path
 from ayon_core.settings import get_project_settings
 from ayon_maya.api import lib
 from ayon_maya.api.pipeline import containerise
-from ayon_maya.api.plugin import Loader, get_load_color_for_product_type
+from ayon_maya.api import plugin
+from ayon_maya.api.plugin import get_load_color_for_product_type
 from ayon_maya.api.yeti import create_yeti_variable
 from maya import cmds
 
@@ -40,7 +41,7 @@ def set_attribute(node, attr, value):
     lib.set_attribute(node, attr, value)
 
 
-class YetiCacheLoader(Loader):
+class YetiCacheLoader(plugin.Loader):
     """Load Yeti Cache with one or more Yeti nodes"""
 
     product_types = {"yeticache", "yetiRig"}
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_animation.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_animation.py
index 7996602c37..528d981c4b 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_animation.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_animation.py
@@ -1,9 +1,9 @@
 import maya.cmds as cmds
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class CollectAnimationOutputGeometry(MayaInstancePlugin):
+class CollectAnimationOutputGeometry(plugin.MayaInstancePlugin):
     """Collect out hierarchy data for instance.
 
     Collect all hierarchy nodes which reside in the out_SET of the animation
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_arnold_scene_source.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_arnold_scene_source.py
index 55f332e4b9..c9dd0b8063 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_arnold_scene_source.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_arnold_scene_source.py
@@ -1,10 +1,10 @@
 import pyblish.api
 from ayon_maya.api.lib import get_all_children
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class CollectArnoldSceneSource(MayaInstancePlugin):
+class CollectArnoldSceneSource(plugin.MayaInstancePlugin):
     """Collect Arnold Scene Source data."""
 
     # Offset to be after renderable camera collection.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_assembly.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_assembly.py
index 57b3443dd3..e57d70662c 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_assembly.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_assembly.py
@@ -11,10 +11,10 @@ import pyblish.api
 from maya import cmds, mel
 from ayon_maya import api
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class CollectAssembly(MayaInstancePlugin):
+class CollectAssembly(plugin.MayaInstancePlugin):
     """Collect all relevant assembly items
 
     Collected data:
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_current_file.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_current_file.py
index 27c9dc130e..8bd1908c73 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_current_file.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_current_file.py
@@ -1,9 +1,9 @@
 import pyblish.api
-from ayon_maya.api.plugin import MayaContextPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class CollectCurrentFile(MayaContextPlugin):
+class CollectCurrentFile(plugin.MayaContextPlugin):
     """Inject the current working file."""
 
     order = pyblish.api.CollectorOrder - 0.4
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_animation.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_animation.py
index 687b93211b..83f42667a5 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_animation.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_animation.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 import pyblish.api
 from ayon_core.pipeline import OptionalPyblishPluginMixin
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds  # noqa
 
 
-class CollectFbxAnimation(MayaInstancePlugin,
+class CollectFbxAnimation(plugin.MayaInstancePlugin,
                           OptionalPyblishPluginMixin):
     """Collect Animated Rig Data for FBX Extractor."""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_camera.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_camera.py
index eabc1237a3..f6791b6e72 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_camera.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_fbx_camera.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds  # noqa
 
 
-class CollectFbxCamera(MayaInstancePlugin):
+class CollectFbxCamera(plugin.MayaInstancePlugin):
     """Collect Camera for FBX export."""
 
     order = pyblish.api.CollectorOrder + 0.2
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_file_dependencies.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_file_dependencies.py
index ca4c617fa9..74b8054c33 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_file_dependencies.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_file_dependencies.py
@@ -1,9 +1,9 @@
 from maya import cmds
-from ayon_maya.api.plugin import MayaContextPlugin
+from ayon_maya.api import plugin
 import pyblish.api
 
 
-class CollectFileDependencies(MayaContextPlugin):
+class CollectFileDependencies(plugin.MayaContextPlugin):
     """Gather all files referenced in this scene."""
 
     label = "Collect File Dependencies"
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_gltf.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_gltf.py
index c34505597c..7ee23d289c 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_gltf.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_gltf.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class CollectGLTF(MayaInstancePlugin):
+class CollectGLTF(plugin.MayaInstancePlugin):
     """Collect Assets for GLTF/GLB export."""
 
     order = pyblish.api.CollectorOrder + 0.2
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_history.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_history.py
index b649628a36..9041d4d1d5 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_history.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_history.py
@@ -1,9 +1,9 @@
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class CollectMayaHistory(MayaInstancePlugin):
+class CollectMayaHistory(plugin.MayaInstancePlugin):
     """Collect history for instances from the Maya scene
 
     Note:
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_inputs.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_inputs.py
index bebd765c1b..67d4a3f378 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_inputs.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_inputs.py
@@ -7,7 +7,7 @@ import pyblish.api
 from ayon_core.pipeline import registered_host
 from ayon_maya.api.lib import get_container_members
 from ayon_maya.api.lib_rendersetup import get_shader_in_layer
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
 def iter_history(nodes,
@@ -94,7 +94,7 @@ def collect_input_containers(containers, nodes):
             if any(node in container["_members"] for node in nodes)]
 
 
-class CollectUpstreamInputs(MayaInstancePlugin):
+class CollectUpstreamInputs(plugin.MayaInstancePlugin):
     """Collect input source inputs for this publish.
 
     This will include `inputs` data of which loaded publishes were used in the
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_instances.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_instances.py
index 89b490febc..0ca43d4be9 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_instances.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_instances.py
@@ -2,10 +2,10 @@ from maya import cmds
 
 import pyblish.api
 from ayon_maya.api.lib import get_all_children
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class CollectNewInstances(MayaInstancePlugin):
+class CollectNewInstances(plugin.MayaInstancePlugin):
     """Gather members for instances and pre-defined attribute
 
     This collector takes into account assets that are associated with
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_look.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_look.py
index 27fb409777..691933babd 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_look.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_look.py
@@ -6,7 +6,7 @@ import re
 
 import pyblish.api
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds  # noqa
 
 SHAPE_ATTRS = {"castsShadows",
@@ -266,7 +266,7 @@ def get_file_node_files(node):
     return result
 
 
-class CollectLook(MayaInstancePlugin):
+class CollectLook(plugin.MayaInstancePlugin):
     """Collect look data for instance.
 
     For the shapes/transforms of the referenced object to collect look for
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_scene_time.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_scene_time.py
index b6a15a637f..c10d0fffbe 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_scene_time.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_scene_time.py
@@ -1,9 +1,9 @@
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class CollectMayaSceneTime(MayaInstancePlugin):
+class CollectMayaSceneTime(plugin.MayaInstancePlugin):
     """Collect Maya Scene playback range
 
     This allows to reproduce the playback range for the content to be loaded.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_units.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_units.py
index 2224037b1f..47888506ff 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_units.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_units.py
@@ -1,12 +1,12 @@
 import maya.cmds as cmds
 import maya.mel as mel
-from ayon_maya.api.plugin import MayaContextPlugin
+from ayon_maya.api import plugin
 
 
 import pyblish.api
 
 
-class CollectMayaUnits(MayaContextPlugin):
+class CollectMayaUnits(plugin.MayaContextPlugin):
     """Collect Maya's scene units."""
 
     label = "Maya Units"
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_workspace.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_workspace.py
index bdcd232348..a7b51e1fb3 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_workspace.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_maya_workspace.py
@@ -1,11 +1,11 @@
 import os
 
 import pyblish.api
-from ayon_maya.api.plugin import MayaContextPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class CollectMayaWorkspace(MayaContextPlugin):
+class CollectMayaWorkspace(plugin.MayaContextPlugin):
     """Inject the current workspace into context"""
 
     order = pyblish.api.CollectorOrder - 0.5
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_model.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_model.py
index c239f1c118..13e5a609e7 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_model.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_model.py
@@ -1,9 +1,9 @@
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class CollectModelData(MayaInstancePlugin):
+class CollectModelData(plugin.MayaInstancePlugin):
     """Collect model data
 
     Ensures always only a single frame is extracted (current frame).
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_multiverse_look.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_multiverse_look.py
index fff35d32f5..ddf36b7eda 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_multiverse_look.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_multiverse_look.py
@@ -4,7 +4,7 @@ import re
 
 import pyblish.api
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 SHAPE_ATTRS = ["castsShadows",
@@ -252,7 +252,7 @@ def is_mipmap(fname):
     return False
 
 
-class CollectMultiverseLookData(MayaInstancePlugin):
+class CollectMultiverseLookData(plugin.MayaInstancePlugin):
     """Collect Multiverse Look
 
     Searches through the overrides finding all material overrides. From there
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_pointcache.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_pointcache.py
index 0c3cccc8ec..8d0b45137f 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_pointcache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_pointcache.py
@@ -1,9 +1,9 @@
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class CollectPointcache(MayaInstancePlugin):
+class CollectPointcache(plugin.MayaInstancePlugin):
     """Collect pointcache data for instance."""
 
     order = pyblish.api.CollectorOrder + 0.4
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_remove_marked.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_remove_marked.py
index 97c5dc67d4..14d914cac5 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_remove_marked.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_remove_marked.py
@@ -1,8 +1,8 @@
 import pyblish.api
-from ayon_maya.api.plugin import MayaContextPlugin
+from ayon_maya.api import plugin
 
 
-class CollectRemoveMarked(MayaContextPlugin):
+class CollectRemoveMarked(plugin.MayaContextPlugin):
     """Remove marked data
 
     Remove instances that have 'remove' in their instance.data
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_render.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_render.py
index 143d1c08e2..160a019540 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_render.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_render.py
@@ -44,11 +44,11 @@ from ayon_maya.api.lib_renderproducts import (
     UnsupportedRendererException,
     get as get_layer_render_products,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class CollectMayaRender(MayaInstancePlugin):
+class CollectMayaRender(plugin.MayaInstancePlugin):
     """Gather all publishable render layers from renderSetup."""
 
     order = pyblish.api.CollectorOrder + 0.01
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_render_layer_aovs.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_render_layer_aovs.py
index 7e1d531541..dd4a8fefe5 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_render_layer_aovs.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_render_layer_aovs.py
@@ -1,10 +1,10 @@
 import pyblish.api
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class CollectRenderLayerAOVS(MayaInstancePlugin):
+class CollectRenderLayerAOVS(plugin.MayaInstancePlugin):
     """Collect all render layer's AOVs / Render Elements that will render.
 
     This collector is important to be able to Extend Frames.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_renderable_camera.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_renderable_camera.py
index 4ac16eb714..fbd181de3e 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_renderable_camera.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_renderable_camera.py
@@ -1,10 +1,10 @@
 import pyblish.api
 from ayon_maya.api.lib_rendersetup import get_attr_in_layer
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class CollectRenderableCamera(MayaInstancePlugin):
+class CollectRenderableCamera(plugin.MayaInstancePlugin):
     """Collect the renderable camera(s) for the render layer"""
 
     # Offset to be after renderlayer collection.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_review.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_review.py
index 90620771e1..8a50c2f0a9 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_review.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_review.py
@@ -2,11 +2,11 @@ import ayon_api
 import pyblish.api
 from ayon_core.pipeline import KnownPublishError
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds, mel
 
 
-class CollectReview(MayaInstancePlugin):
+class CollectReview(plugin.MayaInstancePlugin):
     """Collect Review data
 
     """
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_rig_sets.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_rig_sets.py
index dfa4fc2d9a..98f4d38ab2 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_rig_sets.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_rig_sets.py
@@ -1,9 +1,9 @@
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class CollectRigSets(MayaInstancePlugin):
+class CollectRigSets(plugin.MayaInstancePlugin):
     """Ensure rig contains pipeline-critical content
 
     Every rig must contain at least two object sets:
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_skeleton_mesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_skeleton_mesh.py
index a8783018c9..aaec4cb6d9 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_skeleton_mesh.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_skeleton_mesh.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds  # noqa
 
 
-class CollectSkeletonMesh(MayaInstancePlugin):
+class CollectSkeletonMesh(plugin.MayaInstancePlugin):
     """Collect Static Rig Data for FBX Extractor."""
 
     order = pyblish.api.CollectorOrder + 0.2
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_skeletalmesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_skeletalmesh.py
index a7900a2085..32515a5957 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_skeletalmesh.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_skeletalmesh.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 from maya import cmds  # noqa
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class CollectUnrealSkeletalMesh(MayaInstancePlugin):
+class CollectUnrealSkeletalMesh(plugin.MayaInstancePlugin):
     """Collect Unreal Skeletal Mesh."""
 
     order = pyblish.api.CollectorOrder + 0.2
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_staticmesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_staticmesh.py
index 762c7daa4a..35295d6e3b 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_staticmesh.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_unreal_staticmesh.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 from maya import cmds  # noqa
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from pprint import pformat
 
 
-class CollectUnrealStaticMesh(MayaInstancePlugin):
+class CollectUnrealStaticMesh(plugin.MayaInstancePlugin):
     """Collect Unreal Static Mesh."""
 
     order = pyblish.api.CollectorOrder + 0.2
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_user_defined_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_user_defined_attributes.py
index b7ef70c874..e468636def 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_user_defined_attributes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_user_defined_attributes.py
@@ -1,9 +1,9 @@
 from maya import cmds
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 import pyblish.api
 
 
-class CollectUserDefinedAttributes(MayaInstancePlugin):
+class CollectUserDefinedAttributes(plugin.MayaInstancePlugin):
     """Collect user defined attributes for nodes in instance."""
 
     order = pyblish.api.CollectorOrder + 0.45
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayproxy.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayproxy.py
index 8710858150..a5491e5f9b 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayproxy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayproxy.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 """Collect Vray Proxy."""
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class CollectVrayProxy(MayaInstancePlugin):
+class CollectVrayProxy(plugin.MayaInstancePlugin):
     """Collect Vray Proxy instance.
 
     Add `pointcache` family for it.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayscene.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayscene.py
index 86538450b7..f14735574e 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayscene.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_vrayscene.py
@@ -4,10 +4,10 @@ import pyblish.api
 
 from ayon_core.lib import get_formatted_current_time
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class CollectVrayScene(MayaInstancePlugin):
+class CollectVrayScene(plugin.MayaInstancePlugin):
     """Collect Vray Scene.
 
     If export on farm is checked, job is created to export it.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_workfile.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_workfile.py
index d7cea61a2c..fa0689849a 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_workfile.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_workfile.py
@@ -1,9 +1,9 @@
 import os
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class CollectWorkfileData(MayaInstancePlugin):
+class CollectWorkfileData(plugin.MayaInstancePlugin):
     """Inject data into Workfile instance"""
 
     order = pyblish.api.CollectorOrder - 0.01
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_workscene_fps.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_workscene_fps.py
index 5c1b021799..a87483e67f 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_workscene_fps.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_workscene_fps.py
@@ -1,9 +1,9 @@
 import pyblish.api
-from ayon_maya.api.plugin import MayaContextPlugin
+from ayon_maya.api import plugin
 from maya import mel
 
 
-class CollectWorksceneFPS(MayaContextPlugin):
+class CollectWorksceneFPS(plugin.MayaContextPlugin):
     """Get the FPS of the work scene"""
 
     label = "Workscene FPS"
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_xgen.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_xgen.py
index 784c0a4b83..9ef17f3399 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_xgen.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_xgen.py
@@ -2,11 +2,11 @@ import os
 
 import pyblish.api
 from ayon_maya.api.lib import get_attribute_input
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class CollectXgen(MayaInstancePlugin):
+class CollectXgen(plugin.MayaInstancePlugin):
     """Collect Xgen"""
 
     order = pyblish.api.CollectorOrder + 0.499999
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_cache.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_cache.py
index 10883074d3..44de461126 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_cache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_cache.py
@@ -1,6 +1,6 @@
 import pyblish.api
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from ayon_maya.api.yeti import get_yeti_user_variables
 from maya import cmds
 
@@ -22,7 +22,7 @@ SETTINGS = {
 }
 
 
-class CollectYetiCache(MayaInstancePlugin):
+class CollectYetiCache(plugin.MayaInstancePlugin):
     """Collect all information of the Yeti caches
 
     The information contains the following attributes per Yeti node
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_rig.py b/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_rig.py
index 25bc5ec172..dbdc10789f 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_rig.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/collect_yeti_rig.py
@@ -4,7 +4,7 @@ import re
 import pyblish.api
 from ayon_core.pipeline.publish import KnownPublishError
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 SETTINGS = {"renderDensity",
@@ -15,7 +15,7 @@ SETTINGS = {"renderDensity",
             "cbId"}
 
 
-class CollectYetiRig(MayaInstancePlugin):
+class CollectYetiRig(plugin.MayaInstancePlugin):
     """Collect all information of the Yeti Rig"""
 
     order = pyblish.api.CollectorOrder + 0.4
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/determine_future_version.py b/server_addon/maya/client/ayon_maya/plugins/publish/determine_future_version.py
index a09489d4ae..0c05b499c0 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/determine_future_version.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/determine_future_version.py
@@ -1,8 +1,8 @@
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class DetermineFutureVersion(MayaInstancePlugin):
+class DetermineFutureVersion(plugin.MayaInstancePlugin):
     """
     This will determine version of product if we want render to be attached to.
     """
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_active_view_thumbnail.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_active_view_thumbnail.py
index 221da82d36..290f7e24eb 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_active_view_thumbnail.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_active_view_thumbnail.py
@@ -4,10 +4,10 @@ import maya.api.OpenMaya as om
 import maya.api.OpenMayaUI as omui
 import pyblish.api
 from ayon_maya.api.lib import IS_HEADLESS
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ExtractActiveViewThumbnail(MayaInstancePlugin):
+class ExtractActiveViewThumbnail(plugin.MayaInstancePlugin):
     """Set instance thumbnail to a screengrab of current active viewport.
 
     This makes it so that if an instance does not have a thumbnail set yet that
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_arnold_scene_source.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_arnold_scene_source.py
index fb79094aec..b39c875400 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_arnold_scene_source.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_arnold_scene_source.py
@@ -3,12 +3,11 @@ import os
 from collections import defaultdict
 
 import arnold
-from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import lib, plugin
 from maya import cmds
 
 
-class ExtractArnoldSceneSource(MayaExtractorPlugin):
+class ExtractArnoldSceneSource(plugin.MayaExtractorPlugin):
     """Extract the content of the instance to an Arnold Scene Source file."""
 
     label = "Extract Arnold Scene Source"
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_assembly.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_assembly.py
index ecbf21dfb9..8460fb716f 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_assembly.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_assembly.py
@@ -2,11 +2,11 @@ import json
 import os
 
 from ayon_maya.api.alembic import extract_alembic
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractAssembly(MayaExtractorPlugin):
+class ExtractAssembly(plugin.MayaExtractorPlugin):
     """Produce an alembic of just point positions and normals.
 
     Positions and normals are preserved, but nothing more,
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_alembic.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_alembic.py
index 2c38110913..b5ce6a6a44 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_alembic.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_alembic.py
@@ -2,12 +2,12 @@ import os
 import json
 
 from maya import cmds
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from ayon_core.pipeline import publish
 from ayon_maya.api import lib
 
 
-class ExtractCameraAlembic(MayaExtractorPlugin,
+class ExtractCameraAlembic(plugin.MayaExtractorPlugin,
                            publish.OptionalPyblishPluginMixin):
     """Extract a Camera as Alembic.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_mayaScene.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_mayaScene.py
index 5f6260c794..c5aa331cb2 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_mayaScene.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_camera_mayaScene.py
@@ -7,7 +7,7 @@ import os
 from ayon_core.lib import BoolDef
 from ayon_core.pipeline import publish
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
@@ -80,7 +80,7 @@ def unlock(plug):
             cmds.disconnectAttr(source, destination)
 
 
-class ExtractCameraMayaScene(MayaExtractorPlugin,
+class ExtractCameraMayaScene(plugin.MayaExtractorPlugin,
                              publish.OptionalPyblishPluginMixin):
     """Extract a Camera as Maya Scene.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx.py
index cd1fe1f7e8..d9b0a789c5 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx.py
@@ -5,11 +5,11 @@ import maya.mel as mel  # noqa
 import pyblish.api
 from ayon_maya.api import fbx
 from ayon_maya.api.lib import maintained_selection
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds  # noqa
 
 
-class ExtractFBX(MayaExtractorPlugin):
+class ExtractFBX(plugin.MayaExtractorPlugin):
     """Extract FBX from Maya.
 
     This extracts reproducible FBX exports ignoring any of the
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx_animation.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx_animation.py
index 186486c153..c22241d2ca 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx_animation.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_fbx_animation.py
@@ -4,11 +4,11 @@ import os
 import pyblish.api
 from ayon_maya.api import fbx
 from ayon_maya.api.lib import get_namespace, namespaced, strip_namespace
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds  # noqa
 
 
-class ExtractFBXAnimation(MayaExtractorPlugin):
+class ExtractFBXAnimation(plugin.MayaExtractorPlugin):
     """Extract Rig in FBX format from Maya.
 
     This extracts the rig in fbx with the constraints
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_gltf.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_gltf.py
index 450764a9f1..46da8f9463 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_gltf.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_gltf.py
@@ -3,11 +3,11 @@ import os
 import pyblish.api
 from ayon_maya.api import lib
 from ayon_maya.api.gltf import extract_gltf
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds, mel
 
 
-class ExtractGLB(MayaExtractorPlugin):
+class ExtractGLB(plugin.MayaExtractorPlugin):
 
     order = pyblish.api.ExtractorOrder
     label = "Extract GLB"
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_gpu_cache.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_gpu_cache.py
index 2d177bda96..53944571a8 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_gpu_cache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_gpu_cache.py
@@ -1,11 +1,11 @@
 import json
 
 from ayon_core.pipeline import publish
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractGPUCache(MayaExtractorPlugin,
+class ExtractGPUCache(plugin.MayaExtractorPlugin,
                       publish.OptionalPyblishPluginMixin):
     """Extract the content of the instance to a GPU cache file."""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_import_reference.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_import_reference.py
index 6c76e8173c..b5964e426b 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_import_reference.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_import_reference.py
@@ -6,11 +6,11 @@ import pyblish.api
 from ayon_core.lib import run_subprocess
 from ayon_core.pipeline.publish import OptionalPyblishPluginMixin
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractImportReference(MayaExtractorPlugin,
+class ExtractImportReference(plugin.MayaExtractorPlugin,
                              OptionalPyblishPluginMixin):
     """
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_layout.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_layout.py
index 5f398e2fd5..ca53f563d4 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_layout.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_layout.py
@@ -3,12 +3,12 @@ import math
 import os
 
 from ayon_api import get_representation_by_id
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 from maya.api import OpenMaya as om
 
 
-class ExtractLayout(MayaExtractorPlugin):
+class ExtractLayout(plugin.MayaExtractorPlugin):
     """Extract a layout."""
 
     label = "Extract Layout"
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_look.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_look.py
index ec27e762b5..8e57b22d64 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_look.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_look.py
@@ -22,7 +22,7 @@ from ayon_core.lib import (
 )
 from ayon_core.pipeline import KnownPublishError
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds  # noqa
 
 # Modes for transfer
@@ -405,7 +405,7 @@ class MakeTX(TextureProcessor):
             return False
 
 
-class ExtractLook(MayaExtractorPlugin):
+class ExtractLook(plugin.MayaExtractorPlugin):
     """Extract Look (Maya Scene + JSON)
 
     Only extracts the sets (shadingEngines and alike) alongside a .json file
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_scene_raw.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_scene_raw.py
index 473a26ce8f..6e66353c7a 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_scene_raw.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_scene_raw.py
@@ -6,11 +6,11 @@ from ayon_core.lib import BoolDef
 from ayon_core.pipeline import AVALON_CONTAINER_ID, AYON_CONTAINER_ID
 from ayon_core.pipeline.publish import AYONPyblishPluginMixin
 from ayon_maya.api.lib import maintained_selection
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractMayaSceneRaw(MayaExtractorPlugin, AYONPyblishPluginMixin):
+class ExtractMayaSceneRaw(plugin.MayaExtractorPlugin, AYONPyblishPluginMixin):
     """Extract as Maya Scene (raw).
 
     This will preserve all references, construction history, etc.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_usd.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_usd.py
index 4ae0445055..d2bf98afbc 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_usd.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_maya_usd.py
@@ -5,7 +5,7 @@ import os
 import pyblish.api
 import six
 from ayon_maya.api.lib import maintained_selection
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
@@ -111,7 +111,7 @@ def usd_export_attributes(nodes, attrs=None, attr_prefixes=None, mapping=None):
         dg_mod.undoIt()
 
 
-class ExtractMayaUsd(MayaExtractorPlugin):
+class ExtractMayaUsd(plugin.MayaExtractorPlugin):
     """Extractor for Maya USD Asset data.
 
     Upon publish a .usd (or .usdz) asset file will typically be written.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_model.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_model.py
index 950e09fb29..7f257a2013 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_model.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_model.py
@@ -4,11 +4,11 @@ import os
 
 from ayon_core.pipeline import publish
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractModel(MayaExtractorPlugin,
+class ExtractModel(plugin.MayaExtractorPlugin,
                    publish.OptionalPyblishPluginMixin):
     """Extract as Model (Maya Scene).
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_look.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_look.py
index f951f255b9..b6f8043a93 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_look.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_look.py
@@ -3,10 +3,10 @@ import os
 from maya import cmds
 
 from ayon_maya.api.lib import maintained_selection
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 
 
-class ExtractMultiverseLook(MayaExtractorPlugin):
+class ExtractMultiverseLook(plugin.MayaExtractorPlugin):
     """Extractor for Multiverse USD look data.
 
     This will extract:
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd.py
index 3f86f23ee3..477af9dc26 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd.py
@@ -3,11 +3,11 @@ import os
 import pyblish.api
 import six
 from ayon_maya.api.lib import maintained_selection
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds, mel
 
 
-class ExtractMultiverseUsd(MayaExtractorPlugin):
+class ExtractMultiverseUsd(plugin.MayaExtractorPlugin):
     """Extractor for Multiverse USD Asset data.
 
     This will extract settings for a Multiverse Write Asset operation:
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_comp.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_comp.py
index 648b5b3cc7..3d18bb80e1 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_comp.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_comp.py
@@ -1,11 +1,11 @@
 import os
 
 from ayon_maya.api.lib import maintained_selection
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractMultiverseUsdComposition(MayaExtractorPlugin):
+class ExtractMultiverseUsdComposition(plugin.MayaExtractorPlugin):
     """Extractor of Multiverse USD Composition data.
 
     This will extract settings for a Multiverse Write Composition operation:
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_over.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_over.py
index b7469d3627..a67f5c0a99 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_over.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_multiverse_usd_over.py
@@ -1,11 +1,11 @@
 import os
 
 from ayon_maya.api.lib import maintained_selection
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractMultiverseUsdOverride(MayaExtractorPlugin):
+class ExtractMultiverseUsdOverride(plugin.MayaExtractorPlugin):
     """Extractor for Multiverse USD Override data.
 
     This will extract settings for a Multiverse Write Override operation:
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_obj.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_obj.py
index 1daf37afde..baf86b581e 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_obj.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_obj.py
@@ -3,11 +3,11 @@ import os
 
 import pyblish.api
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractObj(MayaExtractorPlugin):
+class ExtractObj(plugin.MayaExtractorPlugin):
     """Extract OBJ from Maya.
 
     This extracts reproducible OBJ exports ignoring any of the settings
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_playblast.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_playblast.py
index f4388827a5..539246eef0 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_playblast.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_playblast.py
@@ -2,11 +2,11 @@ import os
 
 import clique
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractPlayblast(MayaExtractorPlugin):
+class ExtractPlayblast(plugin.MayaExtractorPlugin):
     """Extract viewport playblast.
 
     Takes review camera and creates review Quicktime video based on viewport
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_pointcache.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_pointcache.py
index cdbcb7c9f1..d3e9d89aaf 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_pointcache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_pointcache.py
@@ -18,11 +18,11 @@ from ayon_maya.api.lib import (
     maintained_selection,
     suspended_refresh,
 )
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractAlembic(MayaExtractorPlugin, AYONPyblishPluginMixin):
+class ExtractAlembic(plugin.MayaExtractorPlugin, AYONPyblishPluginMixin):
     """Produce an alembic of just point positions and normals.
 
     Positions and normals, uvs, creases are preserved, but nothing more,
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_proxy_abc.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_proxy_abc.py
index fb17768eb2..fc1c7981ed 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_proxy_abc.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_proxy_abc.py
@@ -6,11 +6,11 @@ from ayon_maya.api.lib import (
     maintained_selection,
     suspended_refresh,
 )
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractProxyAlembic(MayaExtractorPlugin):
+class ExtractProxyAlembic(plugin.MayaExtractorPlugin):
     """Produce an alembic for bounding box geometry
     """
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_redshift_proxy.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_redshift_proxy.py
index 18b0282e83..909d3dd172 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_redshift_proxy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_redshift_proxy.py
@@ -3,14 +3,14 @@
 import os
 
 from ayon_maya.api.lib import maintained_selection, renderlayer
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from ayon_maya.api.render_setup_tools import (
     allow_export_from_render_setup_layer,
 )
 from maya import cmds
 
 
-class ExtractRedshiftProxy(MayaExtractorPlugin):
+class ExtractRedshiftProxy(plugin.MayaExtractorPlugin):
     """Extract the content of the instance to a redshift proxy file."""
 
     label = "Redshift Proxy (.rs)"
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_rendersetup.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_rendersetup.py
index c8043e435e..8dcdd603b7 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_rendersetup.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_rendersetup.py
@@ -2,10 +2,10 @@ import json
 import os
 
 import maya.app.renderSetup.model.renderSetup as renderSetup
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 
 
-class ExtractRenderSetup(MayaExtractorPlugin):
+class ExtractRenderSetup(plugin.MayaExtractorPlugin):
     """
     Produce renderSetup template file
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_rig.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_rig.py
index 7568ee9b5b..3f96d7123d 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_rig.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_rig.py
@@ -3,11 +3,11 @@
 import os
 
 from ayon_maya.api.lib import maintained_selection
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractRig(MayaExtractorPlugin):
+class ExtractRig(plugin.MayaExtractorPlugin):
     """Extract rig as Maya Scene."""
 
     label = "Extract Rig (Maya Scene)"
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_skeleton_mesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_skeleton_mesh.py
index 549327d8a2..e496d53d42 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_skeleton_mesh.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_skeleton_mesh.py
@@ -6,10 +6,10 @@ import pyblish.api
 
 from ayon_core.pipeline.publish import OptionalPyblishPluginMixin
 from ayon_maya.api import fbx
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 
 
-class ExtractSkeletonMesh(MayaExtractorPlugin,
+class ExtractSkeletonMesh(plugin.MayaExtractorPlugin,
                           OptionalPyblishPluginMixin):
     """Extract Rig in FBX format from Maya.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_thumbnail.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_thumbnail.py
index d2ecf7f158..c2ffedd67c 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_thumbnail.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_thumbnail.py
@@ -3,10 +3,10 @@ import os
 import tempfile
 
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 
 
-class ExtractThumbnail(MayaExtractorPlugin):
+class ExtractThumbnail(plugin.MayaExtractorPlugin):
     """Extract viewport thumbnail.
 
     Takes review camera and creates a thumbnail based on viewport
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_abc.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_abc.py
index 66ea4b1b6c..a5d9303052 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_abc.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_abc.py
@@ -4,11 +4,11 @@ import os
 
 from ayon_maya.api.alembic import extract_alembic
 from ayon_maya.api.lib import maintained_selection, suspended_refresh
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds  # noqa
 
 
-class ExtractUnrealSkeletalMeshAbc(MayaExtractorPlugin):
+class ExtractUnrealSkeletalMeshAbc(plugin.MayaExtractorPlugin):
     """Extract Unreal Skeletal Mesh as FBX from Maya. """
 
     label = "Extract Unreal Skeletal Mesh - Alembic"
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py
index 81135bbb92..36324d3511 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_skeletalmesh_fbx.py
@@ -5,7 +5,7 @@ from contextlib import contextmanager
 
 import pyblish.api
 from ayon_maya.api import fbx
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds  # noqa
 
 
@@ -19,7 +19,7 @@ def renamed(original_name, renamed_name):
         cmds.rename(renamed_name, original_name)
 
 
-class ExtractUnrealSkeletalMeshFbx(MayaExtractorPlugin):
+class ExtractUnrealSkeletalMeshFbx(plugin.MayaExtractorPlugin):
     """Extract Unreal Skeletal Mesh as FBX from Maya. """
 
     order = pyblish.api.ExtractorOrder - 0.1
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_staticmesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_staticmesh.py
index b4ee55b9e1..215f82b338 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_staticmesh.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_staticmesh.py
@@ -5,11 +5,11 @@ import os
 import pyblish.api
 from ayon_maya.api import fbx
 from ayon_maya.api.lib import maintained_selection, parent_nodes
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds  # noqa
 
 
-class ExtractUnrealStaticMesh(MayaExtractorPlugin):
+class ExtractUnrealStaticMesh(plugin.MayaExtractorPlugin):
     """Extract Unreal Static Mesh as FBX from Maya. """
 
     order = pyblish.api.ExtractorOrder - 0.1
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_yeticache.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_yeticache.py
index fb90e9ee2b..79f47fbe9b 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_yeticache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_unreal_yeticache.py
@@ -1,10 +1,10 @@
 import os
 
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractUnrealYetiCache(MayaExtractorPlugin):
+class ExtractUnrealYetiCache(plugin.MayaExtractorPlugin):
     """Producing Yeti cache files using scene time range.
 
     This will extract Yeti cache file sequence and fur settings.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayproxy.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayproxy.py
index 04b037ef03..d6f1fd6698 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayproxy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayproxy.py
@@ -1,11 +1,11 @@
 import os
 
 from ayon_maya.api.lib import maintained_selection
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractVRayProxy(MayaExtractorPlugin):
+class ExtractVRayProxy(plugin.MayaExtractorPlugin):
     """Extract the content of the instance to a vrmesh file
 
     Things to pay attention to:
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayscene.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayscene.py
index 00c3f2b158..785cb4c37c 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayscene.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_vrayscene.py
@@ -4,12 +4,12 @@ import os
 import re
 
 from ayon_maya.api.lib import maintained_selection
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from ayon_maya.api.render_setup_tools import export_in_rs_layer
 from maya import cmds
 
 
-class ExtractVrayscene(MayaExtractorPlugin):
+class ExtractVrayscene(plugin.MayaExtractorPlugin):
     """Extractor for vrscene."""
 
     label = "VRay Scene (.vrscene)"
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_workfile_xgen.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_workfile_xgen.py
index c93da91207..e6df19c7f1 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_workfile_xgen.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_workfile_xgen.py
@@ -4,11 +4,11 @@ import shutil
 
 import pyblish.api
 from ayon_maya.api.alembic import extract_alembic
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractWorkfileXgen(MayaExtractorPlugin):
+class ExtractWorkfileXgen(plugin.MayaExtractorPlugin):
     """Extract Workfile Xgen.
 
     When submitting a render, we need to prep Xgen side car files.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_xgen.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_xgen.py
index 47a8140ef6..bb700bbdec 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_xgen.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_xgen.py
@@ -9,11 +9,11 @@ from ayon_maya.api.lib import (
     maintained_selection,
     write_xgen_file,
 )
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractXgen(MayaExtractorPlugin):
+class ExtractXgen(plugin.MayaExtractorPlugin):
     """Extract Xgen
 
     Workflow:
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_cache.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_cache.py
index e3e9a76d72..b84867316c 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_cache.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_cache.py
@@ -1,11 +1,11 @@
 import json
 import os
 
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ExtractYetiCache(MayaExtractorPlugin):
+class ExtractYetiCache(plugin.MayaExtractorPlugin):
     """Producing Yeti cache files using scene time range.
 
     This will extract Yeti cache file sequence and fur settings.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_rig.py b/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_rig.py
index 0c21118b22..640b37b667 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_rig.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/extract_yeti_rig.py
@@ -6,7 +6,7 @@ import json
 import os
 
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaExtractorPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
@@ -89,7 +89,7 @@ def yetigraph_attribute_values(assumed_destination, resources):
                 pass
 
 
-class ExtractYetiRig(MayaExtractorPlugin):
+class ExtractYetiRig(plugin.MayaExtractorPlugin):
     """Extract the Yeti rig to a Maya Scene and write the Yeti rig data."""
 
     label = "Extract Yeti Rig"
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/increment_current_file_deadline.py b/server_addon/maya/client/ayon_maya/plugins/publish/increment_current_file_deadline.py
index 62c5e9a8b2..66019c4837 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/increment_current_file_deadline.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/increment_current_file_deadline.py
@@ -1,8 +1,8 @@
 import pyblish.api
-from ayon_maya.api.plugin import MayaContextPlugin
+from ayon_maya.api import plugin
 
 
-class IncrementCurrentFileDeadline(MayaContextPlugin):
+class IncrementCurrentFileDeadline(plugin.MayaContextPlugin):
     """Increment the current file.
 
     Saves the current maya scene with an increased version number.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/reset_xgen_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/reset_xgen_attributes.py
index 923614c8d1..ac9e1beeec 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/reset_xgen_attributes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/reset_xgen_attributes.py
@@ -1,9 +1,9 @@
 import pyblish.api
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ResetXgenAttributes(MayaInstancePlugin):
+class ResetXgenAttributes(plugin.MayaInstancePlugin):
     """Reset Xgen attributes.
 
     When the incremental save of the workfile triggers, the Xgen attributes
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/save_scene.py b/server_addon/maya/client/ayon_maya/plugins/publish/save_scene.py
index f062f0d947..9c23fcff85 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/save_scene.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/save_scene.py
@@ -3,10 +3,10 @@ from ayon_core.pipeline.workfile.lock_workfile import (
     is_workfile_lock_enabled,
     remove_workfile_lock,
 )
-from ayon_maya.api.plugin import MayaContextPlugin
+from ayon_maya.api import plugin
 
 
-class SaveCurrentScene(MayaContextPlugin):
+class SaveCurrentScene(plugin.MayaContextPlugin):
     """Save current scene."""
 
     label = "Save current file"
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_alembic_options_defaults.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_alembic_options_defaults.py
index f68418770b..fd4e2254a7 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_alembic_options_defaults.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_alembic_options_defaults.py
@@ -3,11 +3,11 @@ import inspect
 import pyblish.api
 from ayon_core.pipeline import OptionalPyblishPluginMixin
 from ayon_core.pipeline.publish import PublishValidationError, RepairAction
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
 class ValidateAlembicDefaultsPointcache(
-    MayaInstancePlugin, OptionalPyblishPluginMixin
+    plugin.MayaInstancePlugin, OptionalPyblishPluginMixin
 ):
     """Validate the attributes on the instance are defaults.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_content.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_content.py
index b11e6ec930..b10a1a2bb7 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_content.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_content.py
@@ -4,10 +4,10 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateAnimationContent(MayaInstancePlugin,
+class ValidateAnimationContent(plugin.MayaInstancePlugin,
                                OptionalPyblishPluginMixin):
     """Adheres to the content of 'animation' product type
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_out_set_related_node_ids.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_out_set_related_node_ids.py
index ba8a50ea40..40f03b2690 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_out_set_related_node_ids.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_animation_out_set_related_node_ids.py
@@ -9,10 +9,10 @@ from ayon_core.pipeline.publish import (
     get_plugin_settings,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateOutRelatedNodeIds(MayaInstancePlugin,
+class ValidateOutRelatedNodeIds(plugin.MayaInstancePlugin,
                                 OptionalPyblishPluginMixin):
     """Validate if deformed shapes have related IDs to the original shapes
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source.py
index 7f8015443d..edc4161dff 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source.py
@@ -4,11 +4,11 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api.lib import is_visible
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateArnoldSceneSource(MayaInstancePlugin):
+class ValidateArnoldSceneSource(plugin.MayaInstancePlugin):
     """Validate Arnold Scene Source.
 
     Ensure no nodes are hidden.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source_cbid.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source_cbid.py
index 0da1a26293..8da8813b0d 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source_cbid.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_arnold_scene_source_cbid.py
@@ -5,10 +5,10 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateArnoldSceneSourceCbid(MayaInstancePlugin,
+class ValidateArnoldSceneSourceCbid(plugin.MayaInstancePlugin,
                                     OptionalPyblishPluginMixin):
     """Validate Arnold Scene Source Cbid.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_ass_relative_paths.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_ass_relative_paths.py
index 030e2fb950..36c220f862 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_ass_relative_paths.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_ass_relative_paths.py
@@ -10,10 +10,10 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     OptionalPyblishPluginMixin
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateAssRelativePaths(MayaInstancePlugin,
+class ValidateAssRelativePaths(plugin.MayaInstancePlugin,
                                OptionalPyblishPluginMixin):
     """Ensure exporting ass file has set relative texture paths"""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_name.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_name.py
index 468f9aee9b..4dfe7214bf 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_name.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_name.py
@@ -5,10 +5,10 @@ from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin,
     PublishValidationError,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateAssemblyName(MayaInstancePlugin,
+class ValidateAssemblyName(plugin.MayaInstancePlugin,
                            OptionalPyblishPluginMixin):
     """ Ensure Assembly name ends with `GRP`
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_namespaces.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_namespaces.py
index 15119fa3c2..324b12a207 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_namespaces.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_namespaces.py
@@ -4,10 +4,10 @@ from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin,
     PublishValidationError,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateAssemblyNamespaces(MayaInstancePlugin,
+class ValidateAssemblyNamespaces(plugin.MayaInstancePlugin,
                                  OptionalPyblishPluginMixin):
     """Ensure namespaces are not nested.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_transforms.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_transforms.py
index 9d2aa98c24..7fc14560f7 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_transforms.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_assembly_transforms.py
@@ -5,11 +5,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     RepairAction,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateAssemblyModelTransforms(MayaInstancePlugin,
+class ValidateAssemblyModelTransforms(plugin.MayaInstancePlugin,
                                       OptionalPyblishPluginMixin):
     """Verify only root nodes of the loaded asset have transformations.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_attributes.py
index 2f52c92200..8d4d8323ce 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_attributes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_attributes.py
@@ -8,11 +8,11 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api.lib import set_attribute
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateAttributes(MayaInstancePlugin,
+class ValidateAttributes(plugin.MayaInstancePlugin,
                          OptionalPyblishPluginMixin):
     """Ensure attributes are consistent.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_attributes.py
index 1922b22109..8c3f3800cc 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_attributes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_attributes.py
@@ -4,11 +4,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateCameraAttributes(MayaInstancePlugin,
+class ValidateCameraAttributes(plugin.MayaInstancePlugin,
                                OptionalPyblishPluginMixin):
     """Validates Camera has no invalid attribute keys or values.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_contents.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_contents.py
index 988b16cec2..42a5ef1769 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_contents.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_camera_contents.py
@@ -5,10 +5,10 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
     OptionalPyblishPluginMixin)
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateCameraContents(MayaInstancePlugin,
+class ValidateCameraContents(plugin.MayaInstancePlugin,
                              OptionalPyblishPluginMixin):
     """Validates Camera instance contents.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_color_sets.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_color_sets.py
index d89244b5f7..f95e27def1 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_color_sets.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_color_sets.py
@@ -5,11 +5,11 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateMeshOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateColorSets(MayaInstancePlugin,
+class ValidateColorSets(plugin.MayaInstancePlugin,
                         OptionalPyblishPluginMixin):
     """Validate all meshes in the instance have unlocked normals
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_current_renderlayer_renderable.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_current_renderlayer_renderable.py
index c863778e07..6c599d398d 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_current_renderlayer_renderable.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_current_renderlayer_renderable.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     context_plugin_should_run,
 )
-from ayon_maya.api.plugin import MayaContextPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateCurrentRenderLayerIsRenderable(MayaContextPlugin,
+class ValidateCurrentRenderLayerIsRenderable(plugin.MayaContextPlugin,
                                              OptionalPyblishPluginMixin):
     """Validate if current render layer has a renderable camera.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_cycle_error.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_cycle_error.py
index 62aafa9f53..0b870993e9 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_cycle_error.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_cycle_error.py
@@ -5,11 +5,11 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api.lib import maintained_selection
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateCycleError(MayaInstancePlugin,
+class ValidateCycleError(plugin.MayaInstancePlugin,
                          OptionalPyblishPluginMixin):
     """Validate nodes produce no cycle errors."""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_frame_range.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_frame_range.py
index a5834d9bff..90bdef4107 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_frame_range.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_frame_range.py
@@ -5,12 +5,12 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api.lib_rendersetup import get_attr_in_layer, get_attr_overrides
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 from maya.app.renderSetup.model.override import AbsOverride
 
 
-class ValidateFrameRange(MayaInstancePlugin,
+class ValidateFrameRange(plugin.MayaInstancePlugin,
                          OptionalPyblishPluginMixin):
     """Validates the frame ranges.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_material.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_material.py
index d620de49c1..e94cb3e663 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_material.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_material.py
@@ -5,11 +5,11 @@ from ayon_core.pipeline import (
     PublishValidationError,
 )
 from ayon_core.pipeline.publish import RepairAction, ValidateContentsOrder
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateGLSLMaterial(MayaInstancePlugin,
+class ValidateGLSLMaterial(plugin.MayaInstancePlugin,
                            OptionalPyblishPluginMixin):
     """
     Validate if the asset uses GLSL Shader
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_plugin.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_plugin.py
index 588c86e297..aaea616631 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_plugin.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_glsl_plugin.py
@@ -6,10 +6,10 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     OptionalPyblishPluginMixin
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateGLSLPlugin(MayaInstancePlugin,
+class ValidateGLSLPlugin(plugin.MayaInstancePlugin,
                          OptionalPyblishPluginMixin):
     """
     Validate if the asset uses GLSL Shader
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_has_members.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_has_members.py
index 2fc5a3910f..baca2a9008 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_has_members.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_has_members.py
@@ -3,10 +3,10 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateInstanceHasMembers(MayaInstancePlugin):
+class ValidateInstanceHasMembers(plugin.MayaInstancePlugin):
     """Validates instance objectSet has *any* members."""
 
     order = ValidateContentsOrder
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_in_context.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_in_context.py
index 3d1d051484..5168c8496c 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_in_context.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_in_context.py
@@ -9,10 +9,10 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateInstanceInContext(MayaInstancePlugin,
+class ValidateInstanceInContext(plugin.MayaInstancePlugin,
                                 OptionalPyblishPluginMixin):
     """Validator to check if instance asset match context asset.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_subset.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_subset.py
index fe18d9359e..4c876079ff 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_subset.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_instance_subset.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 # Allow only characters, numbers and underscore
 allowed = set(string.ascii_lowercase +
@@ -18,7 +18,7 @@ def validate_name(product_name):
     return all(x in allowed for x in product_name)
 
 
-class ValidateSubsetName(MayaInstancePlugin):
+class ValidateSubsetName(plugin.MayaInstancePlugin):
     """Validates product name has only valid characters"""
 
     order = ValidateContentsOrder
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_loaded_plugin.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_loaded_plugin.py
index b83f411681..60af00186e 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_loaded_plugin.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_loaded_plugin.py
@@ -7,10 +7,10 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     OptionalPyblishPluginMixin
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateLoadedPlugin(MayaInstancePlugin,
+class ValidateLoadedPlugin(plugin.MayaInstancePlugin,
                            OptionalPyblishPluginMixin):
     """Ensure there are no unauthorized loaded plugins"""
 
@@ -23,17 +23,17 @@ class ValidateLoadedPlugin(MayaInstancePlugin,
     def get_invalid(cls, context):
 
         invalid = []
-        loaded_plugin = cmds.pluginInfo(query=True, listPlugins=True)
+        loaded_plugins = cmds.pluginInfo(query=True, listPlugins=True)
         # get variable from AYON settings
         whitelist_native_plugins = cls.whitelist_native_plugins
         authorized_plugins = cls.authorized_plugins or []
 
-        for plugin in loaded_plugin:
+        for maya_plugin in loaded_plugins:
             if not whitelist_native_plugins and os.getenv('MAYA_LOCATION') \
-                    in cmds.pluginInfo(plugin, query=True, path=True):
+                    in cmds.pluginInfo(maya_plugin, query=True, path=True):
                 continue
-            if plugin not in authorized_plugins:
-                invalid.append(plugin)
+            if maya_plugin not in authorized_plugins:
+                invalid.append(maya_plugin)
 
         return invalid
 
@@ -50,6 +50,6 @@ class ValidateLoadedPlugin(MayaInstancePlugin,
     def repair(cls, context):
         """Unload forbidden plugins"""
 
-        for plugin in cls.get_invalid(context):
-            cmds.pluginInfo(plugin, edit=True, autoload=False)
-            cmds.unloadPlugin(plugin, force=True)
+        for maya_plugin in cls.get_invalid(context):
+            cmds.pluginInfo(maya_plugin, edit=True, autoload=False)
+            cmds.unloadPlugin(maya_plugin, force=True)
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_contents.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_contents.py
index 31e4073807..722f92b1b5 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_contents.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_contents.py
@@ -3,11 +3,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds  # noqa
 
 
-class ValidateLookContents(MayaInstancePlugin):
+class ValidateLookContents(plugin.MayaInstancePlugin):
     """Validate look instance contents
 
     Rules:
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_default_shaders_connections.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_default_shaders_connections.py
index 2dca5a4a90..ac936b36c7 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_default_shaders_connections.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_default_shaders_connections.py
@@ -3,11 +3,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     RepairContextAction,
 )
-from ayon_maya.api.plugin import MayaContextPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateLookDefaultShadersConnections(MayaContextPlugin):
+class ValidateLookDefaultShadersConnections(plugin.MayaContextPlugin):
     """Validate default shaders in the scene have their default connections.
 
     For example the standardSurface1 or lambert1 (maya 2023 and before) could
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_id_reference_edits.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_id_reference_edits.py
index e1d956e060..4763128f3f 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_id_reference_edits.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_id_reference_edits.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateLookIdReferenceEdits(MayaInstancePlugin):
+class ValidateLookIdReferenceEdits(plugin.MayaInstancePlugin):
     """Validate nodes in look have no reference edits to cbId.
 
     Note:
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_no_default_shaders.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_no_default_shaders.py
index a93815f275..e4662dd498 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_no_default_shaders.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_no_default_shaders.py
@@ -3,11 +3,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateLookNoDefaultShaders(MayaInstancePlugin):
+class ValidateLookNoDefaultShaders(plugin.MayaInstancePlugin):
     """Validate if any node has a connection to a default shader.
 
     This checks whether the look has any members of:
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_sets.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_sets.py
index 21de06b061..eae1664114 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_sets.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_sets.py
@@ -4,10 +4,10 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     PublishValidationError
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateLookSets(MayaInstancePlugin):
+class ValidateLookSets(plugin.MayaInstancePlugin):
     """Validate if any sets relationships are not being collected.
 
     A shader can be assigned to a node that is missing a Colorbleed ID.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_shading_group.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_shading_group.py
index 8c0a92b012..2aecf64e01 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_shading_group.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_shading_group.py
@@ -5,11 +5,11 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateShadingEngine(MayaInstancePlugin,
+class ValidateShadingEngine(plugin.MayaInstancePlugin,
                             OptionalPyblishPluginMixin):
     """Validate all shading engines are named after the surface material.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_single_shader.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_single_shader.py
index 0cfb18df96..d48c050d97 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_single_shader.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_look_single_shader.py
@@ -3,11 +3,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateSingleShader(MayaInstancePlugin):
+class ValidateSingleShader(plugin.MayaInstancePlugin):
     """Validate all nurbsSurfaces and meshes have exactly one shader assigned.
 
     This will error if a shape has no shaders or more than one shader.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_maya_units.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_maya_units.py
index 16c7920642..cb4df4b5d5 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_maya_units.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_maya_units.py
@@ -6,10 +6,10 @@ from ayon_core.pipeline.publish import (
     RepairContextAction,
     ValidateSceneOrder,
 )
-from ayon_maya.api.plugin import MayaContextPlugin
+from ayon_maya.api import plugin
 
 
-class ValidateMayaUnits(MayaContextPlugin,
+class ValidateMayaUnits(plugin.MayaContextPlugin,
                         OptionalPyblishPluginMixin):
     """Check if the Maya units are set correct"""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_arnold_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_arnold_attributes.py
index 26aac9c944..9729c8863d 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_arnold_attributes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_arnold_attributes.py
@@ -12,11 +12,11 @@ from ayon_maya.api.lib import (
     set_attribute,
     undo_chunk,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateMeshArnoldAttributes(MayaInstancePlugin,
+class ValidateMeshArnoldAttributes(plugin.MayaInstancePlugin,
                                    OptionalPyblishPluginMixin):
     """Validate the mesh has default Arnold attributes.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_empty.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_empty.py
index 419ca3c3c3..12b2252eb8 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_empty.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_empty.py
@@ -4,11 +4,11 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateMeshOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateMeshEmpty(MayaInstancePlugin):
+class ValidateMeshEmpty(plugin.MayaInstancePlugin):
     """Validate meshes have some vertices.
 
     Its possible to have meshes without any vertices. To replicate
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_has_uv.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_has_uv.py
index 6f45cba973..c7576d2a78 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_has_uv.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_has_uv.py
@@ -5,11 +5,11 @@ from ayon_core.pipeline.publish import (
     ValidateMeshOrder,
 )
 from ayon_maya.api.lib import len_flattened
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateMeshHasUVs(MayaInstancePlugin,
+class ValidateMeshHasUVs(plugin.MayaInstancePlugin,
                          OptionalPyblishPluginMixin):
     """Validate the current mesh has UVs.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_lamina_faces.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_lamina_faces.py
index 23a38aedd8..50e3b5b53a 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_lamina_faces.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_lamina_faces.py
@@ -4,11 +4,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateMeshOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateMeshLaminaFaces(MayaInstancePlugin,
+class ValidateMeshLaminaFaces(plugin.MayaInstancePlugin,
                               OptionalPyblishPluginMixin):
     """Validate meshes don't have lamina faces.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_ngons.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_ngons.py
index f1d347df97..c73c8d27e8 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_ngons.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_ngons.py
@@ -5,11 +5,11 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateMeshNgons(MayaInstancePlugin,
+class ValidateMeshNgons(plugin.MayaInstancePlugin,
                         OptionalPyblishPluginMixin):
     """Ensure that meshes don't have ngons
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_no_negative_scale.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_no_negative_scale.py
index 58c3a9bc0f..7a77a2a4f6 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_no_negative_scale.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_no_negative_scale.py
@@ -4,7 +4,7 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateMeshOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
@@ -15,7 +15,7 @@ def _as_report_list(values, prefix="- ", suffix="\n"):
     return prefix + (suffix + prefix).join(values)
 
 
-class ValidateMeshNoNegativeScale(MayaInstancePlugin,
+class ValidateMeshNoNegativeScale(plugin.MayaInstancePlugin,
                                   OptionalPyblishPluginMixin):
     """Ensure that meshes don't have a negative scale.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_manifold.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_manifold.py
index 9e7461772e..8288e8a3b3 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_manifold.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_manifold.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateMeshOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds, mel
 
 
@@ -100,7 +100,7 @@ def _as_report_list(values, prefix="- ", suffix="\n"):
     return prefix + (suffix + prefix).join(values)
 
 
-class ValidateMeshNonManifold(MayaInstancePlugin,
+class ValidateMeshNonManifold(plugin.MayaInstancePlugin,
                               OptionalPyblishPluginMixin):
     """Ensure that meshes don't have non-manifold edges or vertices
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_zero_edge.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_zero_edge.py
index f891a4f7de..bd11ca6488 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_zero_edge.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_non_zero_edge.py
@@ -5,11 +5,11 @@ from ayon_core.pipeline.publish import (
     ValidateMeshOrder,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateMeshNonZeroEdgeLength(MayaInstancePlugin,
+class ValidateMeshNonZeroEdgeLength(plugin.MayaInstancePlugin,
                                     OptionalPyblishPluginMixin):
     """Validate meshes don't have edges with a zero length.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_normals_unlocked.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_normals_unlocked.py
index c6b6786f24..dd8c523082 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_normals_unlocked.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_normals_unlocked.py
@@ -6,7 +6,7 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateMeshOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
@@ -17,7 +17,7 @@ def _as_report_list(values, prefix="- ", suffix="\n"):
     return prefix + (suffix + prefix).join(values)
 
 
-class ValidateMeshNormalsUnlocked(MayaInstancePlugin,
+class ValidateMeshNormalsUnlocked(plugin.MayaInstancePlugin,
                                   OptionalPyblishPluginMixin):
     """Validate all meshes in the instance have unlocked normals
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_overlapping_uvs.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_overlapping_uvs.py
index 5e9a4c3b60..0ef6c2732e 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_overlapping_uvs.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_overlapping_uvs.py
@@ -7,7 +7,7 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateMeshOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 from six.moves import xrange
 
@@ -235,7 +235,7 @@ class GetOverlappingUVs(object):
         return faces
 
 
-class ValidateMeshHasOverlappingUVs(MayaInstancePlugin,
+class ValidateMeshHasOverlappingUVs(plugin.MayaInstancePlugin,
                                     OptionalPyblishPluginMixin):
     """ Validate the current mesh overlapping UVs.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_shader_connections.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_shader_connections.py
index 9f9ca0c0d5..e3fff157ac 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_shader_connections.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_shader_connections.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateMeshOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
@@ -79,7 +79,7 @@ def disconnect(node_a, node_b):
             cmds.disconnectAttr(source, input)
 
 
-class ValidateMeshShaderConnections(MayaInstancePlugin,
+class ValidateMeshShaderConnections(plugin.MayaInstancePlugin,
                                     OptionalPyblishPluginMixin):
     """Ensure mesh shading engine connections are valid.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_single_uv_set.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_single_uv_set.py
index e7fb6d9ae0..a254cbf8a6 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_single_uv_set.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_single_uv_set.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline.publish import (
     ValidateMeshOrder,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateMeshSingleUVSet(MayaInstancePlugin,
+class ValidateMeshSingleUVSet(plugin.MayaInstancePlugin,
                               OptionalPyblishPluginMixin):
     """Warn on multiple UV sets existing for each polygon mesh.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_uv_set_map1.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_uv_set_map1.py
index bce69c8279..a749edb35a 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_uv_set_map1.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_uv_set_map1.py
@@ -7,11 +7,11 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateMeshOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateMeshUVSetMap1(MayaInstancePlugin,
+class ValidateMeshUVSetMap1(plugin.MayaInstancePlugin,
                             OptionalPyblishPluginMixin):
     """Validate model's default set exists and is named 'map1'.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_vertices_have_edges.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_vertices_have_edges.py
index a63e9a0727..a10a275c44 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_vertices_have_edges.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mesh_vertices_have_edges.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline.publish import (
     ValidateMeshOrder,
 )
 from ayon_maya.api.lib import len_flattened
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateMeshVerticesHaveEdges(MayaInstancePlugin,
+class ValidateMeshVerticesHaveEdges(plugin.MayaInstancePlugin,
                                     OptionalPyblishPluginMixin):
     """Validate meshes have only vertices that are connected to edges.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_model_content.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_model_content.py
index 32435e9d86..5e100dca1c 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_model_content.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_model_content.py
@@ -7,11 +7,11 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateModelContent(MayaInstancePlugin,
+class ValidateModelContent(plugin.MayaInstancePlugin,
                            OptionalPyblishPluginMixin):
     """Adheres to the content of 'model' product type
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mvlook_contents.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mvlook_contents.py
index 602c4ff371..b26a3f4cb7 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_mvlook_contents.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_mvlook_contents.py
@@ -6,13 +6,13 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 COLOUR_SPACES = ['sRGB', 'linear', 'auto']
 MIPMAP_EXTENSIONS = ['tdl']
 
 
-class ValidateMvLookContents(MayaInstancePlugin,
+class ValidateMvLookContents(plugin.MayaInstancePlugin,
                              OptionalPyblishPluginMixin):
     order = ValidateContentsOrder
     families = ['mvLook']
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_animation.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_animation.py
index 6e6b04bfea..146dfda2ca 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_animation.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_animation.py
@@ -4,7 +4,7 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
@@ -15,7 +15,7 @@ def _as_report_list(values, prefix="- ", suffix="\n"):
     return prefix + (suffix + prefix).join(values)
 
 
-class ValidateNoAnimation(MayaInstancePlugin,
+class ValidateNoAnimation(plugin.MayaInstancePlugin,
                           OptionalPyblishPluginMixin):
     """Ensure no keyframes on nodes in the Instance.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_default_camera.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_default_camera.py
index e5d938e337..a57c02a842 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_default_camera.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_default_camera.py
@@ -4,7 +4,7 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
@@ -15,7 +15,7 @@ def _as_report_list(values, prefix="- ", suffix="\n"):
     return prefix + (suffix + prefix).join(values)
 
 
-class ValidateNoDefaultCameras(MayaInstancePlugin,
+class ValidateNoDefaultCameras(plugin.MayaInstancePlugin,
                                OptionalPyblishPluginMixin):
     """Ensure no default (startup) cameras are in the instance.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_namespace.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_namespace.py
index a357b9cdec..9bd2d98e54 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_namespace.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_namespace.py
@@ -6,7 +6,7 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
 def _as_report_list(values, prefix="- ", suffix="\n"):
@@ -23,7 +23,7 @@ def get_namespace(node_name):
     return node_name.rpartition(":")[0]
 
 
-class ValidateNoNamespace(MayaInstancePlugin,
+class ValidateNoNamespace(plugin.MayaInstancePlugin,
                           OptionalPyblishPluginMixin):
     """Ensure the nodes don't have a namespace"""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_null_transforms.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_null_transforms.py
index 581b304f60..5c1baeb0e3 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_null_transforms.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_null_transforms.py
@@ -6,7 +6,7 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
 def _as_report_list(values, prefix="- ", suffix="\n"):
@@ -32,7 +32,7 @@ def has_shape_children(node):
     return True
 
 
-class ValidateNoNullTransforms(MayaInstancePlugin,
+class ValidateNoNullTransforms(plugin.MayaInstancePlugin,
                                OptionalPyblishPluginMixin):
     """Ensure no null transforms are in the scene.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_unknown_nodes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_unknown_nodes.py
index 4f55f5f64f..3662c94ba3 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_unknown_nodes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_unknown_nodes.py
@@ -4,7 +4,7 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
@@ -15,7 +15,7 @@ def _as_report_list(values, prefix="- ", suffix="\n"):
     return prefix + (suffix + prefix).join(values)
 
 
-class ValidateNoUnknownNodes(MayaInstancePlugin,
+class ValidateNoUnknownNodes(plugin.MayaInstancePlugin,
                              OptionalPyblishPluginMixin):
     """Checks to see if there are any unknown nodes in the instance.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_vraymesh.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_vraymesh.py
index f54e0ddcd1..d14c335021 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_vraymesh.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_no_vraymesh.py
@@ -3,7 +3,7 @@ from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin,
     PublishValidationError,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
@@ -14,7 +14,7 @@ def _as_report_list(values, prefix="- ", suffix="\n"):
     return prefix + (suffix + prefix).join(values)
 
 
-class ValidateNoVRayMesh(MayaInstancePlugin,
+class ValidateNoVRayMesh(plugin.MayaInstancePlugin,
                          OptionalPyblishPluginMixin):
     """Validate there are no VRayMesh objects in the instance"""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids.py
index a5b1f50044..f9dafa024f 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids.py
@@ -4,10 +4,10 @@ from ayon_core.pipeline.publish import (
 )
 import ayon_maya.api.action
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateNodeIDs(MayaInstancePlugin):
+class ValidateNodeIDs(plugin.MayaInstancePlugin):
     """Validate nodes have a Colorbleed Id.
 
     When IDs are missing from nodes *save your scene* and they should be
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_deformed_shapes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_deformed_shapes.py
index 28e6bf29b7..8e3c4e5bff 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_deformed_shapes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_deformed_shapes.py
@@ -5,11 +5,11 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateNodeIdsDeformedShape(MayaInstancePlugin):
+class ValidateNodeIdsDeformedShape(plugin.MayaInstancePlugin):
     """Validate if deformed shapes have related IDs to the original shapes.
 
     When a deformer is applied in the scene on a referenced mesh that already
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_in_database.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_in_database.py
index 6465878889..95e488d8e7 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_in_database.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_in_database.py
@@ -5,10 +5,10 @@ from ayon_core.pipeline.publish import (
     ValidatePipelineOrder,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateNodeIdsInDatabase(MayaInstancePlugin):
+class ValidateNodeIdsInDatabase(plugin.MayaInstancePlugin):
     """Validate if the CB Id is related to an folder in the database
 
     All nodes with the `cbId` attribute will be validated to ensure that
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_related.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_related.py
index eaf1d8a250..7382653d35 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_related.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_related.py
@@ -10,7 +10,7 @@ from ayon_core.pipeline.publish import (
     ValidatePipelineOrder,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
 def is_valid_uuid(value) -> bool:
@@ -22,7 +22,7 @@ def is_valid_uuid(value) -> bool:
     return True
 
 
-class ValidateNodeIDsRelated(MayaInstancePlugin,
+class ValidateNodeIDsRelated(plugin.MayaInstancePlugin,
                              OptionalPyblishPluginMixin):
     """Validate nodes have a related `cbId` to the instance.data[folderPath]"""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_unique.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_unique.py
index ee32b1decc..27606baa55 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_unique.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_ids_unique.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline.publish import (
     ValidatePipelineOrder,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateNodeIdsUnique(MayaInstancePlugin):
+class ValidateNodeIdsUnique(plugin.MayaInstancePlugin):
     """Validate the nodes in the instance have a unique Colorbleed Id
 
     Here we ensure that what has been added to the instance is unique
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_no_ghosting.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_no_ghosting.py
index 735b98dfe9..184e4eaf15 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_no_ghosting.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_node_no_ghosting.py
@@ -4,11 +4,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateNodeNoGhosting(MayaInstancePlugin,
+class ValidateNodeNoGhosting(plugin.MayaInstancePlugin,
                              OptionalPyblishPluginMixin):
     """Ensure nodes do not have ghosting enabled.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_plugin_path_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_plugin_path_attributes.py
index 4ab03f19c8..506759516e 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_plugin_path_attributes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_plugin_path_attributes.py
@@ -7,11 +7,11 @@ from ayon_core.pipeline.publish import (
 )
 from ayon_maya.api.action import SelectInvalidAction
 from ayon_maya.api.lib import pairwise
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidatePluginPathAttributes(MayaInstancePlugin,
+class ValidatePluginPathAttributes(plugin.MayaInstancePlugin,
                                    OptionalPyblishPluginMixin):
     """
     Validate plug-in path attributes point to existing file paths.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_image_rule.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_image_rule.py
index 72a69302a8..fd1a9ad9e4 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_image_rule.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_image_rule.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateRenderImageRule(MayaInstancePlugin,
+class ValidateRenderImageRule(plugin.MayaInstancePlugin,
                               OptionalPyblishPluginMixin):
     """Validates Maya Workpace "images" file rule matches project settings.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_no_default_cameras.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_no_default_cameras.py
index 85c304e0cd..083b21b819 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_no_default_cameras.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_no_default_cameras.py
@@ -4,11 +4,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateRenderNoDefaultCameras(MayaInstancePlugin,
+class ValidateRenderNoDefaultCameras(plugin.MayaInstancePlugin,
                                      OptionalPyblishPluginMixin):
     """Ensure no default (startup) cameras are to be rendered."""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_single_camera.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_single_camera.py
index a50f4eeab5..6856b9a0f1 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_single_camera.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_render_single_camera.py
@@ -8,11 +8,11 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api.lib_rendersettings import RenderSettings
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateRenderSingleCamera(MayaInstancePlugin,
+class ValidateRenderSingleCamera(plugin.MayaInstancePlugin,
                                  OptionalPyblishPluginMixin):
     """Validate renderable camera count for layer and <Camera> token.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_renderlayer_aovs.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_renderlayer_aovs.py
index dd9cca19a5..16350cfa08 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_renderlayer_aovs.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_renderlayer_aovs.py
@@ -5,10 +5,10 @@ from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin,
     PublishValidationError,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateRenderLayerAOVs(MayaInstancePlugin,
+class ValidateRenderLayerAOVs(plugin.MayaInstancePlugin,
                               OptionalPyblishPluginMixin):
     """Validate created AOVs / RenderElement is registered in the database
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_rendersettings.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rendersettings.py
index 5e3b6c541f..7b21bf6a14 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_rendersettings.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rendersettings.py
@@ -11,7 +11,7 @@ from ayon_core.pipeline.publish import (
 )
 from ayon_maya.api import lib
 from ayon_maya.api.lib_rendersettings import RenderSettings
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds, mel
 
 
@@ -37,7 +37,7 @@ def get_redshift_image_format_labels():
     return mel.eval("{0}={0}".format(var))
 
 
-class ValidateRenderSettings(MayaInstancePlugin,
+class ValidateRenderSettings(plugin.MayaInstancePlugin,
                              OptionalPyblishPluginMixin):
     """Validates the global render settings
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_resolution.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_resolution.py
index 63c0b9dab1..58d2ad3030 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_resolution.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_resolution.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline import (
 from ayon_core.pipeline.publish import RepairAction
 from ayon_maya.api import lib
 from ayon_maya.api.lib import reset_scene_resolution
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateResolution(MayaInstancePlugin,
+class ValidateResolution(plugin.MayaInstancePlugin,
                          OptionalPyblishPluginMixin):
     """Validate the render resolution setting aligned with DB"""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_resources.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_resources.py
index e3c7d65000..0ec51d909c 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_resources.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_resources.py
@@ -5,10 +5,10 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateResources(MayaInstancePlugin):
+class ValidateResources(plugin.MayaInstancePlugin):
     """Validates mapped resources.
 
     These are external files to the current application, for example
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_review.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_review.py
index c38c132347..76f61dc3e5 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_review.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_review.py
@@ -1,10 +1,10 @@
 from ayon_core.pipeline.publish import (
     ValidateContentsOrder, PublishValidationError
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateReview(MayaInstancePlugin):
+class ValidateReview(plugin.MayaInstancePlugin):
     """Validate review."""
 
     order = ValidateContentsOrder
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_contents.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_contents.py
index ad642c34b2..ada2ce045b 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_contents.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_contents.py
@@ -4,11 +4,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateRigContents(MayaInstancePlugin,
+class ValidateRigContents(plugin.MayaInstancePlugin,
                           OptionalPyblishPluginMixin):
     """Ensure rig contains pipeline-critical content
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers.py
index 0bbbecc73d..fed78df2da 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api.lib import undo_chunk
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateRigControllers(MayaInstancePlugin,
+class ValidateRigControllers(plugin.MayaInstancePlugin,
                              OptionalPyblishPluginMixin):
     """Validate rig controllers.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers_arnold_attributes.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
index 4589603bff..06691f4bd3 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_controllers_arnold_attributes.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateRigControllersArnoldAttributes(MayaInstancePlugin,
+class ValidateRigControllersArnoldAttributes(plugin.MayaInstancePlugin,
                                              OptionalPyblishPluginMixin):
     """Validate rig control curves have no keyable arnold attributes.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_joints_hidden.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_joints_hidden.py
index e9e43a9902..f0593ed7bc 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_joints_hidden.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_joints_hidden.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateRigJointsHidden(MayaInstancePlugin,
+class ValidateRigJointsHidden(plugin.MayaInstancePlugin,
                               OptionalPyblishPluginMixin):
     """Validate all joints are hidden visually.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_out_set_node_ids.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_out_set_node_ids.py
index 163e2007dd..e5f7a5b204 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_out_set_node_ids.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_out_set_node_ids.py
@@ -9,10 +9,10 @@ from ayon_core.pipeline.publish import (
     get_plugin_settings,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateRigOutSetNodeIds(MayaInstancePlugin,
+class ValidateRigOutSetNodeIds(plugin.MayaInstancePlugin,
                                OptionalPyblishPluginMixin):
     """Validate if deformed shapes have related IDs to the original shapes.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_output_ids.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_output_ids.py
index 2a965173fa..064c83c0b9 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_output_ids.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_rig_output_ids.py
@@ -7,7 +7,7 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api.lib import get_id, set_id
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
@@ -16,7 +16,7 @@ def get_basename(node):
     return node.rsplit("|", 1)[-1].rsplit(":", 1)[-1]
 
 
-class ValidateRigOutputIds(MayaInstancePlugin):
+class ValidateRigOutputIds(plugin.MayaInstancePlugin):
     """Validate rig output ids.
 
     Ids must share the same id as similarly named nodes in the scene. This is
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_scene_set_workspace.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_scene_set_workspace.py
index d8885cc530..cd36f98dfb 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_scene_set_workspace.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_scene_set_workspace.py
@@ -5,7 +5,7 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidatePipelineOrder,
 )
-from ayon_maya.api.plugin import MayaContextPlugin
+from ayon_maya.api import plugin
 
 
 def is_subdir(path, root_dir):
@@ -27,7 +27,7 @@ def is_subdir(path, root_dir):
         return True
 
 
-class ValidateSceneSetWorkspace(MayaContextPlugin):
+class ValidateSceneSetWorkspace(plugin.MayaContextPlugin):
     """Validate the scene is inside the currently set Maya workspace"""
 
     order = ValidatePipelineOrder
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_setdress_root.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_setdress_root.py
index ae5493ffe4..26245435eb 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_setdress_root.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_setdress_root.py
@@ -2,10 +2,10 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateSetdressRoot(MayaInstancePlugin):
+class ValidateSetdressRoot(plugin.MayaInstancePlugin):
     """Validate if set dress top root node is published."""
 
     order = ValidateContentsOrder
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_shader_name.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shader_name.py
index 77dc24d1a4..45d7ee1c8b 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_shader_name.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shader_name.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateShaderName(MayaInstancePlugin,
+class ValidateShaderName(plugin.MayaInstancePlugin,
                          OptionalPyblishPluginMixin):
     """Validate shader name assigned.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_default_names.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_default_names.py
index bd9f0cf1d7..4e4f98d755 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_default_names.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_default_names.py
@@ -7,7 +7,7 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
@@ -15,7 +15,7 @@ def short_name(node):
     return node.rsplit("|", 1)[-1].rsplit(":", 1)[-1]
 
 
-class ValidateShapeDefaultNames(MayaInstancePlugin,
+class ValidateShapeDefaultNames(plugin.MayaInstancePlugin,
                                 OptionalPyblishPluginMixin):
     """Validates that Shape names are using Maya's default format.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_render_stats.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_render_stats.py
index 646c12f331..a9c3e861f0 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_render_stats.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_render_stats.py
@@ -5,11 +5,11 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateMeshOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateShapeRenderStats(MayaInstancePlugin,
+class ValidateShapeRenderStats(plugin.MayaInstancePlugin,
                                OptionalPyblishPluginMixin):
     """Ensure all render stats are set to the default values."""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_zero.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_zero.py
index 8f58e646f0..8c11009374 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_zero.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_shape_zero.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateShapeZero(MayaInstancePlugin,
+class ValidateShapeZero(plugin.MayaInstancePlugin,
                         OptionalPyblishPluginMixin):
     """Shape components may not have any "tweak" values
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_single_assembly.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_single_assembly.py
index 02f3973149..0a760e2acc 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_single_assembly.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_single_assembly.py
@@ -2,10 +2,10 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateSingleAssembly(MayaInstancePlugin):
+class ValidateSingleAssembly(plugin.MayaInstancePlugin):
     """Ensure the content of the instance is grouped in a single hierarchy
 
     The instance must have a single root node containing all the content.
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_hierarchy.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_hierarchy.py
index be71eebac2..9904fdce22 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_hierarchy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_hierarchy.py
@@ -5,11 +5,11 @@ from ayon_core.pipeline.publish import (
     PublishXmlValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateSkeletalMeshHierarchy(MayaInstancePlugin,
+class ValidateSkeletalMeshHierarchy(plugin.MayaInstancePlugin,
                                     OptionalPyblishPluginMixin):
     """Validates that nodes has common root."""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_triangulated.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_triangulated.py
index db93b8cbc5..7b2b005e9c 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_triangulated.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeletalmesh_triangulated.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api.action import SelectInvalidAction
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateSkeletalMeshTriangulated(MayaInstancePlugin):
+class ValidateSkeletalMeshTriangulated(plugin.MayaInstancePlugin):
     """Validates that the geometry has been triangulated."""
 
     order = ValidateContentsOrder
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeleton_top_group_hierarchy.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeleton_top_group_hierarchy.py
index 57418324c9..4e0dc38a36 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeleton_top_group_hierarchy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skeleton_top_group_hierarchy.py
@@ -5,11 +5,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateSkeletonTopGroupHierarchy(MayaInstancePlugin,
+class ValidateSkeletonTopGroupHierarchy(plugin.MayaInstancePlugin,
                                         OptionalPyblishPluginMixin):
     """Validates top group hierarchy in the SETs
     Make sure the object inside the SETs are always top
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_skinCluster_deformer_set.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skinCluster_deformer_set.py
index ee99b432aa..32015a57bc 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_skinCluster_deformer_set.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_skinCluster_deformer_set.py
@@ -6,10 +6,10 @@ from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin,
     PublishValidationError
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateSkinclusterDeformerSet(MayaInstancePlugin,
+class ValidateSkinclusterDeformerSet(plugin.MayaInstancePlugin,
                                      OptionalPyblishPluginMixin):
     """Validate skinClusters on meshes have valid member relationships.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_step_size.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_step_size.py
index 445388efc1..303885d907 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_step_size.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_step_size.py
@@ -4,10 +4,10 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateStepSize(MayaInstancePlugin,
+class ValidateStepSize(plugin.MayaInstancePlugin,
                        OptionalPyblishPluginMixin):
     """Validates the step size for the instance is in a valid range.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_naming_suffix.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_naming_suffix.py
index 1d6a29d446..3a60bc7aef 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_naming_suffix.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_naming_suffix.py
@@ -8,11 +8,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateTransformNamingSuffix(MayaInstancePlugin,
+class ValidateTransformNamingSuffix(plugin.MayaInstancePlugin,
                                     OptionalPyblishPluginMixin):
     """Validates transform suffix based on the type of its children shapes.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_zero.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_zero.py
index 621a7dd6bc..e251572c0d 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_zero.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_transform_zero.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateTransformZero(MayaInstancePlugin,
+class ValidateTransformZero(plugin.MayaInstancePlugin,
                             OptionalPyblishPluginMixin):
     """Transforms can't have any values
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_unique_names.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unique_names.py
index 59540b659a..cbe5d2f647 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_unique_names.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unique_names.py
@@ -4,11 +4,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateUniqueNames(MayaInstancePlugin,
+class ValidateUniqueNames(plugin.MayaInstancePlugin,
                           OptionalPyblishPluginMixin):
     """transform names should be unique
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_mesh_triangulated.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_mesh_triangulated.py
index e8fc3fc095..f283150892 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_mesh_triangulated.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_mesh_triangulated.py
@@ -5,11 +5,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateMeshOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateUnrealMeshTriangulated(MayaInstancePlugin,
+class ValidateUnrealMeshTriangulated(plugin.MayaInstancePlugin,
                                      OptionalPyblishPluginMixin):
     """Validate if mesh is made of triangles for Unreal Engine"""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_staticmesh_naming.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_staticmesh_naming.py
index 054f9aa3a0..dee6563989 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_staticmesh_naming.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_staticmesh_naming.py
@@ -8,10 +8,10 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateUnrealStaticMeshName(MayaInstancePlugin,
+class ValidateUnrealStaticMeshName(plugin.MayaInstancePlugin,
                                    OptionalPyblishPluginMixin):
     """Validate name of Unreal Static Mesh
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_up_axis.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_up_axis.py
index fad0eff5f8..d970eb8020 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_up_axis.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_unreal_up_axis.py
@@ -5,11 +5,11 @@ from ayon_core.pipeline.publish import (
     RepairAction,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaContextPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateUnrealUpAxis(MayaContextPlugin,
+class ValidateUnrealUpAxis(plugin.MayaContextPlugin,
                            OptionalPyblishPluginMixin):
     """Validate if Z is set as up axis in Maya"""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_visible_only.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_visible_only.py
index 431cf2f229..b694b890fc 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_visible_only.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_visible_only.py
@@ -5,10 +5,10 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api.lib import iter_visible_nodes_in_range
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateAlembicVisibleOnly(MayaInstancePlugin,
+class ValidateAlembicVisibleOnly(plugin.MayaInstancePlugin,
                                  OptionalPyblishPluginMixin):
     """Validates at least a single node is visible in frame range.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray.py
index 65a01886b6..7cf064f993 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray.py
@@ -1,10 +1,10 @@
 import pyblish.api
 from ayon_core.pipeline.publish import PublishValidationError
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateVray(MayaInstancePlugin):
+class ValidateVray(plugin.MayaInstancePlugin):
     """Validate general Vray setup."""
 
     order = pyblish.api.ValidatorOrder
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_distributed_rendering.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_distributed_rendering.py
index d58c01c1e2..0338798e3f 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_distributed_rendering.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_distributed_rendering.py
@@ -6,11 +6,11 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
 )
 from ayon_maya.api import lib
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateVRayDistributedRendering(MayaInstancePlugin,
+class ValidateVRayDistributedRendering(plugin.MayaInstancePlugin,
                                        OptionalPyblishPluginMixin):
     """Validate V-Ray Distributed Rendering is ignored in batch mode.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_referenced_aovs.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_referenced_aovs.py
index 9cc3290853..a330866e9b 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_referenced_aovs.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_referenced_aovs.py
@@ -8,11 +8,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     RepairContextAction,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateVrayReferencedAOVs(MayaInstancePlugin,
+class ValidateVrayReferencedAOVs(plugin.MayaInstancePlugin,
                                  OptionalPyblishPluginMixin):
     """Validate whether the V-Ray Render Elements (AOVs) include references.
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_translator_settings.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_translator_settings.py
index 546fd480a9..a4b34db2a1 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_translator_settings.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vray_translator_settings.py
@@ -7,11 +7,11 @@ from ayon_core.pipeline.publish import (
     ValidateContentsOrder,
     context_plugin_should_run,
 )
-from ayon_maya.api.plugin import MayaContextPlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateVRayTranslatorEnabled(MayaContextPlugin,
+class ValidateVRayTranslatorEnabled(plugin.MayaContextPlugin,
                                     OptionalPyblishPluginMixin):
     """Validate VRay Translator settings for extracting vrscenes."""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy.py
index 06b717be03..67d656b183 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy.py
@@ -3,10 +3,10 @@ from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin,
     PublishValidationError,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateVrayProxy(MayaInstancePlugin,
+class ValidateVrayProxy(plugin.MayaInstancePlugin,
                         OptionalPyblishPluginMixin):
 
     order = pyblish.api.ValidatorOrder
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy_members.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy_members.py
index 60d4fe4d8c..cfb17cda55 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy_members.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_vrayproxy_members.py
@@ -4,11 +4,11 @@ from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin,
     PublishValidationError,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateVrayProxyMembers(MayaInstancePlugin,
+class ValidateVrayProxyMembers(plugin.MayaInstancePlugin,
                                OptionalPyblishPluginMixin):
     """Validate whether the V-Ray Proxy instance has shape members"""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_xgen.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_xgen.py
index 036da2c1e6..050165db01 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_xgen.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_xgen.py
@@ -4,10 +4,10 @@ import maya.cmds as cmds
 import pyblish.api
 import xgenm
 from ayon_core.pipeline.publish import PublishValidationError
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateXgen(MayaInstancePlugin):
+class ValidateXgen(plugin.MayaInstancePlugin):
     """Validate Xgen data."""
 
     label = "Validate Xgen"
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_renderscript_callbacks.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_renderscript_callbacks.py
index c185838028..ce6410deaa 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_renderscript_callbacks.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_renderscript_callbacks.py
@@ -3,11 +3,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateYetiRenderScriptCallbacks(MayaInstancePlugin,
+class ValidateYetiRenderScriptCallbacks(plugin.MayaInstancePlugin,
                                         OptionalPyblishPluginMixin):
     """Check if the render script callbacks will be used during the rendering
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_cache_state.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_cache_state.py
index 64478d4c50..a7f272c1ec 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_cache_state.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_cache_state.py
@@ -8,10 +8,10 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     RepairAction,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateYetiRigCacheState(MayaInstancePlugin,
+class ValidateYetiRigCacheState(plugin.MayaInstancePlugin,
                                 OptionalPyblishPluginMixin):
     """Validate the I/O attributes of the node
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_input_in_instance.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_input_in_instance.py
index cf637e55cb..8c258b4455 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_input_in_instance.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_input_in_instance.py
@@ -4,11 +4,11 @@ from ayon_core.pipeline.publish import (
     PublishValidationError,
     ValidateContentsOrder,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 from maya import cmds
 
 
-class ValidateYetiRigInputShapesInInstance(MayaInstancePlugin,
+class ValidateYetiRigInputShapesInInstance(plugin.MayaInstancePlugin,
                                            OptionalPyblishPluginMixin):
     """Validate if all input nodes are part of the instance's hierarchy"""
 
diff --git a/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_settings.py b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_settings.py
index 4258fb8feb..fa0836e0ef 100644
--- a/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_settings.py
+++ b/server_addon/maya/client/ayon_maya/plugins/publish/validate_yeti_rig_settings.py
@@ -3,10 +3,10 @@ from ayon_core.pipeline.publish import (
     OptionalPyblishPluginMixin,
     PublishValidationError,
 )
-from ayon_maya.api.plugin import MayaInstancePlugin
+from ayon_maya.api import plugin
 
 
-class ValidateYetiRigSettings(MayaInstancePlugin,
+class ValidateYetiRigSettings(plugin.MayaInstancePlugin,
                               OptionalPyblishPluginMixin):
     """Validate Yeti Rig Settings have collected input connections.